[webkit-changes] [129745] trunk/Source

Thu, 27 Sep 2012 02:43:02 -0700

Title: [129745] trunk/Source
Revision
129745
Author
[email protected]
Date
2012-09-27 02:44:05 -0700 (Thu, 27 Sep 2012)

Log Message

[EFL] No way to exit video fullscreen mode once entered
https://bugs.webkit.org/show_bug.cgi?id=97631

Patch by Christophe Dumez <[email protected]> on 2012-09-27
Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

Show fullscreen media control in fullscreen so that
we now have a way to exit fullscreen mode.

No new tests, no behavior change for layout tests.

* css/mediaControlsEflFullscreen.css:
* platform/efl/RenderThemeEfl.cpp:
(WebCore::RenderThemeEfl::emitMediaButtonSignal):
(WebCore::RenderThemeEfl::paintMediaFullscreenButton):

Source/WebKit/efl:

Fix default theme so that we have 2 fullscreen buttons, one
to enter fullscreen mode and another to exit it.

New icon by Alexander Shalamov.

* DefaultTheme/widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png: Added.
* DefaultTheme/widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png: Added.
* DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreen_button.edc:
* DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreenbutton.png: Removed.

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (129744 => 129745)


--- trunk/Source/WebCore/ChangeLog	2012-09-27 09:40:54 UTC (rev 129744)
+++ trunk/Source/WebCore/ChangeLog	2012-09-27 09:44:05 UTC (rev 129745)
@@ -1,3 +1,20 @@
+2012-09-27  Christophe Dumez  <[email protected]>
+
+        [EFL] No way to exit video fullscreen mode once entered
+        https://bugs.webkit.org/show_bug.cgi?id=97631
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Show fullscreen media control in fullscreen so that
+        we now have a way to exit fullscreen mode.
+
+        No new tests, no behavior change for layout tests.
+
+        * css/mediaControlsEflFullscreen.css:
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::emitMediaButtonSignal):
+        (WebCore::RenderThemeEfl::paintMediaFullscreenButton):
+
 2012-09-27  Yoshifumi Inoue  <[email protected]>
 
         [Forms] BaseMultipleFieldsDateAndTimeInputType class should inherit DateTimeEditElement::EditControlOwner rather than containing

Modified: trunk/Source/WebCore/css/mediaControlsEflFullscreen.css (129744 => 129745)


--- trunk/Source/WebCore/css/mediaControlsEflFullscreen.css	2012-09-27 09:40:54 UTC (rev 129744)
+++ trunk/Source/WebCore/css/mediaControlsEflFullscreen.css	2012-09-27 09:44:05 UTC (rev 129745)
@@ -111,10 +111,6 @@
     display: none;
 }
 
-video:-webkit-full-screen::-webkit-media-controls-fullscreen-button {
-    display: none;
-}
-
 video:-webkit-full-screen::-webkit-media-controls-rewind-button {
     display: none;
 }

Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp (129744 => 129745)


--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp	2012-09-27 09:40:54 UTC (rev 129744)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp	2012-09-27 09:44:05 UTC (rev 129745)
@@ -1063,7 +1063,9 @@
     else if (mediaElementType == MediaSeekBackButton)
         edje_object_signal_emit(entry->edje(), "seekbackward", "");
     else if (mediaElementType == MediaEnterFullscreenButton)
-        edje_object_signal_emit(entry->edje(), "fullscreen", "");
+        edje_object_signal_emit(entry->edje(), "fullscreen_enter", "");
+    else if (mediaElementType == MediaExitFullscreenButton)
+        edje_object_signal_emit(entry->edje(), "fullscreen_exit", "");
 #if ENABLE(VIDEO_TRACK)
     else if (mediaElementType == MediaShowClosedCaptionsButton)
         edje_object_signal_emit(entry->edje(), "show_captions", "");
@@ -1103,10 +1105,11 @@
     Node* mediaNode = object->node() ? object->node()->shadowHost() : 0;
     if (!mediaNode)
         mediaNode = object->node();
-    if (!mediaNode || (!mediaNode->hasTagName(videoTag)))
+    if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(mediaNode)->isMediaElement())
         return false;
 
-    if (!emitMediaButtonSignal(FullScreenButton, MediaEnterFullscreenButton, rect))
+    HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(mediaNode);
+    if (!emitMediaButtonSignal(FullScreenButton, mediaElement->isFullscreen() ? MediaExitFullscreenButton : MediaEnterFullscreenButton, rect))
         return false;
 
     return paintThemePart(object, FullScreenButton, info, rect);

Modified: trunk/Source/WebKit/efl/ChangeLog (129744 => 129745)


