Standalone image documents should send their size to the UIClient just like
authorbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Aug 2015 18:46:19 +0000 (18:46 +0000)
committerbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Aug 2015 18:46:19 +0000 (18:46 +0000)
standalone media documents
https://bugs.webkit.org/show_bug.cgi?id=148195
-and corresponding-
rdar://problem/21951253

Reviewed by Tim Horton.

This patch re-names mediaDocumentNaturalSizeChanged() to
imageOrMediaDocumentSizeChanged(), and, as the new name implies, uses the
function for both media documents and images.

Source/WebCore:

* html/ImageDocument.cpp:
(WebCore::ImageDocument::imageUpdated):
* html/MediaDocument.cpp:
(WebCore::MediaDocument::mediaElementNaturalSizeChanged):
* page/ChromeClient.h:

Source/WebKit2:

* UIProcess/API/APIUIClient.h:
(API::UIClient::didClickAutoFillButton):
(API::UIClient::imageOrMediaDocumentSizeChanged):
(API::UIClient::mediaDocumentNaturalSizeChanged): Deleted.
* UIProcess/API/Cocoa/WKUIDelegatePrivate.h:

The WKWebView and PageClient implementations of this function were actually
not being used, so this patch removes them and just keeps the UIClient stuff.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView performDragOperation:]):
(-[WKWebView _mediaDocumentNaturalSizeChanged:]): Deleted.
* UIProcess/API/Cocoa/WKWebViewInternal.h:

More re-naming.
* UIProcess/Cocoa/UIDelegate.h:
* UIProcess/Cocoa/UIDelegate.mm:
(WebKit::UIDelegate::setDelegate):
(WebKit::UIDelegate::UIClient::UIClient):
(WebKit::UIDelegate::UIClient::didNotHandleTapAsClick):
(WebKit::UIDelegate::UIClient::imageOrMediaDocumentSizeChanged):
(WebKit::UIDelegate::UIClient::mediaDocumentNaturalSizeChanged): Deleted.
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::installViewStateChangeCompletionHandler):
(WebKit::WebPageProxy::imageOrMediaDocumentSizeChanged):
(WebKit::WebPageProxy::setShouldDispatchFakeMouseMoveEvents):
(WebKit::WebPageProxy::mediaDocumentNaturalSizeChanged): Deleted.
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::useFixedLayoutDidChange):
(WebKit::WebPageProxy::fixedLayoutSizeDidChange):
* UIProcess/WebPageProxy.messages.in:

The WKWebView and PageClient implementations of this function were actually
not being used, so this patch removes them and just keeps the UIClient stuff.
* UIProcess/ios/PageClientImplIOS.h:
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::mediaDocumentNaturalSizeChanged): Deleted.
* UIProcess/mac/PageClientImpl.h:
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::mediaDocumentNaturalSizeChanged): Deleted.

More re-naming.
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::imageOrMediaDocumentSizeChanged):
(WebKit::WebChromeClient::mediaDocumentNaturalSizeChanged): Deleted.
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::imageOrMediaDocumentSizeChanged):
(WebKit::WebPage::mediaDocumentNaturalSizeChanged): Deleted.
* WebProcess/WebPage/WebPage.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@188693 268f45cc-cd09-0410-ab3c-d52691b4dbfc

23 files changed:
Source/WebCore/ChangeLog
Source/WebCore/html/ImageDocument.cpp
Source/WebCore/html/MediaDocument.cpp
Source/WebCore/page/ChromeClient.h
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/APIUIClient.h
Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h
Source/WebKit2/UIProcess/Cocoa/UIDelegate.h
Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm
Source/WebKit2/UIProcess/PageClient.h
Source/WebKit2/UIProcess/WebPageProxy.cpp
Source/WebKit2/UIProcess/WebPageProxy.h
Source/WebKit2/UIProcess/WebPageProxy.messages.in
Source/WebKit2/UIProcess/ios/PageClientImplIOS.h
Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm
Source/WebKit2/UIProcess/mac/PageClientImpl.h
Source/WebKit2/UIProcess/mac/PageClientImpl.mm
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.h

