| OLD | NEW |
| 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 "core/html/shadow/MediaControls.h" | 5 #include "core/html/shadow/MediaControls.h" |
| 6 | 6 |
| 7 #include "core/HTMLNames.h" | 7 #include "core/HTMLNames.h" |
| 8 #include "core/css/StylePropertySet.h" | 8 #include "core/css/StylePropertySet.h" |
| 9 #include "core/dom/Document.h" | 9 #include "core/dom/Document.h" |
| 10 #include "core/dom/ElementTraversal.h" | 10 #include "core/dom/ElementTraversal.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 }; | 81 }; |
| 82 | 82 |
| 83 class StubFrameLoaderClient : public EmptyFrameLoaderClient { | 83 class StubFrameLoaderClient : public EmptyFrameLoaderClient { |
| 84 public: | 84 public: |
| 85 static StubFrameLoaderClient* create() { return new StubFrameLoaderClient; } | 85 static StubFrameLoaderClient* create() { return new StubFrameLoaderClient; } |
| 86 | 86 |
| 87 std::unique_ptr<WebMediaPlayer> createWebMediaPlayer( | 87 std::unique_ptr<WebMediaPlayer> createWebMediaPlayer( |
| 88 HTMLMediaElement&, | 88 HTMLMediaElement&, |
| 89 const WebMediaPlayerSource&, | 89 const WebMediaPlayerSource&, |
| 90 WebMediaPlayerClient*) override { | 90 WebMediaPlayerClient*) override { |
| 91 return wrapUnique(new MockVideoWebMediaPlayer); | 91 return WTF::wrapUnique(new MockVideoWebMediaPlayer); |
| 92 } | 92 } |
| 93 | 93 |
| 94 WebRemotePlaybackClient* createWebRemotePlaybackClient( | 94 WebRemotePlaybackClient* createWebRemotePlaybackClient( |
| 95 HTMLMediaElement&) override { | 95 HTMLMediaElement&) override { |
| 96 if (!m_remotePlaybackClient) { | 96 if (!m_remotePlaybackClient) { |
| 97 m_remotePlaybackClient = wrapUnique(new MockWebRemotePlaybackClient); | 97 m_remotePlaybackClient = WTF::wrapUnique(new MockWebRemotePlaybackClient); |
| 98 } | 98 } |
| 99 return m_remotePlaybackClient.get(); | 99 return m_remotePlaybackClient.get(); |
| 100 } | 100 } |
| 101 | 101 |
| 102 private: | 102 private: |
| 103 std::unique_ptr<MockWebRemotePlaybackClient> m_remotePlaybackClient; | 103 std::unique_ptr<MockWebRemotePlaybackClient> m_remotePlaybackClient; |
| 104 }; | 104 }; |
| 105 | 105 |
| 106 Element* getElementByShadowPseudoId(Node& rootNode, | 106 Element* getElementByShadowPseudoId(Node& rootNode, |
| 107 const char* shadowPseudoId) { | 107 const char* shadowPseudoId) { |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 309 mediaControls().show(); | 309 mediaControls().show(); |
| 310 mediaControls().toggleOverflowMenu(); | 310 mediaControls().toggleOverflowMenu(); |
| 311 EXPECT_TRUE(isElementVisible(*overflowList)); | 311 EXPECT_TRUE(isElementVisible(*overflowList)); |
| 312 | 312 |
| 313 simulateHideMediaControlsTimerFired(); | 313 simulateHideMediaControlsTimerFired(); |
| 314 EXPECT_TRUE(isElementVisible(*overflowList)); | 314 EXPECT_TRUE(isElementVisible(*overflowList)); |
| 315 EXPECT_TRUE(isElementVisible(*panel)); | 315 EXPECT_TRUE(isElementVisible(*panel)); |
| 316 } | 316 } |
| 317 | 317 |
| 318 } // namespace blink | 318 } // namespace blink |
| OLD | NEW |