[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
gyuyoung.kim at samsung.com
gyuyoung.kim at samsung.com
Wed Dec 22 18:35:30 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7f13e283bcfa00897b92aab00e01f24b374e70cc
Author: gyuyoung.kim at samsung.com <gyuyoung.kim at samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 14 08:34:08 2010 +0000
2010-12-13 Gyuyoung Kim <gyuyoung.kim at samsung.com>
Unreviewed build fix for EFL.
Remove DataSourceGStreamer.cpp in WebCore/CMakeListsEfl.txt
Because, DataSourceGStreamer.cpp was removed by Bug 30007.
* ../WebCore/CMakeListsEfl.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74007 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index f902987..12639f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-13 Gyuyoung Kim <gyuyoung.kim at samsung.com>
+
+ Unreviewed build fix for EFL.
+
+ Remove DataSourceGStreamer.cpp in WebCore/CMakeListsEfl.txt
+ Because, DataSourceGStreamer.cpp was removed by Bug 30007.
+
+ * ../WebCore/CMakeListsEfl.txt:
+
2010-12-13 Andras Becsi <abecsi at webkit.org>
Reviewed by Csaba Osztrogonác.
diff --git a/LayoutTests/animations/animation-on-inline-crash.html b/LayoutTests/animations/animation-on-inline-crash.html
index 1945465..ef10914 100644
--- a/LayoutTests/animations/animation-on-inline-crash.html
+++ b/LayoutTests/animations/animation-on-inline-crash.html
@@ -1,27 +1,27 @@
-<style>
- .box {
- position: relative;
- -webkit-animation-delay: 5ms;
- -webkit-animation-name: anim;
- }
- @-webkit-keyframes anim {
- from { -webkit-transform: translateX(10px); }
- }
-</style>
-<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- }
-
- function waitForAnimation()
- {
- window.setTimeout(function() {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- }, 50);
- }
- window.addEventListener('load', waitForAnimation, false);
-</script>
-<p>Test passes if it does not crash.</p>
-<span class="box">Hello world</span>
+<style>
+ .box {
+ position: relative;
+ -webkit-animation-delay: 5ms;
+ -webkit-animation-name: anim;
+ }
+ @-webkit-keyframes anim {
+ from { -webkit-transform: translateX(10px); }
+ }
+</style>
+<script type="text/javascript" charset="utf-8">
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ }
+
+ function waitForAnimation()
+ {
+ window.setTimeout(function() {
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }, 50);
+ }
+ window.addEventListener('load', waitForAnimation, false);
+</script>
+<p>Test passes if it does not crash.</p>
+<span class="box">Hello world</span>
diff --git a/WebCore/CMakeListsEfl.txt b/WebCore/CMakeListsEfl.txt
index 789cfdc..3fc7a4c 100644
--- a/WebCore/CMakeListsEfl.txt
+++ b/WebCore/CMakeListsEfl.txt
@@ -169,7 +169,6 @@ IF (ENABLE_VIDEO)
"${WEBCORE_DIR}/platform/graphics/gstreamer"
)
LIST(APPEND WebCore_SOURCES
- platform/graphics/gstreamer/DataSourceGStreamer.cpp
platform/graphics/gstreamer/GOwnPtrGStreamer.cpp
platform/graphics/gstreamer/GStreamerGWorld.cpp
platform/graphics/gstreamer/ImageGStreamerCairo.cpp
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list