Diff
Modified: trunk/Source/WebCore/ChangeLog (98471 => 98472)
--- trunk/Source/WebCore/ChangeLog 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebCore/ChangeLog 2011-10-26 13:32:59 UTC (rev 98472)
@@ -1,3 +1,22 @@
+2011-10-26 Zalan Bujtas <[email protected]>
+
+ Name viewport change event consistently.
+ https://bugs.webkit.org/show_bug.cgi?id=70901
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Use ViewportPropertiesDidChange term consistently throughout WebKit.
+
+ No tests needed as the change is only method renaming.
+
+ * page/Chrome.cpp:
+ (WebCore::Chrome::dispatchViewportPropertiesDidChange):
+ * page/Chrome.h:
+ * page/ChromeClient.h:
+ (WebCore::ChromeClient::dispatchViewportPropertiesDidChange):
+ * page/Page.cpp:
+ (WebCore::Page::updateViewportArguments):
+
2011-10-25 Stephen White <[email protected]>
[chromium] Canvas2D should rate-limit drawing to prevent swamping the GPU process.
Modified: trunk/Source/WebCore/page/Chrome.cpp (98471 => 98472)
--- trunk/Source/WebCore/page/Chrome.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebCore/page/Chrome.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -484,9 +484,9 @@
m_client->loadIconForFiles(filenames, loader);
}
-void Chrome::dispatchViewportDataDidChange(const ViewportArguments& arguments) const
+void Chrome::dispatchViewportPropertiesDidChange(const ViewportArguments& arguments) const
{
- m_client->dispatchViewportDataDidChange(arguments);
+ m_client->dispatchViewportPropertiesDidChange(arguments);
}
void Chrome::setCursor(const Cursor& cursor)
Modified: trunk/Source/WebCore/page/Chrome.h (98471 => 98472)
--- trunk/Source/WebCore/page/Chrome.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebCore/page/Chrome.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -167,7 +167,7 @@
void enumerateChosenDirectory(FileChooser*);
#endif
- void dispatchViewportDataDidChange(const ViewportArguments&) const;
+ void dispatchViewportPropertiesDidChange(const ViewportArguments&) const;
bool requiresFullscreenForVideoPlayback();
Modified: trunk/Source/WebCore/page/ChromeClient.h (98471 => 98472)
--- trunk/Source/WebCore/page/ChromeClient.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebCore/page/ChromeClient.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -164,7 +164,7 @@
#endif
// End methods used by HostWindow.
- virtual void dispatchViewportDataDidChange(const ViewportArguments&) const { }
+ virtual void dispatchViewportPropertiesDidChange(const ViewportArguments&) const { }
virtual void contentsSizeChanged(Frame*, const IntSize&) const = 0;
virtual void layoutUpdated(Frame*) const { }
Modified: trunk/Source/WebCore/page/Page.cpp (98471 => 98472)
--- trunk/Source/WebCore/page/Page.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebCore/page/Page.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -403,7 +403,7 @@
return;
m_viewportArguments = mainFrame()->document()->viewportArguments();
- chrome()->dispatchViewportDataDidChange(m_viewportArguments);
+ chrome()->dispatchViewportPropertiesDidChange(m_viewportArguments);
}
void Page::refreshPlugins(bool reload)
Modified: trunk/Source/WebKit/efl/ChangeLog (98471 => 98472)
--- trunk/Source/WebKit/efl/ChangeLog 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-10-26 13:32:59 UTC (rev 98472)
@@ -1,3 +1,16 @@
+2011-10-26 Zalan Bujtas <[email protected]>
+
+ Name viewport change event consistently.
+ https://bugs.webkit.org/show_bug.cgi?id=70901
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Use ViewportPropertiesDidChange term consistently throughout WebKit.
+
+ * WebCoreSupport/ChromeClientEfl.cpp:
+ (WebCore::ChromeClientEfl::dispatchViewportPropertiesDidChange):
+ * WebCoreSupport/ChromeClientEfl.h:
+
2011-10-26 Grzegorz Czajkowski <[email protected]>
[EFL] Private function _ewk_view_viewport_attributes_compute takes an internal data of ewk_view.
Modified: trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp (98471 => 98472)
--- trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -529,7 +529,7 @@
notImplemented();
}
-void ChromeClientEfl::dispatchViewportDataDidChange(const ViewportArguments& arguments) const
+void ChromeClientEfl::dispatchViewportPropertiesDidChange(const ViewportArguments& arguments) const
{
ewk_view_viewport_attributes_set(m_view, arguments);
}
Modified: trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h (98471 => 98472)
--- trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -159,7 +159,7 @@
virtual void cancelGeolocationPermissionRequestForFrame(Frame*);
virtual void iconForFiles(const Vector<String, 0u>&, PassRefPtr<FileChooser>);
- virtual void dispatchViewportDataDidChange(const ViewportArguments&) const;
+ virtual void dispatchViewportPropertiesDidChange(const ViewportArguments&) const;
virtual bool selectItemWritingDirectionIsNatural();
virtual bool selectItemAlignmentFollowsMenuWritingDirection();
Modified: trunk/Source/WebKit/gtk/ChangeLog (98471 => 98472)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-10-26 13:32:59 UTC (rev 98472)
@@ -1,3 +1,16 @@
+2011-10-26 Zalan Bujtas <[email protected]>
+
+ Name viewport change event consistently.
+ https://bugs.webkit.org/show_bug.cgi?id=70901
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Use ViewportPropertiesDidChange term consistently throughout WebKit.
+
+ * WebCoreSupport/ChromeClientGtk.cpp:
+ (WebKit::ChromeClient::dispatchViewportPropertiesDidChange):
+ * WebCoreSupport/ChromeClientGtk.h:
+
2011-10-26 Carlos Garcia Campos <[email protected]>
[GTK] Remove g_thread_init() calls from gtk-doc scanner too
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (98471 => 98472)
--- trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -640,7 +640,7 @@
loader->notifyFinished(Icon::createIconForFiles(filenames));
}
-void ChromeClient::dispatchViewportDataDidChange(const ViewportArguments& arguments) const
+void ChromeClient::dispatchViewportPropertiesDidChange(const ViewportArguments& arguments) const
{
// Recompute the viewport attributes making it valid.
webkitViewportAttributesRecompute(webkit_web_view_get_viewport_attributes(m_webView));
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h (98471 => 98472)
--- trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -112,7 +112,7 @@
virtual void setToolTip(const WTF::String&, WebCore::TextDirection);
- virtual void dispatchViewportDataDidChange(const WebCore::ViewportArguments& arguments) const;
+ virtual void dispatchViewportPropertiesDidChange(const WebCore::ViewportArguments&) const;
virtual void print(WebCore::Frame*);
#if ENABLE(SQL_DATABASE)
Modified: trunk/Source/WebKit/qt/ChangeLog (98471 => 98472)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-26 13:32:59 UTC (rev 98472)
@@ -1,3 +1,16 @@
+2011-10-26 Zalan Bujtas <[email protected]>
+
+ Name viewport change event consistently.
+ https://bugs.webkit.org/show_bug.cgi?id=70901
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Use ViewportPropertiesDidChange term consistently throughout WebKit.
+
+ * WebCoreSupport/ChromeClientQt.cpp:
+ (WebCore::ChromeClientQt::dispatchViewportPropertiesDidChange):
+ * WebCoreSupport/ChromeClientQt.h:
+
2011-10-25 Mark Hahnenberg <[email protected]>
Remove putVirtual
Modified: trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (98471 => 98472)
--- trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -711,7 +711,7 @@
#endif
}
-void ChromeClientQt::dispatchViewportDataDidChange(const ViewportArguments&) const
+void ChromeClientQt::dispatchViewportPropertiesDidChange(const ViewportArguments&) const
{
emit m_webPage->viewportChangeRequested();
}
Modified: trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h (98471 => 98472)
--- trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -191,7 +191,7 @@
PassOwnPtr<QWebSelectMethod> createSelectPopup() const;
- virtual void dispatchViewportDataDidChange(const ViewportArguments&) const;
+ virtual void dispatchViewportPropertiesDidChange(const ViewportArguments&) const;
virtual bool shouldRubberBandInDirection(WebCore::ScrollDirection) const { return true; }
virtual void numWheelEventHandlersChanged(unsigned) { }
Modified: trunk/Source/WebKit2/ChangeLog (98471 => 98472)
--- trunk/Source/WebKit2/ChangeLog 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-26 13:32:59 UTC (rev 98472)
@@ -1,3 +1,49 @@
+2011-10-26 Zalan Bujtas <[email protected]>
+
+ Name viewport change event consistently.
+ https://bugs.webkit.org/show_bug.cgi?id=70901
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Use ViewportPropertiesDidChange term consistently throughout WebKit.
+
+ * UIProcess/API/efl/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::didChangeViewportProperties):
+ * UIProcess/API/efl/PageClientImpl.h:
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::didChangeViewportProperties):
+ * UIProcess/API/gtk/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::didChangeViewportProperties):
+ * UIProcess/API/qt/qdesktopwebview.cpp:
+ (QDesktopWebViewPrivate::didChangeViewportProperties):
+ * UIProcess/API/qt/qdesktopwebview_p.h:
+ * UIProcess/API/qt/qtouchwebview.cpp:
+ (QTouchWebViewPrivate::didChangeViewportProperties):
+ * UIProcess/API/qt/qtouchwebview_p.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didChangeViewportProperties):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/qt/QtDesktopWebPageProxy.cpp:
+ (QtDesktopWebPageProxy::didChangeViewportProperties):
+ * UIProcess/qt/QtDesktopWebPageProxy.h:
+ * UIProcess/qt/QtTouchViewInterface.cpp:
+ (WebKit::QtTouchViewInterface::didChangeViewportProperties):
+ * UIProcess/qt/QtTouchViewInterface.h:
+ * UIProcess/qt/QtViewInterface.h:
+ * UIProcess/qt/QtWebPageProxy.cpp:
+ (QtWebPageProxy::didChangeViewportProperties):
+ * UIProcess/qt/QtWebPageProxy.h:
+ * UIProcess/win/WebView.cpp:
+ (WebKit::WebView::didChangeViewportProperties):
+ * UIProcess/win/WebView.h:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::dispatchViewportPropertiesDidChange):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
2011-10-26 Carlos Garcia Campos <[email protected]>
[GTK] Remove g_thread_init() calls from gtk-doc scanner too
Modified: trunk/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -130,7 +130,7 @@
notImplemented();
}
-void PageClientImpl::setViewportArguments(const WebCore::ViewportArguments&)
+void PageClientImpl::didChangeViewportProperties(const WebCore::ViewportArguments&)
{
notImplemented();
}
Modified: trunk/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -65,7 +65,7 @@
virtual void setCursor(const WebCore::Cursor&);
virtual void setCursorHiddenUntilMouseMoves(bool);
- virtual void setViewportArguments(const WebCore::ViewportArguments&);
+ virtual void didChangeViewportProperties(const WebCore::ViewportArguments&);
virtual void registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo);
virtual void clearAllEditCommands();
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -154,7 +154,7 @@
notImplemented();
}
-void PageClientImpl::setViewportArguments(const WebCore::ViewportArguments&)
+void PageClientImpl::didChangeViewportProperties(const WebCore::ViewportArguments&)
{
notImplemented();
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -69,7 +69,7 @@
virtual void toolTipChanged(const WTF::String&, const WTF::String&);
virtual void setCursor(const WebCore::Cursor&);
virtual void setCursorHiddenUntilMouseMoves(bool);
- virtual void setViewportArguments(const WebCore::ViewportArguments&);
+ virtual void didChangeViewportProperties(const WebCore::ViewportArguments&);
virtual void registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo);
virtual void clearAllEditCommands();
virtual bool canUndoRedo(WebPageProxy::UndoOrRedo);
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -66,7 +66,7 @@
virtual void toolTipChanged(const String& oldToolTip, const String& newToolTip);
virtual void setCursor(const WebCore::Cursor&);
virtual void setCursorHiddenUntilMouseMoves(bool);
- virtual void setViewportArguments(const WebCore::ViewportArguments&);
+ virtual void didChangeViewportProperties(const WebCore::ViewportArguments&);
virtual void registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo);
virtual void clearAllEditCommands();
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2011-10-26 13:32:59 UTC (rev 98472)
@@ -219,7 +219,7 @@
[NSCursor setHiddenUntilMouseMoves:hiddenUntilMouseMoves];
}
-void PageClientImpl::setViewportArguments(const WebCore::ViewportArguments&)
+void PageClientImpl::didChangeViewportProperties(const WebCore::ViewportArguments&)
{
}
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -109,7 +109,7 @@
*clientPosition = window->mapFromGlobal(*globalPosition);
}
-void QDesktopWebViewPrivate::didReceiveViewportArguments(const WebCore::ViewportArguments&)
+void QDesktopWebViewPrivate::didChangeViewportProperties(const WebCore::ViewportArguments&)
{
// This feature is only used by QTouchWebView.
}
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview_p.h (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview_p.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview_p.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -63,7 +63,7 @@
virtual bool isVisible();
virtual void startDrag(Qt::DropActions supportedDropActions, const QImage& dragImage, QMimeData*, QPoint* clientPosition, QPoint* globalPosition, Qt::DropAction* dropAction);
- virtual void didReceiveViewportArguments(const WebCore::ViewportArguments&);
+ virtual void didChangeViewportProperties(const WebCore::ViewportArguments&);
virtual void didFindZoomableArea(const QPoint&, const QRect&);
virtual void didChangeUrl(const QUrl&);
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.cpp (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -86,7 +86,7 @@
wkPage->setResizesToContentsUsingLayoutSize(attr.layoutSize);
}
-void QTouchWebViewPrivate::setViewportArguments(const WebCore::ViewportArguments& args)
+void QTouchWebViewPrivate::didChangeViewportProperties(const WebCore::ViewportArguments& args)
{
viewportArguments = args;
updateViewportConstraints();
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview_p.h (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview_p.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview_p.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -39,7 +39,7 @@
void _q_viewportTrajectoryVectorChanged(const QPointF&);
void updateViewportConstraints();
- void setViewportArguments(const WebCore::ViewportArguments& args);
+ void didChangeViewportProperties(const WebCore::ViewportArguments& args);
QTouchWebView* const q;
QScopedPointer<QTouchWebPage> pageView;
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -111,7 +111,7 @@
virtual void setCursor(const WebCore::Cursor&) = 0;
virtual void setCursorHiddenUntilMouseMoves(bool) = 0;
- virtual void setViewportArguments(const WebCore::ViewportArguments&) = 0;
+ virtual void didChangeViewportProperties(const WebCore::ViewportArguments&) = 0;
virtual void registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo) = 0;
virtual void clearAllEditCommands() = 0;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -2191,9 +2191,9 @@
}
#endif
-void WebPageProxy::didChangeViewportData(const ViewportArguments& args)
+void WebPageProxy::didChangeViewportProperties(const ViewportArguments& args)
{
- m_pageClient->setViewportArguments(args);
+ m_pageClient->didChangeViewportProperties(args);
}
void WebPageProxy::pageDidScroll()
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -651,7 +651,7 @@
void screenToWindow(const WebCore::IntPoint& screenPoint, WebCore::IntPoint& windowPoint);
void windowToScreen(const WebCore::IntRect& viewRect, WebCore::IntRect& result);
void runBeforeUnloadConfirmPanel(const String& message, uint64_t frameID, bool& shouldClose);
- void didChangeViewportData(const WebCore::ViewportArguments&);
+ void didChangeViewportProperties(const WebCore::ViewportArguments&);
void pageDidScroll();
void runOpenPanel(uint64_t frameID, const WebCore::FileChooserSettings&);
void printFrame(uint64_t frameID);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2011-10-26 13:32:59 UTC (rev 98472)
@@ -31,7 +31,7 @@
ShouldInterruptJavaScript() -> (bool shouldInterupt)
MouseDidMoveOverElement(WebKit::WebHitTestResult::Data hitTestResultData, uint32_t modifiers, WebKit::InjectedBundleUserMessageEncoder userData);
MissingPluginButtonClicked(WTF::String mimeType, WTF::String url, WTF::String pluginsPageURL)
- DidChangeViewportData(WebCore::ViewportArguments arguments)
+ DidChangeViewportProperties(WebCore::ViewportArguments arguments)
DidReceiveEvent(uint32_t type, bool handled)
StopResponsivenessTimer()
SetCursor(WebCore::Cursor cursor)
Modified: trunk/Source/WebKit2/UIProcess/qt/QtDesktopWebPageProxy.cpp (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/qt/QtDesktopWebPageProxy.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/qt/QtDesktopWebPageProxy.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -69,7 +69,7 @@
static_cast<DrawingAreaProxyImpl*>(m_webPageProxy->drawingArea())->paint(painter, area, unpaintedRegion);
}
-void QtDesktopWebPageProxy::setViewportArguments(const WebCore::ViewportArguments&)
+void QtDesktopWebPageProxy::didChangeViewportProperties(const WebCore::ViewportArguments&)
{
// We ignore the viewport definition on the Desktop.
}
Modified: trunk/Source/WebKit2/UIProcess/qt/QtDesktopWebPageProxy.h (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/qt/QtDesktopWebPageProxy.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/qt/QtDesktopWebPageProxy.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -41,7 +41,7 @@
private:
/* PageClient overrides. */
virtual PassOwnPtr<DrawingAreaProxy> createDrawingAreaProxy();
- virtual void setViewportArguments(const WebCore::ViewportArguments&);
+ virtual void didChangeViewportProperties(const WebCore::ViewportArguments&);
#if ENABLE(TOUCH_EVENTS)
virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled);
#endif
Modified: trunk/Source/WebKit2/UIProcess/qt/QtTouchViewInterface.cpp (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/qt/QtTouchViewInterface.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/qt/QtTouchViewInterface.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -87,9 +87,9 @@
Q_ASSERT(false);
}
-void QtTouchViewInterface::didReceiveViewportArguments(const WebCore::ViewportArguments& args)
+void QtTouchViewInterface::didChangeViewportProperties(const WebCore::ViewportArguments& args)
{
- m_viewportView->d->setViewportArguments(args);
+ m_viewportView->d->didChangeViewportProperties(args);
}
void QtTouchViewInterface::didChangeUrl(const QUrl& url)
Modified: trunk/Source/WebKit2/UIProcess/qt/QtTouchViewInterface.h (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/qt/QtTouchViewInterface.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/qt/QtTouchViewInterface.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -53,7 +53,7 @@
virtual bool isVisible();
virtual void startDrag(Qt::DropActions supportedDropActions, const QImage& dragImage, QMimeData*, QPoint* clientPosition, QPoint* globalPosition, Qt::DropAction*);
- virtual void didReceiveViewportArguments(const WebCore::ViewportArguments&);
+ virtual void didChangeViewportProperties(const WebCore::ViewportArguments&);
virtual void didFindZoomableArea(const QPoint&, const QRect&);
Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewInterface.h (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/qt/QtViewInterface.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewInterface.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -63,7 +63,7 @@
virtual bool isVisible() = 0;
virtual void startDrag(Qt::DropActions supportedDropActions, const QImage& dragImage, QMimeData*, QPoint* clientPosition, QPoint* globalPosition, Qt::DropAction*) = 0;
- virtual void didReceiveViewportArguments(const WebCore::ViewportArguments&) = 0;
+ virtual void didChangeViewportProperties(const WebCore::ViewportArguments&) = 0;
virtual void didFindZoomableArea(const QPoint&, const QRect&) = 0;
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -589,9 +589,9 @@
m_webPageProxy->dragEnded(clientPosition, globalPosition, dropActionToDragOperation(actualDropAction));
}
-void QtWebPageProxy::setViewportArguments(const WebCore::ViewportArguments& args)
+void QtWebPageProxy::didChangeViewportProperties(const WebCore::ViewportArguments& args)
{
- m_viewInterface->didReceiveViewportArguments(args);
+ m_viewInterface->didChangeViewportProperties(args);
}
#include "moc_QtWebPageProxy.cpp"
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -94,7 +94,7 @@
virtual void didChangeContentsSize(const WebCore::IntSize&);
virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage);
- virtual void setViewportArguments(const WebCore::ViewportArguments&);
+ virtual void didChangeViewportProperties(const WebCore::ViewportArguments&);
virtual void setCursor(const WebCore::Cursor&);
virtual void setCursorHiddenUntilMouseMoves(bool hiddenUntilMouseMoves);
virtual void toolTipChanged(const WTF::String&, const WTF::String&);
Modified: trunk/Source/WebKit2/UIProcess/win/WebView.cpp (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/win/WebView.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/win/WebView.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -1079,7 +1079,7 @@
m_nextResizeScrollOffset = scrollOffset;
}
-void WebView::setViewportArguments(const WebCore::ViewportArguments&)
+void WebView::didChangeViewportProperties(const WebCore::ViewportArguments&)
{
}
Modified: trunk/Source/WebKit2/UIProcess/win/WebView.h (98471 => 98472)
--- trunk/Source/WebKit2/UIProcess/win/WebView.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/UIProcess/win/WebView.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -185,7 +185,7 @@
virtual void toolTipChanged(const WTF::String&, const WTF::String&);
virtual void setCursor(const WebCore::Cursor&);
virtual void setCursorHiddenUntilMouseMoves(bool);
- virtual void setViewportArguments(const WebCore::ViewportArguments&);
+ virtual void didChangeViewportProperties(const WebCore::ViewportArguments&);
virtual void registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo);
virtual void clearAllEditCommands();
virtual bool canUndoRedo(WebPageProxy::UndoOrRedo);
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (98471 => 98472)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2011-10-26 13:32:59 UTC (rev 98472)
@@ -740,9 +740,9 @@
#endif
-void WebChromeClient::dispatchViewportDataDidChange(const ViewportArguments& args) const
+void WebChromeClient::dispatchViewportPropertiesDidChange(const ViewportArguments& args) const
{
- m_page->send(Messages::WebPageProxy::DidChangeViewportData(args));
+ m_page->send(Messages::WebPageProxy::DidChangeViewportProperties(args));
}
void WebChromeClient::didStartRubberBandForFrame(Frame*, const IntSize&) const
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (98471 => 98472)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2011-10-26 13:24:56 UTC (rev 98471)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2011-10-26 13:32:59 UTC (rev 98472)
@@ -206,7 +206,7 @@
virtual void makeFirstResponder() OVERRIDE;
#endif
- virtual void dispatchViewportDataDidChange(const WebCore::ViewportArguments&) const OVERRIDE;
+ virtual void dispatchViewportPropertiesDidChange(const WebCore::ViewportArguments&) const OVERRIDE;
virtual void didStartRubberBandForFrame(WebCore::Frame*, const WebCore::IntSize&) const OVERRIDE;
virtual void didCompleteRubberBandForFrame(WebCore::Frame*, const WebCore::IntSize&) const OVERRIDE;
