Title: [125070] trunk/Source/WebKit/blackberry
- Revision
- 125070
- Author
- toniki...@webkit.org
- Date
- 2012-08-08 12:20:59 -0700 (Wed, 08 Aug 2012)
Log Message
[BlackBerry] Make WebOverlayPrivate::scheduleCompositingRun a WebPagePrivate method.
https://bugs.webkit.org/show_bug.cgi?id=93480
PR #188682
Reviewed by Rob Buis.
Patch by Antonio Gomes <ago...@rim.com>
... this way it can be used by others.
No behavioural change. Another preparation patch.
* Api/WebOverlay.cpp:
(BlackBerry::WebKit::WebOverlayPrivate::scheduleCompositingRun):
* Api/WebPage.cpp:
(WebKit):
(BlackBerry::WebKit::WebPagePrivate::scheduleCompositingRun):
* Api/WebPage_p.h:
(WebPagePrivate):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebOverlay.cpp (125069 => 125070)
--- trunk/Source/WebKit/blackberry/Api/WebOverlay.cpp 2012-08-08 19:20:10 UTC (rev 125069)
+++ trunk/Source/WebKit/blackberry/Api/WebOverlay.cpp 2012-08-08 19:20:59 UTC (rev 125070)
@@ -232,15 +232,10 @@
void WebOverlayPrivate::scheduleCompositingRun()
{
- if (WebPagePrivate* page = this->page()) {
- if (WebPageCompositorClient* compositorClient = page->compositor()->client()) {
- double animationTime = compositorClient->requestAnimationFrame();
- compositorClient->invalidate(animationTime);
- return;
- }
+ if (!page())
+ return;
- page->blitVisibleContents();
- }
+ page()->scheduleCompositingRun();
}
WebOverlayPrivateWebKitThread::WebOverlayPrivateWebKitThread(GraphicsLayerClient* client)
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (125069 => 125070)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-08 19:20:10 UTC (rev 125069)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-08 19:20:59 UTC (rev 125070)
@@ -145,6 +145,7 @@
#if USE(ACCELERATED_COMPOSITING)
#include "FrameLayers.h"
+#include "WebPageCompositorClient.h"
#include "WebPageCompositor_p.h"
#endif
@@ -6289,6 +6290,18 @@
m_backingStore->d->blitVisibleContents();
}
+
+void WebPagePrivate::scheduleCompositingRun()
+{
+ if (WebPageCompositorClient* compositorClient = compositor()->client()) {
+ double animationTime = compositorClient->requestAnimationFrame();
+ compositorClient->invalidate(animationTime);
+ return;
+ }
+
+ blitVisibleContents();
+}
+
#endif
void WebPage::setWebGLEnabled(bool enabled)
Modified: trunk/Source/WebKit/blackberry/Api/WebPage_p.h (125069 => 125070)
--- trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2012-08-08 19:20:10 UTC (rev 125069)
+++ trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2012-08-08 19:20:59 UTC (rev 125070)
@@ -423,6 +423,8 @@
void suspendRootLayerCommit();
void resumeRootLayerCommit();
void blitVisibleContents();
+
+ void scheduleCompositingRun();
#endif
bool dispatchTouchEventToFullScreenPlugin(WebCore::PluginView*, const Platform::TouchEvent&);
Modified: trunk/Source/WebKit/blackberry/ChangeLog (125069 => 125070)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-08-08 19:20:10 UTC (rev 125069)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-08-08 19:20:59 UTC (rev 125070)
@@ -1,3 +1,23 @@
+2012-08-08 Antonio Gomes <ago...@rim.com>
+
+ [BlackBerry] Make WebOverlayPrivate::scheduleCompositingRun a WebPagePrivate method.
+ https://bugs.webkit.org/show_bug.cgi?id=93480
+ PR #188682
+
+ Reviewed by Rob Buis.
+
+ ... this way it can be used by others.
+
+ No behavioural change. Another preparation patch.
+
+ * Api/WebOverlay.cpp:
+ (BlackBerry::WebKit::WebOverlayPrivate::scheduleCompositingRun):
+ * Api/WebPage.cpp:
+ (WebKit):
+ (BlackBerry::WebKit::WebPagePrivate::scheduleCompositingRun):
+ * Api/WebPage_p.h:
+ (WebPagePrivate):
+
2012-08-08 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r124887.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
