Changeset 41096 in webkit

Timestamp:

Feb 19, 2009, 5:41:55 PM (16 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Sam Weinig.

• WebCore part of fixing ​https://bugs.webkit.org/show_bug.cgi?id=24027 Do not send loader callbacks during CSS styling

Undo the iChat-specific quirk added in
<​http://trac.webkit.org/changeset/41071>. Instead, always suspend memory
cache client callbacks during attach() and recalcStyle().

• WebCore.base.exp: Removed Settings::setNeedsIChatMemoryCacheCallsQuirk().
• dom/ContainerNode.cpp: (WebCore::ContainerNode::suspendPostAttachCallbacks): Disable memory cache client callbacks and remember to enable them afterwards if needed. (WebCore::ContainerNode::resumePostAttachCallbacks): Re-enable memory cache client callbacks if they were disabled in suspendPostAttachCallbacks(). (WebCore::ContainerNode::attach): Use suspendPostAttachCallbacks() and resumePostAttachCallbacks().
• dom/ContainerNode.h: Made suspendPostAttachCallbacks() and resumePostAttachCallbacks() non-static.
• dom/Document.cpp: (WebCore::Document::dispatchImageLoadEventsNow): Reverted iChat-specific workaround.
• page/Settings.cpp: Removed m_needsIChatMemoryCacheCallsQuirk and related code. (WebCore::Settings::Settings):
• page/Settings.h:

WebKit/mac:

Reviewed by Sam Weinig.

• WebKit part of fixing ​https://bugs.webkit.org/show_bug.cgi?id=24027 Do not send loader callbacks during CSS styling

• WebView/WebView.mm: (-[WebView _preferencesChangedNotification:]): Reverted the iChat-specific quirk added in <​http://trac.webkit.org/changeset/41071>.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.base.exp (modified) (1 diff)
• WebCore/dom/ContainerNode.cpp (modified) (6 diffs)
• WebCore/dom/ContainerNode.h (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (2 diffs)
• WebCore/page/Settings.cpp (modified) (2 diffs)
• WebCore/page/Settings.h (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-02-19  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        - WebCore part of fixing https://bugs.webkit.org/show_bug.cgi?id=24027
+          Do not send loader callbacks during CSS styling
+
+        Undo the iChat-specific quirk added in
+        <http://trac.webkit.org/changeset/41071>. Instead, always suspend memory
+        cache client callbacks during attach() and recalcStyle().
+
+        * WebCore.base.exp: Removed
+        Settings::setNeedsIChatMemoryCacheCallsQuirk().
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::suspendPostAttachCallbacks): Disable memory
+        cache client callbacks and remember to enable them afterwards if needed.
+        (WebCore::ContainerNode::resumePostAttachCallbacks): Re-enable memory
+        cache client callbacks if they were disabled in
+        suspendPostAttachCallbacks().
+        (WebCore::ContainerNode::attach): Use suspendPostAttachCallbacks() and
+        resumePostAttachCallbacks().
+        * dom/ContainerNode.h: Made suspendPostAttachCallbacks()
+        and resumePostAttachCallbacks() non-static.
+        * dom/Document.cpp:
+        (WebCore::Document::dispatchImageLoadEventsNow): Reverted iChat-specific
+        workaround.
+        * page/Settings.cpp: Removed m_needsIChatMemoryCacheCallsQuirk and
+        related code.
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+
 2009-02-19  Holger Hans Peter Freyther  <zecke@selfish.org>
 

trunk/WebCore/WebCore.base.exp

@@ -617 +617 @@
 __ZN7WebCore8Settings32setNeedsAdobeFrameReloadingQuirkEb
 __ZN7WebCore8Settings33setEnforceCSSMIMETypeInStrictModeEb
-__ZN7WebCore8Settings34setNeedsIChatMemoryCacheCallsQuirkEb
 __ZN7WebCore8Settings35disableRangeMutationForOldAppleMailEb
 __ZN7WebCore8Settings36setOfflineWebApplicationCacheEnabledEb

trunk/WebCore/dom/ContainerNode.cpp

@@ -33 +33 @@
 #include "InlineTextBox.h"
 #include "MutationEvent.h"
+#include "Page.h"
 #include "RenderTheme.h"
 #include "RootInlineBox.h"
@@ -43 +44 @@
 
 typedef Vector<std::pair<NodeCallback, RefPtr<Node> > > NodeCallbackQueue;
-static NodeCallbackQueue* s_postAttachCallbackQueue = 0;
-
-static size_t s_attachDepth = 0;
+static NodeCallbackQueue* s_postAttachCallbackQueue;
+
+static size_t s_attachDepth;
+static bool s_shouldReEnableMemoryCacheCallsAfterAttach;
 
 void ContainerNode::removeAllChildren()
@@ -533 +535 @@
 void ContainerNode::suspendPostAttachCallbacks()
 {
+    if (!s_attachDepth) {
+        ASSERT(!s_shouldReEnableMemoryCacheCallsAfterAttach);
+        if (Page* page = document()->page()) {
+            if (page->areMemoryCacheClientCallsEnabled()) {
+                page->setMemoryCacheClientCallsEnabled(false);
+                s_shouldReEnableMemoryCacheCallsAfterAttach = true;
+            }
+        }
+    }
     ++s_attachDepth;
 }
@@ -538 +549 @@
 void ContainerNode::resumePostAttachCallbacks()
 {
-    if (s_attachDepth == 1 && s_postAttachCallbackQueue)
-        dispatchPostAttachCallbacks();
+    if (s_attachDepth == 1) {
+        if (s_postAttachCallbackQueue)
+            dispatchPostAttachCallbacks();
+        if (s_shouldReEnableMemoryCacheCallsAfterAttach) {
+            s_shouldReEnableMemoryCacheCallsAfterAttach = false;
+            if (Page* page = document()->page())
+                page->setMemoryCacheClientCallsEnabled(true);
+        }
+    }
     --s_attachDepth;
 }
@@ -567 +585 @@
 void ContainerNode::attach()
 {
-    ++s_attachDepth;
+    suspendPostAttachCallbacks();
 
     for (Node* child = m_firstChild; child; child = child->nextSibling())
@@ -573 +591 @@
     Node::attach();
 
-    if (s_attachDepth == 1 && s_postAttachCallbackQueue)
-        dispatchPostAttachCallbacks();
-    --s_attachDepth;
+    resumePostAttachCallbacks();
 }
 

trunk/WebCore/dom/ContainerNode.h

@@ -76 +76 @@
 protected:
     static void queuePostAttachCallback(NodeCallback, Node*);
-    static void suspendPostAttachCallbacks();
-    static void resumePostAttachCallbacks();
+    void suspendPostAttachCallbacks();
+    void resumePostAttachCallbacks();
 
     template<class GenericNode, class GenericNodeContainer>

trunk/WebCore/dom/Document.cpp

@@ -2904 +2904 @@
     if (!m_imageLoadEventDispatchingList.isEmpty())
         return;
-#ifdef BUILDING_ON_LEOPARD
-    bool shouldReenableMemoryCacheClientCalls = false;
-    if (settings() && settings()->needsIChatMemoryCacheCallsQuirk() && page()->areMemoryCacheClientCallsEnabled()) {
-        shouldReenableMemoryCacheClientCalls = true;
-        page()->setMemoryCacheClientCallsEnabled(false);
-    }
-#endif
+
     m_imageLoadEventTimer.stop();
 
@@ -2921 +2915 @@
     }
     m_imageLoadEventDispatchingList.clear();
-#ifdef BUILDING_ON_LEOPARD
-    if (shouldReenableMemoryCacheClientCalls && page())
-        page()->setMemoryCacheClientCallsEnabled(true);
-#endif
 }
 

