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/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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 Element* scrollElement = document->getElementById("proxied-scroller"); | 211 Element* scrollElement = document->getElementById("proxied-scroller"); |
212 WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement); | 212 WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement); |
213 EXPECT_FALSE(!!scrollLayer->compositorMutableProperties()); | 213 EXPECT_FALSE(!!scrollLayer->compositorMutableProperties()); |
214 | 214 |
215 WebLayer* rootScrollLayer = getRootScrollLayer(); | 215 WebLayer* rootScrollLayer = getRootScrollLayer(); |
216 EXPECT_FALSE(!!rootScrollLayer->compositorMutableProperties()); | 216 EXPECT_FALSE(!!rootScrollLayer->compositorMutableProperties()); |
217 } | 217 } |
218 | 218 |
219 TEST_P(CompositorWorkerTest, disconnectedProxies) { | 219 TEST_P(CompositorWorkerTest, disconnectedProxies) { |
220 // This case is identical to compositor-proxy-basic, but the proxies are | 220 // This case is identical to compositor-proxy-basic, but the proxies are |
221 // disconnected (the result should be the same as compositor-proxy-plumbing-no
-proxies). | 221 // disconnected (the result should be the same as |
| 222 // compositor-proxy-plumbing-no-proxies). |
222 registerMockedHttpURLLoad("compositor-proxy-basic-disconnected.html"); | 223 registerMockedHttpURLLoad("compositor-proxy-basic-disconnected.html"); |
223 navigateTo(m_baseURL + "compositor-proxy-basic-disconnected.html"); | 224 navigateTo(m_baseURL + "compositor-proxy-basic-disconnected.html"); |
224 | 225 |
225 forceFullCompositingUpdate(); | 226 forceFullCompositingUpdate(); |
226 | 227 |
227 Document* document = frame()->document(); | 228 Document* document = frame()->document(); |
228 | 229 |
229 Element* tallElement = document->getElementById("tall"); | 230 Element* tallElement = document->getElementById("tall"); |
230 WebLayer* tallLayer = webLayerFromElement(tallElement); | 231 WebLayer* tallLayer = webLayerFromElement(tallElement); |
231 EXPECT_TRUE(!tallLayer); | 232 EXPECT_TRUE(!tallLayer); |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
364 | 365 |
365 const String& opacityValue = | 366 const String& opacityValue = |
366 document->domWindow() | 367 document->domWindow() |
367 ->getComputedStyle(proxiedElement, String()) | 368 ->getComputedStyle(proxiedElement, String()) |
368 ->getPropertyValueInternal(CSSPropertyOpacity); | 369 ->getPropertyValueInternal(CSSPropertyOpacity); |
369 EXPECT_EQ("0.8", opacityValue); | 370 EXPECT_EQ("0.8", opacityValue); |
370 } | 371 } |
371 } | 372 } |
372 | 373 |
373 } // namespace blink | 374 } // namespace blink |
OLD | NEW |