Title: [210020] trunk/Source/WebCore
- Revision
- 210020
- Author
- utatane....@gmail.com
- Date
- 2016-12-20 03:42:20 -0800 (Tue, 20 Dec 2016)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (210019 => 210020)
--- trunk/Source/WebCore/ChangeLog 2016-12-20 11:24:31 UTC (rev 210019)
+++ trunk/Source/WebCore/ChangeLog 2016-12-20 11:42:20 UTC (rev 210020)
@@ -1,5 +1,15 @@
2016-12-20 Yusuke Suzuki <utatane....@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....@gmail.com>
+
Unreviewed, fix Windows Debug build
https://bugs.webkit.org/show_bug.cgi?id=166035
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (210019 => 210020)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-12-20 11:24:31 UTC (rev 210019)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-12-20 11:42:20 UTC (rev 210020)
@@ -83,9 +83,6 @@
namespace WebCore {
struct SameSizeAsRenderElement : public RenderObject {
-#if !ASSERT_DISABLED
- bool reparentingChild;
-#endif
uint8_t bitfields0;
uint8_t bitfields1;
uint8_t bitfields2;
@@ -92,6 +89,9 @@
void* firstChild;
void* lastChild;
RenderStyle style;
+#if !ASSERT_DISABLED
+ bool reparentingChild;
+#endif
};
static_assert(sizeof(RenderElement) == sizeof(SameSizeAsRenderElement), "RenderElement should stay small");
Modified: trunk/Source/WebCore/rendering/RenderElement.h (210019 => 210020)
--- trunk/Source/WebCore/rendering/RenderElement.h 2016-12-20 11:24:31 UTC (rev 210019)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2016-12-20 11:42:20 UTC (rev 210020)
@@ -273,9 +273,6 @@
void removeFromRenderFlowThreadIncludingDescendants(bool shouldUpdateState);
void adjustFlowThreadStateOnContainingBlockChangeIfNeeded();
-#if !ASSERT_DISABLED
- bool m_reparentingChild { false };
-#endif
private:
RenderElement(ContainerNode&, RenderStyle&&, BaseTypeFlags);
@@ -342,6 +339,11 @@
// 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)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
