Changeset 243035 in webkit

Timestamp:

Mar 16, 2019 12:37:24 AM (5 years ago)

Author:

rniwa@webkit.org

Message:

Remove LayoutAssertionDisableScope after r241289
​https://bugs.webkit.org/show_bug.cgi?id=195848

Reviewed by Antti Koivisto.

Remove LayoutAssertionDisableScope for good now that the underlying bug has been fixed in r241289.

• dom/Document.cpp:

(WebCore::isSafeToUpdateStyleOrLayout):

• dom/ScriptDisallowedScope.h:

(WebCore::ScriptDisallowedScope::LayoutAssertionDisableScope): Deleted.

• page/FrameViewLayoutContext.cpp:

(WebCore::FrameViewLayoutContext::layout):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• dom/ScriptDisallowedScope.h (modified) (1 diff)
• page/FrameViewLayoutContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-16  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Remove LayoutAssertionDisableScope after r241289
+        https://bugs.webkit.org/show_bug.cgi?id=195848
+
+        Reviewed by Antti Koivisto.
+
+        Remove LayoutAssertionDisableScope for good now that the underlying bug has been fixed in r241289.
+
+        * dom/Document.cpp:
+        (WebCore::isSafeToUpdateStyleOrLayout):
+        * dom/ScriptDisallowedScope.h:
+        (WebCore::ScriptDisallowedScope::LayoutAssertionDisableScope): Deleted.
+        * page/FrameViewLayoutContext.cpp:
+        (WebCore::FrameViewLayoutContext::layout):
+
 2019-03-15  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -334 +334 @@
 bool Document::hasEverCreatedAnAXObjectCache = false;
 
-unsigned ScriptDisallowedScope::LayoutAssertionDisableScope::s_layoutAssertionDisableCount = 0;
-
 // DOM Level 2 says (letters added):
 //
@@ -2032 +2030 @@
     auto* frameView = document.view();
     bool isInFrameFlattening = frameView && frameView->isInChildFrameWithFrameFlattening();
-    bool isAssertionDisabled = ScriptDisallowedScope::LayoutAssertionDisableScope::shouldDisable();
-    return isSafeToExecuteScript || isInFrameFlattening || !isInWebProcess() || isAssertionDisabled;
+    return isSafeToExecuteScript || isInFrameFlattening || !isInWebProcess();
 }
 

trunk/Source/WebCore/dom/ScriptDisallowedScope.h

@@ -163 +163 @@
     };
 
-    // FIXME: Remove all uses of this class.
-    class LayoutAssertionDisableScope {
-    public:
-        LayoutAssertionDisableScope()
-        {
-            s_layoutAssertionDisableCount++;
-        }
-
-        ~LayoutAssertionDisableScope()
-        {
-            s_layoutAssertionDisableCount--;
-        }
-
-        static bool shouldDisable() { return s_layoutAssertionDisableCount; }
-
-    private:
-        static unsigned s_layoutAssertionDisableCount;
-    };
-
 private:
     WEBCORE_EXPORT static unsigned s_count;

trunk/Source/WebCore/page/FrameViewLayoutContext.cpp

@@ -149 +149 @@
     LOG_WITH_STREAM(Layout, stream << "FrameView " << &view() << " FrameViewLayoutContext::layout() with size " << view().layoutSize());
 
-    RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(!frame().document()->inRenderTreeUpdate() || ScriptDisallowedScope::LayoutAssertionDisableScope::shouldDisable());
+    RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(!frame().document()->inRenderTreeUpdate());
     ASSERT(LayoutDisallowedScope::isLayoutAllowed());
     ASSERT(!view().isPainting());