Diff
Modified: trunk/Source/Platform/ChangeLog (114165 => 114166)
--- trunk/Source/Platform/ChangeLog 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Source/Platform/ChangeLog 2012-04-13 21:01:06 UTC (rev 114166)
@@ -1,3 +1,16 @@
+2012-04-11 James Robinson <jam...@chromium.org>
+
+ [chromium] Remove unused compositeToTexture / compositeOffscreen setting
+ https://bugs.webkit.org/show_bug.cgi?id=83733
+
+ Reviewed by Adrienne Walker.
+
+ Remove compositeOffscreen setting. This was an experiment that is no longer needed.
+
+ * chromium/public/WebLayerTreeView.h:
+ (WebKit::WebLayerTreeView::Settings::Settings):
+ (Settings):
+
2012-04-13 James Robinson <jam...@chromium.org>
[chromium] Move WebVideoFrame into Platform and remove WebCore::VideoFrameChromium wrapper API
Modified: trunk/Source/Platform/chromium/public/WebLayerTreeView.h (114165 => 114166)
--- trunk/Source/Platform/chromium/public/WebLayerTreeView.h 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Source/Platform/chromium/public/WebLayerTreeView.h 2012-04-13 21:01:06 UTC (rev 114166)
@@ -50,7 +50,6 @@
struct Settings {
Settings()
: acceleratePainting(false)
- , compositeOffscreen(false)
, showFPSCounter(false)
, showPlatformLayerTree(false)
, refreshRate(0)
@@ -61,7 +60,6 @@
}
bool acceleratePainting;
- bool compositeOffscreen;
bool showFPSCounter;
bool showPlatformLayerTree;
double refreshRate;
Modified: trunk/Source/WebCore/ChangeLog (114165 => 114166)
--- trunk/Source/WebCore/ChangeLog 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Source/WebCore/ChangeLog 2012-04-13 21:01:06 UTC (rev 114166)
@@ -1,3 +1,22 @@
+2012-04-11 James Robinson <jam...@chromium.org>
+
+ [chromium] Remove unused compositeToTexture / compositeOffscreen setting
+ https://bugs.webkit.org/show_bug.cgi?id=83733
+
+ Reviewed by Adrienne Walker.
+
+ Remove compositeOffscreen setting and implementation. This was an experiment that is no longer needed.
+
+ * platform/graphics/chromium/LayerRendererChromium.cpp:
+ (WebCore::LayerRendererChromium::finishDrawingFrame):
+ (WebCore::LayerRendererChromium::useRenderSurface):
+ (WebCore::LayerRendererChromium::setScissorToRect):
+ * platform/graphics/chromium/LayerRendererChromium.h:
+ (LayerRendererChromium):
+ * platform/graphics/chromium/cc/CCLayerTreeHost.h:
+ (WebCore::CCSettings::CCSettings):
+ (CCSettings):
+
2012-04-13 Alexey Proskuryakov <a...@apple.com>
REGRESSION (XHR Caching): Uncacheable responses sent by Rails through Apache are cached
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (114165 => 114166)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-04-13 21:01:06 UTC (rev 114166)
@@ -1099,9 +1099,6 @@
m_renderSurfaceTextureManager->setPreferredMemoryLimitBytes(preferredLimit);
m_renderSurfaceTextureManager->reduceMemoryToLimit(preferredLimit);
m_renderSurfaceTextureManager->deleteEvictedTextures(m_renderSurfaceTextureAllocator.get());
-
- if (settings().compositeOffscreen)
- copyOffscreenTextureToDisplay();
}
void LayerRendererChromium::toGLMatrix(float* flattened, const TransformationMatrix& m)
@@ -1290,29 +1287,6 @@
return true;
}
-ManagedTexture* LayerRendererChromium::getOffscreenLayerTexture()
-{
- return settings().compositeOffscreen && rootLayer() ? rootLayer()->renderSurface()->contentsTexture() : 0;
-}
-
-void LayerRendererChromium::copyOffscreenTextureToDisplay()
-{
- if (settings().compositeOffscreen) {
- makeContextCurrent();
-
- useRenderSurface(0);
- TransformationMatrix drawTransform;
- drawTransform.translate3d(0.5 * m_defaultRenderSurface->contentRect().width(), 0.5 * m_defaultRenderSurface->contentRect().height(), 0);
- m_defaultRenderSurface->setDrawTransform(drawTransform);
- m_defaultRenderSurface->setDrawOpacity(1);
-
- m_defaultRenderSurface->setScissorRect(this, m_defaultRenderSurface->contentRect());
- if (m_defaultRenderSurface->hasReplica())
- m_defaultRenderSurface->drawReplica(this);
- m_defaultRenderSurface->drawContents(this);
- }
-}
-
bool LayerRendererChromium::isCurrentRenderSurface(CCRenderSurface* renderSurface)
{
// If renderSurface is 0, we can't tell if we are already using it, since m_currentRenderSurface is
@@ -1325,12 +1299,9 @@
m_currentRenderSurface = renderSurface;
m_currentManagedTexture = 0;
- if ((renderSurface == m_defaultRenderSurface && !settings().compositeOffscreen) || (!renderSurface && settings().compositeOffscreen)) {
+ if (renderSurface == m_defaultRenderSurface) {
GLC(m_context.get(), m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, 0));
- if (renderSurface)
- setDrawViewportRect(renderSurface->contentRect(), true);
- else
- setDrawViewportRect(m_defaultRenderSurface->contentRect(), true);
+ setDrawViewportRect(renderSurface->contentRect(), true);
return true;
}
@@ -1381,7 +1352,7 @@
// of the GL scissor is the bottom of our layer.
// But, if rendering to offscreen texture, we reverse our sense of 'upside down'.
int scissorY;
- if (isCurrentRenderSurface(m_defaultRenderSurface) && !settings().compositeOffscreen)
+ if (isCurrentRenderSurface(m_defaultRenderSurface))
scissorY = m_currentRenderSurface->contentRect().height() - (scissorRect.maxY() - m_currentRenderSurface->contentRect().y());
else
scissorY = scissorRect.y() - contentRect.y();
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h (114165 => 114166)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h 2012-04-13 21:01:06 UTC (rev 114166)
@@ -186,7 +186,6 @@
void drawTileQuad(const CCTileDrawQuad*);
void drawVideoQuad(const CCVideoDrawQuad*);
- ManagedTexture* getOffscreenLayerTexture();
void copyPlaneToTexture(const CCVideoDrawQuad*, const void* plane, int index);
bool copyFrameToTextures(const CCVideoDrawQuad*);
template<class Program> void drawSingleTextureVideoQuad(const CCVideoDrawQuad*, Program*, float widthScaleFactor, Platform3DObject textureId, GC3Denum target);
@@ -195,8 +194,6 @@
void drawRGBA(const CCVideoDrawQuad*);
void drawYUV(const CCVideoDrawQuad*);
- void copyOffscreenTextureToDisplay();
-
void setDrawViewportRect(const IntRect&, bool flipY);
// The current drawing target is either a RenderSurface or ManagedTexture. Use these functions to switch to a new drawing target.
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (114165 => 114166)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h 2012-04-13 21:01:06 UTC (rev 114166)
@@ -75,7 +75,6 @@
struct CCSettings {
CCSettings()
: acceleratePainting(false)
- , compositeOffscreen(false)
, showFPSCounter(false)
, showPlatformLayerTree(false)
, refreshRate(0)
@@ -85,7 +84,6 @@
, maxPartialTextureUpdates(std::numeric_limits<size_t>::max()) { }
bool acceleratePainting;
- bool compositeOffscreen;
bool showFPSCounter;
bool showPlatformLayerTree;
double refreshRate;
Modified: trunk/Source/WebKit/chromium/ChangeLog (114165 => 114166)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-13 21:01:06 UTC (rev 114166)
@@ -1,3 +1,22 @@
+2012-04-11 James Robinson <jam...@chromium.org>
+
+ [chromium] Remove unused compositeToTexture / compositeOffscreen setting
+ https://bugs.webkit.org/show_bug.cgi?id=83733
+
+ Reviewed by Adrienne Walker.
+
+ Remove compositeOffscreen / compositeToTexture setting. This was an experiment that is no longer needed.
+
+ * public/WebSettings.h:
+ * src/WebLayerTreeView.cpp:
+ (WebKit::WebLayerTreeView::Settings::operator CCSettings):
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::WebSettingsImpl):
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+
2012-04-13 James Robinson <jam...@chromium.org>
[chromium] Move WebVideoFrame into Platform and remove WebCore::VideoFrameChromium wrapper API
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (114165 => 114166)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-04-13 21:01:06 UTC (rev 114166)
@@ -111,8 +111,6 @@
virtual void setAcceleratedCompositingEnabled(bool) = 0;
virtual void setForceCompositingMode(bool) = 0;
virtual void setMockScrollbarsEnabled(bool) = 0;
- virtual void setCompositeToTextureEnabled(bool) = 0;
- virtual bool compositeToTextureEnabled() const = 0;
virtual void setAcceleratedCompositingFor3DTransformsEnabled(bool) = 0;
virtual void setAcceleratedCompositingForVideoEnabled(bool) = 0;
virtual void setAcceleratedCompositingForCanvasEnabled(bool) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp (114165 => 114166)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2012-04-13 21:01:06 UTC (rev 114166)
@@ -41,7 +41,6 @@
{
CCSettings settings;
settings.acceleratePainting = acceleratePainting;
- settings.compositeOffscreen = compositeOffscreen;
settings.showFPSCounter = showFPSCounter;
settings.showPlatformLayerTree = showPlatformLayerTree;
settings.refreshRate = refreshRate;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (114165 => 114166)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-04-13 21:01:06 UTC (rev 114166)
@@ -47,7 +47,6 @@
WebSettingsImpl::WebSettingsImpl(Settings* settings)
: m_settings(settings)
- , m_compositeToTextureEnabled(false)
, m_showFPSCounter(false)
, m_showPlatformLayerTree(false)
, m_viewportEnabled(false)
@@ -355,11 +354,6 @@
m_settings->setMockScrollbarsEnabled(enabled);
}
-void WebSettingsImpl::setCompositeToTextureEnabled(bool enabled)
-{
- m_compositeToTextureEnabled = enabled;
-}
-
void WebSettingsImpl::setAcceleratedCompositingFor3DTransformsEnabled(bool enabled)
{
m_settings->setAcceleratedCompositingFor3DTransformsEnabled(enabled);
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (114165 => 114166)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-04-13 21:01:06 UTC (rev 114166)
@@ -103,8 +103,6 @@
virtual void setAcceleratedCompositingEnabled(bool);
virtual void setForceCompositingMode(bool);
virtual void setMockScrollbarsEnabled(bool);
- virtual void setCompositeToTextureEnabled(bool);
- virtual bool compositeToTextureEnabled() const { return m_compositeToTextureEnabled; }
virtual void setAcceleratedCompositingFor3DTransformsEnabled(bool);
virtual void setAcceleratedCompositingForVideoEnabled(bool);
virtual void setAcceleratedCompositingForPluginsEnabled(bool);
@@ -146,7 +144,6 @@
private:
WebCore::Settings* m_settings;
- bool m_compositeToTextureEnabled;
bool m_showFPSCounter;
bool m_showPlatformLayerTree;
bool m_viewportEnabled;
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (114165 => 114166)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-04-13 21:01:06 UTC (rev 114166)
@@ -3269,7 +3269,6 @@
WebLayerTreeView::Settings layerTreeViewSettings;
layerTreeViewSettings.acceleratePainting = page()->settings()->acceleratedDrawingEnabled();
- layerTreeViewSettings.compositeOffscreen = settings()->compositeToTextureEnabled();
layerTreeViewSettings.showFPSCounter = settings()->showFPSCounter();
layerTreeViewSettings.showPlatformLayerTree = settings()->showPlatformLayerTree();
Modified: trunk/Tools/ChangeLog (114165 => 114166)
--- trunk/Tools/ChangeLog 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Tools/ChangeLog 2012-04-13 21:01:06 UTC (rev 114166)
@@ -1,3 +1,25 @@
+2012-04-11 James Robinson <jam...@chromium.org>
+
+ [chromium] Remove unused compositeToTexture / compositeOffscreen setting
+ https://bugs.webkit.org/show_bug.cgi?id=83733
+
+ Reviewed by Adrienne Walker.
+
+ Remove compositeOffscreen / compositeToTexture setting. This was an experiment that is no longer needed.
+
+ * DumpRenderTree/chromium/DumpRenderTree.cpp:
+ (main):
+ * DumpRenderTree/chromium/TestShell.cpp:
+ (TestShell::TestShell):
+ (TestShell::resetWebSettings):
+ * DumpRenderTree/chromium/TestShell.h:
+ (TestShell):
+ * DumpRenderTree/chromium/WebPreferences.cpp:
+ (WebPreferences::reset):
+ (WebPreferences::applyTo):
+ * DumpRenderTree/chromium/WebPreferences.h:
+ (WebPreferences):
+
2012-04-13 Ryosuke Niwa <rn...@webkit.org>
webkitpy build fix. Revert the debug change (number of runs was 2 instead of 20),
Modified: trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp (114165 => 114166)
--- trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp 2012-04-13 21:01:06 UTC (rev 114166)
@@ -60,7 +60,6 @@
static const char optionEnableDeferred2DCanvas[] = "--enable-deferred-2d-canvas";
static const char optionEnableAcceleratedPainting[] = "--enable-accelerated-painting";
static const char optionEnableAcceleratedCompositingForVideo[] = "--enable-accelerated-video";
-static const char optionEnableCompositeToTexture[] = "--enable-composite-to-texture";
static const char optionUseGraphicsContext3DImplementation[] = "--use-graphics-context-3d-implementation=";
static const char optionEnablePerTilePainting[] = "--enable-per-tile-painting";
@@ -142,7 +141,6 @@
bool startupDialog = false;
bool acceleratedCompositingForVideoEnabled = false;
bool threadedCompositingEnabled = false;
- bool compositeToTexture = false;
bool forceCompositingMode = false;
bool accelerated2DCanvasEnabled = false;
bool deferred2DCanvasEnabled = false;
@@ -183,8 +181,6 @@
acceleratedCompositingForVideoEnabled = true;
else if (argument == optionEnableThreadedCompositing)
threadedCompositingEnabled = true;
- else if (argument == optionEnableCompositeToTexture)
- compositeToTexture = true;
else if (argument == optionForceCompositingMode)
forceCompositingMode = true;
else if (argument == optionEnableAccelerated2DCanvas)
@@ -239,7 +235,6 @@
shell.setAllowExternalPages(allowExternalPages);
shell.setAcceleratedCompositingForVideoEnabled(acceleratedCompositingForVideoEnabled);
shell.setThreadedCompositingEnabled(threadedCompositingEnabled);
- shell.setCompositeToTexture(compositeToTexture);
shell.setForceCompositingMode(forceCompositingMode);
shell.setAccelerated2dCanvasEnabled(accelerated2DCanvasEnabled);
shell.setDeferred2dCanvasEnabled(deferred2DCanvasEnabled);
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (114165 => 114166)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-04-13 21:01:06 UTC (rev 114166)
@@ -107,7 +107,6 @@
, m_allowExternalPages(false)
, m_acceleratedCompositingForVideoEnabled(false)
, m_threadedCompositingEnabled(false)
- , m_compositeToTexture(false)
, m_forceCompositingMode(false)
, m_accelerated2dCanvasEnabled(false)
, m_deferred2dCanvasEnabled(false)
@@ -220,7 +219,6 @@
m_prefs.reset();
m_prefs.acceleratedCompositingEnabled = true;
m_prefs.acceleratedCompositingForVideoEnabled = m_acceleratedCompositingForVideoEnabled;
- m_prefs.compositeToTexture = m_compositeToTexture;
m_prefs.forceCompositingMode = m_forceCompositingMode;
m_prefs.accelerated2dCanvasEnabled = m_accelerated2dCanvasEnabled;
m_prefs.deferred2dCanvasEnabled = m_deferred2dCanvasEnabled;
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.h (114165 => 114166)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.h 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.h 2012-04-13 21:01:06 UTC (rev 114166)
@@ -135,7 +135,6 @@
void setTestShellMode(bool testShellMode) { m_testShellMode = testShellMode; }
void setAcceleratedCompositingForVideoEnabled(bool enabled) { m_acceleratedCompositingForVideoEnabled = enabled; }
void setThreadedCompositingEnabled(bool enabled) { m_threadedCompositingEnabled = enabled; }
- void setCompositeToTexture(bool enabled) { m_compositeToTexture = enabled; }
void setForceCompositingMode(bool enabled) { m_forceCompositingMode = enabled; }
void setAccelerated2dCanvasEnabled(bool enabled) { m_accelerated2dCanvasEnabled = enabled; }
void setDeferred2dCanvasEnabled(bool enabled) { m_deferred2dCanvasEnabled = enabled; }
@@ -227,7 +226,6 @@
bool m_allowExternalPages;
bool m_acceleratedCompositingForVideoEnabled;
bool m_threadedCompositingEnabled;
- bool m_compositeToTexture;
bool m_forceCompositingMode;
bool m_accelerated2dCanvasEnabled;
bool m_deferred2dCanvasEnabled;
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp (114165 => 114166)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2012-04-13 21:01:06 UTC (rev 114166)
@@ -111,7 +111,6 @@
hyperlinkAuditingEnabled = false;
acceleratedCompositingForVideoEnabled = false;
acceleratedCompositingEnabled = false;
- compositeToTexture = false;
accelerated2dCanvasEnabled = false;
deferred2dCanvasEnabled = false;
acceleratedPaintingEnabled = false;
@@ -220,7 +219,6 @@
settings->setCaretBrowsingEnabled(caretBrowsingEnabled);
settings->setAcceleratedCompositingEnabled(acceleratedCompositingEnabled);
settings->setAcceleratedCompositingForVideoEnabled(acceleratedCompositingForVideoEnabled);
- settings->setCompositeToTextureEnabled(compositeToTexture);
settings->setForceCompositingMode(forceCompositingMode);
settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled);
settings->setDeferred2dCanvasEnabled(deferred2dCanvasEnabled);
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.h (114165 => 114166)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.h 2012-04-13 20:57:10 UTC (rev 114165)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.h 2012-04-13 21:01:06 UTC (rev 114166)
@@ -104,7 +104,6 @@
bool caretBrowsingEnabled;
bool acceleratedCompositingForVideoEnabled;
bool acceleratedCompositingEnabled;
- bool compositeToTexture;
bool forceCompositingMode;
bool accelerated2dCanvasEnabled;
bool deferred2dCanvasEnabled;
