Reviewed by Maciej.

        - various small cleanups

        * khtml/xml/dom_docimpl.h: Added policyBaseURL and setPolicyBaseURL.
        * khtml/html/html_documentimpl.h: Removed policyBaseURL and setPolicyBaseURL.

        * khtml/xml/xml_tokenizer.h: Marked isWaitingForScripts const.
        * khtml/xml/xml_tokenizer.cpp: (khtml::XMLTokenizer::isWaitingForScripts): Marked const.
        * khtml/html/htmltokenizer.h: Marked isWaitingForScripts const.
        * khtml/html/htmltokenizer.cpp:
        (khtml::HTMLTokenizer::isWaitingForScripts): Marked const.
        (khtml::HTMLTokenizer::setOnHold): Took out extraneous line of code.

        * khtml/khtml_part.h: Removed docImpl function.
        * khtml/khtml_part.cpp: Ditto.

        * khtml/xml/dom_docimpl.cpp: (DocumentImpl::close): Simplified code that implements
        the "redirect during onload" optimization. Now uses isScheduledLocationChangePending.

        * kwq/KWQKHTMLPart.h: Removed now-unused _firstResponderAtMouseDownTime.
        * kwq/KWQKHTMLPart.mm: Removed _firstResponderAtMouseDownTime (forgot to land this
        part of the change last time, which is why the build broke).
        (KWQKHTMLPart::updatePolicyBaseURL): Use xmlDocImpl instead of docImpl.
        (KWQKHTMLPart::setPolicyBaseURL): Ditto.
        (KWQKHTMLPart::keyEvent): Ditto.
        (KWQKHTMLPart::dispatchCPPEvent): Ditto.
        (KWQKHTMLPart::bodyBackgroundColor): Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7996 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 959810d50da863cb2326d8e1c4009664ea67bfa3..3e4b49208052d74e4417c2596c5caf1f47e09927 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,34 @@
+2004-11-12  Darin Adler  <darin@apple.com>
+
+        Reviewed by Maciej.
+
+        - various small cleanups
+
+        * khtml/xml/dom_docimpl.h: Added policyBaseURL and setPolicyBaseURL.
+        * khtml/html/html_documentimpl.h: Removed policyBaseURL and setPolicyBaseURL.
+
+        * khtml/xml/xml_tokenizer.h: Marked isWaitingForScripts const.
+        * khtml/xml/xml_tokenizer.cpp: (khtml::XMLTokenizer::isWaitingForScripts): Marked const.
+        * khtml/html/htmltokenizer.h: Marked isWaitingForScripts const.
+        * khtml/html/htmltokenizer.cpp:
+        (khtml::HTMLTokenizer::isWaitingForScripts): Marked const.
+        (khtml::HTMLTokenizer::setOnHold): Took out extraneous line of code.
+
+        * khtml/khtml_part.h: Removed docImpl function.
+        * khtml/khtml_part.cpp: Ditto.
+
+        * khtml/xml/dom_docimpl.cpp: (DocumentImpl::close): Simplified code that implements
+        the "redirect during onload" optimization. Now uses isScheduledLocationChangePending.
+
+        * kwq/KWQKHTMLPart.h: Removed now-unused _firstResponderAtMouseDownTime.
+        * kwq/KWQKHTMLPart.mm: Removed _firstResponderAtMouseDownTime (forgot to land this
+        part of the change last time, which is why the build broke).
+        (KWQKHTMLPart::updatePolicyBaseURL): Use xmlDocImpl instead of docImpl.
+        (KWQKHTMLPart::setPolicyBaseURL): Ditto.
+        (KWQKHTMLPart::keyEvent): Ditto.
+        (KWQKHTMLPart::dispatchCPPEvent): Ditto.
+        (KWQKHTMLPart::bodyBackgroundColor): Ditto.
+
 2004-11-12  Chris Blumenberg  <cblu@apple.com>
 
        <rdar://problem/3843312> REGRESSION: Tabbing into content area puts insertion point at start, should go to where it last was

diff --git a/WebCore/khtml/html/html_documentimpl.h b/WebCore/khtml/html/html_documentimpl.h
index 2925d215b6b3745c442a2328f31a770968ef05df..c0a9ac39aa8f834acf3442e4232af1a8777ec0db 100644 (file)
--- a/WebCore/khtml/html/html_documentimpl.h
+++ b/WebCore/khtml/html/html_documentimpl.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
- * Copyright (C) 2003 Apple Computer, Inc.
+ * Copyright (C) 2004 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -49,10 +49,6 @@ public:
     DOMString lastModified() const;
     DOMString cookie() const;
     void setCookie( const DOMString &);
