Index: Source/core/layout/LayoutScrollbar.cpp |
diff --git a/Source/core/layout/LayoutScrollbar.cpp b/Source/core/layout/LayoutScrollbar.cpp |
index 1829b789c01c9dcd836012414a8c8f9d67b8d81c..f1694a0635dc214d9b98ec49f2ed0077a2950413 100644 |
--- a/Source/core/layout/LayoutScrollbar.cpp |
+++ b/Source/core/layout/LayoutScrollbar.cpp |
@@ -32,6 +32,7 @@ |
#include "core/layout/LayoutPart.h" |
#include "core/layout/LayoutScrollbarPart.h" |
#include "core/layout/LayoutScrollbarTheme.h" |
+#include "core/layout/LayoutView.h" |
#include "platform/graphics/GraphicsContext.h" |
namespace blink { |
@@ -96,6 +97,13 @@ LayoutBox* LayoutScrollbar::owningLayoutObject() const |
return m_owner && m_owner->layoutObject() ? m_owner->layoutObject()->enclosingBox() : 0; |
} |
+LayoutBox* LayoutScrollbar::owningLayoutObjectWithinFrame() const |
+{ |
+ if (m_owningFrame) |
+ return m_owningFrame->contentLayoutObject(); |
+ return owningLayoutObject(); |
+} |
+ |
void LayoutScrollbar::setParent(Widget* parent) |
{ |
Scrollbar::setParent(parent); |
@@ -188,7 +196,7 @@ void LayoutScrollbar::updateScrollbarParts(bool destroy) |
if (newThickness != oldThickness) { |
setFrameRect(IntRect(location(), IntSize(isHorizontal ? width() : newThickness, isHorizontal ? newThickness : height()))); |
- if (LayoutBox* box = owningLayoutObject()) { |
+ if (LayoutBox* box = owningLayoutObjectWithinFrame()) { |
if (box->isLayoutBlock()) |
toLayoutBlock(box)->notifyScrollbarThicknessChanged(); |
box->setChildNeedsLayout(); |