Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(416)

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2740133002: Mark sub-frame root layer non-fast scrollable when wheel handlers present. (Closed)
Patch Set: Add mainframe version of test for verification. Created 3 years, 9 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 3056 matching lines...) Expand 10 before | Expand all | Expand 10 after
3067 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { 3067 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
3068 if (view.compositor()->inCompositingMode()) 3068 if (view.compositor()->inCompositingMode())
3069 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded(); 3069 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded();
3070 } 3070 }
3071 3071
3072 if (LocalFrame* localFrame = m_frame->localFrameRoot()) { 3072 if (LocalFrame* localFrame = m_frame->localFrameRoot()) {
3073 // This is needed since, at present, the ScrollingCoordinator doesn't 3073 // This is needed since, at present, the ScrollingCoordinator doesn't
3074 // send rects for oopif sub-frames. 3074 // send rects for oopif sub-frames.
3075 // TODO(wjmaclean): Remove this pathway when ScrollingCoordinator 3075 // TODO(wjmaclean): Remove this pathway when ScrollingCoordinator
3076 // operates on a per-frame basis. https://crbug.com/680606 3076 // operates on a per-frame basis. https://crbug.com/680606
3077 frame().page()->chromeClient().updateTouchRectsForSubframeIfNecessary( 3077 frame().page()->chromeClient().updateEventRectsForSubframeIfNecessary(
3078 localFrame); 3078 localFrame);
3079 } 3079 }
3080 updateCompositedSelectionIfNeeded(); 3080 updateCompositedSelectionIfNeeded();
3081 } 3081 }
3082 3082
3083 // TODO(pdr): prePaint should be under the "Paint" devtools timeline step 3083 // TODO(pdr): prePaint should be under the "Paint" devtools timeline step
3084 // for slimming paint v2. 3084 // for slimming paint v2.
3085 if (targetState >= DocumentLifecycle::PrePaintClean) 3085 if (targetState >= DocumentLifecycle::PrePaintClean)
3086 prePaint(); 3086 prePaint();
3087 } 3087 }
(...skipping 2165 matching lines...) Expand 10 before | Expand all | Expand 10 after
5253 void FrameView::setAnimationHost( 5253 void FrameView::setAnimationHost(
5254 std::unique_ptr<CompositorAnimationHost> host) { 5254 std::unique_ptr<CompositorAnimationHost> host) {
5255 m_animationHost = std::move(host); 5255 m_animationHost = std::move(host);
5256 } 5256 }
5257 5257
5258 LayoutUnit FrameView::caretWidth() const { 5258 LayoutUnit FrameView::caretWidth() const {
5259 return LayoutUnit(getHostWindow()->windowToViewportScalar(1)); 5259 return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
5260 } 5260 }
5261 5261
5262 } // namespace blink 5262 } // namespace blink
OLDNEW
« no previous file with comments | « content/test/data/page_with_scrollable_div.html ('k') | third_party/WebKit/Source/core/loader/EmptyClients.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698