Source/WebCore/page/FrameView.cpp - Issue 7565014: Merge 92030 - [chromium] Only force slow scrolling for iframes under --force-compositing-mode

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/WebCore/page/FrameView.cpp

Issue 7565014: Merge 92030 - [chromium] Only force slow scrolling for iframes under --force-compositing-mode (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 years, 5 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/WebCore/page/FrameView.cpp

===================================================================

--- Source/WebCore/page/FrameView.cpp (revision 92298)

+++ Source/WebCore/page/FrameView.cpp (working copy)

@@ -1151,7 +1151,7 @@

#if PLATFORM(CHROMIUM)

// The chromium compositor does not support scrolling a non-composited frame within a composited page through

// the fast scrolling path, so force slow scrolling in that case.

- if (!isEnclosedInCompositingLayer() && m_frame->page() && m_frame->page()->mainFrame()->view()->hasCompositedContent())

+ if (m_frame->ownerElement() && !hasCompositedContent() && m_frame->page() && m_frame->page()->mainFrame()->view()->hasCompositedContent())

return true;

#endif

« no previous file with comments | « no previous file | no next file » | no next file with comments »