[webkit-changes] cvs commit: WebCore/kwq DOMInternal.mm
KWQKGlobal.h KWQKHTMLFactory.h KWQKHTMLFactory.mm
KWQKHTMLPart.mm KWQKHTMLSettings.h KWQKPartsPart.h
KWQKStandardDirs.h KWQKStandardDirs.mm WebCoreBridge.mm
KWQKInstance.h KWQKLibrary.h KWQKPartsFactory.h
Eric
eseidel at opensource.apple.com
Wed Dec 14 15:32:05 PST 2005
eseidel 05/12/14 15:32:05
Modified: . ChangeLog
WebCore.xcodeproj project.pbxproj
khtml khtml_part.cpp khtml_part.h khtmlpart_p.h
khtml/css csshelper.cpp cssstyleselector.cpp
cssstyleselector.h
khtml/ecma kjs_dom.h kjs_events.cpp kjs_events.h
kjs_html.cpp kjs_navigator.cpp kjs_proxy.cpp
kjs_proxy.h kjs_traversal.cpp kjs_window.cpp
kjs_window.h
khtml/html html_canvasimpl.cpp html_documentimpl.cpp
html_formimpl.cpp html_headimpl.cpp
html_imageimpl.cpp html_tableimpl.cpp
htmltokenizer.cpp
khtml/misc decoder.cpp loader.cpp
khtml/rendering render_flow.cpp render_frames.cpp
render_inline.cpp render_line.cpp render_table.cpp
table_layout.cpp
khtml/xml dom_docimpl.cpp dom_nodeimpl.cpp
ksvg2/svg SVGTestsImpl.cpp
kwq DOMInternal.mm KWQKGlobal.h KWQKHTMLFactory.h
KWQKHTMLFactory.mm KWQKHTMLPart.mm
KWQKHTMLSettings.h KWQKPartsPart.h
KWQKStandardDirs.h KWQKStandardDirs.mm
WebCoreBridge.mm
Removed: ForwardingHeaders klibloader.h
kwq KWQKInstance.h KWQKLibrary.h KWQKPartsFactory.h
Log:
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:]):
Revision Changes Path
1.532 +109 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -r1.531 -r1.532
--- ChangeLog 14 Dec 2005 22:38:56 -0000 1.531
+++ ChangeLog 14 Dec 2005 23:31:33 -0000 1.532
@@ -1,3 +1,112 @@
+2005-12-14 Eric Seidel <eseidel at 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 at apple.com>
Reviewed by John.
1.55 +0 -20 WebCore/WebCore.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebCore/WebCore.xcodeproj/project.pbxproj,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- project.pbxproj 11 Dec 2005 09:26:00 -0000 1.54
+++ project.pbxproj 14 Dec 2005 23:31:38 -0000 1.55
@@ -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 */,
1.366 +17 -83 WebCore/khtml/khtml_part.cpp
Index: khtml_part.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -r1.365 -r1.366
--- khtml_part.cpp 12 Dec 2005 19:04:31 -0000 1.365
+++ khtml_part.cpp 14 Dec 2005 23:31:40 -0000 1.366
@@ -27,7 +27,6 @@
#include "config.h"
#include "khtml_part.h"
-#define DIRECT_LINKAGE_TO_ECMA
#define QT_NO_CLIPBOARD
#define QT_NO_DRAGANDDROP
@@ -179,17 +178,12 @@
return it;
}
-KHTMLPart::KHTMLPart( QWidget *parentWidget, const char *widgetname, QObject *parent, const char *name,
- GUIProfile prof )
-: KParts::ReadOnlyPart( parent, name )
+KHTMLPart::KHTMLPart(QWidget *parentWidget, const char *widgetname, QObject *parent, const char *name)
+ : KParts::ReadOnlyPart(parent, name), d(0)
{
- d = 0;
- KHTMLFactory::registerPart( this );
- setInstance( KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() );
}
-
-void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
+void KHTMLPart::init(KHTMLView *view)
{
AtomicString::init();
QualifiedName::init();
@@ -199,10 +193,6 @@
KSVG::SVGNames::init();
XLinkNames::init();
#endif
- if ( prof == DefaultGUI )
- setXMLFile( "khtml.rc" );
- else if ( prof == BrowserViewGUI )
- setXMLFile( "khtml_browser.rc" );
frameCount = 0;
@@ -220,11 +210,9 @@
// The java, javascript, and plugin settings will be set after the settings
// have been initialized.
d->m_bJScriptEnabled = true;
- d->m_bJScriptDebugEnabled = true;
d->m_bJavaEnabled = true;
d->m_bPluginsEnabled = true;
-
connect( khtml::Cache::loader(), SIGNAL( requestStarted( khtml::DocLoader*, khtml::CachedObject* ) ),
this, SLOT( slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* ) ) );
connect( khtml::Cache::loader(), SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ),
@@ -232,18 +220,14 @@
connect( khtml::Cache::loader(), SIGNAL( requestFailed( khtml::DocLoader*, khtml::CachedObject *) ),
this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
-
connect( &d->m_redirectionTimer, SIGNAL( timeout() ),
this, SLOT( slotRedirect() ) );
connect(&d->m_lifeSupportTimer, SIGNAL(timeout()), this, SLOT(slotEndLifeSupport()));
-
}
KHTMLPart::~KHTMLPart()
{
- //kdDebug(6050) << "KHTMLPart::~KHTMLPart " << this << endl;
-
stopAutoScroll();
cancelRedirection();
@@ -269,7 +253,6 @@
delete d->m_hostExtension;
delete d; d = 0;
- KHTMLFactory::deregisterPart( this );
}
bool KHTMLPart::restoreURL( const KURL &url )
@@ -294,13 +277,11 @@
// set the java(script) flags according to the current host.
d->m_bJScriptEnabled = d->m_settings->isJavaScriptEnabled(url.host());
- d->m_bJScriptDebugEnabled = d->m_settings->isJavaScriptDebugEnabled();
d->m_bJavaEnabled = d->m_settings->isJavaEnabled(url.host());
d->m_bPluginsEnabled = d->m_settings->isPluginsEnabled(url.host());
m_url = url;
-
emit started( 0L );
return true;
@@ -373,7 +354,6 @@
}
// set the javascript flags according to the current url
- d->m_bJScriptDebugEnabled = d->m_settings->isJavaScriptDebugEnabled();
d->m_bJavaEnabled = d->m_settings->isJavaEnabled(url.host());
d->m_bPluginsEnabled = d->m_settings->isPluginsEnabled(url.host());
@@ -531,50 +511,15 @@
return d->m_metaRefreshEnabled;
}
-// Define this to disable dlopening kjs_html, when directly linking to it.
-// You need to edit khtml/Makefile.am to add ./ecma/libkjs_html.la to LIBADD
-// and to edit khtml/ecma/Makefile.am to s/kjs_html/libkjs_html/, remove libkhtml from LIBADD,
-// remove LDFLAGS line, and replace kde_module with either lib (shared) or noinst (static)
-//#define DIRECT_LINKAGE_TO_ECMA
-
-#ifdef DIRECT_LINKAGE_TO_ECMA
-extern "C" { KJSProxy *kjs_html_init(KHTMLPart *khtmlpart); }
-#endif
-
-KJSProxy *KHTMLPart::jScript()
+KJSProxyImpl *KHTMLPart::jScript()
{
- if (!jScriptEnabled()){
- return 0;
- }
+ if (!jScriptEnabled())
+ return 0;
- if ( !d->m_jscript )
- {
-#ifndef DIRECT_LINKAGE_TO_ECMA
- KLibrary *lib = KLibLoader::self()->library("kjs_html");
- if ( !lib ) {
- setJScriptEnabled( false );
- return 0;
- }
- // look for plain C init function
- void *sym = lib->symbol("kjs_html_init");
- if ( !sym ) {
- lib->unload();
- setJScriptEnabled( false );
- return 0;
- }
- typedef KJSProxy* (*initFunction)(KHTMLPart *);
- initFunction initSym = (initFunction) sym;
- d->m_jscript = (*initSym)(this);
- d->m_kjs_lib = lib;
-#else
- d->m_jscript = kjs_html_init(this);
- // d->m_kjs_lib remains 0L.
-#endif
- if (d->m_bJScriptDebugEnabled)
- d->m_jscript->setDebugEnabled(true);
- }
+ if (!d->m_jscript)
+ d->m_jscript = new KJSProxyImpl(this);
- return d->m_jscript;
+ return d->m_jscript;
}
void KHTMLPart::replaceContentsWithScriptResult( const KURL &url )
@@ -602,9 +547,9 @@
#ifdef KJS_VERBOSE
kdDebug(6070) << "KHTMLPart::executeScript n=" << n.nodeName().qstring().latin1() << "(" << (n.isNull() ? 0 : n.nodeType()) << ") " << script << endl;
#endif
- KJSProxy *proxy = jScript();
+ KJSProxyImpl *proxy = jScript();
- if (!proxy || proxy->paused())
+ if (!proxy)
return QVariant();
d->m_runningScripts++;
// If forceUserGesture is true, then make the script interpreter
@@ -1066,18 +1011,13 @@
d->m_doc->determineParseMode( decoded );
d->m_bFirstData = false;
- //kdDebug(6050) << "KHTMLPart::write haveEnc = " << d->m_haveEncoding << endl;
// ### this is still quite hacky, but should work a lot better than the old solution
if(d->m_decoder->visuallyOrdered()) d->m_doc->setVisuallyOrdered();
d->m_doc->recalcStyle( NodeImpl::Force );
}
- if (jScript())
- jScript()->appendSourceFile(m_url.url(),decoded);
- Tokenizer* t = d->m_doc->tokenizer();
-
- if(t)
- t->write( decoded, true );
+ if (Tokenizer* t = d->m_doc->tokenizer())
+ t->write( decoded, true );
}
void KHTMLPart::write( const QString &str )
@@ -1090,8 +1030,6 @@
d->m_doc->setParseMode( DocumentImpl::Strict );
d->m_bFirstData = false;
}
- if (jScript())
- jScript()->appendSourceFile(m_url.url(),str);
Tokenizer* t = d->m_doc->tokenizer();
if(t)
t->write( str, true );
@@ -2368,7 +2306,6 @@
d->m_doc->docLoader()->setShowAnimations( d->m_settings->showAnimations() );
d->m_bJScriptEnabled = d->m_settings->isJavaScriptEnabled(m_url.host());
- d->m_bJScriptDebugEnabled = d->m_settings->isJavaScriptDebugEnabled();
d->m_bJavaEnabled = d->m_settings->isJavaEnabled(m_url.host());
d->m_bPluginsEnabled = d->m_settings->isPluginsEnabled(m_url.host());
@@ -2936,9 +2873,9 @@
#ifdef KJS_VERBOSE
kdDebug(6070) << "executeScript: filename=" << filename << " baseLine=" << baseLine << " script=" << script << endl;
#endif
- KJSProxy *proxy = jScript();
+ KJSProxyImpl *proxy = jScript();
- if (!proxy || proxy->paused())
+ if (!proxy)
return QVariant();
QVariant ret = proxy->evaluate(filename,baseLine,script, n );
DocumentImpl::updateDocumentsRendering();
@@ -2954,12 +2891,9 @@
DOM::EventListener *KHTMLPart::createHTMLEventListener( QString code, NodeImpl *node )
{
- KJSProxy *proxy = jScript();
-
- if (!proxy)
+ if (KJSProxyImpl *proxy = jScript())
+ return proxy->createHTMLEventHandler(code, node);
return 0;
-
- return proxy->createHTMLEventHandler( m_url.url(), code, node );
}
KHTMLPart *KHTMLPart::opener()
1.143 +5 -10 WebCore/khtml/khtml_part.h
Index: khtml_part.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtml_part.h,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- khtml_part.h 11 Dec 2005 09:26:05 -0000 1.142
+++ khtml_part.h 14 Dec 2005 23:31:41 -0000 1.143
@@ -35,7 +35,7 @@
class KHTMLPartPrivate;
class KHTMLPartBrowserExtension;
-class KJSProxy;
+class KJSProxyImpl;
class KHTMLView;
class KHTMLSettings;
class KJavaAppletContext;
@@ -161,7 +161,6 @@
friend class KJS::Window;
friend class KJS::WindowFunc;
friend class KJS::DOMDocument;
- friend class KJSProxy;
friend class KHTMLPartBrowserExtension;
friend class DOM::DocumentImpl;
friend class DOM::HTMLDocumentImpl;
@@ -181,7 +180,6 @@
Q_PROPERTY( QCString dcopObjectId READ dcopObjectId )
public:
- enum GUIProfile { DefaultGUI, BrowserViewGUI /* ... */ };
enum { NoXPosForVerticalArrowNavigation = INT_MIN };
/**
@@ -196,10 +194,8 @@
* @p parentWidget is used as parent for both objects, the part and
* the view.
*/
- KHTMLPart( QWidget *parentWidget = 0, const char *widgetname = 0,
- QObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
-
- KHTMLPart( KHTMLView *view, QObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
+ KHTMLPart(QWidget *parentWidget = 0, const char *widgetname = 0, QObject *parent = 0, const char *name = 0);
+ KHTMLPart(KHTMLView *view, QObject *parent = 0, const char *name = 0);
/**
* Destructor.
@@ -1138,7 +1134,7 @@
void popupMenu( const QString &url );
- void init( KHTMLView *view, GUIProfile prof );
+ void init(KHTMLView *view);
virtual void clear();
@@ -1190,9 +1186,8 @@
void cancelRedirection(bool newLoadInProgress = false);
- KJSProxy *jScript();
-
public:
+ KJSProxyImpl *jScript();
KHTMLPart *opener();
void setOpener(KHTMLPart *_opener);
bool openedByJS();
1.63 +2 -10 WebCore/khtml/khtmlpart_p.h
Index: khtmlpart_p.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtmlpart_p.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- khtmlpart_p.h 1 Dec 2005 10:32:07 -0000 1.62
+++ khtmlpart_p.h 14 Dec 2005 23:31:41 -0000 1.63
@@ -28,17 +28,14 @@
#define khtmlpart_p_h
#include <kcursor.h>
-#include <klibloader.h>
-#include <kxmlguifactory.h>
#include <kaction.h>
#include <kparts/partmanager.h>
+#include <kio/global.h>
-#include "khtml_run.h"
#include "khtml_find.h"
#include "khtml_factory.h"
#include "khtml_events.h"
#include "khtml_ext.h"
-#include "khtml_iface.h"
#include "khtml_settings.h"
#include "misc/decoder.h"
#include "misc/formdata.h"
@@ -110,7 +107,6 @@
m_decoder = 0L;
m_jscript = 0L;
m_runningScripts = 0;
- m_kjs_lib = 0;
m_job = 0L;
m_bComplete = true;
m_bLoadingMainResource = false;
@@ -193,8 +189,6 @@
delete m_dcopobject;
delete m_extension;
delete m_jscript;
- if ( m_kjs_lib)
- m_kjs_lib->unload();
#ifndef Q_WS_QWS
delete m_javaContext;
#endif
@@ -218,11 +212,9 @@
QString scheduledScript;
RefPtr<DOM::NodeImpl> scheduledScriptNode;
- KJSProxy *m_jscript;
- KLibrary *m_kjs_lib;
+ KJSProxyImpl *m_jscript;
int m_runningScripts;
bool m_bJScriptEnabled :1;
- bool m_bJScriptDebugEnabled :1;
bool m_bJavaEnabled :1;
bool m_bPluginsEnabled :1;
bool m_bJScriptForce :1;
1.10 +0 -1 WebCore/khtml/css/csshelper.cpp
Index: csshelper.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/csshelper.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- csshelper.cpp 3 Oct 2005 21:12:07 -0000 1.9
+++ csshelper.cpp 14 Dec 2005 23:31:43 -0000 1.10
@@ -29,7 +29,6 @@
#include <qfontdatabase.h>
#include <kcharsets.h>
-#include <kglobal.h>
#include <kdebug.h>
#include "rendering/render_style.h"
1.229 +7 -9 WebCore/khtml/css/cssstyleselector.cpp
Index: cssstyleselector.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/cssstyleselector.cpp,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- cssstyleselector.cpp 11 Dec 2005 09:26:07 -0000 1.228
+++ cssstyleselector.cpp 14 Dec 2005 23:31:43 -0000 1.229
@@ -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 @@
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 @@
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 @@
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 @@
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 @@
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");
}
1.49 +1 -1 WebCore/khtml/css/cssstyleselector.h
Index: cssstyleselector.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/cssstyleselector.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cssstyleselector.h 11 Dec 2005 09:26:08 -0000 1.48
+++ cssstyleselector.h 14 Dec 2005 23:31:43 -0000 1.49
@@ -102,7 +102,7 @@
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);
1.64 +1 -2 WebCore/khtml/ecma/kjs_dom.h
Index: kjs_dom.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_dom.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kjs_dom.h 13 Dec 2005 21:29:29 -0000 1.63
+++ kjs_dom.h 14 Dec 2005 23:31:44 -0000 1.64
@@ -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 @@
class ElementImpl;
class EntityImpl;
class NamedNodeMapImpl;
- class NodeImpl;
- class NodeListImpl;
class NotationImpl;
class ProcessingInstructionImpl;
class TextImpl;
1.77 +13 -8 WebCore/khtml/ecma/kjs_events.cpp
Index: kjs_events.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_events.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kjs_events.cpp 11 Dec 2005 02:06:05 -0000 1.76
+++ kjs_events.cpp 14 Dec 2005 23:31:45 -0000 1.77
@@ -80,15 +80,15 @@
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 @@
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 ?
1.37 +3 -0 WebCore/khtml/ecma/kjs_events.h
Index: kjs_events.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_events.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- kjs_events.h 11 Dec 2005 02:06:05 -0000 1.36
+++ kjs_events.h 14 Dec 2005 23:31:45 -0000 1.37
@@ -86,6 +86,9 @@
virtual void handleEvent(DOM::EventListenerEvent evt, bool isWindowEvent);
JSObject *listenerObj() const;
+ protected:
+ virtual JSValue *eventParameterName() const;
+
private:
void parseCode() const;
1.155 +1 -1 WebCore/khtml/ecma/kjs_html.cpp
Index: kjs_html.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- kjs_html.cpp 13 Dec 2005 21:29:29 -0000 1.154
+++ kjs_html.cpp 14 Dec 2005 23:31:45 -0000 1.155
@@ -1420,7 +1420,7 @@
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();
1.41 +1 -3 WebCore/khtml/ecma/kjs_navigator.cpp
Index: kjs_navigator.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_navigator.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kjs_navigator.cpp 13 Dec 2005 21:29:29 -0000 1.40
+++ kjs_navigator.cpp 14 Dec 2005 23:31:46 -0000 1.41
@@ -203,8 +203,6 @@
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 @@
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++ ) {
1.29 +2 -119 WebCore/khtml/ecma/kjs_proxy.cpp
Index: kjs_proxy.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_proxy.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kjs_proxy.cpp 11 Dec 2005 02:06:06 -0000 1.28
+++ kjs_proxy.cpp 14 Dec 2005 23:31:46 -0000 1.29
@@ -32,35 +32,6 @@
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 @@
{
m_script = 0;
m_part = part;
- m_debugEnabled = false;
#ifndef NDEBUG
s_count++;
#endif
@@ -103,13 +73,6 @@
// 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 @@
// 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 @@
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 @@
#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 @@
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);
-}
1.5 +21 -28 WebCore/khtml/ecma/kjs_proxy.h
Index: kjs_proxy.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_proxy.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kjs_proxy.h 12 May 2005 17:11:21 -0000 1.4
+++ kjs_proxy.h 14 Dec 2005 23:31:46 -0000 1.5
@@ -26,7 +26,6 @@
#include <qstring.h>
class KHTMLPart;
-class KJSDebugWin;
namespace DOM {
class EventImpl;
@@ -36,36 +35,30 @@
namespace KJS {
class List;
- class Interpreter;
+ class ScriptInterpreter;
}
-/**
- * @internal
- *
- * @short Proxy class serving as interface when being dlopen'ed.
- */
-class KJSProxy {
+class KJSProxyImpl {
public:
- KJSProxy() { m_handlerLineno = 0; }
- virtual ~KJSProxy() { }
- virtual QVariant evaluate(QString filename, int baseLine, const QString &, DOM::NodeImpl *n) = 0;
- virtual void clear() = 0;
- virtual DOM::EventListener *createHTMLEventHandler(QString sourceUrl, QString code, DOM::NodeImpl *node) = 0;
- virtual void finishedWithEvent(DOM::EventImpl *event) = 0;
- virtual KJS::Interpreter *interpreter() = 0;
-
- virtual void setDebugEnabled(bool enabled) = 0;
- virtual bool paused() const = 0;
- virtual void setSourceFile(QString url, QString code) = 0;
- virtual void appendSourceFile(QString url, QString code) = 0;
-
- void setEventHandlerLineno(int lineno) { m_handlerLineno = lineno; }
-
- KHTMLPart *m_part;
- int m_handlerLineno;
-
- // Helper method, to access the private KHTMLPart::jScript()
- static KJSProxy *proxy( KHTMLPart *part );
+ KJSProxyImpl(KHTMLPart *part);
+ ~KJSProxyImpl();
+ QVariant evaluate(QString filename, int baseLine, const QString& str, DOM::NodeImpl *n);
+ void clear();
+ DOM::EventListener *createHTMLEventHandler(QString code, DOM::NodeImpl *node);
+ void finishedWithEvent(DOM::EventImpl *event);
+ KJS::ScriptInterpreter *interpreter();
+ void setEventHandlerLineno(int lineno) { m_handlerLineno = lineno; }
+
+ void initScript();
+
+private:
+ KJS::ScriptInterpreter* m_script;
+ KHTMLPart *m_part;
+ int m_handlerLineno;
+#ifndef NDEBUG
+ static int s_count;
+#endif
};
+
#endif
1.25 +2 -1 WebCore/khtml/ecma/kjs_traversal.cpp
Index: kjs_traversal.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_traversal.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kjs_traversal.cpp 11 Dec 2005 02:06:07 -0000 1.24
+++ kjs_traversal.cpp 14 Dec 2005 23:31:46 -0000 1.25
@@ -25,6 +25,7 @@
#include <xml/dom_nodeimpl.h>
#include <xml/dom_docimpl.h>
#include <khtmlview.h>
+#include <khtml_part.h>
#include <kdebug.h>
#include <kjs/protect.h>
@@ -316,7 +317,7 @@
{
NodeImpl *node = filterNode;
KHTMLPart *part = node->getDocument()->part();
- KJSProxy *proxy = KJSProxy::proxy(part);
+ KJSProxyImpl *proxy = part->jScript();
if (proxy && filter->implementsCall()) {
JSLock lock;
ExecState *exec = proxy->interpreter()->globalExec();
1.199 +8 -13 WebCore/khtml/ecma/kjs_window.cpp
Index: kjs_window.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- kjs_window.cpp 13 Dec 2005 21:29:30 -0000 1.198
+++ kjs_window.cpp 14 Dec 2005 23:31:46 -0000 1.199
@@ -356,9 +356,9 @@
delete winq;
}
-Interpreter *Window::interpreter() const
+ScriptInterpreter *Window::interpreter() const
{
- return KJSProxy::proxy( m_part )->interpreter();
+ return m_part->jScript()->interpreter();
}
Window *Window::retrieveWindow(KHTMLPart *p)
@@ -383,14 +383,10 @@
JSValue *Window::retrieve(KHTMLPart *p)
{
- assert(p);
- KJSProxy *proxy = KJSProxy::proxy( p );
- if (proxy) {
-#ifdef KJS_VERBOSE
- kdDebug(6070) << "Window::retrieve part=" << p << " interpreter=" << proxy->interpreter() << " window=" << proxy->interpreter()->globalObject() << endl;
-#endif
- return proxy->interpreter()->globalObject(); // the Global object is the "window"
- } else
+ assert(p);
+ if (KJSProxyImpl *proxy = p->jScript())
+ return proxy->interpreter()->globalObject(); // the Global object is the "window"
+
return jsUndefined(); // This can happen with JS disabled on the domain of that window
}
@@ -1423,8 +1419,7 @@
Collector::collect();
// Now recreate a working global object for the next URL that will use us
- Interpreter *interpreter = KJSProxy::proxy( m_part )->interpreter();
- interpreter->initGlobalObject();
+ interpreter()->initGlobalObject();
}
void Window::setCurrentEvent(EventImpl *evt)
@@ -1870,7 +1865,7 @@
if (!window->m_part)
return;
- ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(KJSProxy::proxy(window->m_part)->interpreter());
+ ScriptInterpreter *interpreter = window->interpreter();
interpreter->setProcessingTimerCallback(true);
1.62 +1 -1 WebCore/khtml/ecma/kjs_window.h
Index: kjs_window.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kjs_window.h 13 Dec 2005 21:29:30 -0000 1.61
+++ kjs_window.h 14 Dec 2005 23:31:47 -0000 1.62
@@ -145,7 +145,7 @@
PausedTimeouts* pauseTimeouts() { return winq->pauseTimeouts(); }
void resumeTimeouts(PausedTimeouts* t) { winq->resumeTimeouts(t); }
- KJS::Interpreter *interpreter() const;
+ KJS::ScriptInterpreter *interpreter() const;
void scheduleClose();
1.10 +0 -1 WebCore/khtml/html/html_canvasimpl.cpp
Index: html_canvasimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_canvasimpl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- html_canvasimpl.cpp 8 Nov 2005 08:10:58 -0000 1.9
+++ html_canvasimpl.cpp 14 Dec 2005 23:31:50 -0000 1.10
@@ -31,7 +31,6 @@
#include "khtml_part.h"
#include <kstringhandler.h>
-#include <kglobal.h>
#include <kdebug.h>
#include "rendering/render_canvasimage.h"
1.77 +0 -1 WebCore/khtml/html/html_documentimpl.cpp
Index: html_documentimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_documentimpl.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- html_documentimpl.cpp 21 Nov 2005 04:01:54 -0000 1.76
+++ html_documentimpl.cpp 14 Dec 2005 23:31:50 -0000 1.77
@@ -79,7 +79,6 @@
#include <kapplication.h>
#include <kdebug.h>
#include <kurl.h>
-#include <kglobal.h>
#include <kcharsets.h>
#include <kglobalsettings.h>
1.209 +1 -2 WebCore/khtml/html/html_formimpl.cpp
Index: html_formimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_formimpl.cpp,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- html_formimpl.cpp 14 Dec 2005 07:48:39 -0000 1.208
+++ html_formimpl.cpp 14 Dec 2005 23:31:50 -0000 1.209
@@ -50,7 +50,6 @@
#include "render_theme.h"
#include <kcharsets.h>
-#include <kglobal.h>
#include <kdebug.h>
#include <kmimetype.h>
#include <kmessagebox.h>
@@ -326,7 +325,7 @@
if (part)
enc = part->encoding();
}
- if((codec = KGlobal::charsets()->codecForName(enc.latin1())))
+ if((codec = QTextCodec::codecForName(enc.latin1())))
break;
}
1.61 +1 -1 WebCore/khtml/html/html_headimpl.cpp
Index: html_headimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_headimpl.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- html_headimpl.cpp 30 Nov 2005 03:12:00 -0000 1.60
+++ html_headimpl.cpp 14 Dec 2005 23:31:51 -0000 1.61
@@ -593,7 +593,7 @@
KHTMLPart *part = getDocument()->part();
if (part) {
- KJSProxy *proxy = KJSProxy::proxy(part);
+ KJSProxyImpl *proxy = part->jScript();
if (proxy) {
m_evaluated = true;
proxy->evaluate(URL, 0, script.qstring(), 0);
1.60 +0 -1 WebCore/khtml/html/html_imageimpl.cpp
Index: html_imageimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_imageimpl.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- html_imageimpl.cpp 3 Dec 2005 20:26:01 -0000 1.59
+++ html_imageimpl.cpp 14 Dec 2005 23:31:51 -0000 1.60
@@ -31,7 +31,6 @@
#include "khtml_part.h"
#include <kstringhandler.h>
-#include <kglobal.h>
#include <kdebug.h>
#include "rendering/render_image.h"
1.71 +0 -1 WebCore/khtml/html/html_tableimpl.cpp
Index: html_tableimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_tableimpl.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- html_tableimpl.cpp 2 Dec 2005 03:48:07 -0000 1.70
+++ html_tableimpl.cpp 14 Dec 2005 23:31:51 -0000 1.71
@@ -44,7 +44,6 @@
#include "rendering/render_table.h"
#include <kdebug.h>
-#include <kglobal.h>
using namespace khtml;
1.127 +1 -4 WebCore/khtml/html/htmltokenizer.cpp
Index: htmltokenizer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmltokenizer.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- htmltokenizer.cpp 21 Nov 2005 01:20:15 -0000 1.126
+++ htmltokenizer.cpp 14 Dec 2005 23:31:52 -0000 1.127
@@ -46,7 +46,6 @@
#include "css/csshelper.h"
#include "ecma/kjs_proxy.h"
#include <kcharsets.h>
-#include <kglobal.h>
#include <ctype.h>
#include <assert.h>
#include <qvariant.h>
@@ -164,7 +163,6 @@
buffer = 0;
scriptCode = 0;
scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
- charsets = KGlobal::charsets();
parser = new HTMLParser(_view, _doc, includesComments);
m_executingScript = 0;
onHold = false;
@@ -181,7 +179,6 @@
buffer = 0;
scriptCode = 0;
scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
- charsets = KGlobal::charsets();
parser = new HTMLParser(i, _doc, includesComments);
m_executingScript = 0;
onHold = false;
@@ -1675,7 +1672,7 @@
void HTMLTokenizer::processToken()
{
- KJSProxy *jsProxy = (view && view->part()) ? view->part()->jScript() : 0L;
+ KJSProxyImpl *jsProxy = (view && view->part()) ? view->part()->jScript() : 0L;
if (jsProxy)
jsProxy->setEventHandlerLineno(tagStartLineno);
if ( dest > buffer )
1.48 +0 -1 WebCore/khtml/misc/decoder.cpp
Index: decoder.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/decoder.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- decoder.cpp 27 Nov 2005 02:26:44 -0000 1.47
+++ decoder.cpp 14 Dec 2005 23:31:54 -0000 1.48
@@ -32,7 +32,6 @@
#include <qregexp.h>
#include <qtextcodec.h>
-#include <kglobal.h>
#include <kcharsets.h>
#include <ctype.h>
1.82 +2 -5 WebCore/khtml/misc/loader.cpp
Index: loader.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/loader.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- loader.cpp 21 Nov 2005 01:20:20 -0000 1.81
+++ loader.cpp 14 Dec 2005 23:31:54 -0000 1.82
@@ -45,7 +45,6 @@
#include <kio/job.h>
#include <kio/jobclasses.h>
-#include <kglobal.h>
#include <kimageio.h>
#include <kcharsets.h>
#include <kiconloader.h>
@@ -180,9 +179,8 @@
// load the file
Cache::loader()->load(dl, this, false);
m_loading = true;
- bool b;
if(!charset.isEmpty())
- m_codec = KGlobal::charsets()->codecForName(charset, b);
+ m_codec = QTextCodec::codecForName(charset.latin1());
else
m_codec = QTextCodec::codecForName("iso8859-1");
}
@@ -273,9 +271,8 @@
// load the file
Cache::loader()->load(dl, this, false);
m_loading = true;
- bool b;
if(!charset.isEmpty())
- m_codec = KGlobal::charsets()->codecForName(charset, b);
+ m_codec = QTextCodec::codecForName(charset.latin1());
else
m_codec = QTextCodec::codecForName("iso8859-1");
}
1.176 +0 -1 WebCore/khtml/rendering/render_flow.cpp
Index: render_flow.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_flow.cpp,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- render_flow.cpp 10 Dec 2005 19:56:10 -0000 1.175
+++ render_flow.cpp 14 Dec 2005 23:31:55 -0000 1.176
@@ -26,7 +26,6 @@
#include <kdebug.h>
#include <assert.h>
#include <qpainter.h>
-#include <kglobal.h>
#include "rendering/render_flow.h"
#include "rendering/render_text.h"
1.86 +0 -1 WebCore/khtml/rendering/render_frames.cpp
Index: render_frames.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_frames.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- render_frames.cpp 21 Nov 2005 01:20:24 -0000 1.85
+++ render_frames.cpp 14 Dec 2005 23:31:55 -0000 1.86
@@ -45,7 +45,6 @@
#include <kmimetype.h>
#include <klocale.h>
#include <kdebug.h>
-#include <kglobal.h>
#include <qtimer.h>
#include <qpainter.h>
#include "qdict.h"
1.48 +0 -1 WebCore/khtml/rendering/render_inline.cpp
Index: render_inline.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_inline.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- render_inline.cpp 3 Oct 2005 21:12:39 -0000 1.47
+++ render_inline.cpp 14 Dec 2005 23:31:55 -0000 1.48
@@ -23,7 +23,6 @@
*/
#include "config.h"
-#include <kglobal.h>
#include "render_arena.h"
#include "render_inline.h"
#include "render_block.h"
1.59 +0 -1 WebCore/khtml/rendering/render_line.cpp
Index: render_line.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_line.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- render_line.cpp 27 Nov 2005 22:52:09 -0000 1.58
+++ render_line.cpp 14 Dec 2005 23:31:56 -0000 1.59
@@ -25,7 +25,6 @@
#include <assert.h>
#include <qpainter.h>
#include <qpen.h>
-#include <kglobal.h>
#include "rendering/render_flow.h"
#include "rendering/render_text.h"
1.145 +0 -2 WebCore/khtml/rendering/render_table.cpp
Index: render_table.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_table.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- render_table.cpp 14 Dec 2005 02:22:03 -0000 1.144
+++ render_table.cpp 14 Dec 2005 23:31:56 -0000 1.145
@@ -35,8 +35,6 @@
#include "htmlnames.h"
#include "xml/dom_docimpl.h"
-#include <kglobal.h>
-
#include <qapplication.h>
#include <qstyle.h>
1.29 +1 -3 WebCore/khtml/rendering/table_layout.cpp
Index: table_layout.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/table_layout.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- table_layout.cpp 3 Dec 2005 02:28:59 -0000 1.28
+++ table_layout.cpp 14 Dec 2005 23:31:56 -0000 1.29
@@ -20,14 +20,12 @@
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
- * $Id: table_layout.cpp,v 1.28 2005/12/03 02:28:59 bdakin Exp $
+ * $Id: table_layout.cpp,v 1.29 2005/12/14 23:31:56 eseidel Exp $
*/
#include "config.h"
#include "table_layout.h"
#include "render_table.h"
-#include <kglobal.h>
-
using namespace khtml;
// #define DEBUG_LAYOUT
1.284 +0 -7 WebCore/khtml/xml/dom_docimpl.cpp
Index: dom_docimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.cpp,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- dom_docimpl.cpp 11 Dec 2005 09:26:17 -0000 1.283
+++ dom_docimpl.cpp 14 Dec 2005 23:31:58 -0000 1.284
@@ -1366,10 +1366,6 @@
m_tokenizer = createTokenizer();
connect(m_tokenizer,SIGNAL(finishedParsing()),this,SIGNAL(finishedParsing()));
setParsing(true);
-
- if (m_view && m_view->part()->jScript()) {
- m_view->part()->jScript()->setSourceFile(m_url,""); //fixme
- }
}
HTMLElementImpl* DocumentImpl::body()
@@ -1536,9 +1532,6 @@
write(QString("<html>"));
}
m_tokenizer->write(text, false);
-
- if (m_view && m_view->part()->jScript())
- m_view->part()->jScript()->appendSourceFile(m_url,text);
#ifdef INSTRUMENT_LAYOUT_SCHEDULING
if (!ownerElement())
1.223 +0 -1 WebCore/khtml/xml/dom_nodeimpl.cpp
Index: dom_nodeimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_nodeimpl.cpp,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- dom_nodeimpl.cpp 8 Dec 2005 10:20:41 -0000 1.222
+++ dom_nodeimpl.cpp 14 Dec 2005 23:31:58 -0000 1.223
@@ -39,7 +39,6 @@
#include "editing/html_interchange.h"
#include "editing/SelectionController.h"
-#include <kglobal.h>
#include <kdebug.h>
#include "rendering/render_object.h"
1.11 +1 -1 WebCore/ksvg2/svg/SVGTestsImpl.cpp
Index: SVGTestsImpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/ksvg2/svg/SVGTestsImpl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SVGTestsImpl.cpp 26 Nov 2005 22:35:49 -0000 1.10
+++ SVGTestsImpl.cpp 14 Dec 2005 23:32:00 -0000 1.11
@@ -77,7 +77,7 @@
for(unsigned long i = 0;i < list->numberOfItems();i++)
{
KDOM::DOMString value = KDOM::DOMString(list->getItem(i));
- if(value.isEmpty() || value.qstring() != (KGlobal::locale()->language()).left(2))
+ if(value.isEmpty() || value.qstring() != (KLocale::language()).left(2))
return false;
}
1.12 +1 -1 WebCore/kwq/DOMInternal.mm
Index: DOMInternal.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMInternal.mm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DOMInternal.mm 11 Dec 2005 02:06:15 -0000 1.11
+++ DOMInternal.mm 14 Dec 2005 23:32:00 -0000 1.12
@@ -185,7 +185,7 @@
// Dig up Interpreter and ExecState.
KHTMLPart *part = nodeImpl->getDocument()->part();
- Interpreter *interpreter = KJSProxy::proxy(part)->interpreter();
+ Interpreter *interpreter = part->jScript()->interpreter();
ExecState *exec = interpreter->globalExec();
// Get (or create) a cached JS object for the DOM node.
1.19 +0 -8 WebCore/kwq/KWQKGlobal.h
Index: KWQKGlobal.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKGlobal.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- KWQKGlobal.h 3 May 2005 20:55:32 -0000 1.18
+++ KWQKGlobal.h 14 Dec 2005 23:32:00 -0000 1.19
@@ -27,19 +27,11 @@
#define KGLOBAL_H_
#include "KWQString.h"
-#include "KWQKInstance.h"
-class KCharsets;
-class KLocale;
-class KStandardDirs;
class KConfig;
class KGlobal {
public:
- static KInstance *instance() { return 0; }
- static KCharsets *charsets() { return 0; }
- static KLocale *locale() { return 0; }
- static KStandardDirs *dirs() { return 0; }
static KConfig *config();
static const QString &staticQString(const QString &);
1.10 +0 -7 WebCore/kwq/KWQKHTMLFactory.h
Index: KWQKHTMLFactory.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLFactory.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- KWQKHTMLFactory.h 22 Jan 2003 00:12:35 -0000 1.9
+++ KWQKHTMLFactory.h 14 Dec 2005 23:32:00 -0000 1.10
@@ -27,27 +27,20 @@
#define __khtml_factory_h__
#include "khtml_part.h"
-#include "KWQKPartsFactory.h"
#include "KWQKPartsHistoryProvider.h"
-class KInstance;
class KHTMLPart;
class KHTMLSettings;
class KHTMLFactory
{
public:
- static KInstance *instance();
-
static KHTMLSettings *defaultHTMLSettings();
// list of visited URLs
static KParts::HistoryProvider *vLinks() {
return KParts::HistoryProvider::self();
}
-
- static void registerPart(KHTMLPart *) { }
- static void deregisterPart(KHTMLPart *) { }
};
#endif
1.11 +0 -7 WebCore/kwq/KWQKHTMLFactory.mm
Index: KWQKHTMLFactory.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLFactory.mm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- KWQKHTMLFactory.mm 3 Oct 2005 21:13:03 -0000 1.10
+++ KWQKHTMLFactory.mm 14 Dec 2005 23:32:00 -0000 1.11
@@ -26,15 +26,8 @@
#include "config.h"
#import "KWQKHTMLFactory.h"
-#import "KWQKInstance.h"
#import "KWQKHTMLSettings.h"
-KInstance *KHTMLFactory::instance()
-{
- static KInstance instance;
- return &instance;
-}
-
KHTMLSettings *KHTMLFactory::defaultHTMLSettings()
{
static KHTMLSettings settings;
1.702 +3 -3 WebCore/kwq/KWQKHTMLPart.mm
Index: KWQKHTMLPart.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
retrieving revision 1.701
retrieving revision 1.702
diff -u -r1.701 -r1.702
--- KWQKHTMLPart.mm 11 Dec 2005 02:06:16 -0000 1.701
+++ KWQKHTMLPart.mm 14 Dec 2005 23:32:00 -0000 1.702
@@ -176,7 +176,7 @@
Cache::init();
// The widget is made outside this class in our case.
- KHTMLPart::init( 0, DefaultGUI );
+ KHTMLPart::init(0);
mutableInstances().prepend(this);
d->m_redirectionTimer.setMonitor(redirectionTimerMonitor, this);
@@ -239,7 +239,7 @@
KHTMLPart *rootPart = this;
while (rootPart->parentPart() != 0)
rootPart = rootPart->parentPart();
- KJS::ScriptInterpreter *interpreter = static_cast<KJS::ScriptInterpreter *>(KJSProxy::proxy(rootPart)->interpreter());
+ KJS::ScriptInterpreter *interpreter = rootPart->jScript()->interpreter();
return interpreter->wasRunByUserGesture();
} else
// if no JS, assume the user initiated this nav
@@ -1373,7 +1373,7 @@
_bindingRoot = new KJS::Bindings::RootObject(0); // The root gets deleted by JavaScriptCore.
KJS::JSObject *win = KJS::Window::retrieveWindow(this);
_bindingRoot->setRootObjectImp (win);
- _bindingRoot->setInterpreter (KJSProxy::proxy(this)->interpreter());
+ _bindingRoot->setInterpreter(jScript()->interpreter());
addPluginRootObject (_bindingRoot);
}
return _bindingRoot;
1.28 +0 -3 WebCore/kwq/KWQKHTMLSettings.h
Index: KWQKHTMLSettings.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLSettings.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- KWQKHTMLSettings.h 24 May 2005 17:20:34 -0000 1.27
+++ KWQKHTMLSettings.h 14 Dec 2005 23:32:01 -0000 1.28
@@ -48,8 +48,6 @@
const QString &sansSerifFontName() const { return _sansSerifFontName; }
const QString &cursiveFontName() const { return _cursiveFontName; }
const QString &fantasyFontName() const { return _fantasyFontName; }
-
- static QString settingsToCSS() { return QString(); }
int minFontSize() const { return _minimumFontSize; }
int minLogicalFontSize() const { return _minimumLogicalFontSize; }
@@ -67,7 +65,6 @@
bool isJavaScriptEnabled() const { return _JavaScriptEnabled; }
bool JavaScriptCanOpenWindowsAutomatically() const { return _JavaScriptCanOpenWindowsAutomatically; }
bool isJavaScriptEnabled(const QString &host) const { return _JavaScriptEnabled; }
- static bool isJavaScriptDebugEnabled() { return false; }
bool isJavaEnabled() const { return _JavaEnabled; }
bool isJavaEnabled(const QString &host) const { return _JavaEnabled; }
bool isPluginsEnabled() const { return _pluginsEnabled; }
1.25 +0 -4 WebCore/kwq/KWQKPartsPart.h
Index: KWQKPartsPart.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKPartsPart.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- KWQKPartsPart.h 14 Dec 2004 00:10:18 -0000 1.24
+++ KWQKPartsPart.h 14 Dec 2005 23:32:02 -0000 1.25
@@ -26,7 +26,6 @@
#ifndef PART_H_
#define PART_H_
-#include "KWQKInstance.h"
#include "KWQKURL.h"
#include "KWQObject.h"
#include "KWQVariant.h"
@@ -73,9 +72,6 @@
virtual void setName(const QString &name);
QString name() { return _name; }
-
- void setXMLFile(const char *) { }
- void setInstance(KInstance *, bool) { }
virtual bool openURL(const KURL &) = 0;
virtual bool closeURL() = 0;
1.12 +1 -10 WebCore/kwq/KWQKStandardDirs.h
Index: KWQKStandardDirs.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKStandardDirs.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- KWQKStandardDirs.h 22 Jan 2003 00:12:35 -0000 1.11
+++ KWQKStandardDirs.h 14 Dec 2005 23:32:02 -0000 1.12
@@ -29,15 +29,6 @@
#include "KWQString.h"
#include "KWQKGlobal.h"
-QString locate(const char *type, const QString& filename,
- const KInstance* instance=KGlobal::instance());
-
-QString locateLocal(const char *type, const QString &filename,
- const KInstance *instance=KGlobal::instance());
-
-class KStandardDirs {
-public:
- static QString saveLocation(const char *, const QString &) { return 0; }
-};
+QString locate(const char *type, const QString& filename);
#endif
1.16 +6 -13 WebCore/kwq/KWQKStandardDirs.mm
Index: KWQKStandardDirs.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKStandardDirs.mm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- KWQKStandardDirs.mm 3 Oct 2005 21:13:05 -0000 1.15
+++ KWQKStandardDirs.mm 14 Dec 2005 23:32:02 -0000 1.16
@@ -25,6 +25,7 @@
#include "config.h"
#import "KWQKStandardDirs.h"
+#import "KWQStringList.h"
// The NSBundle calls in this file can't throw, so no need to block
// Cocoa exceptions.
@@ -34,19 +35,11 @@
@implementation KWQKStandardDirsBundleDummy
@end
-QString locate(const char *type, const QString &filename, const KInstance *instance)
+QString locate(const char *type, const QString &filename)
{
- // FIXME: Eliminate this hard-coding at some point?
- bool quirk = true;
- if (filename.contains("html4"))
- quirk = false;
+ QStringList list = QStringList::split('.', filename);
+ if (list.count() != 2)
+ return QString();
NSBundle *bundle = [NSBundle bundleForClass:[KWQKStandardDirsBundleDummy class]];
- if (quirk)
- return QString::fromNSString([bundle pathForResource:@"quirks" ofType:@"css"]);
- return QString::fromNSString([bundle pathForResource:@"html4" ofType:@"css"]);
-}
-
-QString locateLocal(const char *type, const QString &filename, const KInstance *instance)
-{
- return QString();
+ return QString::fromNSString([bundle pathForResource:list[0].getNSString() ofType:list[1].getNSString()]);
}
1.443 +1 -1 WebCore/kwq/WebCoreBridge.mm
Index: WebCoreBridge.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/WebCoreBridge.mm,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- WebCoreBridge.mm 11 Dec 2005 02:06:16 -0000 1.442
+++ WebCoreBridge.mm 14 Dec 2005 23:32:02 -0000 1.443
@@ -2359,7 +2359,7 @@
KWQKHTMLPart *part = [self part];
RootObject *root = new RootObject(aView); // The root gets deleted by JavaScriptCore.
root->setRootObjectImp(Window::retrieveWindow(part));
- root->setInterpreter(KJSProxy::proxy(part)->interpreter());
+ root->setInterpreter(part->jScript()->interpreter());
part->addPluginRootObject(root);
return root;
}
More information about the webkit-changes
mailing list