2010-04-14 Luiz Agostini <luiz.agostini@openbossa.org>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Apr 2010 04:04:50 +0000 (04:04 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Apr 2010 04:04:50 +0000 (04:04 +0000)
        Reviewed by Kenneth Rohde Christiansen.

        Changing view mode names due to specification changes
        https://bugs.webkit.org/show_bug.cgi?id=37615

        specification: http://dev.w3.org/2006/waf/widgets-vmmf/

        * fast/media/media-feature-wgt-view-mode.html:
2010-04-14  Luiz Agostini  <luiz.agostini@openbossa.org>

        Reviewed by Kenneth Rohde Christiansen.

        Changing view mode names due to specification changes
        https://bugs.webkit.org/show_bug.cgi?id=37615

        test: fast/media/media-feature-wgt-view-mode.html

        specification: http://dev.w3.org/2006/waf/widgets-vmmf/

        * css/MediaQueryEvaluator.cpp:
        (WebCore::view_modeMediaFeatureEval):
        * page/ChromeClient.h:
        (WebCore::ChromeClient::isWindowed):
        (WebCore::ChromeClient::isMaximized):
        (WebCore::ChromeClient::isMinimized):
2010-04-14  Luiz Agostini  <luiz.agostini@openbossa.org>

        Reviewed by Kenneth Rohde Christiansen.

        Changing view mode names due to specification changes
        https://bugs.webkit.org/show_bug.cgi?id=37615

        test: fast/media/media-feature-wgt-view-mode.html

        specification: http://dev.w3.org/2006/waf/widgets-vmmf/

        * WebCoreSupport/ChromeClientQt.cpp:
        (WebCore::ChromeClientQt::isWindowed):
        (WebCore::ChromeClientQt::isFullscreen):
        (WebCore::ChromeClientQt::isMaximized):
        (WebCore::ChromeClientQt::isMinimized):
        * WebCoreSupport/ChromeClientQt.h:

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

LayoutTests/ChangeLog
LayoutTests/fast/media/media-feature-wgt-view-mode.html
WebCore/ChangeLog
WebCore/css/MediaQueryEvaluator.cpp
WebCore/page/ChromeClient.h
WebKit/qt/ChangeLog
WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
WebKit/qt/WebCoreSupport/ChromeClientQt.h

index 169b74c..bcc8424 100644 (file)
@@ -1,3 +1,14 @@
+2010-04-14  Luiz Agostini  <luiz.agostini@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Changing view mode names due to specification changes
+        https://bugs.webkit.org/show_bug.cgi?id=37615
+
+        specification: http://dev.w3.org/2006/waf/widgets-vmmf/
+
+        * fast/media/media-feature-wgt-view-mode.html:
+
 2010-04-14  Justin Schuh  <jschuh@chromium.org>
 
         Reviewed by Adam Barth.
index 73b3e0c..4edd067 100644 (file)
@@ -4,7 +4,7 @@
         div {
             background-color: red;
         }
-        @media (-webkit-view-mode: mini) {
+        @media (-webkit-view-mode: minimized) {
             body {
                 background-color: blue;
             }
@@ -17,7 +17,7 @@
     </style>
     <script>
         if (window.layoutTestController)
-            layoutTestController.setViewModeMediaFeature("mini");
+            layoutTestController.setViewModeMediaFeature("minimized");
     </script>
 </head>
 <body>
index bdd5515..cdafb53 100644 (file)
@@ -1,3 +1,21 @@
+2010-04-14  Luiz Agostini  <luiz.agostini@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Changing view mode names due to specification changes
+        https://bugs.webkit.org/show_bug.cgi?id=37615
+
+        test: fast/media/media-feature-wgt-view-mode.html
+
+        specification: http://dev.w3.org/2006/waf/widgets-vmmf/
+
+        * css/MediaQueryEvaluator.cpp:
+        (WebCore::view_modeMediaFeatureEval):
+        * page/ChromeClient.h:
+        (WebCore::ChromeClient::isWindowed):
+        (WebCore::ChromeClient::isMaximized):
+        (WebCore::ChromeClient::isMinimized):
+
 2010-04-14  Adam Barth  <abarth@webkit.org>
 
         Unreviewed attempt to fix Qt build.
index 4fda075..ded40b5 100644 (file)
@@ -501,14 +501,16 @@ static bool view_modeMediaFeatureEval(CSSValue* value, RenderStyle*, Frame* fram
     if (value) {
         String mode = static_cast<CSSPrimitiveValue*>(value)->getStringValue();
         if (ChromeClient* client = frame->page()->chrome()->client()) {
-            if (mode == "mini" && client->isDocked())
+            if (mode == "windowed" && client->isWindowed())
                 return true;
             if (mode == "floating" && client->isFloating())
                 return true;
-            if (mode == "application" && client->isApplication())
-                return true;
             if (mode == "fullscreen" && client->isFullscreen())
                 return true;
+            if (mode == "maximized" && client->isMaximized())
+                return true;
+            if (mode == "minimized" && client->isMinimized())
+                return true;
             return false;
         }
     }
index 70f74c6..0967cea 100644 (file)
@@ -231,10 +231,11 @@ namespace WebCore {
 #endif
 
 #if ENABLE(WIDGETS_10_SUPPORT)
-        virtual bool isDocked() { return false; }
+        virtual bool isWindowed() { return false; }
         virtual bool isFloating() { return false; }
-        virtual bool isApplication() { return false; }
         virtual bool isFullscreen() { return false; }
+        virtual bool isMaximized() { return false; }
+        virtual bool isMinimized() { return false; }
 #endif
 
     protected:
index a205bda..b986a7b 100644 (file)
@@ -1,5 +1,23 @@
 2010-04-14  Luiz Agostini  <luiz.agostini@openbossa.org>
 
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Changing view mode names due to specification changes
+        https://bugs.webkit.org/show_bug.cgi?id=37615
+
+        test: fast/media/media-feature-wgt-view-mode.html
+
+        specification: http://dev.w3.org/2006/waf/widgets-vmmf/
+
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::isWindowed):
+        (WebCore::ChromeClientQt::isFullscreen):
+        (WebCore::ChromeClientQt::isMaximized):
+        (WebCore::ChromeClientQt::isMinimized):
+        * WebCoreSupport/ChromeClientQt.h:
+
+2010-04-14  Luiz Agostini  <luiz.agostini@openbossa.org>
+
         Reviewed by Simon Hausmann.
 
         [Qt] Moving setViewMode from DumpRenderTreeSupportQt to qwebpage.cpp
index 6286c51..5378e7c 100644 (file)
@@ -562,9 +562,9 @@ QtAbstractWebPopup* ChromeClientQt::createSelectPopup()
 }
 
 #if ENABLE(WIDGETS_10_SUPPORT)
-bool ChromeClientQt::isDocked()
+bool ChromeClientQt::isWindowed()
 {
-    return m_webPage->d->viewMode == "mini";
+    return m_webPage->d->viewMode == "windowed";
 }
 
 bool ChromeClientQt::isFloating()
@@ -572,14 +572,19 @@ bool ChromeClientQt::isFloating()
     return m_webPage->d->viewMode == "floating";
 }
 
-bool ChromeClientQt::isApplication()
+bool ChromeClientQt::isFullscreen()
 {
-    return m_webPage->d->viewMode == "application";
+    return m_webPage->d->viewMode == "fullscreen";
 }
 
-bool ChromeClientQt::isFullscreen()
+bool ChromeClientQt::isMaximized()
 {
-    return m_webPage->d->viewMode == "fullscreen";
+    return m_webPage->d->viewMode == "maximized";
+}
+
+bool ChromeClientQt::isMinimized()
+{
+    return m_webPage->d->viewMode == "minimized";
 }
 #endif
 
index 85eb854..f61d9e4 100644 (file)
@@ -159,10 +159,11 @@ namespace WebCore {
         virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { }
 
 #if ENABLE(WIDGETS_10_SUPPORT)
-        virtual bool isDocked();
+        virtual bool isWindowed();
         virtual bool isFloating();
-        virtual bool isApplication();
         virtual bool isFullscreen();
+        virtual bool isMaximized();
+        virtual bool isMinimized();
 #endif
 
         QtAbstractWebPopup* createSelectPopup();