<!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>[194417] 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/194417">194417</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-12-24 21:37:22 -0800 (Thu, 24 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use an enum for RenderElement's baseTypeFlags
https://bugs.webkit.org/show_bug.cgi?id=152553

Reviewed by Zalan Bujtas.

Use an enum, rather than unsigned, for the BaseTypeFlags bit mask.

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::RenderBlock):
* rendering/RenderBlock.h:
* rendering/RenderBox.cpp:
(WebCore::RenderBox::RenderBox):
* rendering/RenderBox.h:
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::RenderBoxModelObject):
* rendering/RenderBoxModelObject.h:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::RenderElement):
* rendering/RenderElement.h:
* rendering/RenderLayerModelObject.cpp:
(WebCore::RenderLayerModelObject::RenderLayerModelObject):
* rendering/RenderLayerModelObject.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockh">trunk/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjecth">trunk/Source/WebCore/rendering/RenderBoxModelObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerModelObjectcpp">trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerModelObjecth">trunk/Source/WebCore/rendering/RenderLayerModelObject.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194416 => 194417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/ChangeLog        2015-12-25 05:37:22 UTC (rev 194417)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2015-12-24  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Use an enum for RenderElement's baseTypeFlags
+        https://bugs.webkit.org/show_bug.cgi?id=152553
+
+        Reviewed by Zalan Bujtas.
+
+        Use an enum, rather than unsigned, for the BaseTypeFlags bit mask.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::RenderBlock):
+        * rendering/RenderBlock.h:
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::RenderBox):
+        * rendering/RenderBox.h:
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::RenderBoxModelObject):
+        * rendering/RenderBoxModelObject.h:
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::RenderElement):
+        * rendering/RenderElement.h:
+        * rendering/RenderLayerModelObject.cpp:
+        (WebCore::RenderLayerModelObject::RenderLayerModelObject):
+        * rendering/RenderLayerModelObject.h:
+
+2015-12-24  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
</ins><span class="cx">         Remove the unused #define _USE_MATH_DEFINES
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=152034
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (194416 => 194417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp        2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp        2015-12-25 05:37:22 UTC (rev 194417)
</span><span class="lines">@@ -181,12 +181,12 @@
</span><span class="cx">     bool m_hadVerticalLayoutOverflow;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-RenderBlock::RenderBlock(Element&amp; element, Ref&lt;RenderStyle&gt;&amp;&amp; style, unsigned baseTypeFlags)
</del><ins>+RenderBlock::RenderBlock(Element&amp; element, Ref&lt;RenderStyle&gt;&amp;&amp; style, BaseTypeFlags baseTypeFlags)
</ins><span class="cx">     : RenderBox(element, WTF::move(style), baseTypeFlags | RenderBlockFlag)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RenderBlock::RenderBlock(Document&amp; document, Ref&lt;RenderStyle&gt;&amp;&amp; style, unsigned baseTypeFlags)
</del><ins>+RenderBlock::RenderBlock(Document&amp; document, Ref&lt;RenderStyle&gt;&amp;&amp; style, BaseTypeFlags baseTypeFlags)
</ins><span class="cx">     : RenderBox(document, WTF::move(style), baseTypeFlags | RenderBlockFlag)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (194416 => 194417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h        2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderBlock.h        2015-12-25 05:37:22 UTC (rev 194417)
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx">     friend class LineLayoutState;
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><del>-    RenderBlock(Element&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, unsigned baseTypeFlags);
-    RenderBlock(Document&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, unsigned baseTypeFlags);
</del><ins>+    RenderBlock(Element&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, BaseTypeFlags);
+    RenderBlock(Document&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, BaseTypeFlags);
</ins><span class="cx">     virtual ~RenderBlock();
</span><span class="cx"> 
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (194416 => 194417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp        2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp        2015-12-25 05:37:22 UTC (rev 194417)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">         &amp;&amp; (documentElementRenderer == bodyElementRenderer-&gt;parent());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RenderBox::RenderBox(Element&amp; element, Ref&lt;RenderStyle&gt;&amp;&amp; style, unsigned baseTypeFlags)
</del><ins>+RenderBox::RenderBox(Element&amp; element, Ref&lt;RenderStyle&gt;&amp;&amp; style, BaseTypeFlags baseTypeFlags)
</ins><span class="cx">     : RenderBoxModelObject(element, WTF::move(style), baseTypeFlags)
</span><span class="cx">     , m_minPreferredLogicalWidth(-1)
</span><span class="cx">     , m_maxPreferredLogicalWidth(-1)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx">     setIsBox();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RenderBox::RenderBox(Document&amp; document, Ref&lt;RenderStyle&gt;&amp;&amp; style, unsigned baseTypeFlags)
</del><ins>+RenderBox::RenderBox(Document&amp; document, Ref&lt;RenderStyle&gt;&amp;&amp; style, BaseTypeFlags baseTypeFlags)
</ins><span class="cx">     : RenderBoxModelObject(document, WTF::move(style), baseTypeFlags)
</span><span class="cx">     , m_minPreferredLogicalWidth(-1)
</span><span class="cx">     , m_maxPreferredLogicalWidth(-1)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (194416 => 194417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h        2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderBox.h        2015-12-25 05:37:22 UTC (rev 194417)
</span><span class="lines">@@ -628,8 +628,8 @@
</span><span class="cx">     const RenderBox* findEnclosingScrollableContainer() const;
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><del>-    RenderBox(Element&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, unsigned baseTypeFlags);
-    RenderBox(Document&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, unsigned baseTypeFlags);
</del><ins>+    RenderBox(Element&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, BaseTypeFlags);
+    RenderBox(Document&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, BaseTypeFlags);
</ins><span class="cx"> 
</span><span class="cx">     virtual void styleWillChange(StyleDifference, const RenderStyle&amp; newStyle) override;
</span><span class="cx">     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (194416 => 194417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp        2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp        2015-12-25 05:37:22 UTC (rev 194417)
</span><span class="lines">@@ -166,12 +166,12 @@
</span><span class="cx">     return view().imageQualityController().shouldPaintAtLowQuality(context, this, image, layer, size);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RenderBoxModelObject::RenderBoxModelObject(Element&amp; element, Ref&lt;RenderStyle&gt;&amp;&amp; style, unsigned baseTypeFlags)
</del><ins>+RenderBoxModelObject::RenderBoxModelObject(Element&amp; element, Ref&lt;RenderStyle&gt;&amp;&amp; style, BaseTypeFlags baseTypeFlags)
</ins><span class="cx">     : RenderLayerModelObject(element, WTF::move(style), baseTypeFlags | RenderBoxModelObjectFlag)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RenderBoxModelObject::RenderBoxModelObject(Document&amp; document, Ref&lt;RenderStyle&gt;&amp;&amp; style, unsigned baseTypeFlags)
</del><ins>+RenderBoxModelObject::RenderBoxModelObject(Document&amp; document, Ref&lt;RenderStyle&gt;&amp;&amp; style, BaseTypeFlags baseTypeFlags)
</ins><span class="cx">     : RenderLayerModelObject(document, WTF::move(style), baseTypeFlags | RenderBoxModelObjectFlag)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (194416 => 194417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h        2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h        2015-12-25 05:37:22 UTC (rev 194417)
</span><span class="lines">@@ -236,8 +236,8 @@
</span><span class="cx">     void suspendAnimations(double time = 0);
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><del>-    RenderBoxModelObject(Element&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, unsigned baseTypeFlags);
-    RenderBoxModelObject(Document&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, unsigned baseTypeFlags);
</del><ins>+    RenderBoxModelObject(Element&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, BaseTypeFlags);
+    RenderBoxModelObject(Document&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, BaseTypeFlags);
</ins><span class="cx"> 
</span><span class="cx">     virtual void willBeDestroyed() override;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (194416 => 194417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp        2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp        2015-12-25 05:37:22 UTC (rev 194417)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">     return map;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline RenderElement::RenderElement(ContainerNode&amp; elementOrDocument, Ref&lt;RenderStyle&gt;&amp;&amp; style, unsigned baseTypeFlags)
</del><ins>+inline RenderElement::RenderElement(ContainerNode&amp; elementOrDocument, Ref&lt;RenderStyle&gt;&amp;&amp; style, BaseTypeFlags baseTypeFlags)
</ins><span class="cx">     : RenderObject(elementOrDocument)
</span><span class="cx">     , m_baseTypeFlags(baseTypeFlags)
</span><span class="cx">     , m_ancestorLineBoxDirty(false)
</span><span class="lines">@@ -103,12 +103,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RenderElement::RenderElement(Element&amp; element, Ref&lt;RenderStyle&gt;&amp;&amp; style, unsigned baseTypeFlags)
</del><ins>+RenderElement::RenderElement(Element&amp; element, Ref&lt;RenderStyle&gt;&amp;&amp; style, BaseTypeFlags baseTypeFlags)
</ins><span class="cx">     : RenderElement(static_cast&lt;ContainerNode&amp;&gt;(element), WTF::move(style), baseTypeFlags)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RenderElement::RenderElement(Document&amp; document, Ref&lt;RenderStyle&gt;&amp;&amp; style, unsigned baseTypeFlags)
</del><ins>+RenderElement::RenderElement(Document&amp; document, Ref&lt;RenderStyle&gt;&amp;&amp; style, BaseTypeFlags baseTypeFlags)
</ins><span class="cx">     : RenderElement(static_cast&lt;ContainerNode&amp;&gt;(document), WTF::move(style), baseTypeFlags)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (194416 => 194417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h        2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderElement.h        2015-12-25 05:37:22 UTC (rev 194417)
</span><span class="lines">@@ -218,17 +218,19 @@
</span><span class="cx">     bool childRequiresTable(const RenderObject&amp; child) const;
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><del>-    enum BaseTypeFlags {
-        RenderLayerModelObjectFlag = 1 &lt;&lt; 0,
-        RenderBoxModelObjectFlag = 1 &lt;&lt; 1,
-        RenderInlineFlag = 1 &lt;&lt; 2,
-        RenderReplacedFlag = 1 &lt;&lt; 3,
-        RenderBlockFlag = 1 &lt;&lt; 4,
-        RenderBlockFlowFlag = 1 &lt;&lt; 5,
</del><ins>+    enum BaseTypeFlag {
+        RenderLayerModelObjectFlag  = 1 &lt;&lt; 0,
+        RenderBoxModelObjectFlag    = 1 &lt;&lt; 1,
+        RenderInlineFlag            = 1 &lt;&lt; 2,
+        RenderReplacedFlag          = 1 &lt;&lt; 3,
+        RenderBlockFlag             = 1 &lt;&lt; 4,
+        RenderBlockFlowFlag         = 1 &lt;&lt; 5,
</ins><span class="cx">     };
</span><ins>+    
+    typedef unsigned BaseTypeFlags;
</ins><span class="cx"> 
</span><del>-    RenderElement(Element&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, unsigned baseTypeFlags);
-    RenderElement(Document&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, unsigned baseTypeFlags);
</del><ins>+    RenderElement(Element&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, BaseTypeFlags);
+    RenderElement(Document&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, BaseTypeFlags);
</ins><span class="cx"> 
</span><span class="cx">     bool layerCreationAllowedForSubtree() const;
</span><span class="cx"> 
</span><span class="lines">@@ -276,7 +278,7 @@
</span><span class="cx">     void paintOutline(PaintInfo&amp;, const LayoutRect&amp;);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    RenderElement(ContainerNode&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, unsigned baseTypeFlags);
</del><ins>+    RenderElement(ContainerNode&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, BaseTypeFlags);
</ins><span class="cx">     void node() const = delete;
</span><span class="cx">     void nonPseudoNode() const = delete;
</span><span class="cx">     void generatingNode() const = delete;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp (194416 => 194417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp        2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp        2015-12-25 05:37:22 UTC (rev 194417)
</span><span class="lines">@@ -36,12 +36,12 @@
</span><span class="cx"> bool RenderLayerModelObject::s_hadTransform = false;
</span><span class="cx"> bool RenderLayerModelObject::s_layerWasSelfPainting = false;
</span><span class="cx"> 
</span><del>-RenderLayerModelObject::RenderLayerModelObject(Element&amp; element, Ref&lt;RenderStyle&gt;&amp;&amp; style, unsigned baseTypeFlags)
</del><ins>+RenderLayerModelObject::RenderLayerModelObject(Element&amp; element, Ref&lt;RenderStyle&gt;&amp;&amp; style, BaseTypeFlags baseTypeFlags)
</ins><span class="cx">     : RenderElement(element, WTF::move(style), baseTypeFlags | RenderLayerModelObjectFlag)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RenderLayerModelObject::RenderLayerModelObject(Document&amp; document, Ref&lt;RenderStyle&gt;&amp;&amp; style, unsigned baseTypeFlags)
</del><ins>+RenderLayerModelObject::RenderLayerModelObject(Document&amp; document, Ref&lt;RenderStyle&gt;&amp;&amp; style, BaseTypeFlags baseTypeFlags)
</ins><span class="cx">     : RenderElement(document, WTF::move(style), baseTypeFlags | RenderLayerModelObjectFlag)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerModelObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.h (194416 => 194417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerModelObject.h        2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.h        2015-12-25 05:37:22 UTC (rev 194417)
</span><span class="lines">@@ -52,8 +52,8 @@
</span><span class="cx">     virtual bool isScrollableOrRubberbandableBox() const { return false; }
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><del>-    RenderLayerModelObject(Element&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, unsigned baseTypeFlags);
-    RenderLayerModelObject(Document&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, unsigned baseTypeFlags);
</del><ins>+    RenderLayerModelObject(Element&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, BaseTypeFlags);
+    RenderLayerModelObject(Document&amp;, Ref&lt;RenderStyle&gt;&amp;&amp;, BaseTypeFlags);
</ins><span class="cx"> 
</span><span class="cx">     void createLayer();
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>