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

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

Issue 2860673002: Change all test cases to use WebViewBase instead of WebViewImpl. (Closed)
Patch Set: Address code review comments. Created 3 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "web/tests/sim/SimTest.h" 5 #include "web/tests/sim/SimTest.h"
6 6
7 #include "core/dom/Document.h" 7 #include "core/dom/Document.h"
8 #include "core/exported/WebViewBase.h" 8 #include "core/exported/WebViewBase.h"
9 #include "core/frame/LocalDOMWindow.h" 9 #include "core/frame/LocalDOMWindow.h"
10 #include "platform/LayoutTestSupport.h" 10 #include "platform/LayoutTestSupport.h"
11 #include "platform/scroll/ScrollbarTheme.h" 11 #include "platform/scroll/ScrollbarTheme.h"
12 #include "platform/testing/UnitTestHelpers.h" 12 #include "platform/testing/UnitTestHelpers.h"
13 #include "public/platform/WebCache.h" 13 #include "public/platform/WebCache.h"
14 #include "web/WebLocalFrameImpl.h" 14 #include "web/WebLocalFrameImpl.h"
15 15
16 namespace blink { 16 namespace blink {
17 17
18 SimTest::SimTest() : web_view_client_(compositor_), web_frame_client_(*this) { 18 SimTest::SimTest() : web_view_client_(compositor_), web_frame_client_(*this) {
19 Document::SetThreadedParsingEnabledForTesting(false); 19 Document::SetThreadedParsingEnabledForTesting(false);
20 // Use the mock theme to get more predictable code paths, this also avoids 20 // Use the mock theme to get more predictable code paths, this also avoids
21 // the OS callbacks in ScrollAnimatorMac which can schedule frames 21 // the OS callbacks in ScrollAnimatorMac which can schedule frames
22 // unpredictably since the OS will randomly call into blink for 22 // unpredictably since the OS will randomly call into blink for
23 // updateScrollerStyleForNewRecommendedScrollerStyle which then does 23 // updateScrollerStyleForNewRecommendedScrollerStyle which then does
24 // FrameView::scrollbarStyleChanged and will adjust the scrollbar existence 24 // FrameView::scrollbarStyleChanged and will adjust the scrollbar existence
25 // in the middle of a test. 25 // in the middle of a test.
26 LayoutTestSupport::SetMockThemeEnabledForTest(true); 26 LayoutTestSupport::SetMockThemeEnabledForTest(true);
27 ScrollbarTheme::SetMockScrollbarsEnabled(true); 27 ScrollbarTheme::SetMockScrollbarsEnabled(true);
28 web_view_helper_.Initialize(true, &web_frame_client_, &web_view_client_); 28 web_view_helper_.Initialize(true, &web_frame_client_, &web_view_client_);
29 compositor_.SetWebViewImpl(WebView()); 29 compositor_.SetWebView(WebView());
30 page_.SetPage(WebView().GetPage()); 30 page_.SetPage(WebView().GetPage());
31 } 31 }
32 32
33 SimTest::~SimTest() { 33 SimTest::~SimTest() {
34 // Pump the message loop to process the load event. 34 // Pump the message loop to process the load event.
35 testing::RunPendingTasks(); 35 testing::RunPendingTasks();
36 36
37 Document::SetThreadedParsingEnabledForTesting(true); 37 Document::SetThreadedParsingEnabledForTesting(true);
38 LayoutTestSupport::SetMockThemeEnabledForTest(false); 38 LayoutTestSupport::SetMockThemeEnabledForTest(false);
39 ScrollbarTheme::SetMockScrollbarsEnabled(false); 39 ScrollbarTheme::SetMockScrollbarsEnabled(false);
(...skipping 10 matching lines...) Expand all
50 } 50 }
51 51
52 SimPage& SimTest::Page() { 52 SimPage& SimTest::Page() {
53 return page_; 53 return page_;
54 } 54 }
55 55
56 Document& SimTest::GetDocument() { 56 Document& SimTest::GetDocument() {
57 return *WebView().MainFrameImpl()->GetFrame()->GetDocument(); 57 return *WebView().MainFrameImpl()->GetFrame()->GetDocument();
58 } 58 }
59 59
60 WebViewImpl& SimTest::WebView() { 60 WebViewBase& SimTest::WebView() {
61 return *web_view_helper_.WebView(); 61 return *web_view_helper_.WebView();
62 } 62 }
63 63
64 WebLocalFrameImpl& SimTest::MainFrame() { 64 WebLocalFrameImpl& SimTest::MainFrame() {
65 return *WebView().MainFrameImpl(); 65 return *WebView().MainFrameImpl();
66 } 66 }
67 67
68 const SimWebViewClient& SimTest::WebViewClient() const { 68 const SimWebViewClient& SimTest::WebViewClient() const {
69 return web_view_client_; 69 return web_view_client_;
70 } 70 }
71 71
72 SimCompositor& SimTest::Compositor() { 72 SimCompositor& SimTest::Compositor() {
73 return compositor_; 73 return compositor_;
74 } 74 }
75 75
76 void SimTest::AddConsoleMessage(const String& message) { 76 void SimTest::AddConsoleMessage(const String& message) {
77 console_messages_.push_back(message); 77 console_messages_.push_back(message);
78 } 78 }
79 79
80 } // namespace blink 80 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698