| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright (C) 2011 Google Inc. All rights reserved. |    2  * Copyright (C) 2011 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 | 
|   11  *     notice, this list of conditions and the following disclaimer in the |   11  *     notice, this list of conditions and the following disclaimer in the | 
|   12  *     documentation and/or other materials provided with the distribution. |   12  *     documentation and/or other materials provided with the distribution. | 
|   13  * |   13  * | 
|   14  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |   14  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | 
|   15  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |   15  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 
|   16  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |   16  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 
|   17  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |   17  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 
|   18  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |   18  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 
|   19  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |   19  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 
|   20  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |   20  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 
|   21  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |   21  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
|   22  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |   22  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 
|   23  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |   23  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
|   24  */ |   24  */ | 
|   25  |   25  | 
|   26 #include "config.h" |   26 #include "config.h" | 
|   27  |   27  | 
|   28 #include "NonCompositedContentHost.h" |   28 #include "NonCompositedContentHost.h" | 
|   29  |   29  | 
|   30 #include "PlatformContextSkia.h" |  | 
|   31 #include "WebViewImpl.h" |   30 #include "WebViewImpl.h" | 
|   32 #include "core/page/Settings.h" |   31 #include "core/page/Settings.h" | 
|   33 #include "core/platform/graphics/FloatPoint.h" |   32 #include "core/platform/graphics/FloatPoint.h" | 
|   34 #include "core/platform/graphics/FloatRect.h" |   33 #include "core/platform/graphics/FloatRect.h" | 
|   35 #include "core/platform/graphics/GraphicsLayer.h" |   34 #include "core/platform/graphics/GraphicsLayer.h" | 
|   36 #include "core/platform/graphics/chromium/GraphicsLayerChromium.h" |   35 #include "core/platform/graphics/chromium/GraphicsLayerChromium.h" | 
 |   36 #include "core/platform/graphics/skia/PlatformContextSkia.h" | 
|   37 #include <public/WebContentLayer.h> |   37 #include <public/WebContentLayer.h> | 
|   38 #include <public/WebFloatPoint.h> |   38 #include <public/WebFloatPoint.h> | 
|   39  |   39  | 
|   40 namespace WebKit { |   40 namespace WebKit { | 
|   41  |   41  | 
|   42 NonCompositedContentHost::NonCompositedContentHost(WebViewImpl* webView, WebCore
     ::GraphicsLayerFactory* graphicsLayerFactory) |   42 NonCompositedContentHost::NonCompositedContentHost(WebViewImpl* webView, WebCore
     ::GraphicsLayerFactory* graphicsLayerFactory) | 
|   43     : m_webView(webView) |   43     : m_webView(webView) | 
|   44     , m_showDebugBorders(false) |   44     , m_showDebugBorders(false) | 
|   45 { |   45 { | 
|   46     m_graphicsLayer = WebCore::GraphicsLayer::create(graphicsLayerFactory, this)
     ; |   46     m_graphicsLayer = WebCore::GraphicsLayer::create(graphicsLayerFactory, this)
     ; | 
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  161     m_showDebugBorders = showDebugBorders; |  161     m_showDebugBorders = showDebugBorders; | 
|  162     m_graphicsLayer->updateDebugIndicators(); |  162     m_graphicsLayer->updateDebugIndicators(); | 
|  163 } |  163 } | 
|  164  |  164  | 
|  165 bool NonCompositedContentHost::isTrackingRepaints() const |  165 bool NonCompositedContentHost::isTrackingRepaints() const | 
|  166 { |  166 { | 
|  167     return m_webView->isTrackingRepaints(); |  167     return m_webView->isTrackingRepaints(); | 
|  168 } |  168 } | 
|  169  |  169  | 
|  170 } // namespace WebKit |  170 } // namespace WebKit | 
| OLD | NEW |