--- trunk/Source/WebKit/efl/ChangeLog	2012-09-27 09:40:54 UTC (rev 129744)
+++ trunk/Source/WebKit/efl/ChangeLog	2012-09-27 09:44:05 UTC (rev 129745)
@@ -1,3 +1,20 @@
+2012-09-27  Christophe Dumez  <[email protected]>
+
+        [EFL] No way to exit video fullscreen mode once entered
+        https://bugs.webkit.org/show_bug.cgi?id=97631
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Fix default theme so that we have 2 fullscreen buttons, one
+        to enter fullscreen mode and another to exit it.
+
+        New icon by Alexander Shalamov.
+
+        * DefaultTheme/widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png: Added.
+        * DefaultTheme/widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png: Added.
+        * DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreen_button.edc:
+        * DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreenbutton.png: Removed.
+
 2012-09-26  Jinwoo Song  <[email protected]>
 
         [EFL] Fix the typo in the ewk_view_fullscreen_exit()

Added: trunk/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png (0 => 129745)


--- trunk/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png	                        (rev 0)
+++ trunk/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png	2012-09-27 09:44:05 UTC (rev 129745)
@@ -0,0 +1,9 @@
+\x89PNG
+
+
+IHDRIH\x8D\xF1(KsRGB\xAE\xCE\xE9MPLTE\xD3\xFC\xE410+SRI{uqlifdba`~wpkcyhojsxrmnhxvgeepjl
+
+q~}su		yzdl|  hf\\x87\x8B\x8C\x88\x84\x87\x86\x80\x86
+
+\x82\x83\x81\x92??\x8E  \x9311\x8922\x8E99\x91!!\x88((\x90::\x89))\x9ALL\x9FJJ\x9BHH\xA6CC\xA7]]\xA0KK\xB6ff\xB1rr\xB3tt\xA8bb\xBAgg\xB2ss\xB9ww\xBF\x8C\x8C\xBF\x86\x86\xB9\x83\x83Ǎ\x8DƗ\x97ɟ\x9Fٽ\xBD֯\xAFӲ\xB2׵\xB5ۿ\xBFϣ\xA3پ\xBEʠ\xA0\xDD\xD9\xC3\xFF\xC0\xE2\xCB\xCB\xE9\xDE\xDE\xE8\xDD\xDD\xE2\xD1\xD1\xE5\xD3\xD3\xE3\xD2\xD2\xF2\xF2\xF2\xEC\xE6\xE6\xEE\xE8\xE8\xED\xE7\xE7$\xA0\x9D\xE3tRNS@\xE6\xD8fbKGD\x88H	pHYsg\x9F\xD2RtIME\xDC	1\xBE\xAA2\x9B\x94IDATX\xC3\xED\xD7\xD7R\xC2@`P	\x90@\x96\x98h@\xBB\xA2 \xF6\xDE{/\xD8\xF4\xFD/\xDD$\xA2H\xC9\xECѽb\xF6\xDC0sH\xBE,[\xFE	\xBDz\xA4SLb\x93\xEAH\xB3\xAA\xC9L\xB2\x82\xCA\'\xAEHOz}2\xA9~%z;\x93\x9E\x94'.&\xE5m\x9C\xDD\xE1\xE4\x97[Dhݸo7\x9F\x88'\x92\xA9Yr\xA9ŀ\xB5\x9E\x87p>\x99J%Ӝ]\xF5B$\x9F\xAACn\xD4v\xF5\xF3k\xAE\xA7\xD2N\xF2\xB7\xF3) 5H\x9C+\x94N\xCC\xF3|G\xA7_\x95Ca\x80\xC4\xE3\xAB\xB1k\xAFl\x8E\xB3m\xB0\x8A\x9B\\xD2ԝ\xA9\\xAF
+\xAF>}䒂\xA1\xC5\\xB5\xA5\xDF\xD7B.\xE1\xD5?\xA8\xB1\x8B.z\xF0\x97\xE4\x8A\\xD6ܐ\x99^\x90\xA2/&{;E\xB4NKa\x89e\x81!\x9AG\xE4Rb\xEB\xDD\xDA\x9C\xBB\xD8\xF4\xF2k-'\xBBɂ7{S\xBA\xEDB\xB2\xA0\x9F\x93|\xA7ՠ\xBBAXHv?\x8E\x8F\xEDJ\xE88\xE0Ł8\xC15\xE0\xC4\xB5\xFAQ\xEDh]P8e>(\xE0\xB0z\xFBu\xE0\xD6\xF4.(B\x82\xD6rH\x8C\x94\xA4\xDD\xFD\xF0W\x92.\x97\xA2跠\x91\xB3"\xF40j4\xB5.;\xC1\xD4ޟ!P\xFB\xA7\xC8$&\xFDU\xA2U\x9F|\x95\x81yC#@IIEND\xAEB`\x82
\ No newline at end of file
Property changes on: trunk/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png
___________________________________________________________________

Added: svn:executable

Added: trunk/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png (0 => 129745)


--- trunk/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png	                        (rev 0)
+++ trunk/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png	2012-09-27 09:44:05 UTC (rev 129745)
@@ -0,0 +1,9 @@
+\x89PNG
+
+
+IHDRIH\x8D\xF1(KsRGB\xAE\xCE\xE9JPLTE~10+SRI{uqlifdba`wpkcyhojsxrmnhxvgeepjl
+
+q~}su		yzdl|  hf\\x87\x8B\x8C\x88\x84\x87\x86\x80\x86
+
+\x82\x83\x81\x92??\x8E  \x9311\x8922\x8E99\x91!!\x88((\x90::\x89))\x9ALL\x9FJJ\x9BHH\xA6CC\xA7]]\xA0KK\xB6ff\xB1rr\xB3tt\xA8bb\xBAgg\xB2ss\xB9ww\xBF\x8C\x8C\xBF\x86\x86\xB9\x83\x83Ǎ\x8DƗ\x97ɟ\x9Fٽ\xBD֯\xAFӲ\xB2׵\xB5ۿ\xBFϣ\xA3پ\xBEʠ\xA0\xDD\xD9\xC3\xFF\xC0\xE2\xCB\xCB\xE9\xDE\xDE\xE8\xDD\xDD\xE2\xD1\xD1\xE5\xD3\xD3\xE3\xD2\xD2\xF2\xF2\xF2\xEC\xE6\xE6\xEE\xE8\xE8\xED\xE7\xE7\xD9s6\xC6tRNS@\xE6\xD8fbKGD\x88H	pHYsg\x9F\xD2RtIME\xDC	7\xADp\xCC\xE0IDATX\xC3\xED\xD7;\xC20pߏ\xD4\xE4\xC0\xA8(T\xF0\x81\xB3\xFA
+N\xDDJ\xC5IAA\xBF\xFFn\x8C\xE0m\x92\xB4\xD5r\xFF\xA5\xBD\xA1?\xBD\\xDAJ\x85.g\x9A\xB0\xC4K%\x926U\x8F4\xBEIU\xAF|\x97\xB6\xCE\xC9!]l>W\x96\xCA+\xD1u&\x9DtwNQ\xD2m\x8D\xF7\xEB[\xE9\xB0,`u\xC8,\xA5\xA0$VRA\x9AM\xBA\xEE\x94\xD4k\xAD\xA5\xDA]3H\xA7\xA5\x81z>\xF4\xB5<yK\xC9Bi=\x9F	\x94\xC4l\xAE\xB5Z$~\xD2#\xB2\x9A\xF6C\x94\xC2\xFE\xD4.+zxH\xC7	\xBC \xD1\x8DQ\x8F\xBA\xE2E\xC1\xE4\xE8,퇠,\xD4iP\xB4;\x96R0\xDC;J1\x98\xB7\xFF\x86ZM\x94\x9A\xAD7e\xBA\xE2wK&\xF6Y\x8F\xEE;\xC2Y@8\x9F(g&\xE1'<[(\xCF;\xC23\xF8G\xF6\xD5\xF7S\xDD\xAA\xF1\x9F"K,e\x95\xA8\xF2\xFC\f\xB0\xB4$\xA4IEND\xAEB`\x82
\ No newline at end of file

Modified: trunk/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreen_button.edc (129744 => 129745)


--- trunk/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreen_button.edc	2012-09-27 09:40:54 UTC (rev 129744)
+++ trunk/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreen_button.edc	2012-09-27 09:44:05 UTC (rev 129745)
@@ -22,7 +22,8 @@
       name: "webkit/widget/mediacontrol/fullscreen_button";
 
       images {
-         image: "widget/mediacontrol/fullscreenbutton/fullscreenbutton.png" COMP;
+         image: "widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png" COMP;
+         image: "widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png" COMP;
       }
 
       parts {
@@ -32,18 +33,27 @@
             description { state: "default" 0.0;
                min: 25 25;
             }
-            description { state: "fullscreen" 0.0;
+            description { state: "fullscreen_enter" 0.0;
                inherit: "default" 0.0;
-               image.normal: "widget/mediacontrol/fullscreenbutton/fullscreenbutton.png";
+               image.normal: "widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png";
             }
+            description { state: "fullscreen_exit" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png";
+            }
          }
       }
 
       programs {
          program {
-             signal: "fullscreen";
-             action: STATE_SET "fullscreen" 0.0;
+             signal: "fullscreen_enter";
+             action: STATE_SET "fullscreen_enter" 0.0;
              target: "fullscreen_button";
          }
+         program {
+             signal: "fullscreen_exit";
+             action: STATE_SET "fullscreen_exit" 0.0;
+             target: "fullscreen_button";
+         }
       }
    }

Deleted: trunk/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreenbutton.png (129744 => 129745)


--- trunk/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreenbutton.png	2012-09-27 09:40:54 UTC (rev 129744)
+++ trunk/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreenbutton.png	2012-09-27 09:44:05 UTC (rev 129745)
@@ -1,11 +0,0 @@
-\x89PNG
-
-
-IHDRIH\x8D\xF1(KsRGB@\xC0}\xC5MPLTE10+SRI{uqlifdba`~wpkcyhojsxrmnhxvgeepjl
-
-q~}su		yzdl|  hf\\x87\x8B\x8C\x88\x84\x87\x86\x80\x86
-
-\x82\x83\x81\x92??\x8E  \x9311\x8922\x8E99\x91!!\x88((\x90::\x89))\x9ALL\x9FJJ\x9BHH\xA6CC\xA7]]\xA0KK\xB6ff\xB1rr\xB3tt\xA8bb\xBAgg\xB2ss\xB9ww\xBF\x8C\x8C\xBF\x86\x86\xB9\x83\x83Ǎ\x8DƗ\x97ɟ\x9Fٽ\xBD֯\xAFӲ\xB2׵\xB5ۿ\xBFϣ\xA3پ\xBEʠ\xA0\xDD\xD9\xC3\xFF\xC0\xE2\xCB\xCB\xE9\xDE\xDE\xE8\xDD\xDD\xE2\xD1\xD1\xE5\xD3\xD3\xE3\xD2\xD2\xF2\xF2\xF2\xEC\xE6\xE6\xEE\xE8\xE8\xED\xE7\xE7\x93o\xBCptRNS@\xE6\xD8f	pHYsg\x9F\xD2RtEXtSoftwareMicrosoft Office\xED5q\x96IDATX\xC3\xED\xD7\xD7R\xC2@`P	\x90@\x96\x98h@\xBB\xA2 \xF6\xDE{/\xD8\xF4\xFD/\xDDlD\x91\x92\xD93f\xBC`\xF6\xDC0sH\xBE,[\xFE	\x8By\xF5hN1\x89IL\xAA#i\xCC
-\xA8&#\xC9
-*ci\x9C\xBA\xFE =\x91\xFA\xFEdR\xFDJ\xE6\xEDL\xF3\xA4<u1)o\xE3\xEC'/\xB8\xDC"B\xEB\xFA}\xBB\xB1\xF8D<\x91\xF4HͲ\xA0\xD0K-:\xA4\x88\xA8\xF5\xA48\x84\xF3\xC9T*\x99\xE6\xEC\xAA"\xF9T\xB9Q\xDB\xD5ϯ\xB9\x9EJ{8\xC9\xDF\xCEC\xA4\x80\xD4 q\xAEP:1\xCF\xF3\x9D~U\x85\x8F\xAFVĮ\xBD\xB29\xCE.8\xB4\xC1*nz\x89\xA8;S\xB9^^2}\x{1120A1}\xC5\\xB5\xA5\xDF'\xA1\x97\xF0\xEA\xD4\xD8E=\xF8Kz	E.kn\xC8L/H\xD1\x83\xBD\x9D\x8B"\xB3NKa\x89e\x81.G\xF4Rb\xEB\xDD\xDA\x9C\xBB\xD8\xF4\xF2k-'\xBBɂ7{S\xBA\xEDB\xB2\xA0\x9F\x93|\xA7ՠ\xBBAXHv?\x8E\x8F\xEDJ\xE88\xE0Ł8\xC15\xE0\xC4\xB5\xFAQ\xEDh]P8e>(\xE0\xB0z\xFBu\xE0\xD6H\x94!Ak9$FJ\xD2\xEE~\xF8\xAB\xC9\x97KQ\xC8-h\xE4\xAC=\x8C\xEAM\xAD\xCBN\xB0i\xEFO\x8D\xA8\xE1\xFEK1\x89I\xF5(\x99U\x9F|\x95\x81y;
-{\x88IEND\xAEB`\x82
\ No newline at end of file

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to