Title: [147905] trunk/Source/WebKit/blackberry
- Revision
- 147905
- Author
- [email protected]
- Date
- 2013-04-08 02:27:27 -0700 (Mon, 08 Apr 2013)
Log Message
[BlackBerry] WebPage: misc build fixes
https://bugs.webkit.org/show_bug.cgi?id=114152
Patch by Alberto Garcia <[email protected]> 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).
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (147904 => 147905)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-04-08 09:27:13 UTC (rev 147904)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-04-08 09:27:27 UTC (rev 147905)
@@ -1985,7 +1985,7 @@
(*it)->handleOnLoadEvent();
}
-bool WebPagePrivate::shouldPluginEnterFullScreen(PluginView* plugin, const char* windowUniquePrefix)
+bool WebPagePrivate::shouldPluginEnterFullScreen(PluginView*, const char*)
{
return m_client->shouldPluginEnterFullScreen();
}
@@ -2002,7 +2002,7 @@
m_client->window()->setSensitivityFullscreenOverride(true);
}
-void WebPagePrivate::didPluginExitFullScreen(PluginView* plugin, const char* windowUniquePrefix)
+void WebPagePrivate::didPluginExitFullScreen(PluginView*, const char*)
{
m_fullScreenPluginView = 0;
m_client->didPluginExitFullScreen();
@@ -2014,12 +2014,12 @@
m_client->window()->setSensitivityFullscreenOverride(false);
}
-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();
}
@@ -2933,7 +2933,7 @@
case WEBKIT_RIGHT:
textAnchor = IntPoint(reflowedRect.x() + reflowedRect.width() - actualVisibleSize().width(), topLeftPoint.y());
break;
- case TAAUTO:
+ case TASTART:
case JUSTIFY:
default:
if (renderer->style()->isLeftToRightDirection())
@@ -3578,7 +3578,7 @@
IntSize viewportSizeAfter = actualVisibleSize();
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));
}
@@ -4573,7 +4573,7 @@
case WEBKIT_RIGHT:
anchor = FloatPoint(nodeRect.x() + nodeRect.width() - scaledViewportWidth, topLeftPoint.y());
break;
- case TAAUTO:
+ case TASTART:
case JUSTIFY:
default:
if (renderer->style()->isLeftToRightDirection())
@@ -5234,7 +5234,7 @@
if (!renderView || !renderView->layer() || !renderView->layer()->backing())
return false;
- return !renderView->layer()->backing()->paintingGoesToWindow();
+ return !renderView->layer()->backing()->paintsIntoWindow();
#else
return false;
#endif
Modified: trunk/Source/WebKit/blackberry/ChangeLog (147904 => 147905)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-04-08 09:27:13 UTC (rev 147904)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-04-08 09:27:27 UTC (rev 147905)
@@ -1,3 +1,29 @@
+2013-04-08 Alberto Garcia <[email protected]>
+
+ [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 <[email protected]>
Remove the rest of SVG_DOM_OBJC_BINDINGS
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
