Diff
Modified: trunk/Source/WebKit2/ChangeLog (146401 => 146402)
--- trunk/Source/WebKit2/ChangeLog 2013-03-20 22:39:23 UTC (rev 146401)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-20 22:40:59 UTC (rev 146402)
@@ -1,3 +1,22 @@
+2013-03-20 Benjamin Poulain <[email protected]>
+
+ [WK2] Remove VIEW_MODE_CSS_MEDIA from WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=112849
+
+ Reviewed by Sam Weinig.
+
+ The code was added in r137148 for the sole purpose of testing,
+ and it is not even being properly tested.
+
+ Remove the code until someone actually implement the feature in WebKit2.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ (WKBundlePageCanShowMIMEType):
+ * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ * WebProcess/WebPage/WebPage.h:
+ (WebPage):
+
2013-03-20 Zan Dobersek <[email protected]>
[GTK] Build ANGLE sources into a separate library from libWebCore.la
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (146401 => 146402)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2013-03-20 22:39:23 UTC (rev 146401)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2013-03-20 22:40:59 UTC (rev 146402)
@@ -469,22 +469,3 @@
{
return toImpl(pageRef)->canShowMIMEType(toWTFString(mimeTypeRef));
}
-
-#if ENABLE(VIEW_MODE_CSS_MEDIA)
-void WKBundlePageSetViewMode(WKBundlePageRef pageRef, WKStringRef mode)
-{
- String modeWTF = toWTFString(mode);
- if (modeWTF == "windowed")
- toImpl(pageRef)->setViewMode(WebCore::Page::ViewModeWindowed);
- else if (modeWTF == "floating")
- toImpl(pageRef)->setViewMode(WebCore::Page::ViewModeFloating);
- else if (modeWTF == "fullscreen")
- toImpl(pageRef)->setViewMode(WebCore::Page::ViewModeFullscreen);
- else if (modeWTF == "maximized")
- toImpl(pageRef)->setViewMode(WebCore::Page::ViewModeMaximized);
- else if (modeWTF == "minimized")
- toImpl(pageRef)->setViewMode(WebCore::Page::ViewModeMinimized);
- else
- ASSERT_NOT_REACHED();
-}
-#endif // ENABLE(VIEW_MODE_CSS_MEDIA)
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h (146401 => 146402)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2013-03-20 22:39:23 UTC (rev 146401)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2013-03-20 22:40:59 UTC (rev 146402)
@@ -79,9 +79,6 @@
WK_EXPORT WKArrayRef WKBundlePageCopyContextMenuItemTitles(WKBundlePageRef);
-#if ENABLE(VIEW_MODE_CSS_MEDIA)
-WK_EXPORT void WKBundlePageSetViewMode(WKBundlePageRef pageRef, WKStringRef mode);
-#endif // ENABLE(VIEW_MODE_CSS_MEDIA)
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (146401 => 146402)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-03-20 22:39:23 UTC (rev 146401)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-03-20 22:40:59 UTC (rev 146402)
@@ -1181,13 +1181,6 @@
m_page->windowScreenDidChange(static_cast<PlatformDisplayID>(displayID));
}
-#if ENABLE(VIEW_MODE_CSS_MEDIA)
-void WebPage::setViewMode(Page::ViewMode mode)
-{
- m_page->setViewMode(mode);
-}
-#endif // ENABLE(VIEW_MODE_CSS_MEDIA)
-
void WebPage::scalePage(double scale, const IntPoint& origin)
{
PluginView* pluginView = pluginViewForFrame(m_page->mainFrame());
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (146401 => 146402)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2013-03-20 22:39:23 UTC (rev 146401)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2013-03-20 22:40:59 UTC (rev 146402)
@@ -315,9 +315,6 @@
void setPageZoomFactor(double);
void setPageAndTextZoomFactors(double pageZoomFactor, double textZoomFactor);
void windowScreenDidChange(uint64_t);
-#if ENABLE(VIEW_MODE_CSS_MEDIA)
- void setViewMode(WebCore::Page::ViewMode);
-#endif // ENABLE(VIEW_MODE_CSS_MEDIA)
void scalePage(double scale, const WebCore::IntPoint& origin);
double pageScaleFactor() const;
Modified: trunk/Tools/ChangeLog (146401 => 146402)
--- trunk/Tools/ChangeLog 2013-03-20 22:39:23 UTC (rev 146401)
+++ trunk/Tools/ChangeLog 2013-03-20 22:40:59 UTC (rev 146402)
@@ -1,3 +1,14 @@
+2013-03-20 Benjamin Poulain <[email protected]>
+
+ [WK2] Remove VIEW_MODE_CSS_MEDIA from WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=112849
+
+ Reviewed by Sam Weinig.
+
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+
2013-03-20 Brent Fulgham <[email protected]>
[WinCairo] Build WebKit Tools under VS2010
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (146401 => 146402)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2013-03-20 22:39:23 UTC (rev 146401)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2013-03-20 22:40:59 UTC (rev 146402)
@@ -155,7 +155,6 @@
// Control full screen behavior.
void setHasCustomFullScreenBehavior(in boolean value);
- void setViewModeMediaFeature(in DOMString mode);
// Web notifications support
void grantWebNotificationPermission(in DOMString origin);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (146401 => 146402)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2013-03-20 22:39:23 UTC (rev 146401)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2013-03-20 22:40:59 UTC (rev 146402)
@@ -780,16 +780,6 @@
InjectedBundle::shared().queueNonLoadingScript(scriptWK.get());
}
-void TestRunner::setViewModeMediaFeature(JSStringRef mode)
-{
-#if ENABLE(VIEW_MODE_CSS_MEDIA)
- WKRetainPtr<WKStringRef> modeWK = toWK(mode);
- WKBundlePageSetViewMode(InjectedBundle::shared().page()->page(), modeWK.get());
-#else
- UNUSED_PARAM(mode);
-#endif // ENABLE(VIEW_MODE_CSS_MEDIA)
-}
-
void TestRunner::setHandlesAuthenticationChallenges(bool handlesAuthenticationChallenges)
{
WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetHandlesAuthenticationChallenge"));
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (146401 => 146402)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2013-03-20 22:39:23 UTC (rev 146401)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2013-03-20 22:40:59 UTC (rev 146402)
@@ -240,7 +240,6 @@
// Custom full screen behavior.
void setHasCustomFullScreenBehavior(bool value) { m_customFullScreenBehavior = value; }
bool hasCustomFullScreenBehavior() const { return m_customFullScreenBehavior; }
- void setViewModeMediaFeature(JSStringRef);
// Web notifications.
void grantWebNotificationPermission(JSStringRef origin);
