Changeset 92206 in webkit

Timestamp:

Aug 2, 2011 10:53:44 AM (13 years ago)

Author:

nduca@chromium.org

Message:

[chromium] Remove resizeOnscreenContent from LRC. It can be derived.
​https://bugs.webkit.org/show_bug.cgi?id=65519

Reviewed by James Robinson.

Source/WebCore:

• platform/graphics/chromium/LayerRendererChromium.cpp:

(WebCore::LayerRendererChromium::setViewport):

• platform/graphics/chromium/LayerRendererChromium.h:

Source/WebKit/chromium:

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::resize):
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (modified) (2 diffs)
• WebCore/platform/graphics/chromium/LayerRendererChromium.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-02  Nat Duca  <nduca@chromium.org>
+
+        [chromium] Remove resizeOnscreenContent from LRC. It can be derived.
+        https://bugs.webkit.org/show_bug.cgi?id=65519
+
+        Reviewed by James Robinson.
+
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::setViewport):
+        * platform/graphics/chromium/LayerRendererChromium.h:
+
 2011-08-02  Nico Weber  <thakis@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

@@ -519 +519 @@
 
     if (visibleRectChanged) {
+        if (m_context)
+            m_context->reshape(std::max(1, visibleRect.width()), std::max(1, visibleRect.height()));
         // Reset the current render surface to force an update of the viewport and
         // projection matrix next time useRenderSurface is called.
@@ -1124 +1126 @@
 }
 
-
-
-void LayerRendererChromium::resizeOnscreenContent(const IntSize& size)
-{
-    if (m_context)
-        m_context->reshape(size.width(), size.height());
-}
 
 bool LayerRendererChromium::initializeSharedObjects()

trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h

@@ -139 +139 @@
     const CCVideoLayerImpl::YUVProgram* videoLayerYUVProgram();
 
-    void resizeOnscreenContent(const IntSize&);
-
     void getFramebufferPixels(void *pixels, const IntRect& rect);
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-08-02  Nat Duca  <nduca@chromium.org>
+
+        [chromium] Remove resizeOnscreenContent from LRC. It can be derived.
+        https://bugs.webkit.org/show_bug.cgi?id=65519
+
+        Reviewed by James Robinson.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::resize):
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+
 2011-08-01  Jean-luc Brouillet  <jeanluc@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -1005 +1005 @@
         }
     }
-
-#if USE(ACCELERATED_COMPOSITING)
-    if (m_layerRenderer && isAcceleratedCompositingActive()) {
-        m_layerRenderer->resizeOnscreenContent(IntSize(max(1, m_size.width),
-                                                       max(1, m_size.height)));
-    }
-#endif
 }
 
@@ -2530 +2523 @@
     } else if (m_layerRenderer) {
         m_isAcceleratedCompositingActive = true;
-        m_layerRenderer->resizeOnscreenContent(WebCore::IntSize(max(1, m_size.width),
-                                                                max(1, m_size.height)));
+        updateLayerRendererViewport();
 
         m_client->didActivateAcceleratedCompositing(true);