[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 11:54:13 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 38577e97e41b8cf4ab9f8753e1e7e05119a562ba
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 11 02:21:37 2010 +0000
Fix for Chromium and gtk builds, broken by http://trac.webkit.org/changeset/65107
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65114 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
index a2d5ea0..352e89f 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
@@ -398,7 +398,7 @@ private:
bool elementDoesAutoCompleteForElementWithId(const WebKit::WebString&);
int numberOfActiveAnimations();
void suspendAnimations();
- void suspendAnimations();
+ void resumeAnimations();
// Used for test timeouts.
ScopedRunnableMethodFactory<LayoutTestController> m_timeoutFactory;
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index b18ac03..db44a60 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -633,12 +633,12 @@ unsigned LayoutTestController::numberOfActiveAnimations() const
void LayoutTestController::suspendAnimations() const
{
- return webkit_web_frame_suspend_animations(mainFrame);
+ webkit_web_frame_suspend_animations(mainFrame);
}
void LayoutTestController::resumeAnimations() const
{
- return webkit_web_frame_resume_animations(mainFrame);
+ webkit_web_frame_resume_animations(mainFrame);
}
void LayoutTestController::overridePreference(JSStringRef key, JSStringRef value)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list