[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
cmarrin at apple.com
cmarrin at apple.com
Thu Apr 8 02:08:08 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 484638719e2631058f45cfe0c312a57a7776e379
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 3 18:51:50 2010 +0000
Enable LayoutTests/compositing for Windows when compositing is available
https://bugs.webkit.org/show_bug.cgi?id=35610
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55467 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 90f4fa2..165aa2b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-03 Chris Marrin <cmarrin at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Added failing Windows compositing tests to Skipped file
+ https://bugs.webkit.org/show_bug.cgi?id=35610
+
+ I actually removed transforms/3d (which all now work) and
+ compositing from the Skipped file and replaced with the
+ tests that are not yet working.
+
+ * platform/win/Skipped:
+
2010-03-03 Eric Carlson <eric.carlson at apple.com>
Reviewed by Adele Peterson.
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 53d3090..e40a16c 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -686,9 +686,19 @@ fast/multicol/single-line.html
# Need to add functionality to DumpRenderTree to handle error pages
fast/history/back-forward-reset-after-error-handling.html
-# Tests requiring 3D_RENDERING and ACCELERATED_COMPOSITING support
-transforms/3d
-compositing
+# ACCELERATED_COMPOSITING tests that crash
+compositing/layers-inside-overflow-scroll.html
+compositing/self-painting-layers.html
+compositing/geometry/clipped-video-controller.html
+compositing/geometry/video-fixed-scrolling.html
+compositing/geometry/video-opacity-overlay.html
+compositing/overflow/scroll-ancestor-update.html
+compositing/reflections/load-video-in-reflection.html
+compositing/video/video-background-color.html
+
+# ACCELERATED_COMPOSITING tests that have incorrect layout
+compositing/webgl/webgl-background-color.html
+compositing/webgl/webgl-reflection.html
# validationMessage: https://bugs.webkit.org/show_bug.cgi?id=27959
fast/forms/validationMessage.html
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index dc5b39d..e8bac36 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-03 Chris Marrin <cmarrin at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Export acceleratedCompositing flag in IWebPreferences.
+ https://bugs.webkit.org/show_bug.cgi?id=35610
+
+ * Interfaces/IWebPreferences.idl:
+
2010-03-02 Beth Dakin <bdakin at apple.com>
Reviewed by Darin Adler and Adam Roben.
diff --git a/WebKit/win/Interfaces/IWebPreferences.idl b/WebKit/win/Interfaces/IWebPreferences.idl
index 9a52d7c..1c43135 100644
--- a/WebKit/win/Interfaces/IWebPreferences.idl
+++ b/WebKit/win/Interfaces/IWebPreferences.idl
@@ -186,4 +186,7 @@ interface IWebPreferences : IUnknown
HRESULT setZoomsTextOnly(BOOL zoomsTextOnly);
HRESULT zoomsTextOnly(BOOL *zoomsTextOnly);
+
+ HRESULT setAcceleratedCompositingEnabled(BOOL acceleratedCompositingEnabled);
+ HRESULT acceleratedCompositingEnabled(BOOL *acceleratedCompositingEnabled);
}
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2b716e6..03c0e56 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,22 @@
+2010-03-03 Chris Marrin <cmarrin at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Added ability to print supported features to console to DRT
+ https://bugs.webkit.org/show_bug.cgi?id=35610
+
+ This currently only prints whether or not Accelerated Compositing
+ and 3D Rendering are supported, which is the only way to tell if you
+ can run the compositing LayoutTests on Windows. But it can be expanded
+ to give more information as needed. Currently it prints that both
+ AcceleratedCompositing and 3DRendering are available if accelerated compositing
+ is enabled since both have to be turned on together. This allows me to maintain
+ separate checks for them.
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:Added --print-supported-features flag
+ (main):
+ * Scripts/run-webkit-tests:Runs DRT and enabled compositing tests if HW comp is available on Windows
+
2010-03-03 Jesus Sanchez-Palencia <jesus.palencia at openbossa.org>
Reviewed by Simon Hausmann.
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index ddfca95..06fadc2 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -84,6 +84,7 @@ static bool printSeparators;
static bool leakChecking = false;
static bool threaded = false;
static bool forceComplexText = false;
+static bool printSupportedFeatures = false;
static RetainPtr<CFStringRef> persistentUserStyleSheetLocation;
volatile bool done;
@@ -1222,6 +1223,11 @@ int main(int argc, char* argv[])
continue;
}
+ if (!stricmp(argv[i], "--print-supported-features")) {
+ printSupportedFeatures = true;
+ continue;
+ }
+
tests.append(argv[i]);
}
@@ -1246,6 +1252,13 @@ int main(int argc, char* argv[])
standardPreferences->setJavaScriptEnabled(TRUE);
standardPreferences->setDefaultFontSize(16);
+ if (printSupportedFeatures) {
+ BOOL acceleratedCompositingAvailable;
+ standardPreferences->acceleratedCompositingEnabled(&acceleratedCompositingAvailable);
+ printf("SupportedFeatures:%s\n", acceleratedCompositingAvailable ? "AcceleratedCompositing, 3DRendering" : "");
+ return 0;
+ }
+
COMPtr<IWebView> webView(AdoptCOM, createWebViewAndOffscreenWindow(&webViewWindow));
if (!webView)
return -1;
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index b8fa2bc..ab32c00 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -454,11 +454,29 @@ if (!$testMedia) {
$ignoredDirectories{'http/tests/media'} = 1;
}
-if (!checkWebCoreFeatureSupport("Accelerated Compositing", 0)) {
+my $supportedFeaturesResult = "";
+
+if (isCygwin()) {
+ # Collect supported features list
+ my $supportedFeaturesCommand = $dumpTool . " --print-supported-features 2>&1";
+ $supportedFeaturesResult = `$supportedFeaturesCommand 2>&1`;
+}
+
+# Check for acelerated compositing support
+if (isCygwin()) {
+ if ($supportedFeaturesResult !~ /AcceleratedCompositing/) {
+ $ignoredDirectories{'compositing'} = 1;
+ }
+} elsif (!checkWebCoreFeatureSupport("Accelerated Compositing", 0)) {
$ignoredDirectories{'compositing'} = 1;
}
-if (!checkWebCoreFeatureSupport("3D Rendering", 0)) {
+if (isCygwin()) {
+ if ($supportedFeaturesResult !~ /3DRendering/) {
+ $ignoredDirectories{'animations/3d'} = 1;
+ $ignoredDirectories{'transforms/3d'} = 1;
+ }
+} elsif (!checkWebCoreFeatureSupport("3D Rendering", 0)) {
$ignoredDirectories{'animations/3d'} = 1;
$ignoredDirectories{'transforms/3d'} = 1;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list