Title: [206060] trunk/Source/WebCore
- Revision
- 206060
- Author
- commit-qu...@webkit.org
- Date
- 2016-09-16 19:39:43 -0700 (Fri, 16 Sep 2016)
Log Message
Unreviewed, rolling out r206055.
https://bugs.webkit.org/show_bug.cgi?id=162110
broke 32bit ARM build (Requested by anttik on #webkit).
Reverted changeset:
"Add size assert for RenderElement"
https://bugs.webkit.org/show_bug.cgi?id=162096
http://trac.webkit.org/changeset/206055
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (206059 => 206060)
--- trunk/Source/WebCore/ChangeLog 2016-09-17 02:14:53 UTC (rev 206059)
+++ trunk/Source/WebCore/ChangeLog 2016-09-17 02:39:43 UTC (rev 206060)
@@ -1,3 +1,16 @@
+2016-09-16 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r206055.
+ https://bugs.webkit.org/show_bug.cgi?id=162110
+
+ broke 32bit ARM build (Requested by anttik on #webkit).
+
+ Reverted changeset:
+
+ "Add size assert for RenderElement"
+ https://bugs.webkit.org/show_bug.cgi?id=162096
+ http://trac.webkit.org/changeset/206055
+
2016-09-16 Brent Fulgham <bfulg...@apple.com>
[Win][Direct2D] Provide Color support for Direct2D
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (206059 => 206060)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-09-17 02:14:53 UTC (rev 206059)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-09-17 02:39:43 UTC (rev 206060)
@@ -78,15 +78,6 @@
namespace WebCore {
-struct SameSizeAsRenderElement : public RenderObject {
- uint32_t bitfields;
- void* firstChild;
- void* lastChild;
- RenderStyle style;
-};
-
-static_assert(sizeof(RenderElement) == sizeof(SameSizeAsRenderElement), "RenderElement should stay small");
-
bool RenderElement::s_affectsParentBlock = false;
bool RenderElement::s_noLongerAffectsParentBlock = false;
@@ -1492,6 +1483,7 @@
setIsRegisteredForVisibleInViewportCallback(false);
view().unregisterForVisibleInViewportCallback(*this);
+ m_visibleInViewportState = VisibilityUnknown;
}
void RenderElement::visibleInViewportStateChanged(VisibleInViewportState state)
Modified: trunk/Source/WebCore/rendering/RenderElement.h (206059 => 206060)
--- trunk/Source/WebCore/rendering/RenderElement.h 2016-09-17 02:14:53 UTC (rev 206059)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2016-09-17 02:39:43 UTC (rev 206060)
@@ -345,6 +345,8 @@
unsigned m_renderBlockFlowHasMarkupTruncation : 1;
unsigned m_renderBlockFlowLineLayoutPath : 2;
+ VisibleInViewportState m_visibleInViewportState { VisibilityUnknown };
+
RenderObject* m_firstChild;
RenderObject* m_lastChild;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