-#if APPLE_CHANGES
-    DOMString policyBaseURL() const { return m_policyBaseURL; }
-    void setPolicyBaseURL(const DOMString &s) { m_policyBaseURL = s; }
-#endif
 
     void setBody(HTMLElementImpl *_body, int& exceptioncode);
 
@@ -81,10 +77,6 @@ private:
      // we actually store ints inside the pointer value itself; would use void *
     // but that makes the template unhappy.
     QDict<char> namedImageAndFormCounts;
-
-#if APPLE_CHANGES
-    DOMString m_policyBaseURL;
-#endif
 };
 
 }; //namespace

diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index 8bf47d46eb93e364424c42552e8180053375305c..1c6a805ffc2fcad2d639c83e309f804e77813ec1 100644 (file)
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -2042,7 +2042,7 @@ void HTMLTokenizer::notifyFinished(CachedObject */*finishedObj*/)
     }
 }
 
-bool HTMLTokenizer::isWaitingForScripts()
+bool HTMLTokenizer::isWaitingForScripts() const
 {
     return loadingExtScript;
 }
@@ -2056,7 +2056,6 @@ void HTMLTokenizer::setSrc(const TokenizerString &source)
 
 void HTMLTokenizer::setOnHold(bool _onHold)
 {
-    if (onHold == _onHold) return;
     onHold = _onHold;
 }
 

diff --git a/WebCore/khtml/html/htmltokenizer.h b/WebCore/khtml/html/htmltokenizer.h
index e0ca963cbeeccad6bfb60795933767722b1d1cdf..02112b8ff1021514e5506392d9aa06468f268eec 100644 (file)
--- a/WebCore/khtml/html/htmltokenizer.h
+++ b/WebCore/khtml/html/htmltokenizer.h
@@ -130,7 +130,8 @@ public:
 
     virtual void write(const TokenizerString &str, bool appendData);
     virtual void finish();
-    virtual void setOnHold(bool _onHold);
+    virtual void setOnHold(bool onHold);
+    virtual bool isWaitingForScripts() const;
     virtual void stopped();
     virtual bool processingData() const;
 
@@ -179,7 +180,6 @@ protected:
     // from CachedObjectClient
     void notifyFinished(CachedObject *finishedObj);
 
-    virtual bool isWaitingForScripts();
 protected:
     // Internal buffers
     ///////////////////

diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index a3afc5382a67e29ebabcc2662580f8adf068b662..d86bbfb51eef5c7270fb586a26c434e5344e0594 100644 (file)
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1095,13 +1095,6 @@ bool KHTMLPart::openFile()
   return true;
 }
 
