Changeset 147905 in webkit

Timestamp:

Apr 8, 2013 2:27:27 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] WebPage: misc build fixes
​https://bugs.webkit.org/show_bug.cgi?id=114152

Patch by Alberto Garcia <​agarcia@igalia.com> on 2013-04-08
Reviewed by Carlos Garcia Campos.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::shouldPluginEnterFullScreen):
(BlackBerry::WebKit::WebPagePrivate::didPluginExitFullScreen):
(BlackBerry::WebKit::WebPagePrivate::onPluginStartBackgroundPlay):
(BlackBerry::WebKit::WebPagePrivate::onPluginStopBackgroundPlay):
Remove unused parameters.

(BlackBerry::WebKit::WebPagePrivate::zoomAnimationFinished):
(BlackBerry::WebKit::WebPage::blockZoom):
Replace TAAUTO with TASTART (this changed in r120495).

(BlackBerry::WebKit::WebPagePrivate::setViewportSize):
Rename m_fullscreenVideoNode to m_fullscreenNode (this changed in
r142220).

(BlackBerry::WebKit::WebPagePrivate::compositorDrawsRootLayer):
Rename paintingGoesToWindow() to paintsIntoWindow() (this changed in
r113514).

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (7 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -1986 +1986 @@
 }
 
-bool WebPagePrivate::shouldPluginEnterFullScreen(PluginView* plugin, const char* windowUniquePrefix)
+bool WebPagePrivate::shouldPluginEnterFullScreen(PluginView*, const char*)
 {
     return m_client->shouldPluginEnterFullScreen();
@@ -2003 +2003 @@
 }
 
-void WebPagePrivate::didPluginExitFullScreen(PluginView* plugin, const char* windowUniquePrefix)
+void WebPagePrivate::didPluginExitFullScreen(PluginView*, const char*)
 {
     m_fullScreenPluginView = 0;
@@ -2015 +2015 @@
 }
 
-void WebPagePrivate::onPluginStartBackgroundPlay(PluginView* plugin, const char* windowUniquePrefix)
+void WebPagePrivate::onPluginStartBackgroundPlay(PluginView*, const char*)
 {
     m_client->onPluginStartBackgroundPlay();
 }
 
-void WebPagePrivate::onPluginStopBackgroundPlay(PluginView* plugin, const char* windowUniquePrefix)
+void WebPagePrivate::onPluginStopBackgroundPlay(PluginView*, const char*)
 {
     m_client->onPluginStopBackgroundPlay();
@@ -2934 +2934 @@
                 textAnchor = IntPoint(reflowedRect.x() + reflowedRect.width() - actualVisibleSize().width(), topLeftPoint.y());
                 break;
-            case TAAUTO:
+            case TASTART:
             case JUSTIFY:
             default:
@@ -3579 +3579 @@
 
     IntSize offset;
-    if (hasPendingOrientation && !m_fullscreenVideoNode) {
+    if (hasPendingOrientation && !m_fullscreenNode) {
         offset = IntSize(roundf((viewportSizeBefore.width() - viewportSizeAfter.width()) / 2.0),
             roundf((viewportSizeBefore.height() - viewportSizeAfter.height()) / 2.0));
@@ -4574 +4574 @@
             anchor = FloatPoint(nodeRect.x() + nodeRect.width() - scaledViewportWidth, topLeftPoint.y());
             break;
-        case TAAUTO:
+        case TASTART:
         case JUSTIFY:
         default:
@@ -5235 +5235 @@
         return false;
 
-    return !renderView->layer()->backing()->paintingGoesToWindow();
+    return !renderView->layer()->backing()->paintsIntoWindow();
 #else
     return false;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-04-08  Alberto Garcia  <agarcia@igalia.com>
+
+        [BlackBerry] WebPage: misc build fixes
+        https://bugs.webkit.org/show_bug.cgi?id=114152
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::shouldPluginEnterFullScreen):
+        (BlackBerry::WebKit::WebPagePrivate::didPluginExitFullScreen):
+        (BlackBerry::WebKit::WebPagePrivate::onPluginStartBackgroundPlay):
+        (BlackBerry::WebKit::WebPagePrivate::onPluginStopBackgroundPlay):
+        Remove unused parameters.
+
+        (BlackBerry::WebKit::WebPagePrivate::zoomAnimationFinished):
+        (BlackBerry::WebKit::WebPage::blockZoom):
+        Replace TAAUTO with TASTART (this changed in r120495).
+
+        (BlackBerry::WebKit::WebPagePrivate::setViewportSize):
+        Rename m_fullscreenVideoNode to m_fullscreenNode (this changed in
+        r142220).
+
+        (BlackBerry::WebKit::WebPagePrivate::compositorDrawsRootLayer):
+        Rename paintingGoesToWindow() to paintsIntoWindow() (this changed in
+        r113514).
+
 2013-04-07  David Kilzer  <ddkilzer@apple.com>