Commit 864721ba authored by eseidel's avatar eseidel

Bug #: 6078

Submitted by: eseidel
Reviewed by: darin
        SVG test cases changed (now the svg.css is loaded properly).
        No other functionality changes, just code removal.
        http://bugzilla.opendarwin.org/show_bug.cgi?id=6078

        * ForwardingHeaders/klibloader.h: Removed.
        * WebCore.xcodeproj/project.pbxproj:
        * khtml/css/csshelper.cpp:
        * khtml/css/cssstyleselector.cpp:
        (khtml::CSSStyleSelector::CSSStyleSelector):
        (khtml::parseUASheet):
        (khtml::CSSStyleSelector::loadDefaultStyle):
        * khtml/css/cssstyleselector.h:
        * khtml/ecma/kjs_dom.h:
        * khtml/ecma/kjs_events.cpp:
        (KJS::JSAbstractEventListener::handleEvent):
        (KJS::JSLazyEventListener::eventParameterName):
        (KJS::JSLazyEventListener::parseCode):
        * khtml/ecma/kjs_events.h:
        * khtml/ecma/kjs_html.cpp:
        (KJS::KJS::HTMLElement::implementsCall):
        * khtml/ecma/kjs_navigator.cpp:
        (KJS::Navigator::getValueProperty):
        (KJS::PluginBase::PluginBase):
        * khtml/ecma/kjs_proxy.cpp:
        (KJSProxyImpl::KJSProxyImpl):
        (KJSProxyImpl::evaluate):
        (KJSProxyImpl::clear):
        (KJSProxyImpl::createHTMLEventHandler):
        (KJSProxyImpl::initScript):
        * khtml/ecma/kjs_proxy.h:
        (KJSProxyImpl::setEventHandlerLineno):
        * khtml/ecma/kjs_traversal.cpp:
        (KJS::JSNodeFilterCondition::acceptNode):
        * khtml/ecma/kjs_window.cpp:
        (KJS::Window::interpreter):
        (KJS::Window::retrieve):
        (KJS::Window::clear):
        (KJS::ScheduledAction::execute):
        * khtml/ecma/kjs_window.h:
        * khtml/html/html_canvasimpl.cpp:
        * khtml/html/html_documentimpl.cpp:
        * khtml/html/html_formimpl.cpp:
        (DOM::HTMLFormElementImpl::formData):
        * khtml/html/html_headimpl.cpp:
        (HTMLScriptElementImpl::evaluateScript):
        * khtml/html/html_imageimpl.cpp:
        * khtml/html/html_tableimpl.cpp:
        * khtml/html/htmltokenizer.cpp:
        (khtml::HTMLTokenizer::HTMLTokenizer):
        (khtml::HTMLTokenizer::processToken):
        * khtml/khtml_part.cpp:
        (KHTMLPart::KHTMLPart):
        (KHTMLPart::init):
        (KHTMLPart::~KHTMLPart):
        (KHTMLPart::restoreURL):
        (KHTMLPart::didOpenURL):
        (KHTMLPart::jScript):
        (KHTMLPart::executeScript):
        (KHTMLPart::write):
        (KHTMLPart::reparseConfiguration):
        (KHTMLPart::createHTMLEventListener):
        * khtml/khtml_part.h:
        * khtml/khtmlpart_p.h:
        (KHTMLPartPrivate::KHTMLPartPrivate):
        (KHTMLPartPrivate::~KHTMLPartPrivate):
        * khtml/misc/decoder.cpp:
        * khtml/misc/loader.cpp:
        (CachedCSSStyleSheet::CachedCSSStyleSheet):
        (CachedScript::CachedScript):
        * khtml/rendering/render_flow.cpp:
        * khtml/rendering/render_frames.cpp:
        * khtml/rendering/render_inline.cpp:
        * khtml/rendering/render_line.cpp:
        * khtml/rendering/render_table.cpp:
        * khtml/rendering/table_layout.cpp:
        * khtml/xml/dom_docimpl.cpp:
        (DocumentImpl::implicitOpen):
        (DocumentImpl::write):
        * khtml/xml/dom_nodeimpl.cpp:
        * ksvg2/svg/SVGTestsImpl.cpp:
        (SVGTestsImpl::isValid):
        * kwq/DOMInternal.mm:
        (-[WebScriptObject _initializeScriptDOMNodeImp]):
        * kwq/KWQKGlobal.h:
        * kwq/KWQKHTMLFactory.h:
        (KHTMLFactory::vLinks):
        * kwq/KWQKHTMLFactory.mm:
        * kwq/KWQKHTMLPart.mm:
        (KWQKHTMLPart::KWQKHTMLPart):
        (KWQKHTMLPart::userGestureHint):
        (KWQKHTMLPart::bindingRootObject):
        * kwq/KWQKHTMLSettings.h:
        (KHTMLSettings::fantasyFontName):
        (KHTMLSettings::isJavaScriptEnabled):
        * kwq/KWQKInstance.h: Removed.
        * kwq/KWQKLibrary.h: Removed.
        * kwq/KWQKPartsFactory.h: Removed.
        * kwq/KWQKPartsPart.h:
        (KParts::ReadOnlyPart::name):
        * kwq/KWQKStandardDirs.h:
        * kwq/KWQKStandardDirs.mm:
        (locate):
        * kwq/WebCoreBridge.mm:
        (-[WebCoreBridge executionContextForView:]):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@11588 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent c4cf0346
