Changeset 210020 in webkit

Timestamp:

Dec 20, 2016 3:42:20 AM (7 years ago)

Author:

Yusuke Suzuki

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (2 diffs)
• rendering/RenderElement.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -84 +84 @@
 
 struct SameSizeAsRenderElement : public RenderObject {
-#if !ASSERT_DISABLED
-    bool reparentingChild;
-#endif
     uint8_t bitfields0;
     uint8_t bitfields1;
@@ -93 +90 @@
     void* lastChild;
     RenderStyle style;
+#if !ASSERT_DISABLED
+    bool reparentingChild;
+#endif
 };
 

trunk/Source/WebCore/rendering/RenderElement.h

@@ -274 +274 @@
     void removeFromRenderFlowThreadIncludingDescendants(bool shouldUpdateState);
     void adjustFlowThreadStateOnContainingBlockChangeIfNeeded();
-#if !ASSERT_DISABLED
-    bool m_reparentingChild { false };
-#endif
 
 private:
@@ -343 +340 @@
     static bool s_affectsParentBlock;
     static bool s_noLongerAffectsParentBlock;
+
+protected:
+#if !ASSERT_DISABLED
+    bool m_reparentingChild { false };
+#endif
 };