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

Side by Side Diff: third_party/WebKit/Source/web/tests/RootScrollerTest.cpp

Issue 1924043002: Switch the inheritance of WebViewClient from WebWidgetClient to protected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, fix new test Created 4 years, 7 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 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/page/scrolling/RootScroller.h" 5 #include "core/page/scrolling/RootScroller.h"
6 6
7 #include "core/frame/FrameHost.h" 7 #include "core/frame/FrameHost.h"
8 #include "core/frame/FrameView.h" 8 #include "core/frame/FrameView.h"
9 #include "core/frame/TopControls.h" 9 #include "core/frame/TopControls.h"
10 #include "core/html/HTMLFrameOwnerElement.h" 10 #include "core/html/HTMLFrameOwnerElement.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 WebCache::clear(); 52 WebCache::clear();
53 } 53 }
54 54
55 WebViewImpl* initialize(const std::string& pageName) 55 WebViewImpl* initialize(const std::string& pageName)
56 { 56 {
57 RuntimeEnabledFeatures::setSetRootScrollerEnabled(true); 57 RuntimeEnabledFeatures::setSetRootScrollerEnabled(true);
58 58
59 // Load a page with large body and set viewport size to 400x400 to 59 // Load a page with large body and set viewport size to 400x400 to
60 // ensure main frame is scrollable. 60 // ensure main frame is scrollable.
61 m_helper.initializeAndLoad( 61 m_helper.initializeAndLoad(
62 m_baseURL + pageName, true, 0, &m_client, &configureSettings); 62 m_baseURL + pageName, true, nullptr, &m_client, nullptr,
63 &configureSettings);
63 64
64 // Initialize top controls to be shown. 65 // Initialize top controls to be shown.
65 webViewImpl()->resizeWithTopControls(IntSize(400, 400), 50, true); 66 webViewImpl()->resizeWithTopControls(IntSize(400, 400), 50, true);
66 webViewImpl()->topControls().setShownRatio(1); 67 webViewImpl()->topControls().setShownRatio(1);
67 68
68 mainFrameView()->updateAllLifecyclePhases(); 69 mainFrameView()->updateAllLifecyclePhases();
69 70
70 return webViewImpl(); 71 return webViewImpl();
71 } 72 }
72 73
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 481
481 ASSERT_EQ( 482 ASSERT_EQ(
482 iframe->contentDocument()->documentElement(), 483 iframe->contentDocument()->documentElement(),
483 iframe->contentDocument()->rootScroller()); 484 iframe->contentDocument()->rootScroller());
484 } 485 }
485 } 486 }
486 487
487 } // namespace 488 } // namespace
488 489
489 } // namespace blink 490 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698