Changeset 92189 in webkit

Timestamp:

Aug 2, 2011 8:08:45 AM (13 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

[EFL] Add fullscreen button to media control UI.
​https://bugs.webkit.org/show_bug.cgi?id=64428

Source/WebCore:

Implement paintMediaFullscreenButton and emit fullscreen signal.

Reviewed by Antonio Gomes.

• platform/efl/RenderThemeEfl.cpp:

(WebCore::RenderThemeEfl::edjeGroupFromFormType):
(WebCore::RenderThemeEfl::emitMediaButtonSignal):
(WebCore::RenderThemeEfl::paintMediaFullscreenButton):

• platform/efl/RenderThemeEfl.h:

Source/WebKit/efl:

Implement functions for full screen in ChromeClientEfl in order to display a full screen button on media control UI.
When full screen mode is activated by pressing the button, the functions are called by Document. So, if there is no implemented
function, full screen button will not be shown.
In addition, a .edc file and an image file are added for full screen button.

Reviewed by Antonio Gomes.

• DefaultTheme/default.edc:
• DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreen_button.edc: Added.
• DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreenbutton.png: Added.
• WebCoreSupport/ChromeClientEfl.cpp:

(WebCore::ChromeClientEfl::supportsFullScreenForElement):
(WebCore::ChromeClientEfl::enterFullScreenForElement):
(WebCore::ChromeClientEfl::exitFullScreenForElement):

• WebCoreSupport/ChromeClientEfl.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/efl/RenderThemeEfl.cpp (modified) (3 diffs)
• WebCore/platform/efl/RenderThemeEfl.h (modified) (1 diff)
• WebKit/efl/ChangeLog (modified) (1 diff)
• WebKit/efl/DefaultTheme/default.edc (modified) (1 diff)
• WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton (added)
• WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreen_button.edc (added)
• WebKit/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreenbutton.png (added)
• WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp (modified) (1 diff)
• WebKit/efl/WebCoreSupport/ChromeClientEfl.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-02  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [EFL] Add fullscreen button to media control UI.
+        https://bugs.webkit.org/show_bug.cgi?id=64428
+
+        Implement paintMediaFullscreenButton and emit fullscreen signal.
+
+        Reviewed by Antonio Gomes.
+
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::edjeGroupFromFormType):
+        (WebCore::RenderThemeEfl::emitMediaButtonSignal):
+        (WebCore::RenderThemeEfl::paintMediaFullscreenButton):
+        * platform/efl/RenderThemeEfl.h:
+
 2011-08-01  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp

@@ -623 +623 @@
         W("mediacontrol/seekforward_button"),
         W("mediacontrol/seekbackward_button"),
+        W("mediacontrol/fullscreen_button"),
 #endif
 #undef W
@@ -1137 +1138 @@
     else if (mediaElementType == MediaSeekBackButton)
         edje_object_signal_emit(entry->o, "seekbackward", "");
+    else if (mediaElementType == MediaFullscreenButton)
+        edje_object_signal_emit(entry->o, "fullscreen", "");
     else
         return false;
@@ -1155 +1158 @@
 bool RenderThemeEfl::paintMediaFullscreenButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
-    notImplemented();
-    return false;
+    Node* mediaNode = object->node() ? object->node()->shadowAncestorNode() : 0;
+    if (!mediaNode || (!mediaNode->hasTagName(videoTag)))
+        return false;
+
+    if (!emitMediaButtonSignal(FullScreenButton, MediaFullscreenButton, rect))
+        return false;
+
+    return paintThemePart(object, FullScreenButton, info, rect);
 }
 

trunk/Source/WebCore/platform/efl/RenderThemeEfl.h

@@ -64 +64 @@
     SeekForwardButton,
     SeekBackwardButton,
+    FullScreenButton,
 #endif
     FormTypeLast

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2011-08-02  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [EFL] Add fullscreen button to media control UI.
+        https://bugs.webkit.org/show_bug.cgi?id=64428
+
+        Implement functions for full screen in ChromeClientEfl in order to display a full screen button on media control UI.
+        When full screen mode is activated by pressing the button, the functions are called by Document. So, if there is no implemented
+        function, full screen button will not be shown.
+        In addition, a .edc file and an image file are added for full screen button.
+
+        Reviewed by Antonio Gomes.
+
+        * DefaultTheme/default.edc:
+        * DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreen_button.edc: Added.
+        * DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreenbutton.png: Added.
+        * WebCoreSupport/ChromeClientEfl.cpp:
+        (WebCore::ChromeClientEfl::supportsFullScreenForElement):
+        (WebCore::ChromeClientEfl::enterFullScreenForElement):
+        (WebCore::ChromeClientEfl::exitFullScreenForElement):
+        * WebCoreSupport/ChromeClientEfl.h:
+
 2011-07-29  Michal Pakula vel Rutka  <m.pakula@samsung.com>
 

trunk/Source/WebKit/efl/DefaultTheme/default.edc

@@ -81 +81 @@
 #include "widget/mediacontrol/seekforwardbutton/seekforward_button.edc"
 #include "widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc"
+#include "widget/mediacontrol/fullscreenbutton/fullscreen_button.edc"
 }

trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

@@ -581 +581 @@
 #endif
 
-}
+#if ENABLE(FULLSCREEN_API)
+bool ChromeClientEfl::supportsFullScreenForElement(const WebCore::Element* element, bool withKeyboard)
+{
+    if (withKeyboard)
+        return false;
+
+    return true;
+}
+
+void ChromeClientEfl::enterFullScreenForElement(WebCore::Element* element)
+{
+    element->document()->webkitWillEnterFullScreenForElement(element);
+    element->document()->webkitDidEnterFullScreenForElement(element);
+}
+
+void ChromeClientEfl::exitFullScreenForElement(WebCore::Element* element)
+{
+    element->document()->webkitWillExitFullScreenForElement(element);
+    element->document()->webkitDidExitFullScreenForElement(element);
+}
+#endif
+}

trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h

@@ -137 +137 @@
 #endif
 
+#if ENABLE(FULLSCREEN_API)
+    virtual bool supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard);
+    virtual void enterFullScreenForElement(WebCore::Element*);
+    virtual void exitFullScreenForElement(WebCore::Element*);
+#endif
+
     virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
     virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*);