| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 #include "WebSettings.h" | 36 #include "WebSettings.h" |
| 37 #include "WebViewClient.h" | 37 #include "WebViewClient.h" |
| 38 #include "WebViewImpl.h" | 38 #include "WebViewImpl.h" |
| 39 #include "core/dom/Document.h" | 39 #include "core/dom/Document.h" |
| 40 #include "core/frame/FrameView.h" | 40 #include "core/frame/FrameView.h" |
| 41 #include "public/platform/Platform.h" | 41 #include "public/platform/Platform.h" |
| 42 #include "public/platform/WebUnitTestSupport.h" | 42 #include "public/platform/WebUnitTestSupport.h" |
| 43 | 43 |
| 44 #include <gtest/gtest.h> | 44 #include <gtest/gtest.h> |
| 45 | 45 |
| 46 using namespace WebKit; | 46 using namespace blink; |
| 47 | 47 |
| 48 namespace WebCore { | 48 namespace WebCore { |
| 49 | 49 |
| 50 namespace { | 50 namespace { |
| 51 | 51 |
| 52 class MockWebViewClient : public WebViewClient { | 52 class MockWebViewClient : public WebViewClient { |
| 53 public: | 53 public: |
| 54 virtual void initializeLayerTreeView() | 54 virtual void initializeLayerTreeView() |
| 55 { | 55 { |
| 56 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->creat
eLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest)); | 56 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->creat
eLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest)); |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 | 129 |
| 130 layerElement = document->getElementById("layer-solid-color"); | 130 layerElement = document->getElementById("layer-solid-color"); |
| 131 renderer = toRenderLayerModelObject(layerElement->renderer()); | 131 renderer = toRenderLayerModelObject(layerElement->renderer()); |
| 132 // CompositedLayerMapping::graphicsLayer's background color is unset if Soli
dColorLayer is created. | 132 // CompositedLayerMapping::graphicsLayer's background color is unset if Soli
dColorLayer is created. |
| 133 EXPECT_EQ(Color(), renderer->layer()->compositedLayerMapping()->mainGraphics
Layer()->backgroundColor()); | 133 EXPECT_EQ(Color(), renderer->layer()->compositedLayerMapping()->mainGraphics
Layer()->backgroundColor()); |
| 134 } | 134 } |
| 135 | 135 |
| 136 } | 136 } |
| 137 | 137 |
| 138 } // namespace WebCore | 138 } // namespace WebCore |
| OLD | NEW |