index 8a1a6ea..2d6835a 100644 (file)
@@ -1,3 +1,23 @@
+2015-08-20  Beth Dakin  <bdakin@apple.com>
+
+        Standalone image documents should send their size to the UIClient just like 
+        standalone media documents
+        https://bugs.webkit.org/show_bug.cgi?id=148195
+        -and corresponding-
+        rdar://problem/21951253
+
+        Reviewed by Tim Horton.
+
+        This patch re-names mediaDocumentNaturalSizeChanged() to 
+        imageOrMediaDocumentSizeChanged(), and, as the new name implies, uses the 
+        function for both media documents and images.
+
+        * html/ImageDocument.cpp:
+        (WebCore::ImageDocument::imageUpdated):
+        * html/MediaDocument.cpp:
+        (WebCore::MediaDocument::mediaElementNaturalSizeChanged):
+        * page/ChromeClient.h:
+
 2015-08-20  Simon Fraser  <simon.fraser@apple.com>
 
         Add myself as the will-change contact.
index 9ec0212..81b5eee 100644 (file)
@@ -27,6 +27,7 @@
 
 #include "CachedImage.h"
 #include "Chrome.h"
+#include "ChromeClient.h"
 #include "DocumentLoader.h"
 #include "EventListener.h"
 #include "EventNames.h"
@@ -264,6 +265,8 @@ void ImageDocument::imageUpdated()
         FloatSize screenSize = page()->chrome().screenSize();
         if (imageSize.width() > screenSize.width())
             processViewport(String::format("width=%u", static_cast<unsigned>(imageSize.width().toInt())), ViewportArguments::ImageDocument);
+        if (page())
+            page()->chrome().client().imageOrMediaDocumentSizeChanged(IntSize(imageSize.width(), imageSize.height()));
 #else
         // Call windowSizeChanged for its side effect of sizing the image.
         windowSizeChanged();
index 2e8103e..dafbd4b 100644 (file)
@@ -270,7 +270,7 @@ void MediaDocument::mediaElementNaturalSizeChanged(const IntSize& newSize)
         return;
 
     if (page())
-        page()->chrome().client().mediaDocumentNaturalSizeChanged(newSize);
+        page()->chrome().client().imageOrMediaDocumentSizeChanged(newSize);
 }
 
 }
index f6a8ede..eafdefd 100644 (file)
@@ -456,7 +456,7 @@ public:
 #endif
 
 #if ENABLE(VIDEO)
-    virtual void mediaDocumentNaturalSizeChanged(const WebCore::IntSize&) { }
+    virtual void imageOrMediaDocumentSizeChanged(const WebCore::IntSize&) { }
 #if USE(GSTREAMER)
     virtual void requestInstallMissingMediaPlugins(const String& /*details*/, const String& /*description*/, MediaPlayerRequestInstallMissingPluginsCallback&) { };
 #endif
