Diff
Modified: trunk/Source/WebKit2/ChangeLog (160296 => 160297)
--- trunk/Source/WebKit2/ChangeLog 2013-12-09 04:11:00 UTC (rev 160296)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-09 04:23:16 UTC (rev 160297)
@@ -1,5 +1,13 @@
2013-12-08 Sam Weinig <s...@webkit.org>
+ Fix the iOS build.
+
+ * UIProcess/API/ios/PageClientImplIOS.h:
+ * UIProcess/API/ios/PageClientImplIOS.mm:
+ * UIProcess/ios/WebFullScreenManagerProxyIOS.mm: Removed.
+
+2013-12-08 Sam Weinig <s...@webkit.org>
+
[Cocoa] Remove knowledge of the WKView from the WebFullScreenManagerProxy by adding a proper client
https://bugs.webkit.org/show_bug.cgi?id=125427
Modified: trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h (160296 => 160297)
--- trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h 2013-12-09 04:11:00 UTC (rev 160296)
+++ trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h 2013-12-09 04:23:16 UTC (rev 160297)
@@ -27,18 +27,24 @@
#define PageClientImplIOS_h
#import "PageClient.h"
+#import "WebFullScreenManagerProxy.h"
#import <wtf/RetainPtr.h>
@class WKContentView;
namespace WebKit {
-class PageClientImpl : public PageClient {
+class PageClientImpl : public PageClient
+#if ENABLE(FULLSCREEN_API)
+ , public WebFullScreenManagerProxyClient
+#endif
+ {
public:
explicit PageClientImpl(WKContentView *);
virtual ~PageClientImpl();
private:
+ // PageClient
virtual std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy() OVERRIDE;
virtual void setViewNeedsDisplay(const WebCore::IntRect&) OVERRIDE;
virtual void displayView() OVERRIDE;
@@ -102,6 +108,21 @@
virtual void selectionDidChange() OVERRIDE;
virtual bool interpretKeyEvent(const NativeWebKeyboardEvent&, bool isCharEvent) OVERRIDE;
+ // Auxiliary Client Creation
+#if ENABLE(FULLSCREEN_API)
+ virual WebFullScreenManagerProxyClient& fullScreenManagerProxyClient() OVERRIDE;
+#endif
+
+#if ENABLE(FULLSCREEN_API)
+ // WebFullScreenManagerProxyClient
+ virtual void closeFullScreenManager() OVERRIDE;
+ virtual bool isFullScreen() OVERRIDE;
+ virtual void enterFullScreen() OVERRIDE;
+ virtual void exitFullScreen() OVERRIDE;
+ virtual void beganEnterFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) OVERRIDE;
+ virtual void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) OVERRIDE;
+#endif
+
WKContentView *m_view;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm (160296 => 160297)
--- trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm 2013-12-09 04:11:00 UTC (rev 160296)
+++ trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm 2013-12-09 04:23:16 UTC (rev 160297)
@@ -341,4 +341,40 @@
[m_view _stopAssistingNode];
}
+#if ENABLE(FULLSCREEN_API)
+
+WebFullScreenManagerProxyClient& PageClientImpl::fullScreenManagerProxyClient()
+{
+ return *this;
+}
+
+// WebFullScreenManagerProxyClient
+
+void PageClientImpl::closeFullScreenManager()
+{
+}
+
+bool PageClientImpl::isFullScreen()
+{
+ return false;
+}
+
+void PageClientImpl::enterFullScreen()
+{
+}
+
+void PageClientImpl::exitFullScreen()
+{
+}
+
+void PageClientImpl::beganEnterFullScreen(const IntRect&, const IntRect&)
+{
+}
+
+void PageClientImpl::beganExitFullScreen(const IntRect&, const IntRect&)
+{
+}
+
+#endif // ENABLE(FULLSCREEN_API)
+
} // namespace WebKit
Deleted: trunk/Source/WebKit2/UIProcess/ios/WebFullScreenManagerProxyIOS.mm (160296 => 160297)
--- trunk/Source/WebKit2/UIProcess/ios/WebFullScreenManagerProxyIOS.mm 2013-12-09 04:11:00 UTC (rev 160296)
+++ trunk/Source/WebKit2/UIProcess/ios/WebFullScreenManagerProxyIOS.mm 2013-12-09 04:23:16 UTC (rev 160297)
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "WebFullScreenManagerProxy.h"
-
-#if ENABLE(FULLSCREEN_API) && PLATFORM(IOS)
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void WebFullScreenManagerProxy::invalidate()
-{
- if (!m_webView)
- return;
-
- m_webView = 0;
-}
-
-void WebFullScreenManagerProxy::close()
-{
- // No-op.
-}
-
-bool WebFullScreenManagerProxy::isFullScreen()
-{
- return false;
-}
-
-void WebFullScreenManagerProxy::enterFullScreen()
-{
- // No-op.
-}
-
-void WebFullScreenManagerProxy::exitFullScreen()
-{
- // No-op.
-}
-
-void WebFullScreenManagerProxy::beganEnterFullScreen(const IntRect& initialFrame, const IntRect& finalFrame)
-{
- // No-op.
-}
-
-void WebFullScreenManagerProxy::beganExitFullScreen(const IntRect& initialFrame, const IntRect& finalFrame)
-{
- // No-op.
-}
-
-} // namespace WebKit
-
-#endif
