Index: third_party/WebKit/Source/core/layout/LayoutPart.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutPart.cpp b/third_party/WebKit/Source/core/layout/LayoutPart.cpp |
index 4741abceb7afd7ad1dd056459bc5ed4746486a0b..0a91fb6bba2cc242daa22a482f19b2f3a212a7e0 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutPart.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutPart.cpp |
@@ -267,7 +267,7 @@ void LayoutPart::updateOnWidgetChange() |
return; |
if (!needsLayout()) |
- updateWidgetGeometry(); |
+ updateWidgetGeometryInternal(); |
if (style()->visibility() != VISIBLE) { |
widget->hide(); |
@@ -278,13 +278,13 @@ void LayoutPart::updateOnWidgetChange() |
} |
} |
-void LayoutPart::updateWidgetPosition() |
+bool LayoutPart::updateWidgetGeometry() |
{ |
Widget* widget = this->widget(); |
if (!widget || !node()) // Check the node in case destroy() has been called. |
- return; |
+ return false; |
- bool boundsChanged = updateWidgetGeometry(); |
+ bool boundsChanged = updateWidgetGeometryInternal(); |
// If the frame bounds got changed, or if view needs layout (possibly indicating |
// content size is wrong) we have to do a layout to set the right widget size. |
@@ -294,17 +294,18 @@ void LayoutPart::updateWidgetPosition() |
if ((boundsChanged || frameView->needsLayout()) && frameView->frame().page()) |
frameView->layout(); |
} |
+ return boundsChanged; |
} |
-void LayoutPart::widgetPositionsUpdated() |
+void LayoutPart::widgetGeometriesUpdated() |
{ |
Widget* widget = this->widget(); |
if (!widget) |
return; |
- widget->widgetPositionsUpdated(); |
+ widget->widgetGeometriesUpdated(); |
} |
-bool LayoutPart::updateWidgetGeometry() |
+bool LayoutPart::updateWidgetGeometryInternal() |
{ |
Widget* widget = this->widget(); |
ASSERT(widget); |