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

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

Issue 2940863005: Move loading methods from WebFrame to WebLocalFrame. (Closed)
Patch Set: Fixing build problems introduced by rebasing... Created 3 years, 6 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 <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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 GetWebView()->Resize(IntSize(320, 240)); 46 GetWebView()->Resize(IntSize(320, 240));
47 } 47 }
48 48
49 ~CompositorWorkerTest() override { 49 ~CompositorWorkerTest() override {
50 Platform::Current() 50 Platform::Current()
51 ->GetURLLoaderMockFactory() 51 ->GetURLLoaderMockFactory()
52 ->UnregisterAllURLsAndClearMemoryCache(); 52 ->UnregisterAllURLsAndClearMemoryCache();
53 } 53 }
54 54
55 void NavigateTo(const String& url) { 55 void NavigateTo(const String& url) {
56 FrameTestHelpers::LoadFrame(GetWebView()->MainFrame(), url.Utf8().data()); 56 FrameTestHelpers::LoadFrame(GetWebView()->MainFrameImpl(),
57 url.Utf8().data());
57 } 58 }
58 59
59 void ForceFullCompositingUpdate() { 60 void ForceFullCompositingUpdate() {
60 GetWebView()->UpdateAllLifecyclePhases(); 61 GetWebView()->UpdateAllLifecyclePhases();
61 } 62 }
62 63
63 void RegisterMockedHttpURLLoad(const std::string& file_name) { 64 void RegisterMockedHttpURLLoad(const std::string& file_name) {
64 URLTestHelpers::RegisterMockedURLLoadFromBase( 65 URLTestHelpers::RegisterMockedURLLoadFromBase(
65 base_url_, testing::WebTestDataPath(), WebString::FromUTF8(file_name)); 66 base_url_, testing::WebTestDataPath(), WebString::FromUTF8(file_name));
66 } 67 }
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 371
371 const String& opacity_value = 372 const String& opacity_value =
372 document->domWindow() 373 document->domWindow()
373 ->getComputedStyle(proxied_element, String()) 374 ->getComputedStyle(proxied_element, String())
374 ->GetPropertyValueInternal(CSSPropertyOpacity); 375 ->GetPropertyValueInternal(CSSPropertyOpacity);
375 EXPECT_EQ("0.8", opacity_value); 376 EXPECT_EQ("0.8", opacity_value);
376 } 377 }
377 } 378 }
378 379
379 } // namespace blink 380 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698