Title: [206121] trunk/Source/WebCore
Revision
206121
Author
an...@apple.com
Date
2016-09-19 15:12:08 -0700 (Mon, 19 Sep 2016)

Log Message

Add size assert for RenderElement
https://bugs.webkit.org/show_bug.cgi?id=162096

Reviewed by Simon Fraser.

Also remove the unused m_visibleInViewportState field.

* rendering/RenderElement.cpp:
(WebCore::RenderElement::unregisterForVisibleInViewportCallback):
* rendering/RenderElement.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (206120 => 206121)


--- trunk/Source/WebCore/ChangeLog	2016-09-19 21:59:28 UTC (rev 206120)
+++ trunk/Source/WebCore/ChangeLog	2016-09-19 22:12:08 UTC (rev 206121)
@@ -1,3 +1,16 @@
+2016-09-19  Antti Koivisto  <an...@apple.com>
+
+        Add size assert for RenderElement
+        https://bugs.webkit.org/show_bug.cgi?id=162096
+
+        Reviewed by Simon Fraser.
+
+        Also remove the unused m_visibleInViewportState field.
+
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::unregisterForVisibleInViewportCallback):
+        * rendering/RenderElement.h:
+
 2016-09-19  Keith Rollin  <krol...@apple.com>
 
         REGRESSION (r205275): LOG_WITH_STREAM() macros are all compiled in release builds now

Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (206120 => 206121)


--- trunk/Source/WebCore/rendering/RenderElement.cpp	2016-09-19 21:59:28 UTC (rev 206120)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp	2016-09-19 22:12:08 UTC (rev 206121)
@@ -78,6 +78,17 @@
 
 namespace WebCore {
 
+struct SameSizeAsRenderElement : public RenderObject {
+    uint8_t bitfields0;
+    uint8_t bitfields1;
+    uint8_t bitfields2;
+    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;
     
@@ -1483,7 +1494,6 @@
     setIsRegisteredForVisibleInViewportCallback(false);
 
     view().unregisterForVisibleInViewportCallback(*this);
-    m_visibleInViewportState = VisibilityUnknown;
 }
 
 void RenderElement::visibleInViewportStateChanged(VisibleInViewportState state)

Modified: trunk/Source/WebCore/rendering/RenderElement.h (206120 => 206121)


--- trunk/Source/WebCore/rendering/RenderElement.h	2016-09-19 21:59:28 UTC (rev 206120)
+++ trunk/Source/WebCore/rendering/RenderElement.h	2016-09-19 22:12:08 UTC (rev 206121)
@@ -345,8 +345,6 @@
     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

Reply via email to