Title: [92206] trunk/Source
- Revision
- 92206
- Author
- [email protected]
- Date
- 2011-08-02 10:53:44 -0700 (Tue, 02 Aug 2011)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (92205 => 92206)
--- trunk/Source/WebCore/ChangeLog 2011-08-02 17:37:47 UTC (rev 92205)
+++ trunk/Source/WebCore/ChangeLog 2011-08-02 17:53:44 UTC (rev 92206)
@@ -1,3 +1,14 @@
+2011-08-02 Nat Duca <[email protected]>
+
+ [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 <[email protected]>
[chromium] Fix unresolved symbols error when linking to libwebkit.dylib
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (92205 => 92206)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-08-02 17:37:47 UTC (rev 92205)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-08-02 17:53:44 UTC (rev 92206)
@@ -518,6 +518,8 @@
m_viewportScrollPosition = scrollPosition;
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.
m_currentRenderSurface = 0;
@@ -1124,13 +1126,6 @@
}
-
-void LayerRendererChromium::resizeOnscreenContent(const IntSize& size)
-{
- if (m_context)
- m_context->reshape(size.width(), size.height());
-}
-
bool LayerRendererChromium::initializeSharedObjects()
{
TRACE_EVENT("LayerRendererChromium::initializeSharedObjects", this, 0);
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h (92205 => 92206)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h 2011-08-02 17:37:47 UTC (rev 92205)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h 2011-08-02 17:53:44 UTC (rev 92206)
@@ -138,8 +138,6 @@
const CCVideoLayerImpl::RGBAProgram* videoLayerRGBAProgram();
const CCVideoLayerImpl::YUVProgram* videoLayerYUVProgram();
- void resizeOnscreenContent(const IntSize&);
-
void getFramebufferPixels(void *pixels, const IntRect& rect);
TextureManager* contentsTextureManager() const { return m_contentsTextureManager.get(); }
Modified: trunk/Source/WebKit/chromium/ChangeLog (92205 => 92206)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-08-02 17:37:47 UTC (rev 92205)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-08-02 17:53:44 UTC (rev 92206)
@@ -1,3 +1,14 @@
+2011-08-02 Nat Duca <[email protected]>
+
+ [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 <[email protected]>
Removing old source files in gyp files that slow build
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (92205 => 92206)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2011-08-02 17:37:47 UTC (rev 92205)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2011-08-02 17:53:44 UTC (rev 92206)
@@ -1004,13 +1004,6 @@
m_client->didInvalidateRect(damagedRect);
}
}
-
-#if USE(ACCELERATED_COMPOSITING)
- if (m_layerRenderer && isAcceleratedCompositingActive()) {
- m_layerRenderer->resizeOnscreenContent(IntSize(max(1, m_size.width),
- max(1, m_size.height)));
- }
-#endif
}
void WebViewImpl::willEndLiveResize()
@@ -2529,8 +2522,7 @@
m_client->didActivateAcceleratedCompositing(false);
} 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);
} else {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
