Diff
Modified: trunk/Source/WebKit2/ChangeLog (181022 => 181023)
--- trunk/Source/WebKit2/ChangeLog 2015-03-04 21:45:18 UTC (rev 181022)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-04 21:45:36 UTC (rev 181023)
@@ -1,3 +1,39 @@
+2015-03-04 Beth Dakin <bda...@apple.com>
+
+ Message UI process when contentSize changes
+ https://bugs.webkit.org/show_bug.cgi?id=142294
+ -and corresponding-
+ rdar://problem/19963165
+
+ Reviewed by Andreas Kling.
+
+ This patch un-ifdefs the didChangeContentSize message so that we can use it on Mac
+ as well.
+
+ New private method that subclasses can override when they need to do something
+ with contentSize changes.
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _didChangeContentSize:]):
+ * UIProcess/PageClient.h:
+
+ Un-ifdef.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didChangeContentSize):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/mac/PageClientImpl.h:
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::didChangeContentSize):
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::contentsSizeChanged):
+
+ Stubs for other platforms now that the pure-virtual is un-masked.
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::didChangeContentSize):
+ * UIProcess/API/gtk/PageClientImpl.h:
+
2015-03-04 Antti Koivisto <an...@apple.com>
Factor platform I/O out from NetworkCacheStorage
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (181022 => 181023)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-03-04 21:45:18 UTC (rev 181022)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-03-04 21:45:36 UTC (rev 181023)
@@ -141,4 +141,6 @@
- (void)_dismissContentRelativeChildWindows;
#endif
+- (void)_didChangeContentSize:(NSSize)newSize;
+
@end
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (181022 => 181023)
--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2015-03-04 21:45:18 UTC (rev 181022)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2015-03-04 21:45:36 UTC (rev 181023)
@@ -101,6 +101,7 @@
virtual void updateAcceleratedCompositingMode(const LayerTreeContext&) override;
virtual void handleDownloadRequest(DownloadProxy*) override;
+ virtual void didChangeContentSize(const WebCore::IntSize&) override { }
virtual void didCommitLoadForMainFrame(const String& mimeType, bool useCustomContentProvider) override;
// Auxiliary Client Creation
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (181022 => 181023)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-04 21:45:18 UTC (rev 181022)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-04 21:45:36 UTC (rev 181023)
@@ -4405,6 +4405,11 @@
{
}
+- (void)_didChangeContentSize:(NSSize)newSize
+{
+
+}
+
- (void)_dismissContentRelativeChildWindows
{
// FIXME: We don't know which panel we are dismissing, it may not even be in the current page (see <rdar://problem/13875766>).
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (181022 => 181023)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2015-03-04 21:45:18 UTC (rev 181022)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2015-03-04 21:45:36 UTC (rev 181023)
@@ -153,9 +153,7 @@
virtual bool handleRunOpenPanel(WebPageProxy*, WebFrameProxy*, WebOpenPanelParameters*, WebOpenPanelResultListenerProxy*) { return false; }
-#if PLATFORM(EFL)
virtual void didChangeContentSize(const WebCore::IntSize&) = 0;
-#endif
#if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage) = 0;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (181022 => 181023)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-03-04 21:45:18 UTC (rev 181022)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-03-04 21:45:36 UTC (rev 181023)
@@ -3660,12 +3660,10 @@
m_pageClient.handleDownloadRequest(download);
}
-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
void WebPageProxy::didChangeContentSize(const IntSize& size)
{
m_pageClient.didChangeContentSize(size);
}
-#endif
#if ENABLE(INPUT_TYPE_COLOR)
void WebPageProxy::showColorPicker(const WebCore::Color& initialColor, const IntRect& elementRect)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (181022 => 181023)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-03-04 21:45:18 UTC (rev 181022)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-03-04 21:45:36 UTC (rev 181023)
@@ -1148,9 +1148,10 @@
void pageDidRequestScroll(const WebCore::IntPoint&);
void pageTransitionViewportReady();
void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&);
- void didChangeContentSize(const WebCore::IntSize&);
#endif
+ void didChangeContentSize(const WebCore::IntSize&);
+
#if ENABLE(INPUT_TYPE_COLOR)
void showColorPicker(const WebCore::Color& initialColor, const WebCore::IntRect&);
virtual void didChooseColor(const WebCore::Color&) override;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (181022 => 181023)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-03-04 21:45:18 UTC (rev 181022)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-03-04 21:45:36 UTC (rev 181023)
@@ -99,9 +99,10 @@
PageDidRequestScroll(WebCore::IntPoint point)
PageTransitionViewportReady()
DidFindZoomableArea(WebCore::IntPoint target, WebCore::IntRect area)
- DidChangeContentSize(WebCore::IntSize newSize)
#endif
+ DidChangeContentSize(WebCore::IntSize newSize)
+
#if ENABLE(INPUT_TYPE_COLOR)
ShowColorPicker(WebCore::Color initialColor, WebCore::IntRect elementRect);
SetColorPickerColor(WebCore::Color color);
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (181022 => 181023)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-03-04 21:45:18 UTC (rev 181022)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-03-04 21:45:36 UTC (rev 181023)
@@ -72,6 +72,7 @@
virtual bool decidePolicyForGeolocationPermissionRequest(WebFrameProxy&, API::SecurityOrigin&, GeolocationPermissionRequestProxy&) override;
virtual void didCommitLoadForMainFrame(const String& mimeType, bool useCustomContentProvider) override;
virtual void handleDownloadRequest(DownloadProxy*) override;
+ virtual void didChangeContentSize(const WebCore::IntSize&) override;
virtual void setCursor(const WebCore::Cursor&) override;
virtual void setCursorHiddenUntilMouseMoves(bool) override;
virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&) override;
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (181022 => 181023)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-03-04 21:45:18 UTC (rev 181022)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-03-04 21:45:36 UTC (rev 181023)
@@ -260,6 +260,11 @@
[static_cast<_WKDownload *>(download->wrapper()) setOriginatingWebView:m_webView];
}
+void PageClientImpl::didChangeContentSize(const WebCore::IntSize&)
+{
+ notImplemented();
+}
+
void PageClientImpl::didChangeViewportMetaTagWidth(float newWidth)
{
[m_webView _setViewportMetaTagWidth:newWidth];
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h (181022 => 181023)
--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-03-04 21:45:18 UTC (rev 181022)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-03-04 21:45:36 UTC (rev 181023)
@@ -83,6 +83,7 @@
virtual void didCommitLoadForMainFrame(const String& mimeType, bool useCustomContentProvider) override;
virtual void didFinishLoadingDataForCustomContentProvider(const String& suggestedFilename, const IPC::DataReference&) override;
virtual void handleDownloadRequest(DownloadProxy*) override;
+ virtual void didChangeContentSize(const WebCore::IntSize&) override;
virtual void setCursor(const WebCore::Cursor&) override;
virtual void setCursorHiddenUntilMouseMoves(bool) override;
virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&) override;
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (181022 => 181023)
--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-03-04 21:45:18 UTC (rev 181022)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-03-04 21:45:36 UTC (rev 181023)
@@ -322,6 +322,11 @@
#endif
}
+void PageClientImpl::didChangeContentSize(const WebCore::IntSize& newSize)
+{
+ [m_wkView _didChangeContentSize:newSize];
+}
+
void PageClientImpl::setCursor(const WebCore::Cursor& cursor)
{
// FIXME: Would be nice to share this code with WebKit1's WebChromeClient.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (181022 => 181023)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-03-04 21:45:18 UTC (rev 181022)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-03-04 21:45:36 UTC (rev 181023)
@@ -523,9 +523,7 @@
m_page->drawingArea()->layerTreeHost()->sizeDidChange(size);
#endif
-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
m_page->send(Messages::WebPageProxy::DidChangeContentSize(size));
-#endif
m_page->drawingArea()->mainFrameContentSizeChanged(size);
