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 <gtest/gtest.h> | 5 #include <gtest/gtest.h> |
6 #include <memory> | 6 #include <memory> |
7 #include "core/exported/WebViewBase.h" | 7 #include "core/exported/WebViewBase.h" |
8 #include "core/frame/FrameTestHelpers.h" | 8 #include "core/frame/FrameTestHelpers.h" |
9 #include "core/frame/LocalFrameView.h" | 9 #include "core/frame/LocalFrameView.h" |
10 #include "core/frame/WebLocalFrameBase.h" | 10 #include "core/frame/WebLocalFrameBase.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 GetWebView()->Resize(IntSize(320, 240)); | 47 GetWebView()->Resize(IntSize(320, 240)); |
48 } | 48 } |
49 | 49 |
50 ~CompositorWorkerTest() override { | 50 ~CompositorWorkerTest() override { |
51 Platform::Current() | 51 Platform::Current() |
52 ->GetURLLoaderMockFactory() | 52 ->GetURLLoaderMockFactory() |
53 ->UnregisterAllURLsAndClearMemoryCache(); | 53 ->UnregisterAllURLsAndClearMemoryCache(); |
54 } | 54 } |
55 | 55 |
56 void NavigateTo(const String& url) { | 56 void NavigateTo(const String& url) { |
57 FrameTestHelpers::LoadFrame(GetWebView()->MainFrame(), url.Utf8().data()); | 57 FrameTestHelpers::LoadFrame(GetWebView()->MainFrameImpl(), |
| 58 url.Utf8().data()); |
58 } | 59 } |
59 | 60 |
60 void ForceFullCompositingUpdate() { | 61 void ForceFullCompositingUpdate() { |
61 GetWebView()->UpdateAllLifecyclePhases(); | 62 GetWebView()->UpdateAllLifecyclePhases(); |
62 } | 63 } |
63 | 64 |
64 void RegisterMockedHttpURLLoad(const std::string& file_name) { | 65 void RegisterMockedHttpURLLoad(const std::string& file_name) { |
65 URLTestHelpers::RegisterMockedURLLoadFromBase( | 66 URLTestHelpers::RegisterMockedURLLoadFromBase( |
66 base_url_, testing::WebTestDataPath(), WebString::FromUTF8(file_name)); | 67 base_url_, testing::WebTestDataPath(), WebString::FromUTF8(file_name)); |
67 } | 68 } |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 | 374 |
374 const String& opacity_value = | 375 const String& opacity_value = |
375 document->domWindow() | 376 document->domWindow() |
376 ->getComputedStyle(proxied_element, String()) | 377 ->getComputedStyle(proxied_element, String()) |
377 ->GetPropertyValueInternal(CSSPropertyOpacity); | 378 ->GetPropertyValueInternal(CSSPropertyOpacity); |
378 EXPECT_EQ("0.8", opacity_value); | 379 EXPECT_EQ("0.8", opacity_value); |
379 } | 380 } |
380 } | 381 } |
381 | 382 |
382 } // namespace blink | 383 } // namespace blink |
OLD | NEW |