trunk/WebCore/page/Settings.cpp

@@ -88 +88 @@
     , m_maximumDecodedImageSize(std::numeric_limits<size_t>::max())
     , m_allowScriptsToCloseWindows(false)
-    , m_needsIChatMemoryCacheCallsQuirk(false)
 {
     // A Frame may not have been created yet, so we initialize the AtomicString 
@@ -419 +418 @@
 }
 
-void Settings::setNeedsIChatMemoryCacheCallsQuirk(bool needsIChatMemoryCacheCallsQuirk)
-{
-    m_needsIChatMemoryCacheCallsQuirk = needsIChatMemoryCacheCallsQuirk;
-}
-
 } // namespace WebCore

trunk/WebCore/page/Settings.h

@@ -205 +205 @@
         void setAllowScriptsToCloseWindows(bool);
         bool allowScriptsToCloseWindows() const { return m_allowScriptsToCloseWindows; }
-
-        void setNeedsIChatMemoryCacheCallsQuirk(bool);
-        bool needsIChatMemoryCacheCallsQuirk() const { return m_needsIChatMemoryCacheCallsQuirk; }
 
     private:
@@ -262 +259 @@
         size_t m_maximumDecodedImageSize;
         bool m_allowScriptsToCloseWindows : 1;
-        bool m_needsIChatMemoryCacheCallsQuirk : 1;
 
 #if USE(SAFARI_THEME)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2009-02-19  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        - WebKit part of fixing https://bugs.webkit.org/show_bug.cgi?id=24027
+          Do not send loader callbacks during CSS styling
+
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChangedNotification:]): Reverted the
+        iChat-specific quirk added in <http://trac.webkit.org/changeset/41071>.
+
 2009-02-18  Dan Bernstein  <mitz@apple.com>
 

trunk/WebKit/mac/WebView/WebView.mm

@@ -1346 +1346 @@
     settings->setZoomsTextOnly([preferences zoomsTextOnly]);
     settings->setEnforceCSSMIMETypeInStrictMode(!WKAppVersionCheckLessThan(@"com.apple.iWeb", -1, 2.1));
-#ifdef BUILDING_ON_LEOPARD
-    settings->setNeedsIChatMemoryCacheCallsQuirk([[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.iChat"]);
-#endif
 }