Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
index a92baefeea2d5c0fa8bc8cffefcc5c186353932a..84eb5035570c93fa95f8d5837e77c308f34cea1c 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
@@ -132,7 +132,7 @@ LayoutObject::SetLayoutNeededForbiddenScope::~SetLayoutNeededForbiddenScope() |
struct SameSizeAsLayoutObject { |
virtual ~SameSizeAsLayoutObject() { } // Allocate vtable pointer. |
- void* pointers[5]; |
+ void* pointers[6]; |
#if ENABLE(ASSERT) |
unsigned m_debugBitfields : 2; |
#endif |
@@ -1234,7 +1234,7 @@ void LayoutObject::invalidatePaintUsingContainer(const LayoutBoxModelObject& pai |
paintInvalidationContainer.setBackingNeedsPaintInvalidationInRect(dirtyRect, invalidationReason); |
} |
-void LayoutObject::invalidateDisplayItemClient(const DisplayItemClientWrapper& displayItemClient) const |
+void LayoutObject::invalidateDisplayItemClient(const DisplayItemClient& displayItemClient) const |
{ |
// TODO(wangxianzhu): Ensure correct bounds for the client will be or has been passed to PaintController. crbug.com/547119. |
// Not using enclosingCompositedContainer() directly because this object may be in an orphaned subtree. |