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

Side by Side Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2285253003: Move TopDocumentRootScrollerController to a separate object on FrameHost (Closed)
Patch Set: None Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #include "core/page/DragController.h" 80 #include "core/page/DragController.h"
81 #include "core/page/DragData.h" 81 #include "core/page/DragData.h"
82 #include "core/page/DragSession.h" 82 #include "core/page/DragSession.h"
83 #include "core/page/FocusController.h" 83 #include "core/page/FocusController.h"
84 #include "core/page/FrameTree.h" 84 #include "core/page/FrameTree.h"
85 #include "core/page/Page.h" 85 #include "core/page/Page.h"
86 #include "core/page/PagePopupClient.h" 86 #include "core/page/PagePopupClient.h"
87 #include "core/page/PointerLockController.h" 87 #include "core/page/PointerLockController.h"
88 #include "core/page/ScopedPageLoadDeferrer.h" 88 #include "core/page/ScopedPageLoadDeferrer.h"
89 #include "core/page/TouchDisambiguation.h" 89 #include "core/page/TouchDisambiguation.h"
90 #include "core/page/scrolling/RootScrollerController.h" 90 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
91 #include "core/paint/PaintLayer.h" 91 #include "core/paint/PaintLayer.h"
92 #include "core/timing/DOMWindowPerformance.h" 92 #include "core/timing/DOMWindowPerformance.h"
93 #include "core/timing/Performance.h" 93 #include "core/timing/Performance.h"
94 #include "modules/accessibility/AXObject.h" 94 #include "modules/accessibility/AXObject.h"
95 #include "modules/accessibility/AXObjectCacheImpl.h" 95 #include "modules/accessibility/AXObjectCacheImpl.h"
96 #include "modules/credentialmanager/CredentialManagerClient.h" 96 #include "modules/credentialmanager/CredentialManagerClient.h"
97 #include "modules/encryptedmedia/MediaKeysController.h" 97 #include "modules/encryptedmedia/MediaKeysController.h"
98 #include "modules/storage/StorageNamespaceController.h" 98 #include "modules/storage/StorageNamespaceController.h"
99 #include "modules/webgl/WebGLRenderingContext.h" 99 #include "modules/webgl/WebGLRenderingContext.h"
100 #include "platform/ContextMenu.h" 100 #include "platform/ContextMenu.h"
(...skipping 4118 matching lines...) Expand 10 before | Expand all | Expand 10 after
4219 4219
4220 if (!page()->mainFrame() || !page()->mainFrame()->isLocalFrame()) 4220 if (!page()->mainFrame() || !page()->mainFrame()->isLocalFrame())
4221 return; 4221 return;
4222 4222
4223 Document* document = page()->deprecatedLocalMainFrame()->document(); 4223 Document* document = page()->deprecatedLocalMainFrame()->document();
4224 4224
4225 DCHECK(document); 4225 DCHECK(document);
4226 4226
4227 // Get the outer viewport scroll layer. 4227 // Get the outer viewport scroll layer.
4228 GraphicsLayer* layoutViewportScrollLayer = 4228 GraphicsLayer* layoutViewportScrollLayer =
4229 document->rootScrollerController()->rootScrollerLayer(); 4229 page()->frameHost().globalRootScrollerController().rootScrollerLayer();
4230 WebLayer* layoutViewportWebLayer = layoutViewportScrollLayer 4230 WebLayer* layoutViewportWebLayer = layoutViewportScrollLayer
4231 ? layoutViewportScrollLayer->platformLayer() 4231 ? layoutViewportScrollLayer->platformLayer()
4232 : nullptr; 4232 : nullptr;
4233 4233
4234 VisualViewport& visualViewport = page()->frameHost().visualViewport(); 4234 VisualViewport& visualViewport = page()->frameHost().visualViewport();
4235 4235
4236 // TODO(bokan): This was moved here from when registerViewportLayers was a 4236 // TODO(bokan): This was moved here from when registerViewportLayers was a
4237 // part of VisualViewport and maybe doesn't belong here. See comment inside 4237 // part of VisualViewport and maybe doesn't belong here. See comment inside
4238 // the mehtod. 4238 // the mehtod.
4239 visualViewport.setScrollLayerOnScrollbars(layoutViewportWebLayer); 4239 visualViewport.setScrollLayerOnScrollbars(layoutViewportWebLayer);
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
4608 return nullptr; 4608 return nullptr;
4609 return focusedFrame; 4609 return focusedFrame;
4610 } 4610 }
4611 4611
4612 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const 4612 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const
4613 { 4613 {
4614 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4614 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4615 } 4615 }
4616 4616
4617 } // namespace blink 4617 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698