Changeset 206060 in webkit

Timestamp:

Sep 16, 2016 7:39:43 PM (8 years ago)

Author:

commit-queue@webkit.org

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-16  Commit Queue  <commit-queue@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  <bfulgham@apple.com>
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -79 +79 @@
 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;
@@ -1493 +1484 @@
 
     view().unregisterForVisibleInViewportCallback(*this);
+    m_visibleInViewportState = VisibilityUnknown;
 }
 

trunk/Source/WebCore/rendering/RenderElement.h

@@ -346 +346 @@
     unsigned m_renderBlockFlowLineLayoutPath : 2;
 
+    VisibleInViewportState m_visibleInViewportState { VisibilityUnknown };
+
     RenderObject* m_firstChild;
     RenderObject* m_lastChild;