Unreviewed, attempt to fix Windows Debug build part 2
authorutatane.tea@gmail.com <utatane.tea@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 20 Dec 2016 11:42:20 +0000 (11:42 +0000)
committerutatane.tea@gmail.com <utatane.tea@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 20 Dec 2016 11:42:20 +0000 (11:42 +0000)
https://bugs.webkit.org/show_bug.cgi?id=166035

Ensured that this patch passes the build on the GTK port.

* rendering/RenderElement.cpp:
* rendering/RenderElement.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@210020 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderElement.cpp
Source/WebCore/rendering/RenderElement.h

index 4a8b725..6f19cde 100644 (file)
@@ -1,5 +1,15 @@
 2016-12-20  Yusuke Suzuki  <utatane.tea@gmail.com>
 
 2016-12-20  Yusuke Suzuki  <utatane.tea@gmail.com>
 
+        Unreviewed, attempt to fix Windows Debug build part 2
+        https://bugs.webkit.org/show_bug.cgi?id=166035
+
+        Ensured that this patch passes the build on the GTK port.
+
+        * rendering/RenderElement.cpp:
+        * rendering/RenderElement.h:
+
+2016-12-20  Yusuke Suzuki  <utatane.tea@gmail.com>
+
         Unreviewed, fix Windows Debug build
         https://bugs.webkit.org/show_bug.cgi?id=166035
 
         Unreviewed, fix Windows Debug build
         https://bugs.webkit.org/show_bug.cgi?id=166035
 
index ceed6d9..2d53f3a 100644 (file)
 namespace WebCore {
 
 struct SameSizeAsRenderElement : public RenderObject {
 namespace WebCore {
 
 struct SameSizeAsRenderElement : public RenderObject {
-#if !ASSERT_DISABLED
-    bool reparentingChild;
-#endif
     uint8_t bitfields0;
     uint8_t bitfields1;
     uint8_t bitfields2;
     void* firstChild;
     void* lastChild;
     RenderStyle style;
     uint8_t bitfields0;
     uint8_t bitfields1;
     uint8_t bitfields2;
     void* firstChild;
     void* lastChild;
     RenderStyle style;
+#if !ASSERT_DISABLED
+    bool reparentingChild;
+#endif
 };
 
 static_assert(sizeof(RenderElement) == sizeof(SameSizeAsRenderElement), "RenderElement should stay small");
 };
 
 static_assert(sizeof(RenderElement) == sizeof(SameSizeAsRenderElement), "RenderElement should stay small");
index 215c1f4..2803744 100644 (file)
@@ -273,9 +273,6 @@ protected:
 
     void removeFromRenderFlowThreadIncludingDescendants(bool shouldUpdateState);
     void adjustFlowThreadStateOnContainingBlockChangeIfNeeded();
 
     void removeFromRenderFlowThreadIncludingDescendants(bool shouldUpdateState);
     void adjustFlowThreadStateOnContainingBlockChangeIfNeeded();
-#if !ASSERT_DISABLED
-    bool m_reparentingChild { false };
-#endif
 
 private:
     RenderElement(ContainerNode&, RenderStyle&&, BaseTypeFlags);
 
 private:
     RenderElement(ContainerNode&, RenderStyle&&, BaseTypeFlags);
@@ -342,6 +339,11 @@ private:
     // Store state between styleWillChange and styleDidChange
     static bool s_affectsParentBlock;
     static bool s_noLongerAffectsParentBlock;
     // Store state between styleWillChange and styleDidChange
     static bool s_affectsParentBlock;
     static bool s_noLongerAffectsParentBlock;
+
+protected:
+#if !ASSERT_DISABLED
+    bool m_reparentingChild { false };
+#endif
 };
 
 inline void RenderElement::setAncestorLineBoxDirty(bool f)
 };
 
 inline void RenderElement::setAncestorLineBoxDirty(bool f)