<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />

<title>[173392] trunk/Source/WebCore</title>

</head>

<body>

<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }

#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<div id="msg">

<dl class="meta">

<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173392">173392</a></dd>

<dt>Author</dt> <dd>simon.fraser@apple.com</dd>

<dt>Date</dt> <dd>2014-09-08 11:57:07 -0700 (Mon, 08 Sep 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>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):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>

<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>

<li><a href="#trunkSourceWebCorehtmlHTMLAppletElementcpp">trunk/Source/WebCore/html/HTMLAppletElement.cpp</a></li>

<li><a href="#trunkSourceWebCorehtmlHTMLEmbedElementcpp">trunk/Source/WebCore/html/HTMLEmbedElement.cpp</a></li>

<li><a href="#trunkSourceWebCorehtmlHTMLObjectElementcpp">trunk/Source/WebCore/html/HTMLObjectElement.cpp</a></li>

<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173391 => 173392)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-09-08 18:54:11 UTC (rev 173391)

+++ trunk/Source/WebCore/ChangeLog        2014-09-08 18:57:07 UTC (rev 173392)

</span><span class="lines">@@ -1,3 +1,25 @@

</span><ins>+2014-09-08  Simon Fraser  &lt;simon.fraser@apple.com&gt;

+

+        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):

+

</ins><span class="cx"> 2014-09-08  peavo@outlook.com  &lt;peavo@outlook.com&gt;

</span><span class="cx"> 

<span class="cx">         [WinCairo] Compile error.

</span></span></pre></div>

<a id="trunkSourceWebCoredomDocumentcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (173391 => 173392)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/dom/Document.cpp        2014-09-08 18:54:11 UTC (rev 173391)

+++ trunk/Source/WebCore/dom/Document.cpp        2014-09-08 18:57:07 UTC (rev 173392)

</span><span class="lines">@@ -1851,7 +1851,7 @@

</span><span class="cx"> 

</span><span class="cx">     updateLayout();

</span><span class="cx"> 

</span><del>-    if (runPostLayoutTasks == RunPostLayoutTasksSynchronously &amp;&amp; view())

</del><ins>+    if (runPostLayoutTasks == RunPostLayoutTasks::Synchronously &amp;&amp; view())

</ins><span class="cx">         view()-&gt;flushAnyPendingPostLayoutTasks();

</span><span class="cx"> 

</span><span class="cx">     m_ignorePendingStylesheets = oldIgnore;

</span></span></pre></div>

<a id="trunkSourceWebCoredomDocumenth"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (173391 => 173392)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/dom/Document.h        2014-09-08 18:54:11 UTC (rev 173391)

+++ trunk/Source/WebCore/dom/Document.h        2014-09-08 18:57:07 UTC (rev 173392)

</span><span class="lines">@@ -591,12 +591,17 @@

</span><span class="cx">     void recalcStyle(Style::Change = Style::NoChange);

</span><span class="cx">     WEBCORE_EXPORT void updateStyleIfNeeded();

</span><span class="cx">     bool updateStyleIfNeededForNode(const Node&amp;);

</span><ins>+

</ins><span class="cx">     WEBCORE_EXPORT void updateLayout();

</span><del>-    enum RunPostLayoutTasks {

-        RunPostLayoutTasksAsynchronously,

-        RunPostLayoutTasksSynchronously,

</del><ins>+    

+    // 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,

</ins><span class="cx">     };

</span><del>-    WEBCORE_EXPORT void updateLayoutIgnorePendingStylesheets(RunPostLayoutTasks = RunPostLayoutTasksAsynchronously);

</del><ins>+    WEBCORE_EXPORT void updateLayoutIgnorePendingStylesheets(RunPostLayoutTasks = RunPostLayoutTasks::Asynchronously);

+

</ins><span class="cx">     PassRef&lt;RenderStyle&gt; styleForElementIgnoringPendingStylesheets(Element*);

</span><span class="cx"> 

<span class="cx">     // Returns true if page box (margin boxes and page borders) is visible.

</span></span></pre></div>

<a id="trunkSourceWebCorehtmlHTMLAppletElementcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAppletElement.cpp (173391 => 173392)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/html/HTMLAppletElement.cpp        2014-09-08 18:54:11 UTC (rev 173391)

+++ trunk/Source/WebCore/html/HTMLAppletElement.cpp        2014-09-08 18:57:07 UTC (rev 173392)

</span><span class="lines">@@ -91,7 +91,7 @@

</span><span class="cx">     // Needs to load the plugin immediatedly because this function is called

<span class="cx">     // when JavaScript code accesses the plugin.

<span class="cx">     // FIXME: &lt;rdar://16893708&gt; Check if dispatching events here is safe.

</span><del>-    document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);

</del><ins>+    document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasks::Synchronously);

</ins><span class="cx">     return renderWidget();

</span><span class="cx"> }

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCorehtmlHTMLEmbedElementcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLEmbedElement.cpp (173391 => 173392)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/html/HTMLEmbedElement.cpp        2014-09-08 18:54:11 UTC (rev 173391)

+++ trunk/Source/WebCore/html/HTMLEmbedElement.cpp        2014-09-08 18:57:07 UTC (rev 173392)

</span><span class="lines">@@ -75,7 +75,7 @@

</span><span class="cx">         // Needs to load the plugin immediatedly because this function is called

<span class="cx">         // when JavaScript code accesses the plugin.

<span class="cx">         // FIXME: &lt;rdar://16893708&gt; Check if dispatching events here is safe.

</span><del>-        document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);

</del><ins>+        document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasks::Synchronously);

</ins><span class="cx">     }

</span><span class="cx">     return findWidgetRenderer(this);

</span><span class="cx"> }

</span></span></pre></div>

<a id="trunkSourceWebCorehtmlHTMLObjectElementcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLObjectElement.cpp (173391 => 173392)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/html/HTMLObjectElement.cpp        2014-09-08 18:54:11 UTC (rev 173391)

+++ trunk/Source/WebCore/html/HTMLObjectElement.cpp        2014-09-08 18:57:07 UTC (rev 173392)

</span><span class="lines">@@ -86,7 +86,7 @@

</span><span class="cx">     // Needs to load the plugin immediatedly because this function is called

<span class="cx">     // when JavaScript code accesses the plugin.

<span class="cx">     // FIXME: &lt;rdar://16893708&gt; Check if dispatching events here is safe.

</span><del>-    document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);

</del><ins>+    document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasks::Synchronously);

</ins><span class="cx">     return renderWidget(); // This will return 0 if the renderer is not a RenderWidget.

</span><span class="cx"> }

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCoretestingInternalscpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (173391 => 173392)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp        2014-09-08 18:54:11 UTC (rev 173391)

+++ trunk/Source/WebCore/testing/Internals.cpp        2014-09-08 18:57:07 UTC (rev 173392)

</span><span class="lines">@@ -1926,7 +1926,7 @@

</span><span class="cx">         return;

</span><span class="cx">     }

</span><span class="cx"> 

</span><del>-    document-&gt;updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);

</del><ins>+    document-&gt;updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasks::Synchronously);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> #if !PLATFORM(IOS)

</span></span></pre>

</div>

</div>

</body>

</html>