Index: Source/core/frame/FrameView.cpp |
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp |
index 3ff03734b8bb63efb9bced21f0761a40336de1d3..0321d07fe7405602c61ec9aef0a7d8a9986dae8d 100644 |
--- a/Source/core/frame/FrameView.cpp |
+++ b/Source/core/frame/FrameView.cpp |
@@ -475,9 +475,9 @@ bool FrameView::shouldUseCustomScrollbars(Element*& customScrollbarElement, Loca |
return true; |
} |
- // If we have an owning ipage/LocalFrame element, then it can set the custom scrollbar also. |
- LayoutPart* frameLayoutObject = m_frame->ownerLayoutObject(); |
- if (frameLayoutObject && frameLayoutObject->style()->hasPseudoStyle(SCROLLBAR)) { |
+ // If we have an ipage/LocalFrame element, then it can set the custom scrollbar also. |
+ LayoutView* frameLayoutView = m_frame->contentLayoutObject(); |
+ if (frameLayoutView && frameLayoutView->style()->hasPseudoStyle(SCROLLBAR)) { |
skobes
2015/09/16 01:49:04
Your test uses ::-webkit-scrollbar with no tag nam
MuVen
2015/09/16 11:18:49
for these tests,::-webkit-scrollbar is defined in
skobes
2015/09/16 15:06:12
If ::-webkit-scrollbar styles are added inside the
|
customScrollbarFrame = m_frame.get(); |
return true; |
} |