Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes

1 files changed, 5 insertions, 5 deletions

diff --git a/Source/WebKit/blackberry/Api/WebOverlay.cpp b/Source/WebKit/blackberry/Api/WebOverlay.cpp
index 792a473b0..d8b2bdc04 100644
--- a/Source/WebKit/blackberry/Api/WebOverlay.cpp
+++ b/Source/WebKit/blackberry/Api/WebOverlay.cpp
@@ -34,9 +34,9 @@
 #include "WebPageCompositorClient.h"
 #include "WebPageCompositor_p.h"
 #include "WebPage_p.h"
-#include "WebString.h"
 
 #include <BlackBerryPlatformMessageClient.h>
+#include <BlackBerryPlatformString.h>
 #include <GLES2/gl2.h>
 #include <SkDevice.h>
 
@@ -137,9 +137,9 @@ void WebOverlay::addAnimation(const WebAnimation& animation)
     d->addAnimation(animation.d->name, animation.d->animation.get(), animation.d->keyframes);
 }
 
-void WebOverlay::removeAnimation(const WebString& name)
+void WebOverlay::removeAnimation(const BlackBerry::Platform::String& name)
 {
-    d->removeAnimation(String(PassRefPtr<StringImpl>(name.impl())));
+    d->removeAnimation(name);
 }
 
 WebOverlay* WebOverlay::parent() const
@@ -364,7 +364,7 @@ void WebOverlayPrivateWebKitThread::resetOverrides()
     }
 }
 
-void WebOverlayPrivateWebKitThread::notifySyncRequired(const WebCore::GraphicsLayer*)
+void WebOverlayPrivateWebKitThread::notifyFlushRequired(const WebCore::GraphicsLayer*)
 {
     if (WebPagePrivate* page = this->page())
         page->scheduleRootLayerCommit();
@@ -754,7 +754,7 @@ void WebOverlay::addAnimation(const WebAnimation&)
 {
 }
 
-void WebOverlay::removeAnimation(const WebString&)
+void WebOverlay::removeAnimation(const BlackBerry::Platform::String&)
 {
 }