[webkit-changes] [119685] trunk/Source

Wed, 06 Jun 2012 23:01:35 -0700

Title: [119685] trunk/Source
Revision
119685
Author
[email protected]
Date
2012-06-06 23:01:23 -0700 (Wed, 06 Jun 2012)

Log Message

Unreviewed, rolling out r119683.
http://trac.webkit.org/changeset/119683
https://bugs.webkit.org/show_bug.cgi?id=88505

it broke webkit-unit-test
WebLayerTreeViewThreadedTest.InstrumentationCallbacks on mac
(Requested by loislo on #webkit).

Patch by Sheriff Bot <[email protected]> on 2012-06-06

Source/WebCore:

* platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
(WebCore::CCLayerTreeHost::initializeLayerRenderer):
(WebCore::CCLayerTreeHost::setVisible):

Source/WebKit/chromium:

* tests/CCLayerTreeHostTest.cpp:
(WTF::MockLayerTreeHost::create):
* tests/Canvas2DLayerChromiumTest.cpp:
(Canvas2DLayerChromiumTest::fullLifecycleTest):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (119684 => 119685)


--- trunk/Source/WebCore/ChangeLog	2012-06-07 05:56:12 UTC (rev 119684)
+++ trunk/Source/WebCore/ChangeLog	2012-06-07 06:01:23 UTC (rev 119685)
@@ -1,3 +1,17 @@
+2012-06-06  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r119683.
+        http://trac.webkit.org/changeset/119683
+        https://bugs.webkit.org/show_bug.cgi?id=88505
+
+        it broke webkit-unit-test
+        WebLayerTreeViewThreadedTest.InstrumentationCallbacks on mac
+        (Requested by loislo on #webkit).
+
+        * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
+        (WebCore::CCLayerTreeHost::initializeLayerRenderer):
+        (WebCore::CCLayerTreeHost::setVisible):
+
 2012-06-06  Robert Kroeger  <[email protected]>
 
         [Chromium] Re-enable handling of smooth scrolling on Chromium Linux/Windows

Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp (119684 => 119685)


--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp	2012-06-07 05:56:12 UTC (rev 119684)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp	2012-06-07 06:01:23 UTC (rev 119685)
@@ -149,6 +149,11 @@
 
     m_contentsTextureManager = TextureManager::create(0, 0, m_proxy->layerRendererCapabilities().maxTextureSize);
 
+    // FIXME: This is the same as setContentsMemoryAllocationLimitBytes, but
+    // we're in the middle of a commit here and don't want to force another.
+    m_memoryAllocationBytes = TextureManager::highLimitBytes(deviceViewportSize());
+    m_memoryAllocationIsForDisplay = true;
+
     m_layerRendererInitialized = true;
 
     m_settings.defaultTileSize = IntSize(min(m_settings.defaultTileSize.width(), m_proxy->layerRendererCapabilities().maxTextureSize),
@@ -400,6 +405,15 @@
         return;
 
     m_visible = visible;
+
+    // FIXME: Remove this stuff, it is here just for the m20 merge.
+    if (!m_visible && m_layerRendererInitialized) {
+        if (m_proxy->layerRendererCapabilities().contextHasCachedFrontBuffer)
+            setContentsMemoryAllocationLimitBytes(0);
+        else
+            setContentsMemoryAllocationLimitBytes(m_contentsTextureManager->preferredMemoryLimitBytes());
+    }
+
     setNeedsForcedCommit();
 }

Modified: trunk/Source/WebKit/chromium/ChangeLog (119684 => 119685)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-06-07 05:56:12 UTC (rev 119684)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-06-07 06:01:23 UTC (rev 119685)
@@ -1,3 +1,18 @@
+2012-06-06  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r119683.
+        http://trac.webkit.org/changeset/119683
+        https://bugs.webkit.org/show_bug.cgi?id=88505
+
+        it broke webkit-unit-test
+        WebLayerTreeViewThreadedTest.InstrumentationCallbacks on mac
+        (Requested by loislo on #webkit).
+
+        * tests/CCLayerTreeHostTest.cpp:
+        (WTF::MockLayerTreeHost::create):
+        * tests/Canvas2DLayerChromiumTest.cpp:
+        (Canvas2DLayerChromiumTest::fullLifecycleTest):
+
 2012-06-06  Robert Kroeger  <[email protected]>
 
         [Chromium] Re-enable handling of smooth scrolling on Chromium Linux/Windows

Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp (119684 => 119685)


--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp	2012-06-07 05:56:12 UTC (rev 119684)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp	2012-06-07 06:01:23 UTC (rev 119685)
@@ -227,7 +227,6 @@
 
         // LayerTreeHostImpl won't draw if it has 1x1 viewport.
         layerTreeHost->setViewportSize(IntSize(1, 1));
-        layerTreeHost->setContentsMemoryAllocationLimitBytes(TextureManager::highLimitBytes(layerTreeHost->viewportSize()));
 
         layerTreeHost->rootLayer()->setLayerAnimationDelegate(testHooks);

Modified: trunk/Source/WebKit/chromium/tests/Canvas2DLayerChromiumTest.cpp (119684 => 119685)


--- trunk/Source/WebKit/chromium/tests/Canvas2DLayerChromiumTest.cpp	2012-06-07 05:56:12 UTC (rev 119684)
+++ trunk/Source/WebKit/chromium/tests/Canvas2DLayerChromiumTest.cpp	2012-06-07 06:01:23 UTC (rev 119685)
@@ -125,7 +125,6 @@
         WebCompositor::initialize(thread.get());
 
         OwnPtr<FakeCCLayerTreeHost> layerTreeHost(FakeCCLayerTreeHost::create());
-        layerTreeHost->setContentsMemoryAllocationLimitBytes(TextureManager::highLimitBytes(layerTreeHost->viewportSize()));
         // Force an update, so that we get a valid TextureManager.
         layerTreeHost->updateLayers(updater);
 

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to