From 5ef7c8a6a70875d4430752d146bdcb069605d71d Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Tue, 21 Aug 2012 10:57:44 +0200
Subject: Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831
 (http://svn.webkit.org/repository/webkit/trunk@126147)

New snapshot including various build fixes for newer Qt 5
---
 Source/WebKit/chromium/src/WebLayerTreeView.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'Source/WebKit/chromium/src/WebLayerTreeView.cpp')

diff --git a/Source/WebKit/chromium/src/WebLayerTreeView.cpp b/Source/WebKit/chromium/src/WebLayerTreeView.cpp
index edd43df20..7dfbcd129 100644
--- a/Source/WebKit/chromium/src/WebLayerTreeView.cpp
+++ b/Source/WebKit/chromium/src/WebLayerTreeView.cpp
@@ -26,12 +26,13 @@
 #include "config.h"
 #include <public/WebLayerTreeView.h>
 
+#include "CCFontAtlas.h"
+#include "CCGraphicsContext.h"
+#include "CCLayerTreeHost.h"
+#include "CCRenderingStats.h"
 #include "LayerChromium.h"
+#include "WebLayerImpl.h"
 #include "WebLayerTreeViewImpl.h"
-#include "cc/CCFontAtlas.h"
-#include "cc/CCGraphicsContext.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCRenderingStats.h"
 #include <public/WebLayer.h>
 #include <public/WebPoint.h>
 #include <public/WebRect.h>
@@ -83,7 +84,7 @@ void WebLayerTreeView::setSurfaceReady()
 void WebLayerTreeView::setRootLayer(WebLayer *root)
 {
     if (root)
-        m_private->layerTreeHost()->setRootLayer(*root);
+        m_private->layerTreeHost()->setRootLayer(static_cast<WebLayerImpl*>(root)->layer());
     else
         m_private->layerTreeHost()->setRootLayer(PassRefPtr<LayerChromium>());
 }
-- 
cgit v1.2.1