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

Side by Side Diff: third_party/WebKit/Source/core/paint/VideoPainterTest.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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/paint/VideoPainter.h" 5 #include "core/paint/VideoPainter.h"
6 6
7 #include "core/frame/FrameView.h" 7 #include "core/frame/FrameView.h"
8 #include "core/frame/Settings.h" 8 #include "core/frame/Settings.h"
9 #include "core/html/HTMLMediaElement.h" 9 #include "core/html/HTMLMediaElement.h"
10 #include "core/loader/EmptyClients.h" 10 #include "core/loader/EmptyClients.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 ReadyState m_readyState = ReadyStateHaveNothing; 78 ReadyState m_readyState = ReadyStateHaveNothing;
79 }; 79 };
80 80
81 class StubFrameLoaderClient : public EmptyFrameLoaderClient { 81 class StubFrameLoaderClient : public EmptyFrameLoaderClient {
82 public: 82 public:
83 // FrameLoaderClient 83 // FrameLoaderClient
84 std::unique_ptr<WebMediaPlayer> createWebMediaPlayer( 84 std::unique_ptr<WebMediaPlayer> createWebMediaPlayer(
85 HTMLMediaElement&, 85 HTMLMediaElement&,
86 const WebMediaPlayerSource&, 86 const WebMediaPlayerSource&,
87 WebMediaPlayerClient* client) override { 87 WebMediaPlayerClient* client) override {
88 return makeUnique<StubWebMediaPlayer>(client); 88 return WTF::makeUnique<StubWebMediaPlayer>(client);
89 } 89 }
90 }; 90 };
91 91
92 class VideoPainterTestForSPv2 : public ::testing::Test { 92 class VideoPainterTestForSPv2 : public ::testing::Test {
93 protected: 93 protected:
94 void SetUp() override { 94 void SetUp() override {
95 RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true); 95 RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true);
96 m_chromeClient = new StubChromeClientForSPv2(); 96 m_chromeClient = new StubChromeClientForSPv2();
97 m_frameLoaderClient = new StubFrameLoaderClient; 97 m_frameLoaderClient = new StubFrameLoaderClient;
98 Page::PageClients clients; 98 Page::PageClients clients;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 StubWebMediaPlayer* player = 137 StubWebMediaPlayer* player =
138 static_cast<StubWebMediaPlayer*>(element->webMediaPlayer()); 138 static_cast<StubWebMediaPlayer*>(element->webMediaPlayer());
139 const WebLayer* layer = player->getWebLayer(); 139 const WebLayer* layer = player->getWebLayer();
140 ASSERT_TRUE(layer); 140 ASSERT_TRUE(layer);
141 EXPECT_TRUE(hasLayerAttached(*layer)); 141 EXPECT_TRUE(hasLayerAttached(*layer));
142 EXPECT_EQ(WebSize(300, 200), layer->bounds()); 142 EXPECT_EQ(WebSize(300, 200), layer->bounds());
143 } 143 }
144 144
145 } // namespace 145 } // namespace
146 } // namespace blink 146 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/paint/SVGPaintContext.cpp ('k') | third_party/WebKit/Source/core/style/CachedUAStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698