Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

1 files changed, 10 insertions, 7 deletions

diff --git a/Source/WebKit/chromium/src/NonCompositedContentHost.h b/Source/WebKit/chromium/src/NonCompositedContentHost.h
index 320e7c1be..9706860d7 100644
--- a/Source/WebKit/chromium/src/NonCompositedContentHost.h
+++ b/Source/WebKit/chromium/src/NonCompositedContentHost.h
@@ -40,30 +40,31 @@ class GraphicsContext;
 class IntPoint;
 class IntRect;
 class LayerChromium;
-class LayerPainterChromium;
 }
 
 namespace WebKit {
+class WebViewImpl;
 
 class NonCompositedContentHost : public WebCore::GraphicsLayerClient {
 WTF_MAKE_NONCOPYABLE(NonCompositedContentHost);
 public:
-    static PassOwnPtr<NonCompositedContentHost> create(PassOwnPtr<WebCore::LayerPainterChromium> contentPaint)
+    static PassOwnPtr<NonCompositedContentHost> create(WebViewImpl* webView)
     {
-        return adoptPtr(new NonCompositedContentHost(contentPaint));
+        return adoptPtr(new NonCompositedContentHost(webView));
     }
     virtual ~NonCompositedContentHost();
 
     void invalidateRect(const WebCore::IntRect&);
     void setBackgroundColor(const WebCore::Color&);
+    void setOpaque(bool);
     void setScrollLayer(WebCore::GraphicsLayer*);
-    void setViewport(const WebCore::IntSize& viewportSize, const WebCore::IntSize& contentsSize, const WebCore::IntPoint& scrollPosition, float deviceScale, int layerAdjustX);
+    void setViewport(const WebCore::IntSize& viewportSize, const WebCore::IntSize& contentsSize, const WebCore::IntPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, float deviceScale);
     WebCore::GraphicsLayer* topLevelRootLayer() const { return m_graphicsLayer.get(); }
 
     void setShowDebugBorders(bool);
 
 protected:
-    explicit NonCompositedContentHost(PassOwnPtr<WebCore::LayerPainterChromium> contentPaint);
+    explicit NonCompositedContentHost(WebViewImpl*);
 
 private:
     // GraphicsLayerClient
@@ -81,9 +82,11 @@ private:
     WebCore::LayerChromium* scrollLayer();
 
     OwnPtr<WebCore::GraphicsLayer> m_graphicsLayer;
-    OwnPtr<WebCore::LayerPainterChromium> m_contentPaint;
+    WebViewImpl* m_webView;
     WebCore::IntSize m_viewportSize;
-    int m_layerAdjustX;
+    WebCore::IntSize m_layerAdjust;
+
+    bool m_opaque;
     bool m_showDebugBorders;
     float m_deviceScaleFactor;
 };