Changeset 11588 in webkit


Ignore:
Timestamp:
Dec 14, 2005 3:32:02 PM (18 years ago)
Author:
eseidel
Message:

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:]):
Location:
trunk/WebCore
Files:
4 deleted
46 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog-2005-12-19

    r11585 r11588  
     12005-12-14  Eric Seidel  <eseidel@apple.com>
     2
     3        Reviewed by darin.
     4
     5        SVG test cases changed (now the svg.css is loaded properly).
     6        No other functionality changes, just code removal.
     7        http://bugzilla.opendarwin.org/show_bug.cgi?id=6078
     8
     9        * ForwardingHeaders/klibloader.h: Removed.
     10        * WebCore.xcodeproj/project.pbxproj:
     11        * khtml/css/csshelper.cpp:
     12        * khtml/css/cssstyleselector.cpp:
     13        (khtml::CSSStyleSelector::CSSStyleSelector):
     14        (khtml::parseUASheet):
     15        (khtml::CSSStyleSelector::loadDefaultStyle):
     16        * khtml/css/cssstyleselector.h:
     17        * khtml/ecma/kjs_dom.h:
     18        * khtml/ecma/kjs_events.cpp:
     19        (KJS::JSAbstractEventListener::handleEvent):
     20        (KJS::JSLazyEventListener::eventParameterName):
     21        (KJS::JSLazyEventListener::parseCode):
     22        * khtml/ecma/kjs_events.h:
     23        * khtml/ecma/kjs_html.cpp:
     24        (KJS::KJS::HTMLElement::implementsCall):
     25        * khtml/ecma/kjs_navigator.cpp:
     26        (KJS::Navigator::getValueProperty):
     27        (KJS::PluginBase::PluginBase):
     28        * khtml/ecma/kjs_proxy.cpp:
     29        (KJSProxyImpl::KJSProxyImpl):
     30        (KJSProxyImpl::evaluate):
     31        (KJSProxyImpl::clear):
     32        (KJSProxyImpl::createHTMLEventHandler):
     33        (KJSProxyImpl::initScript):
     34        * khtml/ecma/kjs_proxy.h:
     35        (KJSProxyImpl::setEventHandlerLineno):
     36        * khtml/ecma/kjs_traversal.cpp:
     37        (KJS::JSNodeFilterCondition::acceptNode):
     38        * khtml/ecma/kjs_window.cpp:
     39        (KJS::Window::interpreter):
     40        (KJS::Window::retrieve):
     41        (KJS::Window::clear):
     42        (KJS::ScheduledAction::execute):
     43        * khtml/ecma/kjs_window.h:
     44        * khtml/html/html_canvasimpl.cpp:
     45        * khtml/html/html_documentimpl.cpp:
     46        * khtml/html/html_formimpl.cpp:
     47        (DOM::HTMLFormElementImpl::formData):
     48        * khtml/html/html_headimpl.cpp:
     49        (HTMLScriptElementImpl::evaluateScript):
     50        * khtml/html/html_imageimpl.cpp:
     51        * khtml/html/html_tableimpl.cpp:
     52        * khtml/html/htmltokenizer.cpp:
     53        (khtml::HTMLTokenizer::HTMLTokenizer):
     54        (khtml::HTMLTokenizer::processToken):
     55        * khtml/khtml_part.cpp:
     56        (KHTMLPart::KHTMLPart):
     57        (KHTMLPart::init):
     58        (KHTMLPart::~KHTMLPart):
     59        (KHTMLPart::restoreURL):
     60        (KHTMLPart::didOpenURL):
     61        (KHTMLPart::jScript):
     62        (KHTMLPart::executeScript):
     63        (KHTMLPart::write):
     64        (KHTMLPart::reparseConfiguration):
     65        (KHTMLPart::createHTMLEventListener):
     66        * khtml/khtml_part.h:
     67        * khtml/khtmlpart_p.h:
     68        (KHTMLPartPrivate::KHTMLPartPrivate):
     69        (KHTMLPartPrivate::~KHTMLPartPrivate):
     70        * khtml/misc/decoder.cpp:
     71        * khtml/misc/loader.cpp:
     72        (CachedCSSStyleSheet::CachedCSSStyleSheet):
     73        (CachedScript::CachedScript):
     74        * khtml/rendering/render_flow.cpp:
     75        * khtml/rendering/render_frames.cpp:
     76        * khtml/rendering/render_inline.cpp:
     77        * khtml/rendering/render_line.cpp:
     78        * khtml/rendering/render_table.cpp:
     79        * khtml/rendering/table_layout.cpp:
     80        * khtml/xml/dom_docimpl.cpp:
     81        (DocumentImpl::implicitOpen):
     82        (DocumentImpl::write):
     83        * khtml/xml/dom_nodeimpl.cpp:
     84        * ksvg2/svg/SVGTestsImpl.cpp:
     85        (SVGTestsImpl::isValid):
     86        * kwq/DOMInternal.mm:
     87        (-[WebScriptObject _initializeScriptDOMNodeImp]):
     88        * kwq/KWQKGlobal.h:
     89        * kwq/KWQKHTMLFactory.h:
     90        (KHTMLFactory::vLinks):
     91        * kwq/KWQKHTMLFactory.mm:
     92        * kwq/KWQKHTMLPart.mm:
     93        (KWQKHTMLPart::KWQKHTMLPart):
     94        (KWQKHTMLPart::userGestureHint):
     95        (KWQKHTMLPart::bindingRootObject):
     96        * kwq/KWQKHTMLSettings.h:
     97        (KHTMLSettings::fantasyFontName):
     98        (KHTMLSettings::isJavaScriptEnabled):
     99        * kwq/KWQKInstance.h: Removed.
     100        * kwq/KWQKLibrary.h: Removed.
     101        * kwq/KWQKPartsFactory.h: Removed.
     102        * kwq/KWQKPartsPart.h:
     103        (KParts::ReadOnlyPart::name):
     104        * kwq/KWQKStandardDirs.h:
     105        * kwq/KWQKStandardDirs.mm:
     106        (locate):
     107        * kwq/WebCoreBridge.mm:
     108        (-[WebCoreBridge executionContextForView:]):
     109
    11102005-12-14  Beth Dakin  <bdakin@apple.com>
    2111
  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r11529 r11588  
    211211                93F1995608245E59001E9ABC /* KWQKJobClasses.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864B02DE3A9A01EA4122 /* KWQKJobClasses.h */; };
    212212                93F1995708245E59001E9ABC /* KWQKKAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F587861D02DE398401EA4122 /* KWQKKAction.h */; };
    213                 93F1995808245E59001E9ABC /* KWQKLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F902DE382001EA4122 /* KWQKLibrary.h */; };
    214213                93F1995908245E59001E9ABC /* KWQKLineEdit.h in Headers */ = {isa = PBXBuildFile; fileRef = F587862102DE398401EA4122 /* KWQKLineEdit.h */; };
    215214                93F1995A08245E59001E9ABC /* KWQKListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587862202DE398401EA4122 /* KWQKListBox.h */; };
     
    218217                93F1995D08245E59001E9ABC /* KWQKPartsBrowserInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866802DE3B3201EA4122 /* KWQKPartsBrowserInterface.h */; };
    219218                93F1995E08245E59001E9ABC /* KWQKPartsEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866902DE3B3201EA4122 /* KWQKPartsEvent.h */; };
    220                 93F1995F08245E59001E9ABC /* KWQKPartsFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866A02DE3B3201EA4122 /* KWQKPartsFactory.h */; };
    221219                93F1996008245E59001E9ABC /* KWQKPartsHistoryProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866B02DE3B3201EA4122 /* KWQKPartsHistoryProvider.h */; };
    222220                93F1996108245E59001E9ABC /* KWQKPartsPart.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866C02DE3B3201EA4122 /* KWQKPartsPart.h */; };
     
    747745                A8212B2108794A2300677359 /* KWQKJobClasses.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864B02DE3A9A01EA4122 /* KWQKJobClasses.h */; };
    748746                A8212B2208794A2300677359 /* KWQKKAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F587861D02DE398401EA4122 /* KWQKKAction.h */; };
    749                 A8212B2308794A2300677359 /* KWQKLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F902DE382001EA4122 /* KWQKLibrary.h */; };
    750747                A8212B2408794A2300677359 /* KWQKLineEdit.h in Headers */ = {isa = PBXBuildFile; fileRef = F587862102DE398401EA4122 /* KWQKLineEdit.h */; };
    751748                A8212B2508794A2300677359 /* KWQKListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587862202DE398401EA4122 /* KWQKListBox.h */; };
     
    754751                A8212B2808794A2300677359 /* KWQKPartsBrowserInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866802DE3B3201EA4122 /* KWQKPartsBrowserInterface.h */; };
    755752                A8212B2908794A2300677359 /* KWQKPartsEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866902DE3B3201EA4122 /* KWQKPartsEvent.h */; };
    756                 A8212B2A08794A2300677359 /* KWQKPartsFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866A02DE3B3201EA4122 /* KWQKPartsFactory.h */; };
    757753                A8212B2B08794A2300677359 /* KWQKPartsHistoryProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866B02DE3B3201EA4122 /* KWQKPartsHistoryProvider.h */; };
    758754                A8212B2C08794A2300677359 /* KWQKPartsPart.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866C02DE3B3201EA4122 /* KWQKPartsPart.h */; };
     
    12641260                A8C0FBA0089701F900BA5114 /* KSVGTimeScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0F6EF089701F100BA5114 /* KSVGTimeScheduler.cpp */; };
    12651261                A8C0FBA1089701F900BA5114 /* KSVGTimeScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0F6F0089701F100BA5114 /* KSVGTimeScheduler.h */; };
    1266                 A8C0FBA6089701F900BA5114 /* KSVGCSSParser.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0F6F7089701F100BA5114 /* KSVGCSSParser.h */; };
    12671262                A8C0FBA7089701F900BA5114 /* svg.css in Resources */ = {isa = PBXBuildFile; fileRef = A8C0F6F8089701F100BA5114 /* svg.css */; };
    12681263                A8C0FBAA089701F900BA5114 /* SVGCSSStyleSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0F6FB089701F100BA5114 /* SVGCSSStyleSelector.cpp */; };
    1269                 A8C0FBAB089701F900BA5114 /* SVGCSSStyleSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0F6FC089701F100BA5114 /* SVGCSSStyleSelector.h */; };
    12701264                A8C0FBAE089701F900BA5114 /* SVGRenderStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0F6FF089701F100BA5114 /* SVGRenderStyle.cpp */; };
    12711265                A8C0FBAF089701F900BA5114 /* SVGRenderStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0F700089701F100BA5114 /* SVGRenderStyle.h */; };
     
    19741968                A8C0F6F5089701F100BA5114 /* cssvalues.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cssvalues.in; sourceTree = "<group>"; };
    19751969                A8C0F6F6089701F100BA5114 /* KSVGCSSParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KSVGCSSParser.cpp; sourceTree = "<group>"; };
    1976                 A8C0F6F7089701F100BA5114 /* KSVGCSSParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSVGCSSParser.h; sourceTree = "<group>"; };
    19771970                A8C0F6F8089701F100BA5114 /* svg.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg.css; sourceTree = "<group>"; };
    19781971                A8C0F6FB089701F100BA5114 /* SVGCSSStyleSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGCSSStyleSelector.cpp; sourceTree = "<group>"; };
    1979                 A8C0F6FC089701F100BA5114 /* SVGCSSStyleSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGCSSStyleSelector.h; sourceTree = "<group>"; };
    19801972                A8C0F6FF089701F100BA5114 /* SVGRenderStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGRenderStyle.cpp; sourceTree = "<group>"; };
    19811973                A8C0F700089701F100BA5114 /* SVGRenderStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGRenderStyle.h; sourceTree = "<group>"; };
     
    26642656                F58785F602DE382001EA4122 /* KWQKGlobalSettings.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKGlobalSettings.h; sourceTree = "<group>"; };
    26652657                F58785F802DE382001EA4122 /* KWQKInstance.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKInstance.h; sourceTree = "<group>"; };
    2666                 F58785F902DE382001EA4122 /* KWQKLibrary.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKLibrary.h; sourceTree = "<group>"; };
    26672658                F58785FA02DE382001EA4122 /* KWQKLocale.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKLocale.h; sourceTree = "<group>"; };
    26682659                F58785FD02DE382001EA4122 /* KWQKStandardDirs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKStandardDirs.h; sourceTree = "<group>"; };
     
    26932684                F587866802DE3B3201EA4122 /* KWQKPartsBrowserInterface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsBrowserInterface.h; sourceTree = "<group>"; };
    26942685                F587866902DE3B3201EA4122 /* KWQKPartsEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsEvent.h; sourceTree = "<group>"; };
    2695                 F587866A02DE3B3201EA4122 /* KWQKPartsFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsFactory.h; sourceTree = "<group>"; };
    26962686                F587866B02DE3B3201EA4122 /* KWQKPartsHistoryProvider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsHistoryProvider.h; sourceTree = "<group>"; };
    26972687                F587866C02DE3B3201EA4122 /* KWQKPartsPart.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsPart.h; sourceTree = "<group>"; };
     
    30993089                                A8C0F6F5089701F100BA5114 /* cssvalues.in */,
    31003090                                A8C0F6F6089701F100BA5114 /* KSVGCSSParser.cpp */,
    3101                                 A8C0F6F7089701F100BA5114 /* KSVGCSSParser.h */,
    31023091                                A8C0F6F8089701F100BA5114 /* svg.css */,
    31033092                                A8C0F6FB089701F100BA5114 /* SVGCSSStyleSelector.cpp */,
    3104                                 A8C0F6FC089701F100BA5114 /* SVGCSSStyleSelector.h */,
    31053093                                A8C0F6FF089701F100BA5114 /* SVGRenderStyle.cpp */,
    31063094                                A8C0F700089701F100BA5114 /* SVGRenderStyle.h */,
     
    40574045                                F58784F502DE375901EA4122 /* KWQKGlobalSettings.mm */,
    40584046                                F58785F802DE382001EA4122 /* KWQKInstance.h */,
    4059                                 F58785F902DE382001EA4122 /* KWQKLibrary.h */,
    40604047                                F58785FA02DE382001EA4122 /* KWQKLocale.h */,
    40614048                                F587850402DE375901EA4122 /* KWQKLocale.mm */,
     
    41304117                                F587866902DE3B3201EA4122 /* KWQKPartsEvent.h */,
    41314118                                F587850802DE375901EA4122 /* KWQKPartsEvent.mm */,
    4132                                 F587866A02DE3B3201EA4122 /* KWQKPartsFactory.h */,
    41334119                                F587866B02DE3B3201EA4122 /* KWQKPartsHistoryProvider.h */,
    41344120                                F58784F602DE375901EA4122 /* KWQKHistoryProvider.mm */,
     
    44124398                                93F1995608245E59001E9ABC /* KWQKJobClasses.h in Headers */,
    44134399                                93F1995708245E59001E9ABC /* KWQKKAction.h in Headers */,
    4414                                 93F1995808245E59001E9ABC /* KWQKLibrary.h in Headers */,
    44154400                                93F1995908245E59001E9ABC /* KWQKLineEdit.h in Headers */,
    44164401                                93F1995A08245E59001E9ABC /* KWQKListBox.h in Headers */,
     
    44194404                                93F1995D08245E59001E9ABC /* KWQKPartsBrowserInterface.h in Headers */,
    44204405                                93F1995E08245E59001E9ABC /* KWQKPartsEvent.h in Headers */,
    4421                                 93F1995F08245E59001E9ABC /* KWQKPartsFactory.h in Headers */,
    44224406                                93F1996008245E59001E9ABC /* KWQKPartsHistoryProvider.h in Headers */,
    44234407                                93F1996108245E59001E9ABC /* KWQKPartsPart.h in Headers */,
     
    47534737                                A8212B2108794A2300677359 /* KWQKJobClasses.h in Headers */,
    47544738                                A8212B2208794A2300677359 /* KWQKKAction.h in Headers */,
    4755                                 A8212B2308794A2300677359 /* KWQKLibrary.h in Headers */,
    47564739                                A8212B2408794A2300677359 /* KWQKLineEdit.h in Headers */,
    47574740                                A8212B2508794A2300677359 /* KWQKListBox.h in Headers */,
     
    47604743                                A8212B2808794A2300677359 /* KWQKPartsBrowserInterface.h in Headers */,
    47614744                                A8212B2908794A2300677359 /* KWQKPartsEvent.h in Headers */,
    4762                                 A8212B2A08794A2300677359 /* KWQKPartsFactory.h in Headers */,
    47634745                                A8212B2B08794A2300677359 /* KWQKPartsHistoryProvider.h in Headers */,
    47644746                                A8212B2C08794A2300677359 /* KWQKPartsPart.h in Headers */,
     
    49444926                                A8C0FB9D089701F900BA5114 /* KCanvasRenderingStyle.h in Headers */,
    49454927                                A8C0FBA1089701F900BA5114 /* KSVGTimeScheduler.h in Headers */,
    4946                                 A8C0FBA6089701F900BA5114 /* KSVGCSSParser.h in Headers */,
    4947                                 A8C0FBAB089701F900BA5114 /* SVGCSSStyleSelector.h in Headers */,
    49484928                                A8C0FBAF089701F900BA5114 /* SVGRenderStyle.h in Headers */,
    49494929                                A8C0FBB1089701F900BA5114 /* SVGRenderStyleDefs.h in Headers */,
  • trunk/WebCore/khtml/css/csshelper.cpp

    r10701 r11588  
    3030
    3131#include <kcharsets.h>
    32 #include <kglobal.h>
    3332#include <kdebug.h>
    3433
  • trunk/WebCore/khtml/css/cssstyleselector.cpp

    r11529 r11588  
    5454#include <kstandarddirs.h>
    5555#include <kcharsets.h>
    56 #include <kglobal.h>
    5756#include <qfile.h>
    5857#include <qfontdatabase.h>
     
    226225    strictParsing = _strictParsing;
    227226    settings = view ? view->part()->settings() : 0;
    228     if(!defaultStyle) loadDefaultStyle(settings);
     227    if (!defaultStyle)
     228        loadDefaultStyle();
    229229    m_medium = view ? view->mediaType() : QString("all");
    230230
     
    303303}
    304304
    305 static CSSStyleSheetImpl* parseUASheet(const KHTMLSettings* s, const char* sheetName)
     305static CSSStyleSheetImpl* parseUASheet(const char* sheetName)
    306306{
    307307    QFile f(locate( "data", sheetName));
     
    315315
    316316    QString style = QString::fromLatin1(file.data());
    317     if (s)
    318         style += s->settingsToCSS();
    319317    DOMString str(style);
    320318
     
    324322}
    325323
    326 void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s)
     324void CSSStyleSelector::loadDefaultStyle()
    327325{
    328326    if(defaultStyle) return;
    329     defaultSheet = parseUASheet(s, "khtml/css/html4.css");
     327    defaultSheet = parseUASheet("html4.css");
    330328
    331329    // Collect only strict-mode rules.
     
    337335
    338336#if SVG_SUPPORT
    339     svgSheet = parseUASheet(0, "ksvg2/css/svg.css");
     337    svgSheet = parseUASheet("svg.css");
    340338    defaultStyle->addRulesFromSheet(svgSheet, "screen");
    341339    defaultPrintStyle->addRulesFromSheet(svgSheet, "print");
     
    343341
    344342    // Collect only quirks-mode rules.
    345     quirksSheet = parseUASheet(0, "khtml/css/quirks.css");
     343    quirksSheet = parseUASheet("quirks.css");
    346344    defaultQuirksStyle = new CSSRuleSet();
    347345    defaultQuirksStyle->addRulesFromSheet(quirksSheet, "screen");
  • trunk/WebCore/khtml/css/cssstyleselector.h

    r11529 r11588  
    103103        ~CSSStyleSelector();
    104104
    105         static void loadDefaultStyle(const KHTMLSettings *s = 0);
     105        static void loadDefaultStyle();
    106106
    107107        void initElementAndPseudoState(DOM::ElementImpl* e);
  • trunk/WebCore/khtml/ecma/kjs_dom.h

    r11569 r11588  
    2323
    2424#include "kjs_binding.h"
     25#include "dom_nodeimpl.h"
    2526
    2627#include <qvaluelist.h>
     
    3637    class EntityImpl;
    3738    class NamedNodeMapImpl;
    38     class NodeImpl;
    39     class NodeListImpl;
    4039    class NotationImpl;
    4140    class ProcessingInstructionImpl;
  • trunk/WebCore/khtml/ecma/kjs_events.cpp

    r11527 r11588  
    8181
    8282  KHTMLPart *part = static_cast<Window*>(win)->part();
    83   KJSProxy *proxy = 0;
     83  KJSProxyImpl *proxy = 0;
    8484  if (part)
    85       proxy = KJSProxy::proxy( part );
     85      proxy = part->jScript();
    8686  if (!proxy)
    8787    return;
     
    8989  JSLock lock;
    9090 
    91   ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(proxy->interpreter());
     91  ScriptInterpreter *interpreter = proxy->interpreter();
    9292  ExecState *exec = interpreter->globalExec();
    9393 
     
    284284}
    285285
     286JSValue *JSLazyEventListener::eventParameterName() const
     287{
     288    static ProtectedPtr<JSValue> eventString = jsString("event");
     289    return eventString.get();
     290}
     291
    286292void JSLazyEventListener::parseCode() const
    287293{
     
    289295    JSObject *w = win;
    290296    KHTMLPart *part = static_cast<Window *>(w)->part();
    291     KJSProxy *proxy = 0L;
     297    KJSProxyImpl *proxy = 0;
    292298    if (part)
    293       proxy = KJSProxy::proxy( part );
     299      proxy = part->jScript();
    294300
    295301    if (proxy) {
    296       ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(proxy->interpreter());
     302      ScriptInterpreter *interpreter = proxy->interpreter();
    297303      ExecState *exec = interpreter->globalExec();
    298304
     
    301307      List args;
    302308
    303       static ProtectedPtr<JSValue> eventString = jsString("event");
    304309      UString sourceURL(part->m_url.url());
    305       args.append(eventString);
     310      args.append(eventParameterName());
    306311      args.append(jsString(code));
    307312      listener = constr->construct(exec, args, sourceURL, lineNumber); // ### is globalExec ok ?
  • trunk/WebCore/khtml/ecma/kjs_events.h

    r11527 r11588  
    8787    JSObject *listenerObj() const;
    8888   
     89  protected:
     90    virtual JSValue *eventParameterName() const;
     91   
    8992  private:
    9093    void parseCode() const;
  • trunk/WebCore/khtml/ecma/kjs_html.cpp

    r11569 r11588  
    14211421    if (element->hasTagName(embedTag) || element->hasTagName(objectTag) || element->hasTagName(appletTag)) {
    14221422        DocumentImpl* doc = element->getDocument();
    1423         KJSProxy *proxy = KJSProxy::proxy(doc->part());
     1423        KJSProxyImpl *proxy = doc->part()->jScript();
    14241424        ExecState *exec = proxy->interpreter()->globalExec();
    14251425        if (JSValue *runtimeObject = getRuntimeObject(exec, element))
  • trunk/WebCore/khtml/ecma/kjs_navigator.cpp

    r11569 r11588  
    204204    return jsString("Apple Computer, Inc.");
    205205  case Language:
    206     // We don't have an implementation of KGlobal::locale().  We do however
    207     // have a static method on KLocale to access the current language.
    208206    return jsString(KLocale::language());
    209207  case UserAgent:
     
    242240
    243241        // read configuration
    244         KConfig c(KGlobal::dirs()->saveLocation("data","nsplugins")+"/pluginsinfo");
     242        KConfig c("");
    245243        unsigned num = (unsigned int)c.readNumEntry("number");
    246244        for ( unsigned n=0; n<num; n++ ) {
  • trunk/WebCore/khtml/ecma/kjs_proxy.cpp

    r11527 r11588  
    3333using DOM::EventListener;
    3434
    35 extern "C" {
    36   KJSProxy *kjs_html_init(KHTMLPart *khtmlpart);
    37 }
    38 
    39 class KJSProxyImpl : public KJSProxy {
    40 public:
    41   KJSProxyImpl(KHTMLPart *part);
    42   virtual ~KJSProxyImpl();
    43   virtual QVariant evaluate(QString filename, int baseLine, const QString&str, DOM::NodeImpl *n);
    44   virtual void clear();
    45   virtual DOM::EventListener *createHTMLEventHandler(QString sourceUrl, QString code, DOM::NodeImpl *node);
    46   virtual void finishedWithEvent(DOM::EventImpl *event);
    47   virtual KJS::ScriptInterpreter *interpreter();
    48 
    49   virtual void setDebugEnabled(bool enabled);
    50   virtual bool paused() const;
    51   virtual void setSourceFile(QString url, QString code);
    52   virtual void appendSourceFile(QString url, QString code);
    53 
    54   void initScript();
    55 
    56 private:
    57   KJS::ScriptInterpreter* m_script;
    58   bool m_debugEnabled;
    59 #ifndef NDEBUG
    60   static int s_count;
    61 #endif
    62 };
    63 
    6435#ifndef NDEBUG
    6536int KJSProxyImpl::s_count = 0;
     
    7041  m_script = 0;
    7142  m_part = part;
    72   m_debugEnabled = false;
    7343#ifndef NDEBUG
    7444  s_count++;
     
    10474  bool inlineCode = filename.isNull();
    10575
    106 #ifdef KJS_DEBUGGER
    107   if (inlineCode)
    108     filename = "(unknown file)";
    109   if (KJSDebugWin::instance())
    110     KJSDebugWin::instance()->setNextSourceInfo(filename,baseLine);
    111 #endif
    112 
    11376  m_script->setInlineCode(inlineCode);
    11477
     
    140103  // (we used to delete and re-create it, previously)
    141104  if (m_script) {
    142 #ifdef KJS_DEBUGGER
    143     KJSDebugWin *debugWin = KJSDebugWin::instance();
    144     if (debugWin && debugWin->currentScript() == m_script) {
    145         debugWin->setMode(KJSDebugWin::Stop);
    146     }
    147 #endif
    148105    Window *win = Window::retrieveWindow(m_part);
    149106    if (win)
     
    152109}
    153110
    154 DOM::EventListener *KJSProxyImpl::createHTMLEventHandler(QString sourceUrl, QString code, DOM::NodeImpl *node)
     111DOM::EventListener *KJSProxyImpl::createHTMLEventHandler(QString code, DOM::NodeImpl *node)
    155112{
    156 #ifdef KJS_DEBUGGER
    157   if (KJSDebugWin::instance())
    158     KJSDebugWin::instance()->setNextSourceInfo(sourceUrl,m_handlerLineno);
    159 #else
    160   Q_UNUSED(sourceUrl);
    161 #endif
    162 
    163113  initScript();
    164114  JSLock lock;
    165   return KJS::Window::retrieveWindow(m_part)->getJSLazyEventListener(code,node,m_handlerLineno);
     115  return KJS::Window::retrieveWindow(m_part)->getJSLazyEventListener(code, node, m_handlerLineno);
    166116}
    167117
     
    181131  m_part->keepAlive();
    182132  return m_script;
    183 }
    184 
    185 void KJSProxyImpl::setDebugEnabled(bool enabled)
    186 {
    187 #ifdef KJS_DEBUGGER
    188   m_debugEnabled = enabled;
    189   if (m_script)
    190       m_script->setDebuggingEnabled(enabled);
    191   // NOTE: this is consistent across all KJSProxyImpl instances, as we only
    192   // ever have 1 debug window
    193   if (!enabled && KJSDebugWin::instance()) {
    194     KJSDebugWin::destroyInstance();
    195   }
    196   else if (enabled && !KJSDebugWin::instance()) {
    197     KJSDebugWin::createInstance();
    198     initScript();
    199     KJSDebugWin::instance()->attach(m_script);
    200   }
    201 #else
    202   Q_UNUSED(enabled);
    203 #endif
    204 }
    205 
    206 bool KJSProxyImpl::paused() const
    207 {
    208 #ifdef KJS_DEBUGGER
    209   if (KJSDebugWin::instance())
    210     return KJSDebugWin::instance()->inSession();
    211 #endif
    212   return false;
    213 }
    214 
    215 void KJSProxyImpl::setSourceFile(QString url, QString code)
    216 {
    217 #ifdef KJS_DEBUGGER
    218   if (KJSDebugWin::instance())
    219     KJSDebugWin::instance()->setSourceFile(url,code);
    220 #else
    221   Q_UNUSED(url);
    222   Q_UNUSED(code);
    223 #endif
    224 
    225 }
    226 
    227 void KJSProxyImpl::appendSourceFile(QString url, QString code)
    228 {
    229 #ifdef KJS_DEBUGGER
    230   if (KJSDebugWin::instance())
    231     KJSDebugWin::instance()->appendSourceFile(url,code);
    232 #else
    233   Q_UNUSED(url);
    234   Q_UNUSED(code);
    235 #endif
    236133}
    237134
     
    265162  m_script->setDebuggingEnabled(m_debugEnabled);
    266163#endif
    267   //m_script->enableDebug();
    268164  globalObject->put(m_script->globalExec(), "debug", new TestFunctionImp(), Internal);
    269165
     
    278174      m_script->setCompatMode(Interpreter::NetscapeCompat);
    279175}
    280 
    281 // Helper method, so that all classes which need jScript() don't need to be added
    282 // as friend to KHTMLPart
    283 KJSProxy * KJSProxy::proxy( KHTMLPart *part )
    284 {
    285     return part ? part->jScript() : NULL;
    286 }
    287 
    288 // initialize HTML module
    289 KJSProxy *kjs_html_init(KHTMLPart *khtmlpart)
    290 {
    291   return new KJSProxyImpl(khtmlpart);
    292 }
  • trunk/WebCore/khtml/ecma/kjs_proxy.h

    r9165 r11588  
    2727
    2828class KHTMLPart;
    29 class KJSDebugWin;
    3029
    3130namespace DOM {
     
    3736namespace KJS {
    3837  class List;
    39   class Interpreter;
     38  class ScriptInterpreter;
    4039}
    4140
    42 /**
    43  * @internal
    44  *
    45  * @short Proxy class serving as interface when being dlopen'ed.
    46  */
    47 class KJSProxy {
     41class KJSProxyImpl {
    4842public:
    49   KJSProxy() { m_handlerLineno = 0; }
    50   virtual ~KJSProxy() { }
    51   virtual QVariant evaluate(QString filename, int baseLine, const QString &, DOM::NodeImpl *n) = 0;
    52   virtual void clear() = 0;
    53   virtual DOM::EventListener *createHTMLEventHandler(QString sourceUrl, QString code, DOM::NodeImpl *node) = 0;
    54   virtual void finishedWithEvent(DOM::EventImpl *event) = 0;
    55   virtual KJS::Interpreter *interpreter() = 0;
     43    KJSProxyImpl(KHTMLPart *part);
     44    ~KJSProxyImpl();
     45    QVariant evaluate(QString filename, int baseLine, const QString& str, DOM::NodeImpl *n);
     46    void clear();
     47    DOM::EventListener *createHTMLEventHandler(QString code, DOM::NodeImpl *node);
     48    void finishedWithEvent(DOM::EventImpl *event);
     49    KJS::ScriptInterpreter *interpreter();
     50    void setEventHandlerLineno(int lineno) { m_handlerLineno = lineno; }
    5651
    57   virtual void setDebugEnabled(bool enabled) = 0;
    58   virtual bool paused() const = 0;
    59   virtual void setSourceFile(QString url, QString code) = 0;
    60   virtual void appendSourceFile(QString url, QString code) = 0;
     52    void initScript();
    6153
    62   void setEventHandlerLineno(int lineno) { m_handlerLineno = lineno; }
    63 
    64   KHTMLPart *m_part;
    65   int m_handlerLineno;
    66 
    67   // Helper method, to access the private KHTMLPart::jScript()
    68   static KJSProxy *proxy( KHTMLPart *part );
     54private:
     55    KJS::ScriptInterpreter* m_script;
     56    KHTMLPart *m_part;
     57    int m_handlerLineno;
     58#ifndef NDEBUG
     59    static int s_count;
     60#endif
    6961};
    7062
     63
    7164#endif
  • trunk/WebCore/khtml/ecma/kjs_traversal.cpp

    r11527 r11588  
    2626#include <xml/dom_docimpl.h>
    2727#include <khtmlview.h>
     28#include <khtml_part.h>
    2829#include <kdebug.h>
    2930#include <kjs/protect.h>
     
    317318    NodeImpl *node = filterNode;
    318319    KHTMLPart *part = node->getDocument()->part();
    319     KJSProxy *proxy = KJSProxy::proxy(part);
     320    KJSProxyImpl *proxy = part->jScript();
    320321    if (proxy && filter->implementsCall()) {
    321322        JSLock lock;
  • trunk/WebCore/khtml/ecma/kjs_window.cpp

    r11569 r11588  
    357357}
    358358
    359 Interpreter *Window::interpreter() const
    360 {
    361     return KJSProxy::proxy( m_part )->interpreter();
     359ScriptInterpreter *Window::interpreter() const
     360{
     361    return m_part->jScript()->interpreter();
    362362}
    363363
     
    384384JSValue *Window::retrieve(KHTMLPart *p)
    385385{
    386   assert(p);
    387   KJSProxy *proxy = KJSProxy::proxy( p );
    388   if (proxy) {
    389 #ifdef KJS_VERBOSE
    390     kdDebug(6070) << "Window::retrieve part=" << p << " interpreter=" << proxy->interpreter() << " window=" << proxy->interpreter()->globalObject() << endl;
    391 #endif
    392     return proxy->interpreter()->globalObject(); // the Global object is the "window"
    393   } else
     386    assert(p);
     387    if (KJSProxyImpl *proxy = p->jScript())
     388        return proxy->interpreter()->globalObject(); // the Global object is the "window"
     389 
    394390    return jsUndefined(); // This can happen with JS disabled on the domain of that window
    395391}
     
    14241420
    14251421  // Now recreate a working global object for the next URL that will use us
    1426   Interpreter *interpreter = KJSProxy::proxy( m_part )->interpreter();
    1427   interpreter->initGlobalObject();
     1422  interpreter()->initGlobalObject();
    14281423}
    14291424
     
    18711866        return;
    18721867
    1873     ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(KJSProxy::proxy(window->m_part)->interpreter());
     1868    ScriptInterpreter *interpreter = window->interpreter();
    18741869
    18751870    interpreter->setProcessingTimerCallback(true);
  • trunk/WebCore/khtml/ecma/kjs_window.h

    r11569 r11588  
    146146    void resumeTimeouts(PausedTimeouts* t) { winq->resumeTimeouts(t); }
    147147   
    148     KJS::Interpreter *interpreter() const;
     148    KJS::ScriptInterpreter *interpreter() const;
    149149
    150150    void scheduleClose();
  • trunk/WebCore/khtml/html/html_canvasimpl.cpp

    r11096 r11588  
    3232
    3333#include <kstringhandler.h>
    34 #include <kglobal.h>
    3534#include <kdebug.h>
    3635
  • trunk/WebCore/khtml/html/html_documentimpl.cpp

    r11272 r11588  
    8080#include <kdebug.h>
    8181#include <kurl.h>
    82 #include <kglobal.h>
    8382#include <kcharsets.h>
    8483#include <kglobalsettings.h>
  • trunk/WebCore/khtml/html/html_formimpl.cpp

    r11581 r11588  
    5151
    5252#include <kcharsets.h>
    53 #include <kglobal.h>
    5453#include <kdebug.h>
    5554#include <kmimetype.h>
     
    327326                enc = part->encoding();
    328327        }
    329         if((codec = KGlobal::charsets()->codecForName(enc.latin1())))
     328        if((codec = QTextCodec::codecForName(enc.latin1())))
    330329            break;
    331330    }
  • trunk/WebCore/khtml/html/html_headimpl.cpp

    r11359 r11588  
    594594    KHTMLPart *part = getDocument()->part();
    595595    if (part) {
    596         KJSProxy *proxy = KJSProxy::proxy(part);
     596        KJSProxyImpl *proxy = part->jScript();
    597597        if (proxy) {
    598598            m_evaluated = true;
  • trunk/WebCore/khtml/html/html_imageimpl.cpp

    r11424 r11588  
    3232
    3333#include <kstringhandler.h>
    34 #include <kglobal.h>
    3534#include <kdebug.h>
    3635
  • trunk/WebCore/khtml/html/html_tableimpl.cpp

    r11392 r11588  
    4545
    4646#include <kdebug.h>
    47 #include <kglobal.h>
    4847
    4948using namespace khtml;
  • trunk/WebCore/khtml/html/htmltokenizer.cpp

    r11271 r11588  
    4747#include "ecma/kjs_proxy.h"
    4848#include <kcharsets.h>
    49 #include <kglobal.h>
    5049#include <ctype.h>
    5150#include <assert.h>
     
    165164    scriptCode = 0;
    166165    scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
    167     charsets = KGlobal::charsets();
    168166    parser = new HTMLParser(_view, _doc, includesComments);
    169167    m_executingScript = 0;
     
    182180    scriptCode = 0;
    183181    scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
    184     charsets = KGlobal::charsets();
    185182    parser = new HTMLParser(i, _doc, includesComments);
    186183    m_executingScript = 0;
     
    16761673void HTMLTokenizer::processToken()
    16771674{
    1678     KJSProxy *jsProxy = (view && view->part()) ? view->part()->jScript() : 0L;   
     1675    KJSProxyImpl *jsProxy = (view && view->part()) ? view->part()->jScript() : 0L;   
    16791676    if (jsProxy)
    16801677        jsProxy->setEventHandlerLineno(tagStartLineno);
  • trunk/WebCore/khtml/khtml_part.cpp

    r11539 r11588  
    2828#include "khtml_part.h"
    2929
    30 #define DIRECT_LINKAGE_TO_ECMA
    3130#define QT_NO_CLIPBOARD
    3231#define QT_NO_DRAGANDDROP
     
    180179}
    181180
    182 KHTMLPart::KHTMLPart( QWidget *parentWidget, const char *widgetname, QObject *parent, const char *name,
    183                       GUIProfile prof )
    184 : KParts::ReadOnlyPart( parent, name )
    185 {
    186     d = 0;
    187     KHTMLFactory::registerPart( this );
    188     setInstance( KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() );
    189 }
    190 
    191 
    192 void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
     181KHTMLPart::KHTMLPart(QWidget *parentWidget, const char *widgetname, QObject *parent, const char *name)
     182    : KParts::ReadOnlyPart(parent, name), d(0)
     183{
     184}
     185
     186void KHTMLPart::init(KHTMLView *view)
    193187{
    194188  AtomicString::init();
     
    200194  XLinkNames::init();
    201195#endif
    202   if ( prof == DefaultGUI )
    203     setXMLFile( "khtml.rc" );
    204   else if ( prof == BrowserViewGUI )
    205     setXMLFile( "khtml_browser.rc" );
    206196
    207197  frameCount = 0;
     
    221211  // have been initialized.
    222212  d->m_bJScriptEnabled = true;
    223   d->m_bJScriptDebugEnabled = true;
    224213  d->m_bJavaEnabled = true;
    225214  d->m_bPluginsEnabled = true;
    226 
    227215
    228216  connect( khtml::Cache::loader(), SIGNAL( requestStarted( khtml::DocLoader*, khtml::CachedObject* ) ),
     
    233221           this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
    234222
    235 
    236223  connect( &d->m_redirectionTimer, SIGNAL( timeout() ),
    237224           this, SLOT( slotRedirect() ) );
    238225
    239226  connect(&d->m_lifeSupportTimer, SIGNAL(timeout()), this, SLOT(slotEndLifeSupport()));
    240 
    241227}
    242228
    243229KHTMLPart::~KHTMLPart()
    244230{
    245   //kdDebug(6050) << "KHTMLPart::~KHTMLPart " << this << endl;
    246 
    247231  stopAutoScroll();
    248232  cancelRedirection();
     
    270254
    271255  delete d; d = 0;
    272   KHTMLFactory::deregisterPart( this );
    273256}
    274257
     
    295278  // set the java(script) flags according to the current host.
    296279  d->m_bJScriptEnabled = d->m_settings->isJavaScriptEnabled(url.host());
    297   d->m_bJScriptDebugEnabled = d->m_settings->isJavaScriptDebugEnabled();
    298280  d->m_bJavaEnabled = d->m_settings->isJavaEnabled(url.host());
    299281  d->m_bPluginsEnabled = d->m_settings->isPluginsEnabled(url.host());
    300282
    301283  m_url = url;
    302 
    303284
    304285  emit started( 0L );
     
    374355
    375356  // set the javascript flags according to the current url
    376   d->m_bJScriptDebugEnabled = d->m_settings->isJavaScriptDebugEnabled();
    377357  d->m_bJavaEnabled = d->m_settings->isJavaEnabled(url.host());
    378358  d->m_bPluginsEnabled = d->m_settings->isPluginsEnabled(url.host());
     
    532512}
    533513
    534 // Define this to disable dlopening kjs_html, when directly linking to it.
    535 // You need to edit khtml/Makefile.am to add ./ecma/libkjs_html.la to LIBADD
    536 // and to edit khtml/ecma/Makefile.am to s/kjs_html/libkjs_html/, remove libkhtml from LIBADD,
    537 //        remove LDFLAGS line, and replace kde_module with either lib (shared) or noinst (static)
    538 //#define DIRECT_LINKAGE_TO_ECMA
    539 
    540 #ifdef DIRECT_LINKAGE_TO_ECMA
    541 extern "C" { KJSProxy *kjs_html_init(KHTMLPart *khtmlpart); }
    542 #endif
    543 
    544 KJSProxy *KHTMLPart::jScript()
    545 {
    546   if (!jScriptEnabled()){
    547     return 0;
    548   }
    549 
    550   if ( !d->m_jscript )
    551   {
    552 #ifndef DIRECT_LINKAGE_TO_ECMA
    553     KLibrary *lib = KLibLoader::self()->library("kjs_html");
    554     if ( !lib ) {
    555       setJScriptEnabled( false );
    556       return 0;
    557     }
    558     // look for plain C init function
    559     void *sym = lib->symbol("kjs_html_init");
    560     if ( !sym ) {
    561       lib->unload();
    562       setJScriptEnabled( false );
    563       return 0;
    564     }
    565     typedef KJSProxy* (*initFunction)(KHTMLPart *);
    566     initFunction initSym = (initFunction) sym;
    567     d->m_jscript = (*initSym)(this);
    568     d->m_kjs_lib = lib;
    569 #else
    570     d->m_jscript = kjs_html_init(this);
    571     // d->m_kjs_lib remains 0L.
    572 #endif
    573     if (d->m_bJScriptDebugEnabled)
    574         d->m_jscript->setDebugEnabled(true);
    575   }
    576 
    577   return d->m_jscript;
     514KJSProxyImpl *KHTMLPart::jScript()
     515{
     516    if (!jScriptEnabled())
     517        return 0;
     518
     519    if (!d->m_jscript)
     520        d->m_jscript = new KJSProxyImpl(this);
     521
     522    return d->m_jscript;
    578523}
    579524
     
    603548  kdDebug(6070) << "KHTMLPart::executeScript n=" << n.nodeName().qstring().latin1() << "(" << (n.isNull() ? 0 : n.nodeType()) << ") " << script << endl;
    604549#endif
    605   KJSProxy *proxy = jScript();
    606 
    607   if (!proxy || proxy->paused())
     550  KJSProxyImpl *proxy = jScript();
     551
     552  if (!proxy)
    608553    return QVariant();
    609554  d->m_runningScripts++;
     
    10671012      d->m_bFirstData = false;
    10681013
    1069   //kdDebug(6050) << "KHTMLPart::write haveEnc = " << d->m_haveEncoding << endl;
    10701014      // ### this is still quite hacky, but should work a lot better than the old solution
    10711015      if(d->m_decoder->visuallyOrdered()) d->m_doc->setVisuallyOrdered();
     
    10731017  }
    10741018
    1075   if (jScript())
    1076     jScript()->appendSourceFile(m_url.url(),decoded);
    1077   Tokenizer* t = d->m_doc->tokenizer();
    1078 
    1079   if(t)
    1080     t->write( decoded, true );
     1019  if (Tokenizer* t = d->m_doc->tokenizer())
     1020      t->write( decoded, true );
    10811021}
    10821022
     
    10911031      d->m_bFirstData = false;
    10921032  }
    1093   if (jScript())
    1094     jScript()->appendSourceFile(m_url.url(),str);
    10951033  Tokenizer* t = d->m_doc->tokenizer();
    10961034  if(t)
     
    23692307
    23702308  d->m_bJScriptEnabled = d->m_settings->isJavaScriptEnabled(m_url.host());
    2371   d->m_bJScriptDebugEnabled = d->m_settings->isJavaScriptDebugEnabled();
    23722309  d->m_bJavaEnabled = d->m_settings->isJavaEnabled(m_url.host());
    23732310  d->m_bPluginsEnabled = d->m_settings->isPluginsEnabled(m_url.host());
     
    29372874  kdDebug(6070) << "executeScript: filename=" << filename << " baseLine=" << baseLine << " script=" << script << endl;
    29382875#endif
    2939   KJSProxy *proxy = jScript();
    2940 
    2941   if (!proxy || proxy->paused())
     2876  KJSProxyImpl *proxy = jScript();
     2877
     2878  if (!proxy)
    29422879    return QVariant();
    29432880  QVariant ret = proxy->evaluate(filename,baseLine,script, n );
     
    29552892DOM::EventListener *KHTMLPart::createHTMLEventListener( QString code, NodeImpl *node )
    29562893{
    2957   KJSProxy *proxy = jScript();
    2958 
    2959   if (!proxy)
     2894    if (KJSProxyImpl *proxy = jScript())
     2895        return proxy->createHTMLEventHandler(code, node);
    29602896    return 0;
    2961 
    2962   return proxy->createHTMLEventHandler( m_url.url(), code, node );
    29632897}
    29642898
  • trunk/WebCore/khtml/khtml_part.h

    r11529 r11588  
    3636class KHTMLPartPrivate;
    3737class KHTMLPartBrowserExtension;
    38 class KJSProxy;
     38class KJSProxyImpl;
    3939class KHTMLView;
    4040class KHTMLSettings;
     
    162162  friend class KJS::WindowFunc;
    163163  friend class KJS::DOMDocument;
    164   friend class KJSProxy;
    165164  friend class KHTMLPartBrowserExtension;
    166165  friend class DOM::DocumentImpl;
     
    182181
    183182public:
    184   enum GUIProfile { DefaultGUI, BrowserViewGUI /* ... */ };
    185183  enum { NoXPosForVerticalArrowNavigation = INT_MIN };
    186184
     
    197195   * the view.
    198196   */
    199   KHTMLPart( QWidget *parentWidget = 0, const char *widgetname = 0,
    200              QObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
    201 
    202   KHTMLPart( KHTMLView *view, QObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
     197  KHTMLPart(QWidget *parentWidget = 0, const char *widgetname = 0, QObject *parent = 0, const char *name = 0);
     198  KHTMLPart(KHTMLView *view, QObject *parent = 0, const char *name = 0);
    203199
    204200  /**
     
    11391135
    11401136
    1141   void init( KHTMLView *view, GUIProfile prof );
     1137  void init(KHTMLView *view);
    11421138
    11431139  virtual void clear();
     
    11911187  void cancelRedirection(bool newLoadInProgress = false);
    11921188
    1193   KJSProxy *jScript();
    1194 
    11951189 public:
     1190  KJSProxyImpl *jScript();
    11961191  KHTMLPart *opener();
    11971192  void setOpener(KHTMLPart *_opener);
  • trunk/WebCore/khtml/khtmlpart_p.h

    r11375 r11588  
    2929
    3030#include <kcursor.h>
    31 #include <klibloader.h>
    32 #include <kxmlguifactory.h>
    3331#include <kaction.h>
    3432#include <kparts/partmanager.h>
    35 
    36 #include "khtml_run.h"
     33#include <kio/global.h>
     34
    3735#include "khtml_find.h"
    3836#include "khtml_factory.h"
    3937#include "khtml_events.h"
    4038#include "khtml_ext.h"
    41 #include "khtml_iface.h"
    4239#include "khtml_settings.h"
    4340#include "misc/decoder.h"
     
    111108    m_jscript = 0L;
    112109    m_runningScripts = 0;
    113     m_kjs_lib = 0;
    114110    m_job = 0L;
    115111    m_bComplete = true;
     
    194190    delete m_extension;
    195191    delete m_jscript;
    196     if ( m_kjs_lib)
    197        m_kjs_lib->unload();
    198192#ifndef Q_WS_QWS
    199193    delete m_javaContext;
     
    219213  RefPtr<DOM::NodeImpl> scheduledScriptNode;
    220214
    221   KJSProxy *m_jscript;
    222   KLibrary *m_kjs_lib;
     215  KJSProxyImpl *m_jscript;
    223216  int m_runningScripts;
    224217  bool m_bJScriptEnabled :1;
    225   bool m_bJScriptDebugEnabled :1;
    226218  bool m_bJavaEnabled :1;
    227219  bool m_bPluginsEnabled :1;
  • trunk/WebCore/khtml/misc/decoder.cpp

    r11302 r11588  
    3333#include <qtextcodec.h>
    3434
    35 #include <kglobal.h>
    3635#include <kcharsets.h>
    3736
  • trunk/WebCore/khtml/misc/loader.cpp

    r11271 r11588  
    4646#include <kio/job.h>
    4747#include <kio/jobclasses.h>
    48 #include <kglobal.h>
    4948#include <kimageio.h>
    5049#include <kcharsets.h>
     
    181180    Cache::loader()->load(dl, this, false);
    182181    m_loading = true;
    183     bool b;
    184182    if(!charset.isEmpty())
    185         m_codec = KGlobal::charsets()->codecForName(charset, b);
     183        m_codec = QTextCodec::codecForName(charset.latin1());
    186184    else
    187185        m_codec = QTextCodec::codecForName("iso8859-1");
     
    274272    Cache::loader()->load(dl, this, false);
    275273    m_loading = true;
    276     bool b;
    277274    if(!charset.isEmpty())
    278         m_codec = KGlobal::charsets()->codecForName(charset, b);
     275        m_codec = QTextCodec::codecForName(charset.latin1());
    279276    else
    280277        m_codec = QTextCodec::codecForName("iso8859-1");
  • trunk/WebCore/khtml/rendering/render_flow.cpp

    r11520 r11588  
    2727#include <assert.h>
    2828#include <qpainter.h>
    29 #include <kglobal.h>
    3029
    3130#include "rendering/render_flow.h"
  • trunk/WebCore/khtml/rendering/render_frames.cpp

    r11271 r11588  
    4646#include <klocale.h>
    4747#include <kdebug.h>
    48 #include <kglobal.h>
    4948#include <qtimer.h>
    5049#include <qpainter.h>
  • trunk/WebCore/khtml/rendering/render_inline.cpp

    r10701 r11588  
    2424
    2525#include "config.h"
    26 #include <kglobal.h>
    2726#include "render_arena.h"
    2827#include "render_inline.h"
  • trunk/WebCore/khtml/rendering/render_line.cpp

    r11306 r11588  
    2626#include <qpainter.h>
    2727#include <qpen.h>
    28 #include <kglobal.h>
    2928
    3029#include "rendering/render_flow.h"
  • trunk/WebCore/khtml/rendering/render_table.cpp

    r11579 r11588  
    3535#include "htmlnames.h"
    3636#include "xml/dom_docimpl.h"
    37 
    38 #include <kglobal.h>
    3937
    4038#include <qapplication.h>
  • trunk/WebCore/khtml/rendering/table_layout.cpp

    r11421 r11588  
    2626#include "table_layout.h"
    2727#include "render_table.h"
    28 
    29 #include <kglobal.h>
    3028
    3129using namespace khtml;
  • trunk/WebCore/khtml/xml/dom_docimpl.cpp

    r11529 r11588  
    13671367    connect(m_tokenizer,SIGNAL(finishedParsing()),this,SIGNAL(finishedParsing()));
    13681368    setParsing(true);
    1369 
    1370     if (m_view && m_view->part()->jScript()) {
    1371         m_view->part()->jScript()->setSourceFile(m_url,""); //fixme
    1372     }
    13731369}
    13741370
     
    15371533    }
    15381534    m_tokenizer->write(text, false);
    1539 
    1540     if (m_view && m_view->part()->jScript())
    1541         m_view->part()->jScript()->appendSourceFile(m_url,text);
    15421535   
    15431536#ifdef INSTRUMENT_LAYOUT_SCHEDULING
  • trunk/WebCore/khtml/xml/dom_nodeimpl.cpp

    r11495 r11588  
    4040#include "editing/SelectionController.h"
    4141
    42 #include <kglobal.h>
    4342#include <kdebug.h>
    4443
  • trunk/WebCore/ksvg2/svg/SVGTestsImpl.cpp

    r11292 r11588  
    7878    {
    7979        KDOM::DOMString value = KDOM::DOMString(list->getItem(i));
    80         if(value.isEmpty() || value.qstring() != (KGlobal::locale()->language()).left(2))
     80        if(value.isEmpty() || value.qstring() != (KLocale::language()).left(2))
    8181            return false;
    8282    }
  • trunk/WebCore/kwq/DOMInternal.mm

    r11527 r11588  
    186186    // Dig up Interpreter and ExecState.
    187187    KHTMLPart *part = nodeImpl->getDocument()->part();
    188     Interpreter *interpreter = KJSProxy::proxy(part)->interpreter();
     188    Interpreter *interpreter = part->jScript()->interpreter();
    189189    ExecState *exec = interpreter->globalExec();
    190190   
  • trunk/WebCore/kwq/KWQKGlobal.h

    r9096 r11588  
    2828
    2929#include "KWQString.h"
    30 #include "KWQKInstance.h"
    3130
    32 class KCharsets;
    33 class KLocale;
    34 class KStandardDirs;
    3531class KConfig;
    3632
    3733class KGlobal {
    3834public:
    39     static KInstance *instance() { return 0; }
    40     static KCharsets *charsets() { return 0; }
    41     static KLocale *locale() { return 0; }
    42     static KStandardDirs *dirs() { return 0; }
    4335    static KConfig *config();
    4436
  • trunk/WebCore/kwq/KWQKHTMLFactory.h

    r3376 r11588  
    2828
    2929#include "khtml_part.h"
    30 #include "KWQKPartsFactory.h"
    3130#include "KWQKPartsHistoryProvider.h"
    3231
    33 class KInstance;
    3432class KHTMLPart;
    3533class KHTMLSettings;
     
    3836{
    3937public:
    40   static KInstance *instance();
    41 
    4238  static KHTMLSettings *defaultHTMLSettings();
    4339
     
    4642    return KParts::HistoryProvider::self();
    4743  }
    48  
    49   static void registerPart(KHTMLPart *) { }
    50   static void deregisterPart(KHTMLPart *) { }
    5144};
    5245
  • trunk/WebCore/kwq/KWQKHTMLFactory.mm

    r10701 r11588  
    2727#import "KWQKHTMLFactory.h"
    2828
    29 #import "KWQKInstance.h"
    3029#import "KWQKHTMLSettings.h"
    31 
    32 KInstance *KHTMLFactory::instance()
    33 {
    34     static KInstance instance;
    35     return &instance;
    36 }
    3730
    3831KHTMLSettings *KHTMLFactory::defaultHTMLSettings()
  • trunk/WebCore/kwq/KWQKHTMLPart.mm

    r11527 r11588  
    177177
    178178    // The widget is made outside this class in our case.
    179     KHTMLPart::init( 0, DefaultGUI );
     179    KHTMLPart::init(0);
    180180
    181181    mutableInstances().prepend(this);
     
    240240        while (rootPart->parentPart() != 0)
    241241            rootPart = rootPart->parentPart();
    242         KJS::ScriptInterpreter *interpreter = static_cast<KJS::ScriptInterpreter *>(KJSProxy::proxy(rootPart)->interpreter());
     242        KJS::ScriptInterpreter *interpreter = rootPart->jScript()->interpreter();
    243243        return interpreter->wasRunByUserGesture();
    244244    } else
     
    13741374        KJS::JSObject *win = KJS::Window::retrieveWindow(this);
    13751375        _bindingRoot->setRootObjectImp (win);
    1376         _bindingRoot->setInterpreter (KJSProxy::proxy(this)->interpreter());
     1376        _bindingRoot->setInterpreter(jScript()->interpreter());
    13771377        addPluginRootObject (_bindingRoot);
    13781378    }
  • trunk/WebCore/kwq/KWQKHTMLSettings.h

    r9198 r11588  
    4949    const QString &cursiveFontName() const { return _cursiveFontName; }
    5050    const QString &fantasyFontName() const { return _fantasyFontName; }
    51    
    52     static QString settingsToCSS() { return QString(); }
    5351
    5452    int minFontSize() const { return _minimumFontSize; }
     
    6866    bool JavaScriptCanOpenWindowsAutomatically() const { return _JavaScriptCanOpenWindowsAutomatically; }
    6967    bool isJavaScriptEnabled(const QString &host) const { return _JavaScriptEnabled; }
    70     static bool isJavaScriptDebugEnabled() { return false; }
    7168    bool isJavaEnabled() const { return _JavaEnabled; }
    7269    bool isJavaEnabled(const QString &host) const { return _JavaEnabled; }
  • trunk/WebCore/kwq/KWQKPartsPart.h

    r8198 r11588  
    2727#define PART_H_
    2828
    29 #include "KWQKInstance.h"
    3029#include "KWQKURL.h"
    3130#include "KWQObject.h"
     
    7473    virtual void setName(const QString &name);
    7574    QString name() { return _name; }
    76 
    77     void setXMLFile(const char *) { }
    78     void setInstance(KInstance *, bool) { }
    7975   
    8076    virtual bool openURL(const KURL &) = 0;
  • trunk/WebCore/kwq/KWQKStandardDirs.h

    r3376 r11588  
    3030#include "KWQKGlobal.h"
    3131
    32 QString locate(const char *type, const QString& filename,
    33     const KInstance* instance=KGlobal::instance());
    34 
    35 QString locateLocal(const char *type, const QString &filename,
    36     const KInstance *instance=KGlobal::instance());
    37 
    38 class KStandardDirs {
    39 public:
    40     static QString saveLocation(const char *, const QString &) { return 0; }
    41 };
     32QString locate(const char *type, const QString& filename);
    4233
    4334#endif
  • trunk/WebCore/kwq/KWQKStandardDirs.mm

    r10701 r11588  
    2626#include "config.h"
    2727#import "KWQKStandardDirs.h"
     28#import "KWQStringList.h"
    2829
    2930// The NSBundle calls in this file can't throw, so no need to block
     
    3536@end
    3637
    37 QString locate(const char *type, const QString &filename, const KInstance *instance)
     38QString locate(const char *type, const QString &filename)
    3839{
    39     // FIXME: Eliminate this hard-coding at some point?
    40     bool quirk = true;
    41     if (filename.contains("html4"))
    42         quirk = false;
     40    QStringList list = QStringList::split('.', filename);
     41    if (list.count() != 2)
     42        return QString();
    4343    NSBundle *bundle = [NSBundle bundleForClass:[KWQKStandardDirsBundleDummy class]];
    44     if (quirk)
    45         return QString::fromNSString([bundle pathForResource:@"quirks" ofType:@"css"]);
    46     return QString::fromNSString([bundle pathForResource:@"html4" ofType:@"css"]);
     44    return QString::fromNSString([bundle pathForResource:list[0].getNSString() ofType:list[1].getNSString()]);
    4745}
    48 
    49 QString locateLocal(const char *type, const QString &filename, const KInstance *instance)
    50 {
    51     return QString();
    52 }
  • trunk/WebCore/kwq/WebCoreBridge.mm

    r11527 r11588  
    23602360    RootObject *root = new RootObject(aView);    // The root gets deleted by JavaScriptCore.
    23612361    root->setRootObjectImp(Window::retrieveWindow(part));
    2362     root->setInterpreter(KJSProxy::proxy(part)->interpreter());
     2362    root->setInterpreter(part->jScript()->interpreter());
    23632363    part->addPluginRootObject(root);
    23642364    return root;
Note: See TracChangeset for help on using the changeset viewer.