index f6defdd..6bf875a 100644 (file)
@@ -1,3 +1,68 @@
+2015-08-20  Beth Dakin  <bdakin@apple.com>
+
+        Standalone image documents should send their size to the UIClient just like 
+        standalone media documents
+        https://bugs.webkit.org/show_bug.cgi?id=148195
+        -and corresponding-
+        rdar://problem/21951253
+
+        Reviewed by Tim Horton.
+
+        This patch re-names mediaDocumentNaturalSizeChanged() to 
+        imageOrMediaDocumentSizeChanged(), and, as the new name implies, uses the 
+        function for both media documents and images.
+
+        * UIProcess/API/APIUIClient.h:
+        (API::UIClient::didClickAutoFillButton):
+        (API::UIClient::imageOrMediaDocumentSizeChanged):
+        (API::UIClient::mediaDocumentNaturalSizeChanged): Deleted.
+        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+
+        The WKWebView and PageClient implementations of this function were actually 
+        not being used, so this patch removes them and just keeps the UIClient stuff.
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView performDragOperation:]):
+        (-[WKWebView _mediaDocumentNaturalSizeChanged:]): Deleted.
+        * UIProcess/API/Cocoa/WKWebViewInternal.h:
+
+        More re-naming.
+        * UIProcess/Cocoa/UIDelegate.h:
+        * UIProcess/Cocoa/UIDelegate.mm:
+        (WebKit::UIDelegate::setDelegate):
+        (WebKit::UIDelegate::UIClient::UIClient):
+        (WebKit::UIDelegate::UIClient::didNotHandleTapAsClick):
+        (WebKit::UIDelegate::UIClient::imageOrMediaDocumentSizeChanged):
+        (WebKit::UIDelegate::UIClient::mediaDocumentNaturalSizeChanged): Deleted.
+        * UIProcess/PageClient.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::installViewStateChangeCompletionHandler):
+        (WebKit::WebPageProxy::imageOrMediaDocumentSizeChanged):
+        (WebKit::WebPageProxy::setShouldDispatchFakeMouseMoveEvents):
+        (WebKit::WebPageProxy::mediaDocumentNaturalSizeChanged): Deleted.
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::useFixedLayoutDidChange):
+        (WebKit::WebPageProxy::fixedLayoutSizeDidChange):
+        * UIProcess/WebPageProxy.messages.in:
+
+        The WKWebView and PageClient implementations of this function were actually 
+        not being used, so this patch removes them and just keeps the UIClient stuff.
+        * UIProcess/ios/PageClientImplIOS.h:
+        * UIProcess/ios/PageClientImplIOS.mm:
+        (WebKit::PageClientImpl::mediaDocumentNaturalSizeChanged): Deleted.
+        * UIProcess/mac/PageClientImpl.h:
+        * UIProcess/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::mediaDocumentNaturalSizeChanged): Deleted.
+
+        More re-naming.
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::imageOrMediaDocumentSizeChanged):
+        (WebKit::WebChromeClient::mediaDocumentNaturalSizeChanged): Deleted.
+        * WebProcess/WebCoreSupport/WebChromeClient.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::imageOrMediaDocumentSizeChanged):
+        (WebKit::WebPage::mediaDocumentNaturalSizeChanged): Deleted.
+        * WebProcess/WebPage/WebPage.h:
+
 2015-08-19  Eric Carlson  <eric.carlson@apple.com>
 
         Remove ENABLE_WEBVTT_REGIONS
index 0341345..feaf911 100644 (file)
@@ -168,9 +168,7 @@ public:
 
     virtual void didClickAutoFillButton(WebKit::WebPageProxy&, API::Object*) { }
 
-#if ENABLE(VIDEO)
-    virtual void mediaDocumentNaturalSizeChanged(const WebCore::IntSize&) { }
-#endif
+    virtual void imageOrMediaDocumentSizeChanged(const WebCore::IntSize&) { }
 };
 
 } // namespace API
index e946c33..0b22d97 100644 (file)
@@ -54,7 +54,8 @@ struct UIEdgeInsets;
 - (void)_webViewFullscreenMayReturnToInline:(WKWebView *)webView;
 - (void)_webViewDidEnterFullscreen:(WKWebView *)webView WK_AVAILABLE(WK_MAC_TBA, 8_3);
 - (void)_webViewDidExitFullscreen:(WKWebView *)webView WK_AVAILABLE(WK_MAC_TBA, 8_3);
-- (void)_webView:(WKWebView *)webView mediaDocumentNaturalSizeChanged:(CGSize)size;
+
+- (void)_webView:(WKWebView *)webView imageOrMediaDocumentSizeChanged:(CGSize)size WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
 
 #if TARGET_OS_IPHONE
 - (BOOL)_webView:(WKWebView *)webView shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element WK_AVAILABLE(NA, WK_IOS_TBA);
