Changeset 173392 in webkit

Timestamp:

Sep 8, 2014 11:57:07 AM (10 years ago)

Author:

Simon Fraser

Message:

Use enum class for the RunPostLayoutTasks enum
​https://bugs.webkit.org/show_bug.cgi?id=136640

Reviewed by Dean Jackson.

Use enum class for RunPostLayoutTasks fixing callers. Add an explanatory comment,
and add some spacing.

• dom/Document.cpp:

(WebCore::Document::updateLayoutIgnorePendingStylesheets):

• dom/Document.h:
• html/HTMLAppletElement.cpp:

(WebCore::HTMLAppletElement::renderWidgetForJSBindings):

• html/HTMLEmbedElement.cpp:

(WebCore::HTMLEmbedElement::renderWidgetForJSBindings):

• html/HTMLObjectElement.cpp:

(WebCore::HTMLObjectElement::renderWidgetForJSBindings):

• testing/Internals.cpp:

(WebCore::Internals::updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• dom/Document.h (modified) (1 diff)
• html/HTMLAppletElement.cpp (modified) (1 diff)
• html/HTMLEmbedElement.cpp (modified) (1 diff)
• html/HTMLObjectElement.cpp (modified) (1 diff)
• testing/Internals.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-08  Simon Fraser  <simon.fraser@apple.com>
+
+        Use enum class for the RunPostLayoutTasks enum
+        https://bugs.webkit.org/show_bug.cgi?id=136640
+
+        Reviewed by Dean Jackson.
+
+        Use enum class for RunPostLayoutTasks fixing callers. Add an explanatory comment,
+        and add some spacing.
+
+        * dom/Document.cpp:
+        (WebCore::Document::updateLayoutIgnorePendingStylesheets):
+        * dom/Document.h:
+        * html/HTMLAppletElement.cpp:
+        (WebCore::HTMLAppletElement::renderWidgetForJSBindings):
+        * html/HTMLEmbedElement.cpp:
+        (WebCore::HTMLEmbedElement::renderWidgetForJSBindings):
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::renderWidgetForJSBindings):
+        * testing/Internals.cpp:
+        (WebCore::Internals::updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks):
+
 2014-09-08  peavo@outlook.com  <peavo@outlook.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1852 +1852 @@
     updateLayout();
 
-    if (runPostLayoutTasks == RunPostLayoutTasksSynchronously && view())
+    if (runPostLayoutTasks == RunPostLayoutTasks::Synchronously && view())
         view()->flushAnyPendingPostLayoutTasks();
 

trunk/Source/WebCore/dom/Document.h

@@ -592 +592 @@
     WEBCORE_EXPORT void updateStyleIfNeeded();
     bool updateStyleIfNeededForNode(const Node&);
+
     WEBCORE_EXPORT void updateLayout();
-    enum RunPostLayoutTasks {
-        RunPostLayoutTasksAsynchronously,
-        RunPostLayoutTasksSynchronously,
+    
+    // updateLayoutIgnorePendingStylesheets() forces layout even if we are waiting for pending stylesheet loads,
+    // so calling this may cause a flash of unstyled content (FOUC).
+    enum class RunPostLayoutTasks {
+        Asynchronously,
+        Synchronously,
     };
-    WEBCORE_EXPORT void updateLayoutIgnorePendingStylesheets(RunPostLayoutTasks = RunPostLayoutTasksAsynchronously);
+    WEBCORE_EXPORT void updateLayoutIgnorePendingStylesheets(RunPostLayoutTasks = RunPostLayoutTasks::Asynchronously);
+
     PassRef<RenderStyle> styleForElementIgnoringPendingStylesheets(Element*);
 

trunk/Source/WebCore/html/HTMLAppletElement.cpp

@@ -92 +92 @@
     // when JavaScript code accesses the plugin.
     // FIXME: <rdar://16893708> Check if dispatching events here is safe.
-    document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
+    document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasks::Synchronously);
     return renderWidget();
 }

trunk/Source/WebCore/html/HTMLEmbedElement.cpp

@@ -76 +76 @@
         // when JavaScript code accesses the plugin.
         // FIXME: <rdar://16893708> Check if dispatching events here is safe.
-        document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
+        document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasks::Synchronously);
     }
     return findWidgetRenderer(this);

trunk/Source/WebCore/html/HTMLObjectElement.cpp

@@ -87 +87 @@
     // when JavaScript code accesses the plugin.
     // FIXME: <rdar://16893708> Check if dispatching events here is safe.
-    document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
+    document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasks::Synchronously);
     return renderWidget(); // This will return 0 if the renderer is not a RenderWidget.
 }

trunk/Source/WebCore/testing/Internals.cpp

@@ -1927 +1927 @@
     }
 
-    document->updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
+    document->updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasks::Synchronously);
 }