[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
eric at webkit.org
eric at webkit.org
Thu Oct 29 20:35:17 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 5430fc372dcd91d64744fc1b09de8b97cd0d6aa7
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 28 21:22:50 2009 +0000
2009-09-25 Eric Seidel <eric at webkit.org>
Reviewed by Simon Fraser.
REGRESSION: media/video-pause-empty-events.html is occasionally timing out on bots
https://bugs.webkit.org/show_bug.cgi?id=28624
No longer skip media tests now that we're disabling hardware compositing instead.
Add leopard-specific results for 2 tests expected to fail with HW compositing disabled.
* platform/mac-leopard/Skipped:
* platform/mac-leopard/fast/media/mq-transform-02-expected.checksum: Copied from LayoutTests/platform/mac-tiger/fast/media/mq-transform-02-expected.checksum.
* platform/mac-leopard/fast/media/mq-transform-02-expected.png: Copied from LayoutTests/platform/mac-tiger/fast/media/mq-transform-02-expected.png.
* platform/mac-leopard/fast/media/mq-transform-02-expected.txt: Copied from LayoutTests/platform/mac-tiger/fast/media/mq-transform-02-expected.txt.
* platform/mac-leopard/fast/media/mq-transform-03-expected.checksum: Copied from LayoutTests/platform/mac-tiger/fast/media/mq-transform-03-expected.checksum.
* platform/mac-leopard/fast/media/mq-transform-03-expected.png: Copied from LayoutTests/platform/mac-tiger/fast/media/mq-transform-03-expected.png.
* platform/mac-leopard/fast/media/mq-transform-03-expected.txt: Copied from LayoutTests/platform/mac-tiger/fast/media/mq-transform-03-expected.txt.
2009-09-27 Jakub Wieczorek <faw217 at gmail.com>
Reviewed by Darin Adler.
run-webkit-tests: Do not strip the metrics when there is no expected result for a test.
https://bugs.webkit.org/show_bug.cgi?id=29771
* Scripts/run-webkit-tests:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48833 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c885d73..9a29436 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2009-09-25 Eric Seidel <eric at webkit.org>
+
+ Reviewed by Simon Fraser.
+
+ REGRESSION: media/video-pause-empty-events.html is occasionally timing out on bots
+ https://bugs.webkit.org/show_bug.cgi?id=28624
+
+ No longer skip media tests now that we're disabling hardware compositing instead.
+ Add leopard-specific results for 2 tests expected to fail with HW compositing disabled.
+
+ * platform/mac-leopard/Skipped:
+ * platform/mac-leopard/fast/media/mq-transform-02-expected.checksum: Copied from LayoutTests/platform/mac-tiger/fast/media/mq-transform-02-expected.checksum.
+ * platform/mac-leopard/fast/media/mq-transform-02-expected.png: Copied from LayoutTests/platform/mac-tiger/fast/media/mq-transform-02-expected.png.
+ * platform/mac-leopard/fast/media/mq-transform-02-expected.txt: Copied from LayoutTests/platform/mac-tiger/fast/media/mq-transform-02-expected.txt.
+ * platform/mac-leopard/fast/media/mq-transform-03-expected.checksum: Copied from LayoutTests/platform/mac-tiger/fast/media/mq-transform-03-expected.checksum.
+ * platform/mac-leopard/fast/media/mq-transform-03-expected.png: Copied from LayoutTests/platform/mac-tiger/fast/media/mq-transform-03-expected.png.
+ * platform/mac-leopard/fast/media/mq-transform-03-expected.txt: Copied from LayoutTests/platform/mac-tiger/fast/media/mq-transform-03-expected.txt.
+
2009-09-28 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/mac-leopard/Skipped b/LayoutTests/platform/mac-leopard/Skipped
index 5c1c0d0..0f6caf2 100644
--- a/LayoutTests/platform/mac-leopard/Skipped
+++ b/LayoutTests/platform/mac-leopard/Skipped
@@ -14,8 +14,3 @@ platform/mac/accessibility/table-multi-bodies.html
# Tests of font features not supported by ATSUI
platform/mac/fast/text/myanmar-shaping.html
platform/mac/fast/text/thai-combining-mark-positioning.html
-
-# Intermittent crashes/hangs caused by <rdar://problem/7228836>
-# https://bugs.webkit.org/show_bug.cgi?id=28845
-media/controls-after-reload.html
-media/video-size-intrinsic-scale.html
diff --git a/LayoutTests/platform/mac-tiger/fast/media/mq-transform-02-expected.checksum b/LayoutTests/platform/mac-leopard/fast/media/mq-transform-02-expected.checksum
similarity index 100%
copy from LayoutTests/platform/mac-tiger/fast/media/mq-transform-02-expected.checksum
copy to LayoutTests/platform/mac-leopard/fast/media/mq-transform-02-expected.checksum
diff --git a/LayoutTests/platform/mac-tiger/fast/media/mq-transform-02-expected.png b/LayoutTests/platform/mac-leopard/fast/media/mq-transform-02-expected.png
similarity index 100%
copy from LayoutTests/platform/mac-tiger/fast/media/mq-transform-02-expected.png
copy to LayoutTests/platform/mac-leopard/fast/media/mq-transform-02-expected.png
diff --git a/LayoutTests/platform/mac-tiger/fast/media/mq-transform-02-expected.txt b/LayoutTests/platform/mac-leopard/fast/media/mq-transform-02-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac-tiger/fast/media/mq-transform-02-expected.txt
copy to LayoutTests/platform/mac-leopard/fast/media/mq-transform-02-expected.txt
diff --git a/LayoutTests/platform/mac-tiger/fast/media/mq-transform-03-expected.checksum b/LayoutTests/platform/mac-leopard/fast/media/mq-transform-03-expected.checksum
similarity index 100%
copy from LayoutTests/platform/mac-tiger/fast/media/mq-transform-03-expected.checksum
copy to LayoutTests/platform/mac-leopard/fast/media/mq-transform-03-expected.checksum
diff --git a/LayoutTests/platform/mac-tiger/fast/media/mq-transform-03-expected.png b/LayoutTests/platform/mac-leopard/fast/media/mq-transform-03-expected.png
similarity index 100%
copy from LayoutTests/platform/mac-tiger/fast/media/mq-transform-03-expected.png
copy to LayoutTests/platform/mac-leopard/fast/media/mq-transform-03-expected.png
diff --git a/LayoutTests/platform/mac-tiger/fast/media/mq-transform-03-expected.txt b/LayoutTests/platform/mac-leopard/fast/media/mq-transform-03-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac-tiger/fast/media/mq-transform-03-expected.txt
copy to LayoutTests/platform/mac-leopard/fast/media/mq-transform-03-expected.txt
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index eb28c3f..67aeb4d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -117,6 +117,18 @@
2009-09-25 Eric Seidel <eric at webkit.org>
+ Reviewed by Simon Fraser.
+
+ REGRESSION: media/video-pause-empty-events.html is occasionally timing out on bots
+ https://bugs.webkit.org/show_bug.cgi?id=28624
+
+ Disable hardware compositing on Leopard for versions of QuickTime 7.6.4 and older.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetDefaultsToConsistentValues):
+
+2009-09-25 Eric Seidel <eric at webkit.org>
+
Reviewed by Adam Barth.
commit-queue should auto-retry patches which fail to commit due to out of date files
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
index e77587f..99cfae8 100644
--- a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -425,6 +425,20 @@ static void resetDefaultsToConsistentValues()
// So, turn it off for now, but we might want to turn it back on some day.
[preferences setUsesPageCache:NO];
+#if defined(BUILDING_ON_LEOPARD)
+ // Disable hardware composititing to avoid timeouts and crashes from buggy CoreVideo teardown code.
+ // https://bugs.webkit.org/show_bug.cgi?id=28845 and rdar://problem/7228836
+ SInt32 qtVersion;
+ OSErr err = Gestalt(gestaltQuickTimeVersion, &qtVersion);
+ assert(err == noErr);
+ // Bug 7228836 exists in at least 7.6.3 and 7.6.4, hopefully it will be fixed in 7.6.5.
+ // FIXME: Once we know the exact versions of QuickTime affected, we can update this check.
+ if (qtVersion <= 0x07640000)
+ [preferences setAcceleratedCompositingEnabled:NO];
+ else
+#endif
+ [preferences setAcceleratedCompositingEnabled:YES];
+
[[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list