[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
cmarrin at apple.com
cmarrin at apple.com
Wed Dec 22 15:31:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 215078c11b3be97756c47ed4daa514c59f5e5e59
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 5 17:05:12 2010 +0000
Fix for GTK build broken by http://trac.webkit.org/changeset/71424
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71427 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index d7ccf17..fc09afa 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,5 +1,15 @@
2010-11-05 Chris Marrin <cmarrin at apple.com>
+ Unreviewed.
+
+ Small fix to GTK build
+
+ * webkit/webkitwebframe.cpp:
+ (webkit_web_frame_suspend_animations):
+ (webkit_web_frame_resume_animations):
+
+2010-11-05 Chris Marrin <cmarrin at apple.com>
+
Reviewed by Simon Fraser.
Make suspendAnimations/resumeAnimations and setCSSAnimations traverse through subframes and remember state
diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
index c60e39a..93497cb 100644
--- a/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -1059,7 +1059,7 @@ void webkit_web_frame_suspend_animations(WebKitWebFrame* frame)
if (!coreFrame)
return;
- frame->suspendAnimations();
+ coreFrame->suspendAnimations();
}
void webkit_web_frame_resume_animations(WebKitWebFrame* frame)
@@ -1068,7 +1068,7 @@ void webkit_web_frame_resume_animations(WebKitWebFrame* frame)
if (!coreFrame)
return;
- frame->resumeAnimations();
+ coreFrame->resumeAnimations();
}
gchar* webkit_web_frame_get_response_mime_type(WebKitWebFrame* frame)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list