| 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/LayoutView.h" | 6 #include "core/layout/LayoutView.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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 } | 49 } |
| 50 | 50 |
| 51 void registerMockedHttpURLLoad(const std::string& fileName) | 51 void registerMockedHttpURLLoad(const std::string& fileName) |
| 52 { | 52 { |
| 53 URLTestHelpers::registerMockedURLFromBaseURL(m_baseURL, WebString::fromU
TF8(fileName.c_str())); | 53 URLTestHelpers::registerMockedURLFromBaseURL(m_baseURL, WebString::fromU
TF8(fileName.c_str())); |
| 54 } | 54 } |
| 55 | 55 |
| 56 WebLayer* getRootScrollLayer() | 56 WebLayer* getRootScrollLayer() |
| 57 { | 57 { |
| 58 PaintLayerCompositor* compositor = frame()->contentLayoutObject()->compo
sitor(); | 58 PaintLayerCompositor* compositor = frame()->contentLayoutObject()->compo
sitor(); |
| 59 ASSERT(compositor); | 59 DCHECK(compositor); |
| 60 ASSERT(compositor->scrollLayer()); | 60 DCHECK(compositor->scrollLayer()); |
| 61 | 61 |
| 62 WebLayer* webScrollLayer = compositor->scrollLayer()->platformLayer(); | 62 WebLayer* webScrollLayer = compositor->scrollLayer()->platformLayer(); |
| 63 return webScrollLayer; | 63 return webScrollLayer; |
| 64 } | 64 } |
| 65 | 65 |
| 66 WebViewImpl* webViewImpl() const { return m_helper.webViewImpl(); } | 66 WebViewImpl* webViewImpl() const { return m_helper.webViewImpl(); } |
| 67 LocalFrame* frame() const { return m_helper.webViewImpl()->mainFrameImpl()->
frame(); } | 67 LocalFrame* frame() const { return m_helper.webViewImpl()->mainFrameImpl()->
frame(); } |
| 68 | 68 |
| 69 protected: | 69 protected: |
| 70 String m_baseURL; | 70 String m_baseURL; |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement); | 204 WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement); |
| 205 EXPECT_FALSE(!!scrollLayer->compositorMutableProperties()); | 205 EXPECT_FALSE(!!scrollLayer->compositorMutableProperties()); |
| 206 EXPECT_EQ(0UL, scrollLayer->elementId()); | 206 EXPECT_EQ(0UL, scrollLayer->elementId()); |
| 207 | 207 |
| 208 WebLayer* rootScrollLayer = getRootScrollLayer(); | 208 WebLayer* rootScrollLayer = getRootScrollLayer(); |
| 209 EXPECT_FALSE(!!rootScrollLayer->compositorMutableProperties()); | 209 EXPECT_FALSE(!!rootScrollLayer->compositorMutableProperties()); |
| 210 EXPECT_EQ(0UL, rootScrollLayer->elementId()); | 210 EXPECT_EQ(0UL, rootScrollLayer->elementId()); |
| 211 } | 211 } |
| 212 | 212 |
| 213 } // namespace blink | 213 } // namespace blink |
| OLD | NEW |