Diff
Modified: trunk/Tools/ChangeLog (107021 => 107022)
--- trunk/Tools/ChangeLog 2012-02-08 02:05:34 UTC (rev 107021)
+++ trunk/Tools/ChangeLog 2012-02-08 02:06:08 UTC (rev 107022)
@@ -1,3 +1,27 @@
+2012-02-07 Justin Novosad <ju...@chromium.org>
+
+ [Chromium] add option for 2d canvas defered rendering to DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=78039
+
+ Reviewed by Stephen White.
+
+ Adding the --enable-deferred-2d-canvas switch to DumpRenderTree
+
+ * DumpRenderTree/chromium/DumpRenderTree.cpp:
+ (main):
+ * DumpRenderTree/chromium/TestShell.cpp:
+ (TestShell::TestShell):
+ (TestShell::resetWebSettings):
+ (TestShell::runFileTest):
+ * DumpRenderTree/chromium/TestShell.h:
+ (TestShell::setDeferred2dCanvasEnabled):
+ (TestShell):
+ * DumpRenderTree/chromium/WebPreferences.cpp:
+ (WebPreferences::reset):
+ (WebPreferences::applyTo):
+ * DumpRenderTree/chromium/WebPreferences.h:
+ (WebPreferences):
+
2012-02-07 Gyuyoung Kim <gyuyoung....@samsung.com>
[CMAKE] Use *bin* and *lib* directories for executable and libraries.
Modified: trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp (107021 => 107022)
--- trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp 2012-02-08 02:05:34 UTC (rev 107021)
+++ trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp 2012-02-08 02:06:08 UTC (rev 107022)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2012 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -56,6 +56,7 @@
static const char optionEnableThreadedCompositing[] = "--enable-threaded-compositing";
static const char optionForceCompositingMode[] = "--force-compositing-mode";
static const char optionEnableAccelerated2DCanvas[] = "--enable-accelerated-2d-canvas";
+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";
@@ -143,6 +144,7 @@
bool compositeToTexture = false;
bool forceCompositingMode = false;
bool accelerated2DCanvasEnabled = false;
+ bool deferred2DCanvasEnabled = false;
bool acceleratedPaintingEnabled = false;
bool perTilePaintingEnabled = false;
bool stressOpt = false;
@@ -186,6 +188,8 @@
forceCompositingMode = true;
else if (argument == optionEnableAccelerated2DCanvas)
accelerated2DCanvasEnabled = true;
+ else if (argument == optionEnableDeferred2DCanvas)
+ deferred2DCanvasEnabled = true;
else if (argument == optionEnableAcceleratedPainting)
acceleratedPaintingEnabled = true;
else if (!argument.find(optionUseGraphicsContext3DImplementation)) {
@@ -236,6 +240,7 @@
shell.setCompositeToTexture(compositeToTexture);
shell.setForceCompositingMode(forceCompositingMode);
shell.setAccelerated2dCanvasEnabled(accelerated2DCanvasEnabled);
+ shell.setDeferred2dCanvasEnabled(deferred2DCanvasEnabled);
shell.setAcceleratedPaintingEnabled(acceleratedPaintingEnabled);
shell.setPerTilePaintingEnabled(perTilePaintingEnabled);
shell.setJavaScriptFlags(_javascript_Flags);
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (107021 => 107022)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-02-08 02:05:34 UTC (rev 107021)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-02-08 02:06:08 UTC (rev 107022)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2012 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -110,6 +110,7 @@
, m_compositeToTexture(false)
, m_forceCompositingMode(false)
, m_accelerated2dCanvasEnabled(false)
+ , m_deferred2dCanvasEnabled(false)
, m_acceleratedPaintingEnabled(false)
, m_perTilePaintingEnabled(false)
, m_stressOpt(false)
@@ -218,6 +219,7 @@
m_prefs.compositeToTexture = m_compositeToTexture;
m_prefs.forceCompositingMode = m_forceCompositingMode;
m_prefs.accelerated2dCanvasEnabled = m_accelerated2dCanvasEnabled;
+ m_prefs.deferred2dCanvasEnabled = m_deferred2dCanvasEnabled;
m_prefs.acceleratedPaintingEnabled = m_acceleratedPaintingEnabled;
m_prefs.perTilePaintingEnabled = m_perTilePaintingEnabled;
m_prefs.applyTo(&webView);
@@ -237,6 +239,7 @@
if (testUrl.find("compositing/") != string::npos || testUrl.find("compositing\\") != string::npos) {
m_prefs.acceleratedCompositingForVideoEnabled = true;
m_prefs.accelerated2dCanvasEnabled = true;
+ m_prefs.deferred2dCanvasEnabled = true;
m_prefs.applyTo(m_webView);
}
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.h (107021 => 107022)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.h 2012-02-08 02:05:34 UTC (rev 107021)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.h 2012-02-08 02:06:08 UTC (rev 107022)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2012 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -136,6 +136,7 @@
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; }
void setAcceleratedPaintingEnabled(bool enabled) { m_acceleratedPaintingEnabled = enabled; }
void setPerTilePaintingEnabled(bool enabled) { m_perTilePaintingEnabled = enabled; }
#if defined(OS_WIN)
@@ -225,6 +226,7 @@
bool m_compositeToTexture;
bool m_forceCompositingMode;
bool m_accelerated2dCanvasEnabled;
+ bool m_deferred2dCanvasEnabled;
bool m_acceleratedPaintingEnabled;
bool m_perTilePaintingEnabled;
WebPreferences m_prefs;
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp (107021 => 107022)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2012-02-08 02:05:34 UTC (rev 107021)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2012-02-08 02:06:08 UTC (rev 107022)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2012 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -112,6 +112,7 @@
acceleratedCompositingEnabled = false;
compositeToTexture = false;
accelerated2dCanvasEnabled = false;
+ deferred2dCanvasEnabled = false;
acceleratedPaintingEnabled = false;
forceCompositingMode = false;
hixie76WebSocketProtocolEnabled = true;
@@ -217,6 +218,7 @@
settings->setCompositeToTextureEnabled(compositeToTexture);
settings->setForceCompositingMode(forceCompositingMode);
settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled);
+ settings->setDeferred2dCanvasEnabled(deferred2dCanvasEnabled);
settings->setAcceleratedPaintingEnabled(acceleratedPaintingEnabled);
settings->setHixie76WebSocketProtocolEnabled(hixie76WebSocketProtocolEnabled);
settings->setPerTilePaintingEnabled(perTilePaintingEnabled);
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.h (107021 => 107022)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.h 2012-02-08 02:05:34 UTC (rev 107021)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.h 2012-02-08 02:06:08 UTC (rev 107022)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2012 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -106,6 +106,7 @@
bool compositeToTexture;
bool forceCompositingMode;
bool accelerated2dCanvasEnabled;
+ bool deferred2dCanvasEnabled;
bool acceleratedPaintingEnabled;
bool hixie76WebSocketProtocolEnabled;
bool perTilePaintingEnabled;