2005-12-14 Eric Seidel <eseidel@apple.com>
Reviewed by darin.
SVG test cases changed (now the svg.css is loaded properly).
No other functionality changes, just code removal.
http://bugzilla.opendarwin.org/show_bug.cgi?id=6078
* ForwardingHeaders/klibloader.h: Removed.
* WebCore.xcodeproj/project.pbxproj:
* khtml/css/csshelper.cpp:
* khtml/css/cssstyleselector.cpp:
(khtml::CSSStyleSelector::CSSStyleSelector):
(khtml::parseUASheet):
(khtml::CSSStyleSelector::loadDefaultStyle):
* khtml/css/cssstyleselector.h:
* khtml/ecma/kjs_dom.h:
* khtml/ecma/kjs_events.cpp:
(KJS::JSAbstractEventListener::handleEvent):
(KJS::JSLazyEventListener::eventParameterName):
(KJS::JSLazyEventListener::parseCode):
* khtml/ecma/kjs_events.h:
* khtml/ecma/kjs_html.cpp:
(KJS::KJS::HTMLElement::implementsCall):
* khtml/ecma/kjs_navigator.cpp:
(KJS::Navigator::getValueProperty):
(KJS::PluginBase::PluginBase):
* khtml/ecma/kjs_proxy.cpp:
(KJSProxyImpl::KJSProxyImpl):
(KJSProxyImpl::evaluate):
(KJSProxyImpl::clear):
(KJSProxyImpl::createHTMLEventHandler):
(KJSProxyImpl::initScript):
* khtml/ecma/kjs_proxy.h:
(KJSProxyImpl::setEventHandlerLineno):
* khtml/ecma/kjs_traversal.cpp:
(KJS::JSNodeFilterCondition::acceptNode):
* khtml/ecma/kjs_window.cpp:
(KJS::Window::interpreter):
(KJS::Window::retrieve):
(KJS::Window::clear):
(KJS::ScheduledAction::execute):
* khtml/ecma/kjs_window.h:
* khtml/html/html_canvasimpl.cpp:
* khtml/html/html_documentimpl.cpp:
* khtml/html/html_formimpl.cpp:
(DOM::HTMLFormElementImpl::formData):
* khtml/html/html_headimpl.cpp:
(HTMLScriptElementImpl::evaluateScript):
* khtml/html/html_imageimpl.cpp:
* khtml/html/html_tableimpl.cpp:
* khtml/html/htmltokenizer.cpp:
(khtml::HTMLTokenizer::HTMLTokenizer):
(khtml::HTMLTokenizer::processToken):
* khtml/khtml_part.cpp:
(KHTMLPart::KHTMLPart):
(KHTMLPart::init):
(KHTMLPart::~KHTMLPart):
(KHTMLPart::restoreURL):
(KHTMLPart::didOpenURL):
(KHTMLPart::jScript):
(KHTMLPart::executeScript):
(KHTMLPart::write):
(KHTMLPart::reparseConfiguration):
(KHTMLPart::createHTMLEventListener):
* khtml/khtml_part.h:
* khtml/khtmlpart_p.h:
(KHTMLPartPrivate::KHTMLPartPrivate):
(KHTMLPartPrivate::~KHTMLPartPrivate):
* khtml/misc/decoder.cpp:
* khtml/misc/loader.cpp:
(CachedCSSStyleSheet::CachedCSSStyleSheet):
(CachedScript::CachedScript):
* khtml/rendering/render_flow.cpp:
* khtml/rendering/render_frames.cpp:
* khtml/rendering/render_inline.cpp:
* khtml/rendering/render_line.cpp:
* khtml/rendering/render_table.cpp:
* khtml/rendering/table_layout.cpp:
* khtml/xml/dom_docimpl.cpp:
(DocumentImpl::implicitOpen):
(DocumentImpl::write):
* khtml/xml/dom_nodeimpl.cpp:
* ksvg2/svg/SVGTestsImpl.cpp:
(SVGTestsImpl::isValid):
* kwq/DOMInternal.mm:
(-[WebScriptObject _initializeScriptDOMNodeImp]):
* kwq/KWQKGlobal.h:
* kwq/KWQKHTMLFactory.h:
(KHTMLFactory::vLinks):
* kwq/KWQKHTMLFactory.mm:
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::KWQKHTMLPart):
(KWQKHTMLPart::userGestureHint):
(KWQKHTMLPart::bindingRootObject):
* kwq/KWQKHTMLSettings.h:
(KHTMLSettings::fantasyFontName):
(KHTMLSettings::isJavaScriptEnabled):
* kwq/KWQKInstance.h: Removed.
* kwq/KWQKLibrary.h: Removed.
* kwq/KWQKPartsFactory.h: Removed.
* kwq/KWQKPartsPart.h:
(KParts::ReadOnlyPart::name):
* kwq/KWQKStandardDirs.h:
* kwq/KWQKStandardDirs.mm:
(locate):
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge executionContextForView:]):
2005-12-14 Beth Dakin <bdakin@apple.com>
Reviewed by John.
......@@ -210,14 +210,12 @@
93F1995508245E59001E9ABC /* KWQKJob.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864A02DE3A9A01EA4122 /* KWQKJob.h */; };
93F1995608245E59001E9ABC /* KWQKJobClasses.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864B02DE3A9A01EA4122 /* KWQKJobClasses.h */; };
93F1995708245E59001E9ABC /* KWQKKAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F587861D02DE398401EA4122 /* KWQKKAction.h */; };
93F1995808245E59001E9ABC /* KWQKLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F902DE382001EA4122 /* KWQKLibrary.h */; };
93F1995908245E59001E9ABC /* KWQKLineEdit.h in Headers */ = {isa = PBXBuildFile; fileRef = F587862102DE398401EA4122 /* KWQKLineEdit.h */; };
93F1995A08245E59001E9ABC /* KWQKListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587862202DE398401EA4122 /* KWQKListBox.h */; };
93F1995B08245E59001E9ABC /* KWQKLocale.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785FA02DE382001EA4122 /* KWQKLocale.h */; };
93F1995C08245E59001E9ABC /* KWQKPartsBrowserExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866702DE3B3201EA4122 /* KWQKPartsBrowserExtension.h */; };
93F1995D08245E59001E9ABC /* KWQKPartsBrowserInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866802DE3B3201EA4122 /* KWQKPartsBrowserInterface.h */; };
93F1995E08245E59001E9ABC /* KWQKPartsEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866902DE3B3201EA4122 /* KWQKPartsEvent.h */; };
93F1995F08245E59001E9ABC /* KWQKPartsFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866A02DE3B3201EA4122 /* KWQKPartsFactory.h */; };
93F1996008245E59001E9ABC /* KWQKPartsHistoryProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866B02DE3B3201EA4122 /* KWQKPartsHistoryProvider.h */; };
93F1996108245E59001E9ABC /* KWQKPartsPart.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866C02DE3B3201EA4122 /* KWQKPartsPart.h */; };
93F1996208245E59001E9ABC /* KWQKPartsPartManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866D02DE3B3201EA4122 /* KWQKPartsPartManager.h */; };
......@@ -746,14 +744,12 @@
A8212B2008794A2300677359 /* KWQKJob.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864A02DE3A9A01EA4122 /* KWQKJob.h */; };
A8212B2108794A2300677359 /* KWQKJobClasses.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864B02DE3A9A01EA4122 /* KWQKJobClasses.h */; };
A8212B2208794A2300677359 /* KWQKKAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F587861D02DE398401EA4122 /* KWQKKAction.h */; };
A8212B2308794A2300677359 /* KWQKLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F902DE382001EA4122 /* KWQKLibrary.h */; };
A8212B2408794A2300677359 /* KWQKLineEdit.h in Headers */ = {isa = PBXBuildFile; fileRef = F587862102DE398401EA4122 /* KWQKLineEdit.h */; };
A8212B2508794A2300677359 /* KWQKListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587862202DE398401EA4122 /* KWQKListBox.h */; };
A8212B2608794A2300677359 /* KWQKLocale.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785FA02DE382001EA4122 /* KWQKLocale.h */; };
A8212B2708794A2300677359 /* KWQKPartsBrowserExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866702DE3B3201EA4122 /* KWQKPartsBrowserExtension.h */; };
A8212B2808794A2300677359 /* KWQKPartsBrowserInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866802DE3B3201EA4122 /* KWQKPartsBrowserInterface.h */; };
A8212B2908794A2300677359 /* KWQKPartsEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866902DE3B3201EA4122 /* KWQKPartsEvent.h */; };
A8212B2A08794A2300677359 /* KWQKPartsFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866A02DE3B3201EA4122 /* KWQKPartsFactory.h */; };
A8212B2B08794A2300677359 /* KWQKPartsHistoryProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866B02DE3B3201EA4122 /* KWQKPartsHistoryProvider.h */; };
A8212B2C08794A2300677359 /* KWQKPartsPart.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866C02DE3B3201EA4122 /* KWQKPartsPart.h */; };
A8212B2D08794A2300677359 /* KWQKPartsPartManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866D02DE3B3201EA4122 /* KWQKPartsPartManager.h */; };
......@@ -1263,10 +1259,8 @@
A8C0FB9D089701F900BA5114 /* KCanvasRenderingStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0F6EC089701F100BA5114 /* KCanvasRenderingStyle.h */; };
A8C0FBA0089701F900BA5114 /* KSVGTimeScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0F6EF089701F100BA5114 /* KSVGTimeScheduler.cpp */; };
A8C0FBA1089701F900BA5114 /* KSVGTimeScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0F6F0089701F100BA5114 /* KSVGTimeScheduler.h */; };
A8C0FBA6089701F900BA5114 /* KSVGCSSParser.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0F6F7089701F100BA5114 /* KSVGCSSParser.h */; };
A8C0FBA7089701F900BA5114 /* svg.css in Resources */ = {isa = PBXBuildFile; fileRef = A8C0F6F8089701F100BA5114 /* svg.css */; };
A8C0FBAA089701F900BA5114 /* SVGCSSStyleSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0F6FB089701F100BA5114 /* SVGCSSStyleSelector.cpp */; };
A8C0FBAB089701F900BA5114 /* SVGCSSStyleSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0F6FC089701F100BA5114 /* SVGCSSStyleSelector.h */; };
A8C0FBAE089701F900BA5114 /* SVGRenderStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0F6FF089701F100BA5114 /* SVGRenderStyle.cpp */; };
A8C0FBAF089701F900BA5114 /* SVGRenderStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0F700089701F100BA5114 /* SVGRenderStyle.h */; };
A8C0FBB0089701F900BA5114 /* SVGRenderStyleDefs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0F701089701F100BA5114 /* SVGRenderStyleDefs.cpp */; };
......@@ -1973,10 +1967,8 @@
A8C0F6F4089701F100BA5114 /* cssproperties.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cssproperties.in; sourceTree = "<group>"; };
A8C0F6F5089701F100BA5114 /* cssvalues.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cssvalues.in; sourceTree = "<group>"; };
A8C0F6F6089701F100BA5114 /* KSVGCSSParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KSVGCSSParser.cpp; sourceTree = "<group>"; };
A8C0F6F7089701F100BA5114 /* KSVGCSSParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSVGCSSParser.h; sourceTree = "<group>"; };
A8C0F6F8089701F100BA5114 /* svg.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg.css; sourceTree = "<group>"; };
A8C0F6FB089701F100BA5114 /* SVGCSSStyleSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGCSSStyleSelector.cpp; sourceTree = "<group>"; };
A8C0F6FC089701F100BA5114 /* SVGCSSStyleSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGCSSStyleSelector.h; sourceTree = "<group>"; };
A8C0F6FF089701F100BA5114 /* SVGRenderStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGRenderStyle.cpp; sourceTree = "<group>"; };
A8C0F700089701F100BA5114 /* SVGRenderStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGRenderStyle.h; sourceTree = "<group>"; };
A8C0F701089701F100BA5114 /* SVGRenderStyleDefs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGRenderStyleDefs.cpp; sourceTree = "<group>"; };
......@@ -2663,7 +2655,6 @@
F58785F502DE382001EA4122 /* KWQKGlobal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKGlobal.h; sourceTree = "<group>"; };
F58785F602DE382001EA4122 /* KWQKGlobalSettings.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKGlobalSettings.h; sourceTree = "<group>"; };
F58785F802DE382001EA4122 /* KWQKInstance.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKInstance.h; sourceTree = "<group>"; };
F58785F902DE382001EA4122 /* KWQKLibrary.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKLibrary.h; sourceTree = "<group>"; };
F58785FA02DE382001EA4122 /* KWQKLocale.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKLocale.h; sourceTree = "<group>"; };
F58785FD02DE382001EA4122 /* KWQKStandardDirs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKStandardDirs.h; sourceTree = "<group>"; };
F58785FE02DE382001EA4122 /* KWQKStaticDeleter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKStaticDeleter.h; sourceTree = "<group>"; };
......@@ -2692,7 +2683,6 @@
F587866702DE3B3201EA4122 /* KWQKPartsBrowserExtension.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsBrowserExtension.h; sourceTree = "<group>"; };
F587866802DE3B3201EA4122 /* KWQKPartsBrowserInterface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsBrowserInterface.h; sourceTree = "<group>"; };
F587866902DE3B3201EA4122 /* KWQKPartsEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsEvent.h; sourceTree = "<group>"; };
F587866A02DE3B3201EA4122 /* KWQKPartsFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsFactory.h; sourceTree = "<group>"; };
F587866B02DE3B3201EA4122 /* KWQKPartsHistoryProvider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsHistoryProvider.h; sourceTree = "<group>"; };
F587866C02DE3B3201EA4122 /* KWQKPartsPart.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsPart.h; sourceTree = "<group>"; };
F587866D02DE3B3201EA4122 /* KWQKPartsPartManager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsPartManager.h; sourceTree = "<group>"; };
......@@ -3098,10 +3088,8 @@
A8C0F6F4089701F100BA5114 /* cssproperties.in */,
A8C0F6F5089701F100BA5114 /* cssvalues.in */,
A8C0F6F6089701F100BA5114 /* KSVGCSSParser.cpp */,
A8C0F6F7089701F100BA5114 /* KSVGCSSParser.h */,
A8C0F6F8089701F100BA5114 /* svg.css */,
A8C0F6FB089701F100BA5114 /* SVGCSSStyleSelector.cpp */,
A8C0F6FC089701F100BA5114 /* SVGCSSStyleSelector.h */,
A8C0F6FF089701F100BA5114 /* SVGRenderStyle.cpp */,
A8C0F700089701F100BA5114 /* SVGRenderStyle.h */,
A8C0F701089701F100BA5114 /* SVGRenderStyleDefs.cpp */,
......@@ -4056,7 +4044,6 @@
F58785F602DE382001EA4122 /* KWQKGlobalSettings.h */,
F58784F502DE375901EA4122 /* KWQKGlobalSettings.mm */,
F58785F802DE382001EA4122 /* KWQKInstance.h */,
F58785F902DE382001EA4122 /* KWQKLibrary.h */,
F58785FA02DE382001EA4122 /* KWQKLocale.h */,
F587850402DE375901EA4122 /* KWQKLocale.mm */,
F58785FE02DE382001EA4122 /* KWQKStaticDeleter.h */,
......@@ -4129,7 +4116,6 @@
F58784C702DE375801EA4122 /* KWQKPartsBrowserInterface.mm */,
F587866902DE3B3201EA4122 /* KWQKPartsEvent.h */,
F587850802DE375901EA4122 /* KWQKPartsEvent.mm */,
F587866A02DE3B3201EA4122 /* KWQKPartsFactory.h */,
F587866B02DE3B3201EA4122 /* KWQKPartsHistoryProvider.h */,
F58784F602DE375901EA4122 /* KWQKHistoryProvider.mm */,
F587866C02DE3B3201EA4122 /* KWQKPartsPart.h */,
......@@ -4411,14 +4397,12 @@
93F1995508245E59001E9ABC /* KWQKJob.h in Headers */,
93F1995608245E59001E9ABC /* KWQKJobClasses.h in Headers */,
93F1995708245E59001E9ABC /* KWQKKAction.h in Headers */,
93F1995808245E59001E9ABC /* KWQKLibrary.h in Headers */,
93F1995908245E59001E9ABC /* KWQKLineEdit.h in Headers */,
93F1995A08245E59001E9ABC /* KWQKListBox.h in Headers */,
93F1995B08245E59001E9ABC /* KWQKLocale.h in Headers */,
93F1995C08245E59001E9ABC /* KWQKPartsBrowserExtension.h in Headers */,
93F1995D08245E59001E9ABC /* KWQKPartsBrowserInterface.h in Headers */,
93F1995E08245E59001E9ABC /* KWQKPartsEvent.h in Headers */,
93F1995F08245E59001E9ABC /* KWQKPartsFactory.h in Headers */,
93F1996008245E59001E9ABC /* KWQKPartsHistoryProvider.h in Headers */,
93F1996108245E59001E9ABC /* KWQKPartsPart.h in Headers */,
93F1996208245E59001E9ABC /* KWQKPartsPartManager.h in Headers */,
......@@ -4752,14 +4736,12 @@
A8212B2008794A2300677359 /* KWQKJob.h in Headers */,
A8212B2108794A2300677359 /* KWQKJobClasses.h in Headers */,
A8212B2208794A2300677359 /* KWQKKAction.h in Headers */,
A8212B2308794A2300677359 /* KWQKLibrary.h in Headers */,
A8212B2408794A2300677359 /* KWQKLineEdit.h in Headers */,
A8212B2508794A2300677359 /* KWQKListBox.h in Headers */,
A8212B2608794A2300677359 /* KWQKLocale.h in Headers */,
A8212B2708794A2300677359 /* KWQKPartsBrowserExtension.h in Headers */,
A8212B2808794A2300677359 /* KWQKPartsBrowserInterface.h in Headers */,
A8212B2908794A2300677359 /* KWQKPartsEvent.h in Headers */,
A8212B2A08794A2300677359 /* KWQKPartsFactory.h in Headers */,
A8212B2B08794A2300677359 /* KWQKPartsHistoryProvider.h in Headers */,
A8212B2C08794A2300677359 /* KWQKPartsPart.h in Headers */,
A8212B2D08794A2300677359 /* KWQKPartsPartManager.h in Headers */,
......@@ -4943,8 +4925,6 @@
A898F147088121E90075EFB2 /* htmlfactory.h in Headers */,
A8C0FB9D089701F900BA5114 /* KCanvasRenderingStyle.h in Headers */,
A8C0FBA1089701F900BA5114 /* KSVGTimeScheduler.h in Headers */,
A8C0FBA6089701F900BA5114 /* KSVGCSSParser.h in Headers */,
A8C0FBAB089701F900BA5114 /* SVGCSSStyleSelector.h in Headers */,
A8C0FBAF089701F900BA5114 /* SVGRenderStyle.h in Headers */,
A8C0FBB1089701F900BA5114 /* SVGRenderStyleDefs.h in Headers */,
A8C0FCA0089701F900BA5114 /* SVGZoomEventImpl.h in Headers */,
......
......@@ -29,7 +29,6 @@
#include <qfontdatabase.h>
#include <kcharsets.h>
#include <kglobal.h>
#include <kdebug.h>
#include "rendering/render_style.h"
......
......@@ -53,7 +53,6 @@
#include <kstandarddirs.h>
#include <kcharsets.h>
#include <kglobal.h>
#include <qfile.h>
#include <qfontdatabase.h>
#include <qfontinfo.h>
......@@ -225,7 +224,8 @@ CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, QString userStyleSheet, S
view = doc->view();
strictParsing = _strictParsing;
settings = view ? view->part()->settings() : 0;
if(!defaultStyle) loadDefaultStyle(settings);
if (!defaultStyle)
loadDefaultStyle();
m_medium = view ? view->mediaType() : QString("all");
m_userStyle = 0;
......@@ -302,7 +302,7 @@ CSSStyleSelector::~CSSStyleSelector()
delete m_userSheet;
}
static CSSStyleSheetImpl* parseUASheet(const KHTMLSettings* s, const char* sheetName)
static CSSStyleSheetImpl* parseUASheet(const char* sheetName)
{
QFile f(locate( "data", sheetName));
f.open(IO_ReadOnly);
......@@ -314,8 +314,6 @@ static CSSStyleSheetImpl* parseUASheet(const KHTMLSettings* s, const char* sheet
file[readbytes] = '\0';
QString style = QString::fromLatin1(file.data());
if (s)
style += s->settingsToCSS();
DOMString str(style);
CSSStyleSheetImpl* sheet = new CSSStyleSheetImpl((CSSStyleSheetImpl*)0);
......@@ -323,10 +321,10 @@ static CSSStyleSheetImpl* parseUASheet(const KHTMLSettings* s, const char* sheet
return sheet;
}
void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s)
void CSSStyleSelector::loadDefaultStyle()
{
if(defaultStyle) return;
defaultSheet = parseUASheet(s, "khtml/css/html4.css");
defaultSheet = parseUASheet("html4.css");
// Collect only strict-mode rules.
defaultStyle = new CSSRuleSet();
......@@ -336,13 +334,13 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s)
defaultPrintStyle->addRulesFromSheet(defaultSheet, "print");
#if SVG_SUPPORT
svgSheet = parseUASheet(0, "ksvg2/css/svg.css");
svgSheet = parseUASheet("svg.css");
defaultStyle->addRulesFromSheet(svgSheet, "screen");
defaultPrintStyle->addRulesFromSheet(svgSheet, "print");
#endif
// Collect only quirks-mode rules.
quirksSheet = parseUASheet(0, "khtml/css/quirks.css");
quirksSheet = parseUASheet("quirks.css");
defaultQuirksStyle = new CSSRuleSet();
defaultQuirksStyle->addRulesFromSheet(quirksSheet, "screen");
}
......
......@@ -102,7 +102,7 @@ namespace khtml
CSSStyleSelector(DOM::CSSStyleSheetImpl *sheet);
~CSSStyleSelector();
static void loadDefaultStyle(const KHTMLSettings *s = 0);
static void loadDefaultStyle();
void initElementAndPseudoState(DOM::ElementImpl* e);
void initForStyleResolve(DOM::ElementImpl* e, RenderStyle* parentStyle);
......
......@@ -22,6 +22,7 @@
#define KJS_DOM_H
#include "kjs_binding.h"
#include "dom_nodeimpl.h"
#include <qvaluelist.h>
#include "misc/shared.h"
......@@ -35,8 +36,6 @@ namespace DOM {
class ElementImpl;
class EntityImpl;
class NamedNodeMapImpl;
class NodeImpl;
class NodeListImpl;
class NotationImpl;
class ProcessingInstructionImpl;
class TextImpl;
......
......@@ -80,15 +80,15 @@ void JSAbstractEventListener::handleEvent(EventListenerEvent ele, bool isWindowE
JSObject *win = windowObj();
KHTMLPart *part = static_cast<Window*>(win)->part();
KJSProxy *proxy = 0;
KJSProxyImpl *proxy = 0;
if (part)
proxy = KJSProxy::proxy( part );
proxy = part->jScript();
if (!proxy)
return;
JSLock lock;
ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(proxy->interpreter());
ScriptInterpreter *interpreter = proxy->interpreter();
ExecState *exec = interpreter->globalExec();
bool hasHandleEvent = false;
......@@ -283,26 +283,31 @@ JSObject *JSLazyEventListener::listenerObj() const
return listener;
}
JSValue *JSLazyEventListener::eventParameterName() const
{
static ProtectedPtr<JSValue> eventString = jsString("event");
return eventString.get();
}
void JSLazyEventListener::parseCode() const
{
if (!parsed) {
JSObject *w = win;
KHTMLPart *part = static_cast<Window *>(w)->part();
KJSProxy *proxy = 0L;
KJSProxyImpl *proxy = 0;
if (part)
proxy = KJSProxy::proxy( part );
proxy = part->jScript();
if (proxy) {
ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(proxy->interpreter());
ScriptInterpreter *interpreter = proxy->interpreter();
ExecState *exec = interpreter->globalExec();
JSLock lock;
JSObject *constr = interpreter->builtinFunction();
List args;
static ProtectedPtr<JSValue> eventString = jsString("event");
UString sourceURL(part->m_url.url());
args.append(eventString);
args.append(eventParameterName());
args.append(jsString(code));
listener = constr->construct(exec, args, sourceURL, lineNumber); // ### is globalExec ok ?
......
......@@ -86,6 +86,9 @@ namespace KJS {
virtual void handleEvent(DOM::EventListenerEvent evt, bool isWindowEvent);
JSObject *listenerObj() const;
protected:
virtual JSValue *eventParameterName() const;
private:
void parseCode() const;
......
......@@ -1420,7 +1420,7 @@ bool KJS::HTMLElement::implementsCall() const
HTMLElementImpl *element = static_cast<HTMLElementImpl *>(impl());
if (element->hasTagName(embedTag) || element->hasTagName(objectTag) || element->hasTagName(appletTag)) {
DocumentImpl* doc = element->getDocument();
KJSProxy *proxy = KJSProxy::proxy(doc->part());
KJSProxyImpl *proxy = doc->part()->jScript();
ExecState *exec = proxy->interpreter()->globalExec();
if (JSValue *runtimeObject = getRuntimeObject(exec, element))
return static_cast<JSObject *>(runtimeObject)->implementsCall();
......
......@@ -203,8 +203,6 @@ JSValue *Navigator::getValueProperty(ExecState *exec, int token) const
case Vendor:
return jsString("Apple Computer, Inc.");
case Language:
// We don't have an implementation of KGlobal::locale(). We do however
// have a static method on KLocale to access the current language.
return jsString(KLocale::language());
case UserAgent:
return jsString(userAgent);
......@@ -241,7 +239,7 @@ PluginBase::PluginBase(ExecState *exec)
mimes->setAutoDelete( true );
// read configuration
KConfig c(KGlobal::dirs()->saveLocation("data","nsplugins")+"/pluginsinfo");
KConfig c("");
unsigned num = (unsigned int)c.readNumEntry("number");
for ( unsigned n=0; n<num; n++ ) {
......
......@@ -32,35 +32,6 @@ using namespace KJS;
using DOM::EventListener;
extern "C" {
KJSProxy *kjs_html_init(KHTMLPart *khtmlpart);
}
class KJSProxyImpl : public KJSProxy {
public:
KJSProxyImpl(KHTMLPart *part);
virtual ~KJSProxyImpl();
virtual QVariant evaluate(QString filename, int baseLine, const QString&str, DOM::NodeImpl *n);
virtual void clear();
virtual DOM::EventListener *createHTMLEventHandler(QString sourceUrl, QString code, DOM::NodeImpl *node);
virtual void finishedWithEvent(DOM::EventImpl *event);
virtual KJS::ScriptInterpreter *interpreter();
virtual void setDebugEnabled(bool enabled);
virtual bool paused() const;
virtual void setSourceFile(QString url, QString code);
virtual void appendSourceFile(QString url, QString code);
void initScript();
private:
KJS::ScriptInterpreter* m_script;
bool m_debugEnabled;
#ifndef NDEBUG
static int s_count;
#endif
};
#ifndef NDEBUG
int KJSProxyImpl::s_count = 0;
#endif
......@@ -69,7 +40,6 @@ KJSProxyImpl::KJSProxyImpl(KHTMLPart *part)
{
m_script = 0;
m_part = part;
m_debugEnabled = false;
#ifndef NDEBUG
s_count++;
#endif
......@@ -103,13 +73,6 @@ QVariant KJSProxyImpl::evaluate(QString filename, int baseLine,
// See smart window.open policy for where this is used.
bool inlineCode = filename.isNull();
#ifdef KJS_DEBUGGER
if (inlineCode)
filename = "(unknown file)";
if (KJSDebugWin::instance())
KJSDebugWin::instance()->setNextSourceInfo(filename,baseLine);
#endif
m_script->setInlineCode(inlineCode);
JSLock lock;
......@@ -139,30 +102,17 @@ void KJSProxyImpl::clear() {
// We have to keep it, so that the Window object for the part remains the same.
// (we used to delete and re-create it, previously)
if (m_script) {
#ifdef KJS_DEBUGGER
KJSDebugWin *debugWin = KJSDebugWin::instance();
if (debugWin && debugWin->currentScript() == m_script) {
debugWin->setMode(KJSDebugWin::Stop);
}
#endif
Window *win = Window::retrieveWindow(m_part);
if (win)
win->clear( m_script->globalExec() );
}
}
DOM::EventListener *KJSProxyImpl::createHTMLEventHandler(QString sourceUrl, QString code, DOM::NodeImpl *node)
DOM::EventListener *KJSProxyImpl::createHTMLEventHandler(QString code, DOM::NodeImpl *node)
{
#ifdef KJS_DEBUGGER
if (KJSDebugWin::instance())
KJSDebugWin::instance()->setNextSourceInfo(sourceUrl,m_handlerLineno);
#else
Q_UNUSED(sourceUrl);
#endif
initScript();
JSLock lock;
return KJS::Window::retrieveWindow(m_part)->getJSLazyEventListener(code,node,m_handlerLineno);
return KJS::Window::retrieveWindow(m_part)->getJSLazyEventListener(code, node, m_handlerLineno);
}
void KJSProxyImpl::finishedWithEvent(DOM::EventImpl *event)
......@@ -182,59 +132,6 @@ KJS::ScriptInterpreter *KJSProxyImpl::interpreter()
return m_script;
}
void KJSProxyImpl::setDebugEnabled(bool enabled)
{
#ifdef KJS_DEBUGGER
m_debugEnabled = enabled;
if (m_script)
m_script->setDebuggingEnabled(enabled);
// NOTE: this is consistent across all KJSProxyImpl instances, as we only
// ever have 1 debug window
if (!enabled && KJSDebugWin::instance()) {
KJSDebugWin::destroyInstance();
}
else if (enabled && !KJSDebugWin::instance()) {
KJSDebugWin::createInstance();
initScript();
KJSDebugWin::instance()->attach(m_script);
}
#else
Q_UNUSED(enabled);
#endif
}
bool KJSProxyImpl::paused() const
{
#ifdef KJS_DEBUGGER
if (KJSDebugWin::instance())
return KJSDebugWin::instance()->inSession();
#endif
return false;
}
void KJSProxyImpl::setSourceFile(QString url, QString code)
{
#ifdef KJS_DEBUGGER
if (KJSDebugWin::instance())
KJSDebugWin::instance()->setSourceFile(url,code);
#else
Q_UNUSED(url);
Q_UNUSED(code);
#endif
}
void KJSProxyImpl::appendSourceFile(QString url, QString code)
{
#ifdef KJS_DEBUGGER
if (KJSDebugWin::instance())
KJSDebugWin::instance()->appendSourceFile(url,code);
#else
Q_UNUSED(url);
Q_UNUSED(code);
#endif
}
// Implementation of the debug() function
class TestFunctionImp : public JSObject {
public:
......@@ -264,7 +161,6 @@ void KJSProxyImpl::initScript()
#ifdef KJS_DEBUGGER
m_script->setDebuggingEnabled(m_debugEnabled);
#endif
//m_script->enableDebug();
globalObject->put(m_script->globalExec(), "debug", new TestFunctionImp(), Internal);
QString userAgent = KWQ(m_part)->userAgent();
......@@ -277,16 +173,3 @@ void KJSProxyImpl::initScript()
userAgent.find(QString::fromLatin1("compatible")) == -1)
m_script->setCompatMode(Interpreter::NetscapeCompat);
}
// Helper method, so that all classes which need jScript() don't need to be added
// as friend to KHTMLPart
KJSProxy * KJSProxy::proxy( KHTMLPart *part )
{
return part ? part->jScript() : NULL;
}
// initialize HTML module
KJSProxy *kjs_html_init(KHTMLPart *khtmlpart)
{
return new KJSProxyImpl(khtmlpart);
}
......@@ -26,7 +26,6 @@
#include <qstring.h>
class KHTMLPart;
class KJSDebugWin;
namespace DOM {
class EventImpl;
......@@ -36,36 +35,30 @@ namespace DOM {
namespace KJS {
class List;
class Interpreter;
class ScriptInterpreter;
}