index 1a78f2b..141bf1d 100644 (file)
@@ -1897,15 +1897,6 @@ static WebCore::FloatPoint constrainContentOffset(WebCore::FloatPoint contentOff
 }
 #endif // PLATFORM(MAC)
 
-#if ENABLE(VIDEO)
-- (void)_mediaDocumentNaturalSizeChanged:(NSSize)newSize
-{
-    id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([self UIDelegate]);
-    if ([uiDelegate respondsToSelector:@selector(_webView:mediaDocumentNaturalSizeChanged:)])
-        [uiDelegate _webView:self mediaDocumentNaturalSizeChanged:newSize];
-}
-#endif
-
 @end
 
 @implementation WKWebView (WKPrivate)
index 3a7a62d..d2def23 100644 (file)
@@ -116,10 +116,6 @@ struct PrintInfo;
 
 - (WKPageRef)_pageForTesting;
 
-#if ENABLE(VIDEO)
-- (void)_mediaDocumentNaturalSizeChanged:(CGSize)newSize;
-#endif
-
 @end
 
 WKWebView* fromWebPageProxy(WebKit::WebPageProxy&);
index 7e71dba..e3b151b 100644 (file)
@@ -76,9 +76,7 @@ private:
         virtual RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) override;
         virtual void didNotHandleTapAsClick(const WebCore::IntPoint&) override;
 #endif
-#if ENABLE(VIDEO)
-        virtual void mediaDocumentNaturalSizeChanged(const WebCore::IntSize&) override;
-#endif
+        virtual void imageOrMediaDocumentSizeChanged(const WebCore::IntSize&) override;
 
         UIDelegate& m_uiDelegate;
     };
@@ -106,9 +104,7 @@ private:
         bool webViewActionsForElementDefaultActions : 1;
         bool webViewDidNotHandleTapAsClickAtPoint : 1;
 #endif
-#if ENABLE(VIDEO)
-        bool webViewMediaDocumentNaturalSizeChanged : 1;
-#endif
+        bool webViewImageOrMediaDocumentSizeChanged : 1;
     } m_delegateMethods;
 };
 
index a28a9c9..d3cf5de 100644 (file)
@@ -85,9 +85,7 @@ void UIDelegate::setDelegate(id <WKUIDelegate> delegate)
     m_delegateMethods.webViewActionsForElementDefaultActions = [delegate respondsToSelector:@selector(_webView:actionsForElement:defaultActions:)];
     m_delegateMethods.webViewDidNotHandleTapAsClickAtPoint = [delegate respondsToSelector:@selector(_webView:didNotHandleTapAsClickAtPoint:)];
 #endif
-#if ENABLE(VIDEO)
-    m_delegateMethods.webViewMediaDocumentNaturalSizeChanged = [delegate respondsToSelector:@selector(_webView:mediaDocumentNaturalSizeChanged:)];
-#endif
+    m_delegateMethods.webViewImageOrMediaDocumentSizeChanged = [delegate respondsToSelector:@selector(_webView:imageOrMediaDocumentSizeChanged:)];
 }
 
 UIDelegate::UIClient::UIClient(UIDelegate& uiDelegate)
@@ -343,19 +341,17 @@ void UIDelegate::UIClient::didNotHandleTapAsClick(const WebCore::IntPoint& point
 }
 #endif
 
-#if ENABLE(VIDEO)
-void UIDelegate::UIClient::mediaDocumentNaturalSizeChanged(const WebCore::IntSize& newSize)
+void UIDelegate::UIClient::imageOrMediaDocumentSizeChanged(const WebCore::IntSize& newSize)
 {
-    if (!m_uiDelegate.m_delegateMethods.webViewMediaDocumentNaturalSizeChanged)
+    if (!m_uiDelegate.m_delegateMethods.webViewImageOrMediaDocumentSizeChanged)
         return;
 
     auto delegate = m_uiDelegate.m_delegate.get();
     if (!delegate)
         return;
 
-    [static_cast<id <WKUIDelegatePrivate>>(delegate) _webView:m_uiDelegate.m_webView mediaDocumentNaturalSizeChanged:newSize];
+    [static_cast<id <WKUIDelegatePrivate>>(delegate) _webView:m_uiDelegate.m_webView imageOrMediaDocumentSizeChanged:newSize];
 }
