Source/core/frame/FrameView.cpp - Issue 1340643004: Stop propagating customscrollbar styles across iframe boundaries.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/frame/FrameView.cpp

Issue 1340643004: Stop propagating customscrollbar styles across iframe boundaries. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: fixing test cases Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

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;

}

« no previous file with comments | « LayoutTests/fast/events/scale-and-scroll-iframe-window.html ('k') | no next file » | no next file with comments »