-DOM::HTMLDocumentImpl *KHTMLPart::docImpl() const
-{
-    if ( d && d->m_doc && d->m_doc->isHTMLDocument() )
-        return static_cast<HTMLDocumentImpl*>(d->m_doc);
-    return 0;
-}
-
 DOM::DocumentImpl *KHTMLPart::xmlDocImpl() const
 {
     if ( d )

diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index 81b24a9fe1cf0f256db26bd86eb80711b0e26104..ac2a99bf770308b5aa5a3d6a0b144e7055734a9e 100644 (file)
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -1272,17 +1272,11 @@ private:
 
   DOM::EventListener *createHTMLEventListener( QString code );
 
-#if APPLE_CHANGES
-  public:
-#endif
-
-  DOM::HTMLDocumentImpl *docImpl() const;
+public:
   DOM::DocumentImpl *xmlDocImpl() const;
   void replaceDocImpl(DOM::DocumentImpl* newDoc);
   
-#if APPLE_CHANGES
-  private:
-#endif
+private:
   khtml::ChildFrame *childFrame( const QObject *obj );
 
   khtml::ChildFrame *recursiveFrameRequest( const KURL &url, const KParts::URLArgs &args, bool callParent = true );

diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 7a6ff6049287696a84202b99c2781c3d46cf7c09..e26f5c2606894c779f84e2843a3a094fcb5c7be3 100644 (file)
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -1349,10 +1349,10 @@ void DocumentImpl::close()
     // First fire the onload.
     bool doload = !parsing() && m_tokenizer && !m_processingLoadEvent;
     
-    bool wasNotRedirecting = !part() || part()->d->m_scheduledRedirection == noRedirectionScheduled || part()->d->m_scheduledRedirection == historyNavigationScheduled;
+    bool wasLocationChangePending = part() && part()->isScheduledLocationChangePending();
     
-    m_processingLoadEvent = true;
     if (body() && doload) {
+        m_processingLoadEvent = true;
         // We have to clear the tokenizer, in case someone document.write()s from the
         // onLoad event handler, as in Radar 3206524
         delete m_tokenizer;
@@ -1363,16 +1363,16 @@ void DocumentImpl::close()
         if (!ownerElement())
             printf("onload fired at %d\n", elapsedTime());
 #endif
+        m_processingLoadEvent = false;
     }
-    m_processingLoadEvent = false;
     
     // Make sure both the initial layout and reflow happen after the onload
     // fires. This will improve onload scores, and other browsers do it.
     // If they wanna cheat, we can too. -dwh
     
-    bool isRedirectingSoon = view() && view()->part()->d->m_scheduledRedirection != noRedirectionScheduled && view()->part()->d->m_scheduledRedirection != historyNavigationScheduled && view()->part()->d->m_delayRedirect == 0;
+    bool isLocationChangePending = part() && part()->isScheduledLocationChangePending();
     
-    if (doload && wasNotRedirecting && isRedirectingSoon && m_startTime.elapsed() < cLayoutTimerDelay) {
+    if (doload && !wasLocationChangePending && isLocationChangePending && m_startTime.elapsed() < cLayoutTimerDelay) {
        // Just bail out. During the onload we were shifted to another page.
        // i-Bench does this. When this happens don't bother painting or laying out.        
        delete m_tokenizer;

diff --git a/WebCore/khtml/xml/dom_docimpl.h b/WebCore/khtml/xml/dom_docimpl.h
index 11faa0d42cdf0fdca7df00b37c19bb88af685c1c..3e25c50c7e2783beebac08812c9b7e8d02be9fab 100644 (file)
--- a/WebCore/khtml/xml/dom_docimpl.h
+++ b/WebCore/khtml/xml/dom_docimpl.h
@@ -523,6 +523,9 @@ public:
 
     DOMString domain() const;
     void setDomain( const DOMString &newDomain, bool force = false ); // not part of the DOM
+
+    DOMString policyBaseURL() const { return m_policyBaseURL; }
+    void setPolicyBaseURL(const DOMString &s) { m_policyBaseURL = s; }
     
     // The following implements the rule from HTML 4 for what valid names are.
     // To get this right for all the XML cases, we probably have to improve this or move it
@@ -698,6 +701,8 @@ protected:
     
     QMap<QString, HTMLMapElementImpl *> m_imageMapsByName;
 
+    DOMString m_policyBaseURL;
+
 #if APPLE_CHANGES
 public:
     KWQSignal m_finishedParsing;

diff --git a/WebCore/khtml/xml/xml_tokenizer.cpp b/WebCore/khtml/xml/xml_tokenizer.cpp
index aeb482a9063eb7a99705e308d85e43cb50eed19b..f16d528785c284eec0a0a0d02bdc89d7a969387c 100644 (file)
--- a/WebCore/khtml/xml/xml_tokenizer.cpp
+++ b/WebCore/khtml/xml/xml_tokenizer.cpp
@@ -136,7 +136,7 @@ public:
     virtual void write(const TokenizerString &str, bool);
     virtual void finish();
     virtual void setOnHold(bool onHold);
-    virtual bool isWaitingForScripts();
+    virtual bool isWaitingForScripts() const;
 
 #ifdef KHTML_XSLT
     void setTransformSource(DocumentImpl* doc);
@@ -709,7 +709,7 @@ void XMLTokenizer::notifyFinished(CachedObject *finishedObj)
     }
 }
 
-bool XMLTokenizer::isWaitingForScripts()
+bool XMLTokenizer::isWaitingForScripts() const
 {
     return m_cachedScript != 0;
 }

diff --git a/WebCore/khtml/xml/xml_tokenizer.h b/WebCore/khtml/xml/xml_tokenizer.h
index b95beec5ac95ff71c012c08c3aedd6a3512e6bb8..473f3d74d47ebfbd95f23db8d9c2d3b2a5810a77 100644 (file)
--- a/WebCore/khtml/xml/xml_tokenizer.h
+++ b/WebCore/khtml/xml/xml_tokenizer.h
@@ -56,7 +56,7 @@ public:
     virtual void write(const TokenizerString &str, bool appendData) = 0;
     virtual void finish() = 0;
     virtual void setOnHold(bool onHold) = 0;
-    virtual bool isWaitingForScripts() = 0;
+    virtual bool isWaitingForScripts() const = 0;
 
     virtual void stopped() {};
     virtual bool processingData() const { return false; }

diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 24c06559bfe90aa44eef300e08424b4fcafdbbb4..106cac972781109646cc43f9c34f533e6b6d78a6 100644 (file)
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -412,7 +412,6 @@ private:
     int _activationEventNumber;
     
     static NSEvent *_currentEvent;
-    static NSResponder *_firstResponderAtMouseDownTime;
 
     KURL _submittedFormURL;
 

diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index e0a69d773c4233ff711eda9e60767b85004fe3f3..2bdfd1e06c526cf5904a8f0562e1d7d9159a4291 100644 (file)
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -160,7 +160,6 @@ using KParts::ReadOnlyPart;
 using KParts::URLArgs;
 
 NSEvent *KWQKHTMLPart::_currentEvent = nil;
-NSResponder *KWQKHTMLPart::_firstResponderAtMouseDownTime = nil;
 
 void KHTMLPart::completed()
 {
@@ -1671,9 +1670,8 @@ QPtrList<KWQKHTMLPart> &KWQKHTMLPart::mutableInstances()
 
 void KWQKHTMLPart::updatePolicyBaseURL()
 {
-    // FIXME: docImpl() returns null for everything other than HTML documents; is this causing problems? -dwh
-    if (parentPart() && parentPart()->docImpl()) {
-        setPolicyBaseURL(parentPart()->docImpl()->policyBaseURL());
+    if (parentPart() && parentPart()->xmlDocImpl()) {
+        setPolicyBaseURL(parentPart()->xmlDocImpl()->policyBaseURL());
     } else {
         setPolicyBaseURL(m_url.url());
     }
@@ -1681,10 +1679,8 @@ void KWQKHTMLPart::updatePolicyBaseURL()
 
 void KWQKHTMLPart::setPolicyBaseURL(const DOMString &s)
 {
-    // FIXME: XML documents will cause this to return null.  docImpl() is
-    // an HTMLdocument only. -dwh
-    if (docImpl())
-        docImpl()->setPolicyBaseURL(s);
+    if (xmlDocImpl())
+        xmlDocImpl()->setPolicyBaseURL(s);
     ConstFrameIt end = d->m_frames.end();
     for (ConstFrameIt it = d->m_frames.begin(); it != end; ++it) {
         ReadOnlyPart *subpart = (*it).m_part;
@@ -1897,11 +1893,11 @@ bool KWQKHTMLPart::keyEvent(NSEvent *event)
         return false;
     }
     NodeImpl *node = doc->focusNode();
-    if (!node && docImpl()) {
-       node = docImpl()->body();
-    }
     if (!node) {
-        return false;
+       node = doc->body();
+        if (!node) {
+            return false;
+        }
     }
     
     if ([event type] == NSKeyDown) {
@@ -2396,8 +2392,8 @@ void KWQKHTMLPart::dragSourceEndedAt(const QPoint &loc, NSDragOperation operatio
 bool KWQKHTMLPart::dispatchCPPEvent(int eventId, KWQClipboard::AccessPolicy policy)
 {
     NodeImpl *target = d->m_selection.start().element();
-    if (!target && docImpl()) {
-        target = docImpl()->body();
+    if (!target && xmlDocImpl()) {
+        target = xmlDocImpl()->body();
     }
     if (!target) {
         return true;
@@ -3707,8 +3703,8 @@ QChar KWQKHTMLPart::backslashAsCurrencySymbol() const
 
 NSColor *KWQKHTMLPart::bodyBackgroundColor() const
 {
-    if (docImpl() && docImpl()->body() && docImpl()->body()->renderer()) {
-        QColor bgColor = docImpl()->body()->renderer()->style()->backgroundColor();
+    if (xmlDocImpl() && xmlDocImpl()->body() && xmlDocImpl()->body()->renderer()) {
+        QColor bgColor = xmlDocImpl()->body()->renderer()->style()->backgroundColor();
         if (bgColor.isValid()) {
             return bgColor.getNSColor();
         }