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

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

Issue 1924043002: Switch the inheritance of WebViewClient from WebWidgetClient to protected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, fix new test Created 4 years, 7 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 "core/frame/FrameView.h" 5 #include "core/frame/FrameView.h"
6 #include "core/layout/api/LayoutViewItem.h" 6 #include "core/layout/api/LayoutViewItem.h"
7 #include "core/layout/compositing/CompositedLayerMapping.h" 7 #include "core/layout/compositing/CompositedLayerMapping.h"
8 #include "core/layout/compositing/PaintLayerCompositor.h" 8 #include "core/layout/compositing/PaintLayerCompositor.h"
9 #include "core/page/Page.h" 9 #include "core/page/Page.h"
10 #include "platform/graphics/CompositorMutableProperties.h" 10 #include "platform/graphics/CompositorMutableProperties.h"
(...skipping 13 matching lines...) Expand all
24 #include <gtest/gtest.h> 24 #include <gtest/gtest.h>
25 25
26 namespace blink { 26 namespace blink {
27 27
28 class CompositorWorkerTest : public testing::Test { 28 class CompositorWorkerTest : public testing::Test {
29 public: 29 public:
30 CompositorWorkerTest() 30 CompositorWorkerTest()
31 : m_baseURL("http://www.test.com/") 31 : m_baseURL("http://www.test.com/")
32 { 32 {
33 RuntimeEnabledFeatures::setCompositorWorkerEnabled(true); 33 RuntimeEnabledFeatures::setCompositorWorkerEnabled(true);
34 m_helper.initialize(true, 0, &m_mockWebViewClient, &configureSettings); 34 m_helper.initialize(true, nullptr, &m_mockWebViewClient, nullptr, &confi gureSettings);
35 webViewImpl()->resize(IntSize(320, 240)); 35 webViewImpl()->resize(IntSize(320, 240));
36 } 36 }
37 37
38 ~CompositorWorkerTest() override 38 ~CompositorWorkerTest() override
39 { 39 {
40 Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs(); 40 Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
41 WebCache::clear(); 41 WebCache::clear();
42 } 42 }
43 43
44 void navigateTo(const String& url) 44 void navigateTo(const String& url)
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 { 298 {
299 const String& transformValue = document->domWindow()->getComputedStyle( proxiedElement, String())->getPropertyValueInternal(CSSPropertyTransform); 299 const String& transformValue = document->domWindow()->getComputedStyle( proxiedElement, String())->getPropertyValueInternal(CSSPropertyTransform);
300 EXPECT_EQ("matrix3d(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 41, 42, 43, 44)", transformValue); 300 EXPECT_EQ("matrix3d(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 41, 42, 43, 44)", transformValue);
301 301
302 const String& opacityValue = document->domWindow()->getComputedStyle(pro xiedElement, String())->getPropertyValueInternal(CSSPropertyOpacity); 302 const String& opacityValue = document->domWindow()->getComputedStyle(pro xiedElement, String())->getPropertyValueInternal(CSSPropertyOpacity);
303 EXPECT_EQ("0.8", opacityValue); 303 EXPECT_EQ("0.8", opacityValue);
304 } 304 }
305 } 305 }
306 306
307 } // namespace blink 307 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698