-#endif
 
 } // namespace WebKit
 
index 1d00feb..e687fda 100644 (file)
@@ -337,10 +337,6 @@ public:
     virtual WebCore::WebMediaSessionManager& mediaSessionManager() = 0;
 #endif
 
-#if ENABLE(VIDEO)
-    virtual void mediaDocumentNaturalSizeChanged(const WebCore::IntSize&) = 0;
-#endif
-
     virtual void refView() = 0;
     virtual void derefView() = 0;
 
index 01244c9..dc322c4 100644 (file)
@@ -6046,12 +6046,10 @@ void WebPageProxy::installViewStateChangeCompletionHandler(void (^completionHand
 }
 #endif
 
-#if ENABLE(VIDEO)
-void WebPageProxy::mediaDocumentNaturalSizeChanged(const WebCore::IntSize& newSize)
+void WebPageProxy::imageOrMediaDocumentSizeChanged(const WebCore::IntSize& newSize)
 {
-    m_uiClient->mediaDocumentNaturalSizeChanged(newSize);
+    m_uiClient->imageOrMediaDocumentSizeChanged(newSize);
 }
-#endif
 
 void WebPageProxy::setShouldDispatchFakeMouseMoveEvents(bool shouldDispatchFakeMouseMoveEvents)
 {
index 6c18d85..89be9a9 100644 (file)
@@ -1455,8 +1455,8 @@ private:
     void useFixedLayoutDidChange(bool useFixedLayout) { m_useFixedLayout = useFixedLayout; }
     void fixedLayoutSizeDidChange(WebCore::IntSize fixedLayoutSize) { m_fixedLayoutSize = fixedLayoutSize; }
 
+    void imageOrMediaDocumentSizeChanged(const WebCore::IntSize&);
 #if ENABLE(VIDEO)
-    void mediaDocumentNaturalSizeChanged(const WebCore::IntSize&);
 #if USE(GSTREAMER)
     void requestInstallMissingMediaPlugins(const String& details, const String& description);
 #endif
index d5cc211..e2c1b9d 100644 (file)
@@ -445,9 +445,7 @@ messages -> WebPageProxy {
     PlaybackTargetPickerClientStateDidChange(uint64_t contextId, unsigned mediaState)
 #endif
 
-#if ENABLE(VIDEO)
-    MediaDocumentNaturalSizeChanged(WebCore::IntSize newSize)
-#endif
+    ImageOrMediaDocumentSizeChanged(WebCore::IntSize newSize)
 
     UseFixedLayoutDidChange(bool useFixedLayout)
     FixedLayoutSizeDidChange(WebCore::IntSize fixedLayoutSize)
index 3b841a0..038cd4e 100644 (file)
@@ -186,10 +186,6 @@ private:
 
     virtual void didChangeBackgroundColor() override;
 
-#if ENABLE(VIDEO)
-    virtual void mediaDocumentNaturalSizeChanged(const WebCore::IntSize&) override;
-#endif
-
     virtual void refView() override;
     virtual void derefView() override;
 
index ec45487..f4918b6 100644 (file)
@@ -739,14 +739,6 @@ void PageClientImpl::didChangeBackgroundColor()
     [m_webView _updateScrollViewBackground];
 }
 
-#if ENABLE(VIDEO)
-void PageClientImpl::mediaDocumentNaturalSizeChanged(const IntSize& newSize)
-{
-    [m_webView _mediaDocumentNaturalSizeChanged:newSize];
-}
-#endif
-
-
 void PageClientImpl::refView()
 {
     [m_contentView retain];
index 38ddc5c..3d18252 100644 (file)
@@ -203,10 +203,6 @@ private:
 
     virtual void didChangeBackgroundColor() override;
 
-#if ENABLE(VIDEO)
-    virtual void mediaDocumentNaturalSizeChanged(const WebCore::IntSize&) override;
-#endif
-
     WKView *m_wkView;
     WKWebView *m_webView;
     RetainPtr<WKEditorUndoTargetObjC> m_undoTarget;
index fa79f9c..b1d5689 100644 (file)
@@ -845,15 +845,6 @@ WebCore::WebMediaSessionManager& PageClientImpl::mediaSessionManager()
 }
 #endif
 
-#if ENABLE(VIDEO)
-void PageClientImpl::mediaDocumentNaturalSizeChanged(const IntSize& newSize)
-{
-#if WK_API_ENABLED
-    [m_webView _mediaDocumentNaturalSizeChanged:newSize];
-#endif
-}
-#endif
-
 void PageClientImpl::refView()
 {
     CFRetain(m_wkView);
index ac82ad1..6b07c50 100644 (file)
@@ -1163,12 +1163,12 @@ void WebChromeClient::playbackTargetPickerClientStateDidChange(uint64_t contextI
 }
 #endif
 
-#if ENABLE(VIDEO)
-void WebChromeClient::mediaDocumentNaturalSizeChanged(const WebCore::IntSize& newSize)
+void WebChromeClient::imageOrMediaDocumentSizeChanged(const WebCore::IntSize& newSize)
 {
-    m_page->mediaDocumentNaturalSizeChanged(newSize);
+    m_page->imageOrMediaDocumentSizeChanged(newSize);
 }
 
+#if ENABLE(VIDEO)
 #if USE(GSTREAMER)
 void WebChromeClient::requestInstallMissingMediaPlugins(const String& details, const String& description, WebCore::MediaPlayerRequestInstallMissingPluginsCallback& callback)
 {
index 20952d1..70e2b1e 100644 (file)
@@ -325,8 +325,8 @@ private:
     virtual void playbackTargetPickerClientStateDidChange(uint64_t, WebCore::MediaProducer::MediaStateFlags) override;
 #endif
 
+    virtual void imageOrMediaDocumentSizeChanged(const WebCore::IntSize&) override;
 #if ENABLE(VIDEO)
-    virtual void mediaDocumentNaturalSizeChanged(const WebCore::IntSize&) override;
 #if USE(GSTREAMER)
     virtual void requestInstallMissingMediaPlugins(const String& /*details*/, const String& /*description*/, WebCore::MediaPlayerRequestInstallMissingPluginsCallback&) override;
 #endif
index e2798c1..a6dce7e 100644 (file)
@@ -5052,11 +5052,9 @@ void WebPage::setUserContentExtensionsEnabled(bool userContentExtensionsEnabled)
     m_page->setUserContentExtensionsEnabled(userContentExtensionsEnabled);
 }
 
-#if ENABLE(VIDEO)
-void WebPage::mediaDocumentNaturalSizeChanged(const IntSize& newSize)
+void WebPage::imageOrMediaDocumentSizeChanged(const IntSize& newSize)
 {
-    send(Messages::WebPageProxy::MediaDocumentNaturalSizeChanged(newSize));
+    send(Messages::WebPageProxy::ImageOrMediaDocumentSizeChanged(newSize));
 }
-#endif
 
 } // namespace WebKit
index d240b3a..a6605a5 100644 (file)
@@ -906,8 +906,8 @@ public:
     void setInputMethodState(bool);
 #endif
 
+    void imageOrMediaDocumentSizeChanged(const WebCore::IntSize&);
 #if ENABLE(VIDEO)
-    void mediaDocumentNaturalSizeChanged(const WebCore::IntSize&);
 #if USE(GSTREAMER)
     void requestInstallMissingMediaPlugins(const String& details, const String& description, WebCore::MediaPlayerRequestInstallMissingPluginsCallback&);
 #endif