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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTestHelper.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/layout/LayoutTestHelper.h" 5 #include "core/layout/LayoutTestHelper.h"
6 6
7 #include "core/frame/FrameHost.h" 7 #include "core/frame/FrameHost.h"
8 #include "core/html/HTMLIFrameElement.h" 8 #include "core/html/HTMLIFrameElement.h"
9 #include "platform/graphics/test/FakeGraphicsLayerFactory.h" 9 #include "platform/graphics/test/FakeGraphicsLayerFactory.h"
10 #include "platform/scroll/ScrollbarTheme.h" 10 #include "platform/scroll/ScrollbarTheme.h"
11 11
12 namespace blink { 12 namespace blink {
13 13
14 namespace { 14 namespace {
15 15
16 class FakeChromeClient : public EmptyChromeClient { 16 class FakeChromeClient : public EmptyChromeClient {
17 public: 17 public:
18 static PassOwnPtrWillBeRawPtr<FakeChromeClient> create() { return adoptPtrWi llBeNoop(new FakeChromeClient); } 18 static RawPtr<FakeChromeClient> create() { return (new FakeChromeClient); }
19 19
20 GraphicsLayerFactory* graphicsLayerFactory() const override 20 GraphicsLayerFactory* graphicsLayerFactory() const override
21 { 21 {
22 return FakeGraphicsLayerFactory::instance(); 22 return FakeGraphicsLayerFactory::instance();
23 } 23 }
24 }; 24 };
25 25
26 } // namespace 26 } // namespace
27 27
28 RenderingTest::RenderingTest(PassOwnPtrWillBeRawPtr<FrameLoaderClient> frameLoad erClient) 28 RenderingTest::RenderingTest(RawPtr<FrameLoaderClient> frameLoaderClient)
29 : m_frameLoaderClient(frameLoaderClient) { } 29 : m_frameLoaderClient(frameLoaderClient) { }
30 30
31 void RenderingTest::SetUp() 31 void RenderingTest::SetUp()
32 { 32 {
33 Page::PageClients pageClients; 33 Page::PageClients pageClients;
34 fillWithEmptyClients(pageClients); 34 fillWithEmptyClients(pageClients);
35 DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<FakeChromeClient>, chromeClient, (FakeChromeClient::create())); 35 DEFINE_STATIC_LOCAL(Persistent<FakeChromeClient>, chromeClient, (FakeChromeC lient::create()));
36 pageClients.chromeClient = chromeClient.get(); 36 pageClients.chromeClient = chromeClient.get();
37 m_pageHolder = DummyPageHolder::create(IntSize(800, 600), &pageClients, m_fr ameLoaderClient.release(), settingOverrider()); 37 m_pageHolder = DummyPageHolder::create(IntSize(800, 600), &pageClients, m_fr ameLoaderClient.release(), settingOverrider());
38 38
39 Settings::setMockScrollbarsEnabled(true); 39 Settings::setMockScrollbarsEnabled(true);
40 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true); 40 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
41 EXPECT_TRUE(ScrollbarTheme::theme().usesOverlayScrollbars()); 41 EXPECT_TRUE(ScrollbarTheme::theme().usesOverlayScrollbars());
42 42
43 // This ensures that the minimal DOM tree gets attached 43 // This ensures that the minimal DOM tree gets attached
44 // correctly for tests that don't call setBodyInnerHTML. 44 // correctly for tests that don't call setBodyInnerHTML.
45 document().view()->updateAllLifecyclePhases(); 45 document().view()->updateAllLifecyclePhases();
(...skipping 26 matching lines...) Expand all
72 static_cast<SingleChildFrameLoaderClient*>(document().frame()->client())->se tChild(m_subframe.get()); 72 static_cast<SingleChildFrameLoaderClient*>(document().frame()->client())->se tChild(m_subframe.get());
73 document().frame()->host()->incrementSubframeCount(); 73 document().frame()->host()->incrementSubframeCount();
74 Document& frameDocument = *iframe.contentDocument(); 74 Document& frameDocument = *iframe.contentDocument();
75 75
76 frameDocument.setBaseURLOverride(KURL(ParsedURLString, "http://test.com")); 76 frameDocument.setBaseURLOverride(KURL(ParsedURLString, "http://test.com"));
77 frameDocument.body()->setInnerHTML(htmlContentOfIframe, ASSERT_NO_EXCEPTION) ; 77 frameDocument.body()->setInnerHTML(htmlContentOfIframe, ASSERT_NO_EXCEPTION) ;
78 return frameDocument; 78 return frameDocument;
79 } 79 }
80 80
81 } // namespace blink 81 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698