Changeset 24550 in webkit

Timestamp:

Jul 23, 2007 5:04:32 PM (17 years ago)

Author:

thatcher

Message:

Reviewed by Hyatt.

<rdar://problem/5242145> REGRESSION: Clicking on symbol in documentation often doesn't scroll to symbol

A renderer for the anchor wasn't always available at the time parsing finished. So we need
to bail out of gotoAnchor if stylesheets are pending and remember to call gotoAnchor later
once all of the pending stylesheets load.

• dom/Document.cpp: (WebCore::Document::Document): Initialize m_gotoAnchorNeededAfterStylesheetsLoad to false. (WebCore::Document::stylesheetLoaded): If we have no more pending stylesheets, call gotoAnchor if needed.
• dom/Document.h: (WebCore::Document::gotoAnchorNeededAfterStylesheetsLoad): New method. (WebCore::Document::setGotoAnchorNeededAfterStylesheetsLoad): Ditto.
• loader/FrameLoader.cpp: (WebCore::FrameLoader::gotoAnchor): Bail early if the document still has pending stylesheets.
• loader/FrameLoader.h: Make gotoAnchor() public.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• dom/Document.h (modified) (2 diffs)
• loader/FrameLoader.cpp (modified) (1 diff)
• loader/FrameLoader.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-23  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Hyatt.
+
+        <rdar://problem/5242145> REGRESSION: Clicking on symbol in documentation often doesn't scroll to symbol
+
+        A renderer for the anchor wasn't always available at the time parsing finished. So we need
+        to bail out of gotoAnchor if stylesheets are pending and remember to call gotoAnchor later
+        once all of the pending stylesheets load.
+
+        * dom/Document.cpp:
+        (WebCore::Document::Document): Initialize m_gotoAnchorNeededAfterStylesheetsLoad to false.
+        (WebCore::Document::stylesheetLoaded): If we have no more pending stylesheets, call gotoAnchor if needed.
+        * dom/Document.h:
+        (WebCore::Document::gotoAnchorNeededAfterStylesheetsLoad): New method.
+        (WebCore::Document::setGotoAnchorNeededAfterStylesheetsLoad): Ditto.
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::gotoAnchor): Bail early if the document still has pending stylesheets.
+        * loader/FrameLoader.h: Make gotoAnchor() public.
+
 2007-07-23  John Sullivan  <sullivan@apple.com>
 

trunk/WebCore/dom/Document.cpp

@@ -309 +309 @@
     m_usesFirstLineRules = false;
     m_usesFirstLetterRules = false;
+    m_gotoAnchorNeededAfterStylesheetsLoad = false;
 
     m_styleSelector = new CSSStyleSelector(this, m_usersheet, m_styleSheets.get(), !inCompatMode());
@@ -1925 +1926 @@
 
     updateStyleSelector();
+
+    if (!m_pendingStylesheets && m_gotoAnchorNeededAfterStylesheetsLoad)
+        m_frame->loader()->gotoAnchor();
 }
 

trunk/WebCore/dom/Document.h

@@ -272 +272 @@
     void addPendingSheet() { m_pendingStylesheets++; }
 
+    bool gotoAnchorNeededAfterStylesheetsLoad() { return m_gotoAnchorNeededAfterStylesheetsLoad; }
+    void setGotoAnchorNeededAfterStylesheetsLoad(bool b) { m_gotoAnchorNeededAfterStylesheetsLoad = b; }
+
     /**
      * Called when one or more stylesheets in the document may have been added, removed or changed.
@@ -731 +734 @@
     bool m_usesFirstLineRules;
     bool m_usesFirstLetterRules;
+    bool m_gotoAnchorNeededAfterStylesheetsLoad;
 
     String m_title;

trunk/WebCore/loader/FrameLoader.cpp

@@ -1413 +1413 @@
     ASSERT(m_frame->document());
 
+    if (!m_frame->document()->haveStylesheetsLoaded()) {
+        m_frame->document()->setGotoAnchorNeededAfterStylesheetsLoad(true);
+        return false;
+    }
+
+    m_frame->document()->setGotoAnchorNeededAfterStylesheetsLoad(false);
+
     Node* anchorNode = m_frame->document()->getElementById(AtomicString(name));
     if (!anchorNode)

trunk/WebCore/loader/FrameLoader.h

@@ -323 +323 @@
         KJS::JSValue* executeScript(const String& script, bool forceUserGesture = false);
 
+        void gotoAnchor();
         bool gotoAnchor(const String& name); // returns true if the anchor was found
         void scrollToAnchor(const KURL&);
@@ -473 +474 @@
         void receivedFirstData();
 
-        void gotoAnchor();
-
         void updatePolicyBaseURL();
         void setPolicyBaseURL(const String&);