[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
commit-queue at webkit.org
commit-queue at webkit.org
Sun Feb 20 22:57:45 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit ea5fb8d1d99f2929085c3c4586fe71ed0424e7fd
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 14 18:09:10 2011 +0000
2011-01-14 Vincent Scheib <scheib at chromium.org>
Reviewed by David Levin.
Add support to DumpRenderTree to use the GPU rather than software renderer
https://bugs.webkit.org/show_bug.cgi?id=52333
* DumpRenderTree/chromium/DumpRenderTree.cpp:
(main):
* Scripts/webkitpy/layout_tests/port/chromium.py:
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
2011-01-14 Vincent Scheib <scheib at chromium.org>
Reviewed by David Levin.
Add support to DumpRenderTree to use the GPU rather than software renderer
https://bugs.webkit.org/show_bug.cgi?id=52333
* DEPS: Moved forward to take required support from webkit_support.h
* WebKit.gyp: DumpRenderTree depends on Angle on windows
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75800 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 2eaba79..d4be04e 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-14 Vincent Scheib <scheib at chromium.org>
+
+ Reviewed by David Levin.
+
+ Add support to DumpRenderTree to use the GPU rather than software renderer
+ https://bugs.webkit.org/show_bug.cgi?id=52333
+
+ * DumpRenderTree/chromium/DumpRenderTree.cpp:
+ (main):
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
2011-01-14 Tony Chang <tony at chromium.org>
Reviewed by Kent Tamura.
diff --git a/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp b/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp
index 6522450..bd5075c 100644
--- a/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp
+++ b/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp
@@ -50,6 +50,8 @@ static const char optionTestShell[] = "--test-shell";
static const char optionAllowExternalPages[] = "--allow-external-pages";
static const char optionStartupDialog[] = "--testshell-startup-dialog";
static const char optionCheckLayoutTestSystemDeps[] = "--check-layout-test-sys-deps";
+
+static const char optionHardwareAcceleratedGL[] = "--enable-hardware-gpu";
static const char optionEnableAcceleratedCompositing[] = "--enable-accelerated-compositing";
static const char optionEnableAccelerated2DCanvas[] = "--enable-accelerated-2d-canvas";
@@ -119,6 +121,7 @@ int main(int argc, char* argv[])
bool accelerated2DCanvasEnabled = false;
bool stressOpt = false;
bool stressDeopt = false;
+ bool hardwareAcceleratedGL = false;
string javaScriptFlags;
for (int i = 1; i < argc; ++i) {
string argument(argv[i]);
@@ -140,6 +143,8 @@ int main(int argc, char* argv[])
startupDialog = true;
else if (argument == optionCheckLayoutTestSystemDeps)
exit(checkLayoutTestSystemDependencies() ? EXIT_SUCCESS : EXIT_FAILURE);
+ else if (argument == optionHardwareAcceleratedGL)
+ hardwareAcceleratedGL = true;
else if (argument == optionEnableAcceleratedCompositing)
acceleratedCompositingEnabled = true;
else if (argument == optionEnableAccelerated2DCanvas)
@@ -164,6 +169,8 @@ int main(int argc, char* argv[])
return EXIT_FAILURE;
}
+ webkit_support::SetUpGLBindings(hardwareAcceleratedGL ? webkit_support::GL_BINDING_DEFAULT : webkit_support::GL_BINDING_SOFTWARE_RENDERER);
+
if (startupDialog)
openStartupDialog();
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
index b90421a..7e934a8 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -392,6 +392,8 @@ class ChromiumDriver(base.Driver):
cmd.append('--enable-accelerated-compositing')
if self._port.get_option('accelerated_2d_canvas'):
cmd.append('--enable-accelerated-2d-canvas')
+ if self._port.get_option('enable_hardware_gpu'):
+ cmd.append('--enable-hardware-gpu')
return cmd
def start(self):
diff --git a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index c431765..a141661 100755
--- a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -243,6 +243,10 @@ def parse_args(args=None):
action="store_false",
dest="accelerated_2d_canvas",
help="Don't use hardware-accelerated 2D Canvas calls"),
+ optparse.make_option("--enable-hardware-gpu",
+ action="store_true",
+ default=False,
+ help="Run graphics tests on real GPU hardware vs software"),
]
# Missing Mac-specific old-run-webkit-tests options:
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6fb6706..1c9a6c3 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-14 Vincent Scheib <scheib at chromium.org>
+
+ Reviewed by David Levin.
+
+ Add support to DumpRenderTree to use the GPU rather than software renderer
+ https://bugs.webkit.org/show_bug.cgi?id=52333
+
+ * DEPS: Moved forward to take required support from webkit_support.h
+ * WebKit.gyp: DumpRenderTree depends on Angle on windows
+
2011-01-14 Finnur Thorarinsson <finnur.webkit at gmail.com>
Reviewed by Ojan Vafai.
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index f2d56fb..c2d198f 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '71249'
+ 'chromium_rev': '71405'
}
deps = {
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 3f205b7..904a238 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -900,7 +900,11 @@
],
'conditions': [
['OS=="win"', {
- 'dependencies': ['LayoutTestHelper'],
+ 'dependencies': [
+ 'LayoutTestHelper',
+ '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:libEGL',
+ '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:libGLESv2',
+ ],
'resource_include_dirs': ['<(SHARED_INTERMEDIATE_DIR)/webkit'],
'sources': [
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list