From 8d473cf9743f1d30a16a27114e93bd5af5648d23 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 18 May 2012 14:03:11 +0200 Subject: Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578) Weekly snapshot --- Source/WebKit/chromium/src/WebLayerTreeView.cpp | 4 ++++ 1 file changed, 4 insertions(+) (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 6c18f6742..a4d7d918a 100644 --- a/Source/WebKit/chromium/src/WebLayerTreeView.cpp +++ b/Source/WebKit/chromium/src/WebLayerTreeView.cpp @@ -43,10 +43,14 @@ WebLayerTreeView::Settings::operator CCSettings() const settings.acceleratePainting = acceleratePainting; settings.showFPSCounter = showFPSCounter; settings.showPlatformLayerTree = showPlatformLayerTree; + settings.showPaintRects = showPaintRects; settings.refreshRate = refreshRate; settings.perTilePainting = perTilePainting; settings.partialSwapEnabled = partialSwapEnabled; settings.threadedAnimationEnabled = threadedAnimationEnabled; + settings.defaultTileSize = defaultTileSize; + settings.maxUntiledLayerSize = maxUntiledLayerSize; + settings.deviceScaleFactor = deviceScaleFactor; // FIXME: showFPSCounter / showPlatformLayerTree / maxPartialTextureUpdates aren't supported currently. return settings; -- cgit v1.2.1