[EFL] Turn on ENABLE_MEDIA_CONTROLS_SCRIPT
authorryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 7 Apr 2014 12:34:25 +0000 (12:34 +0000)
committerryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 7 Apr 2014 12:34:25 +0000 (12:34 +0000)
https://bugs.webkit.org/show_bug.cgi?id=131257

Reviewed by Gyuyoung Kim.

.:

* Source/cmake/OptionsEfl.cmake: Enable MEDIA_CONTROLS_SCRIPT

Source/WebCore:

no new tests. just rebased exisiting tests.

* PlatformEfl.cmake: Added the media controls script associated files.
* css/mediaControlsEfl.css: Removed.
* css/mediaControlsEflFullscreen.css: Removed.
* platform/efl/DefaultTheme/CMakeLists.txt:
* platform/efl/DefaultTheme/default.edc:
* platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreen_button.edc: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/mute_button.edc: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/mutebutton.png: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/unmutebutton.png: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/pausebutton.png: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playbutton.png: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playpause_button.edc: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforward_button.edc: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforwardbutton.png: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption.png: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png: Removed.
* platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc: Removed.
* platform/efl/RenderThemeEfl.cpp:
(WebCore::toEdjeGroup):
(WebCore::RenderThemeEfl::RenderThemeEfl):
(WebCore::RenderThemeEfl::adjustSliderThumbSize):
(WebCore::RenderThemeEfl::mediaControlsStyleSheet): Modified to load bundle style sheet.
(WebCore::RenderThemeEfl::mediaControlsScript): Added to load bundle scripts.
(WebCore::RenderThemeEfl::emitMediaButtonSignal): Deleted.
(WebCore::RenderThemeEfl::extraMediaControlsStyleSheet): Deleted.
(WebCore::RenderThemeEfl::extraFullScreenStyleSheet): Deleted.
(WebCore::RenderThemeEfl::formatMediaControlsCurrentTime): Deleted.
(WebCore::RenderThemeEfl::hasOwnDisabledStateHandlingFor): Deleted.
(WebCore::RenderThemeEfl::paintMediaFullscreenButton): Deleted.
(WebCore::RenderThemeEfl::paintMediaMuteButton): Deleted.
(WebCore::RenderThemeEfl::paintMediaPlayButton): Deleted.
(WebCore::RenderThemeEfl::paintMediaSeekBackButton): Deleted.
(WebCore::RenderThemeEfl::paintMediaSeekForwardButton): Deleted.
(WebCore::RenderThemeEfl::paintMediaSliderTrack): Deleted.
(WebCore::RenderThemeEfl::paintMediaSliderThumb): Deleted.
(WebCore::RenderThemeEfl::paintMediaVolumeSliderContainer): Deleted.
(WebCore::RenderThemeEfl::paintMediaVolumeSliderTrack): Deleted.
(WebCore::RenderThemeEfl::paintMediaVolumeSliderThumb): Deleted.
(WebCore::RenderThemeEfl::paintMediaCurrentTime): Deleted.
(WebCore::RenderThemeEfl::supportsClosedCaptioning): Deleted.
(WebCore::RenderThemeEfl::paintMediaToggleClosedCaptionsButton): Deleted.
* platform/efl/RenderThemeEfl.h:

LayoutTests:

Rebased tests.

* platform/efl/TestExpectations:
* platform/efl/media/audio-controls-rendering-expected.png:
* platform/efl/media/audio-controls-rendering-expected.txt:
* platform/efl/media/controls-after-reload-expected.png:
* platform/efl/media/controls-after-reload-expected.txt:
* platform/efl/media/controls-strict-expected.png:
* platform/efl/media/controls-strict-expected.txt:
* platform/efl/media/controls-styling-expected.png:
* platform/efl/media/controls-styling-expected.txt:
* platform/efl/media/controls-without-preload-expected.png:
* platform/efl/media/controls-without-preload-expected.txt:

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

38 files changed:
ChangeLog
LayoutTests/ChangeLog
LayoutTests/platform/efl/TestExpectations
LayoutTests/platform/efl/media/audio-controls-rendering-expected.png
LayoutTests/platform/efl/media/audio-controls-rendering-expected.txt
LayoutTests/platform/efl/media/controls-after-reload-expected.png
LayoutTests/platform/efl/media/controls-after-reload-expected.txt
LayoutTests/platform/efl/media/controls-strict-expected.png
LayoutTests/platform/efl/media/controls-strict-expected.txt
LayoutTests/platform/efl/media/controls-styling-expected.png
LayoutTests/platform/efl/media/controls-styling-expected.txt
LayoutTests/platform/efl/media/controls-without-preload-expected.png
LayoutTests/platform/efl/media/controls-without-preload-expected.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformEfl.cmake
Source/WebCore/css/mediaControlsEfl.css [deleted file]
Source/WebCore/css/mediaControlsEflFullscreen.css [deleted file]
Source/WebCore/platform/efl/DefaultTheme/CMakeLists.txt
Source/WebCore/platform/efl/DefaultTheme/default.edc
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreen_button.edc [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/mute_button.edc [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/mutebutton.png [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/unmutebutton.png [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/pausebutton.png [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playbutton.png [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playpause_button.edc [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforward_button.edc [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforwardbutton.png [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption.png [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png [deleted file]
Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc [deleted file]
Source/WebCore/platform/efl/RenderThemeEfl.cpp
Source/WebCore/platform/efl/RenderThemeEfl.h
Source/cmake/OptionsEfl.cmake

index 0001a3c..650ca7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-04-07  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Turn on ENABLE_MEDIA_CONTROLS_SCRIPT
+        https://bugs.webkit.org/show_bug.cgi?id=131257
+
+        Reviewed by Gyuyoung Kim.
+
+        * Source/cmake/OptionsEfl.cmake: Enable MEDIA_CONTROLS_SCRIPT
+
 2014-04-06  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
 
         [GTK] Stop trying to install WebKit1 documentation
index 489bbb0..aa62c2d 100644 (file)
@@ -1,3 +1,24 @@
+2014-04-07  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Turn on ENABLE_MEDIA_CONTROLS_SCRIPT
+        https://bugs.webkit.org/show_bug.cgi?id=131257
+
+        Reviewed by Gyuyoung Kim.
+
+        Rebased tests.
+
+        * platform/efl/TestExpectations:
+        * platform/efl/media/audio-controls-rendering-expected.png:
+        * platform/efl/media/audio-controls-rendering-expected.txt:
+        * platform/efl/media/controls-after-reload-expected.png:
+        * platform/efl/media/controls-after-reload-expected.txt:
+        * platform/efl/media/controls-strict-expected.png:
+        * platform/efl/media/controls-strict-expected.txt:
+        * platform/efl/media/controls-styling-expected.png:
+        * platform/efl/media/controls-styling-expected.txt:
+        * platform/efl/media/controls-without-preload-expected.png:
+        * platform/efl/media/controls-without-preload-expected.txt:
+
 2014-04-07  Sergio Villar Senin  <svillar@igalia.com>
 
         Unreviewed gardening.
index 2f6b0a7..30a36d0 100644 (file)
@@ -1266,9 +1266,6 @@ webkit.org/b/84037 fast/text/international/spaces-combined-in-vertical-text.html
 # Failed table/mozilla test, fields are not on the same line
 webkit.org/b/97109 tables/mozilla/bugs/bug99948.html [ Pass ]
 
-# Fails after r126350
-webkit.org/b/94788 media/track/track-cue-rendering-snap-to-lines-not-set.html [ Failure ]
-
 # Asserts in MessagePort::contextDestroyed, but the assert usually gets attributed to later tests. 
 webkit.org/b/94458 fast/events/message-port-constructor-for-deleted-document.html
 
@@ -1551,9 +1548,6 @@ webkit.org/b/114739 compositing/patterns/direct-pattern-compositing-position.htm
 webkit.org/b/114739 compositing/patterns/direct-pattern-compositing-size.html [ ImageOnlyFailure Crash ]
 webkit.org/b/114739 compositing/patterns/direct-pattern-compositing-contain-no-repeat.html [ ImageOnlyFailure Crash ]
 
-# Newly added test in r148131 is failing.
-webkit.org/b/114876 media/click-volume-bar-not-pausing.html [ Failure ]
-
 # Unidentified failing media tests
 webkit.org/b/115419 media/media-can-play-ogg.html [ Failure ]
 webkit.org/b/115419 media/track/track-automatic-subtitles.html [ Failure ]
@@ -1762,8 +1756,6 @@ webkit.org/b/127106 media/video-canvas-drawing-output.html [ Failure ]
 
 webkit.org/b/127107 media/volume-bar-empty-when-muted.html [ Failure ]
 
-webkit.org/b/127108 media/media-document-audio-controls-visible.html [ Failure ]
-
 webkit.org/b/127282 fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-tall-underlines.html [ ImageOnlyFailure ]
 
 # Failing after r159674
index d9e3754..df1bc8a 100644 (file)
Binary files a/LayoutTests/platform/efl/media/audio-controls-rendering-expected.png and b/LayoutTests/platform/efl/media/audio-controls-rendering-expected.png differ
index 3a57f0c..cd056e7 100644 (file)
@@ -6,70 +6,118 @@ layer at (0,0) size 800x600
       RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 153x17
           text run at (0,0) width 153: "Test controls placement."
-      RenderBlock (anonymous) at (0,34) size 784x94
-        RenderMedia {AUDIO} at (0,0) size 300x20 [bgcolor=#0000FF]
-        RenderBR {BR} at (300,20) size 0x0
-        RenderBR {BR} at (0,20) size 0x17
-        RenderMedia {AUDIO} at (0,38) size 320x20 [bgcolor=#0000FF]
-        RenderBR {BR} at (320,58) size 0x0
-        RenderBR {BR} at (0,58) size 0x17
-        RenderBR {BR} at (0,76) size 0x17
-layer at (8,42) size 300x20
-  RenderFlexibleBox {DIV} at (0,0) size 300x20
-layer at (8,42) size 300x20
-  RenderFlexibleBox {DIV} at (0,0) size 300x20
-    RenderButton {INPUT} at (0,0) size 20x20
-    RenderFlexibleBox {DIV} at (20,0) size 220x20
-      RenderFlexibleBox {DIV} at (0,0) size 65x20
-        RenderBlock (anonymous) at (5,5) size 55x10
-          RenderText {#text} at (0,0) size 55x11
-            text run at (0,0) width 55: "00:00 / 00:07"
-      RenderSlider {INPUT} at (65,0) size 155x20
-        RenderFlexibleBox {DIV} at (2,0) size 151x20
-          RenderBlock {DIV} at (0,4) size 151x12
-            RenderBlock {DIV} at (0,0) size 12x12
-    RenderButton {INPUT} at (240,0) size 20x20
-    RenderButton {INPUT} at (260,0) size 20x20
-    RenderBlock {DIV} at (280,0) size 20x20
-layer at (288,42) size 20x20
-  RenderButton zI: 2 {INPUT} at (0,0) size 20x20
-layer at (8,80) size 320x20
-  RenderFlexibleBox {DIV} at (0,0) size 320x20
-layer at (8,80) size 320x20
-  RenderFlexibleBox {DIV} at (0,0) size 320x20
-    RenderButton {INPUT} at (0,0) size 20x20
-    RenderFlexibleBox {DIV} at (20,0) size 240x20
-      RenderFlexibleBox {DIV} at (0,0) size 65x20
-        RenderBlock (anonymous) at (5,5) size 55x10
-          RenderText {#text} at (0,0) size 55x11
-            text run at (0,0) width 55: "00:00 / 00:07"
-      RenderSlider {INPUT} at (65,0) size 175x20
-        RenderFlexibleBox {DIV} at (2,0) size 171x20
-          RenderBlock {DIV} at (0,4) size 171x12
-            RenderBlock {DIV} at (0,0) size 12x12
-    RenderButton {INPUT} at (260,0) size 20x20
-    RenderButton {INPUT} at (280,0) size 20x20
-    RenderBlock {DIV} at (300,0) size 20x20
-layer at (308,80) size 20x20
-  RenderButton zI: 2 {INPUT} at (0,0) size 20x20
-layer at (8,118) size 320x100
-  RenderMedia {AUDIO} at (8,118) size 320x100 [bgcolor=#0000FF]
-layer at (8,118) size 320x100
+      RenderBlock (anonymous) at (0,34) size 784x104
+        RenderMedia {AUDIO} at (0,0) size 200x25 [bgcolor=#0000FF]
+        RenderBR {BR} at (200,25) size 0x0
+        RenderBR {BR} at (0,25) size 0x17
+        RenderMedia {AUDIO} at (0,43) size 320x25 [bgcolor=#0000FF]
+        RenderBR {BR} at (320,68) size 0x0
+        RenderBR {BR} at (0,68) size 0x17
+        RenderBR {BR} at (0,86) size 0x17
+layer at (8,42) size 200x25
+  RenderFlexibleBox {DIV} at (0,0) size 200x25
+layer at (8,42) size 200x25
+  RenderFlexibleBox {DIV} at (0,0) size 200x25
+    RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+    RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+layer at (57,50) size 127x10
+  RenderFlexibleBox {DIV} at (49,8) size 127x10
+layer at (57,50) size 45x10
+  RenderFlexibleBox {DIV} at (0,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (11,0) size 23x10
+      RenderText {#text} at (0,0) size 23x10
+        text run at (0,0) width 23: "00:00"
+layer at (139,50) size 45x10
+  RenderFlexibleBox {DIV} at (82,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (9,0) size 27x10
+      RenderText {#text} at (0,0) size 26x10
+        text run at (0,0) width 26: "-00:07"
+layer at (104,51) size 33x9
+  RenderFlexibleBox {DIV} at (47,0) size 33x10
+    RenderSlider {INPUT} at (0,0) size 33x9 [color=#909090] [bgcolor=#4A4A4A]
+      RenderFlexibleBox {DIV} at (0,0) size 33x9
+        RenderBlock {DIV} at (0,1) size 33x7
+layer at (104,52) size 6x6
+  RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (184,44) size 22x22
+  RenderFlexibleBox {DIV} at (176,2) size 22x22
+    RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (184,44) size 2x22
+  RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+    RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+      RenderFlexibleBox {DIV} at (1,1) size 0x8
+        RenderBlock {DIV} at (0,0) size 0x8
+layer at (170,51) size 8x8
+  RenderBlock {DIV} at (-8,0) size 8x8
+layer at (8,85) size 320x25
+  RenderFlexibleBox {DIV} at (0,0) size 320x25
+layer at (8,85) size 320x25
+  RenderFlexibleBox {DIV} at (0,0) size 320x25
+    RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+    RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+layer at (57,93) size 247x10
+  RenderFlexibleBox {DIV} at (49,8) size 247x10
+layer at (57,93) size 45x10
+  RenderFlexibleBox {DIV} at (0,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (11,0) size 23x10
+      RenderText {#text} at (0,0) size 23x10
+        text run at (0,0) width 23: "00:00"
+layer at (259,93) size 45x10
+  RenderFlexibleBox {DIV} at (202,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (9,0) size 27x10
+      RenderText {#text} at (0,0) size 26x10
+        text run at (0,0) width 26: "-00:07"
+layer at (104,94) size 153x9
+  RenderFlexibleBox {DIV} at (47,0) size 153x10
+    RenderSlider {INPUT} at (0,0) size 153x9 [color=#909090] [bgcolor=#4A4A4A]
+      RenderFlexibleBox {DIV} at (0,0) size 153x9
+        RenderBlock {DIV} at (0,1) size 153x7
+layer at (104,95) size 6x6
+  RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (304,87) size 22x22
+  RenderFlexibleBox {DIV} at (296,2) size 22x22
+    RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (304,87) size 2x22
+  RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+    RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+      RenderFlexibleBox {DIV} at (1,1) size 0x8
+        RenderBlock {DIV} at (0,0) size 0x8
+layer at (290,94) size 8x8
+  RenderBlock {DIV} at (-8,0) size 8x8
+layer at (8,128) size 320x100
+  RenderMedia {AUDIO} at (8,128) size 320x100 [bgcolor=#0000FF]
+layer at (8,128) size 320x100
   RenderFlexibleBox {DIV} at (0,0) size 320x100
-layer at (8,198) size 320x20
-  RenderFlexibleBox {DIV} at (0,80) size 320x20
-    RenderButton {INPUT} at (0,0) size 20x20
-    RenderFlexibleBox {DIV} at (20,0) size 240x20
-      RenderFlexibleBox {DIV} at (0,0) size 65x20
-        RenderBlock (anonymous) at (5,5) size 55x10
-          RenderText {#text} at (0,0) size 55x11
-            text run at (0,0) width 55: "00:00 / 00:07"
-      RenderSlider {INPUT} at (65,0) size 175x20
-        RenderFlexibleBox {DIV} at (2,0) size 171x20
-          RenderBlock {DIV} at (0,4) size 171x12
-            RenderBlock {DIV} at (0,0) size 12x12
-    RenderButton {INPUT} at (260,0) size 20x20
-    RenderButton {INPUT} at (280,0) size 20x20
-    RenderBlock {DIV} at (300,0) size 20x20
-layer at (308,198) size 20x20
-  RenderButton zI: 2 {INPUT} at (0,0) size 20x20
+layer at (8,203) size 320x25
+  RenderFlexibleBox {DIV} at (0,75) size 320x25
+    RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+    RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+layer at (57,211) size 247x10
+  RenderFlexibleBox {DIV} at (49,8) size 247x10
+layer at (57,211) size 45x10
+  RenderFlexibleBox {DIV} at (0,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (11,0) size 23x10
+      RenderText {#text} at (0,0) size 23x10
+        text run at (0,0) width 23: "00:00"
+layer at (259,211) size 45x10
+  RenderFlexibleBox {DIV} at (202,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (9,0) size 27x10
+      RenderText {#text} at (0,0) size 26x10
+        text run at (0,0) width 26: "-00:07"
+layer at (104,212) size 153x9
+  RenderFlexibleBox {DIV} at (47,0) size 153x10
+    RenderSlider {INPUT} at (0,0) size 153x9 [color=#909090] [bgcolor=#4A4A4A]
+      RenderFlexibleBox {DIV} at (0,0) size 153x9
+        RenderBlock {DIV} at (0,1) size 153x7
+layer at (104,213) size 6x6
+  RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (304,205) size 22x22
+  RenderFlexibleBox {DIV} at (296,2) size 22x22
+    RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (304,205) size 2x22
+  RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+    RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+      RenderFlexibleBox {DIV} at (1,1) size 0x8
+        RenderBlock {DIV} at (0,0) size 0x8
+layer at (290,212) size 8x8
+  RenderBlock {DIV} at (-8,0) size 8x8
index 80bc4c8..d2d18d3 100644 (file)
Binary files a/LayoutTests/platform/efl/media/controls-after-reload-expected.png and b/LayoutTests/platform/efl/media/controls-after-reload-expected.png differ
index 0068d40..a6b6c7a 100644 (file)
@@ -12,21 +12,37 @@ layer at (8,42) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,262) size 320x20
-  RenderFlexibleBox {DIV} at (0,220) size 320x20
-    RenderButton {INPUT} at (0,0) size 20x20
-    RenderFlexibleBox {DIV} at (20,0) size 220x20
-      RenderFlexibleBox {DIV} at (0,0) size 65x20
-        RenderBlock (anonymous) at (5,5) size 55x10
-          RenderText {#text} at (0,0) size 55x11
-            text run at (0,0) width 55: "00:00 / 00:06"
-      RenderSlider {INPUT} at (65,0) size 155x20
-        RenderFlexibleBox {DIV} at (2,0) size 151x20
-          RenderBlock {DIV} at (0,4) size 151x12
-            RenderBlock {DIV} at (0,0) size 12x12
-    RenderButton {INPUT} at (240,0) size 20x20
-    RenderButton {INPUT} at (260,0) size 20x20
-    RenderButton {INPUT} at (280,0) size 20x20
-    RenderBlock {DIV} at (300,0) size 20x20
-layer at (308,262) size 20x20
-  RenderButton zI: 2 {INPUT} at (0,0) size 20x20
+layer at (8,257) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
+    RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+    RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+    RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (57,265) size 217x10
+  RenderFlexibleBox {DIV} at (49,8) size 217x10
+layer at (57,265) size 45x10
+  RenderFlexibleBox {DIV} at (0,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (11,0) size 23x10
+      RenderText {#text} at (0,0) size 23x10
+        text run at (0,0) width 23: "00:00"
+layer at (229,265) size 45x10
+  RenderFlexibleBox {DIV} at (172,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (9,0) size 27x10
+      RenderText {#text} at (0,0) size 26x10
+        text run at (0,0) width 26: "-00:06"
+layer at (104,266) size 123x9
+  RenderFlexibleBox {DIV} at (47,0) size 123x10
+    RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
+      RenderFlexibleBox {DIV} at (0,0) size 123x9
+        RenderBlock {DIV} at (0,1) size 123x7
+layer at (104,267) size 6x6
+  RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (274,259) size 22x22
+  RenderFlexibleBox {DIV} at (266,2) size 22x22
+    RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (274,259) size 2x22
+  RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+    RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+      RenderFlexibleBox {DIV} at (1,1) size 0x8
+        RenderBlock {DIV} at (0,0) size 0x8
+layer at (260,266) size 8x8
+  RenderBlock {DIV} at (-8,0) size 8x8
index 8bb133d..c1fda9d 100644 (file)
Binary files a/LayoutTests/platform/efl/media/controls-strict-expected.png and b/LayoutTests/platform/efl/media/controls-strict-expected.png differ
index fb25fa6..a936be2 100644 (file)
@@ -12,21 +12,37 @@ layer at (8,50) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,50) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,270) size 320x20
-  RenderFlexibleBox {DIV} at (0,220) size 320x20
-    RenderButton {INPUT} at (0,0) size 20x20
-    RenderFlexibleBox {DIV} at (20,0) size 220x20
-      RenderFlexibleBox {DIV} at (0,0) size 65x20
-        RenderBlock (anonymous) at (5,5) size 55x10
-          RenderText {#text} at (0,0) size 55x11
-            text run at (0,0) width 55: "00:00 / 00:06"
-      RenderSlider {INPUT} at (65,0) size 155x20
-        RenderFlexibleBox {DIV} at (2,0) size 151x20
-          RenderBlock {DIV} at (0,4) size 151x12
-            RenderBlock {DIV} at (0,0) size 12x12
-    RenderButton {INPUT} at (240,0) size 20x20
-    RenderButton {INPUT} at (260,0) size 20x20
-    RenderButton {INPUT} at (280,0) size 20x20
-    RenderBlock {DIV} at (300,0) size 20x20
-layer at (308,270) size 20x20
-  RenderButton zI: 2 {INPUT} at (0,0) size 20x20
+layer at (8,265) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
+    RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+    RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+    RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (57,273) size 217x10
+  RenderFlexibleBox {DIV} at (49,8) size 217x10
+layer at (57,273) size 45x10
+  RenderFlexibleBox {DIV} at (0,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (11,0) size 23x10
+      RenderText {#text} at (0,0) size 23x10
+        text run at (0,0) width 23: "00:00"
+layer at (229,273) size 45x10
+  RenderFlexibleBox {DIV} at (172,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (9,0) size 27x10
+      RenderText {#text} at (0,0) size 26x10
+        text run at (0,0) width 26: "-00:06"
+layer at (104,274) size 123x9
+  RenderFlexibleBox {DIV} at (47,0) size 123x10
+    RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
+      RenderFlexibleBox {DIV} at (0,0) size 123x9
+        RenderBlock {DIV} at (0,1) size 123x7
+layer at (104,275) size 6x6
+  RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (274,267) size 22x22
+  RenderFlexibleBox {DIV} at (266,2) size 22x22
+    RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (274,267) size 2x22
+  RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+    RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+      RenderFlexibleBox {DIV} at (1,1) size 0x8
+        RenderBlock {DIV} at (0,0) size 0x8
+layer at (260,274) size 8x8
+  RenderBlock {DIV} at (-8,0) size 8x8
index 9210d78..ad3378f 100644 (file)
Binary files a/LayoutTests/platform/efl/media/controls-styling-expected.png and b/LayoutTests/platform/efl/media/controls-styling-expected.png differ
index cc1633d..dfe0bad 100644 (file)
@@ -1,56 +1,88 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x302
-  RenderBlock {HTML} at (0,0) size 800x302
-    RenderBody {BODY} at (8,16) size 784x278
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 467x17
-          text run at (0,0) width 467: "The look of the controls should not change when styled under strict mode."
-      RenderBlock (anonymous) at (0,34) size 784x244
-        RenderText {#text} at (320,226) size 4x17
-          text run at (320,226) width 4: " "
+        RenderText {#text} at (0,0) size 274x17
+          text run at (0,0) width 274: "The look of the controls should not change."
+      RenderBlock {DIV} at (0,34) size 784x240 [color=#0000FF]
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock (anonymous) at (0,274) size 784x240
         RenderText {#text} at (0,0) size 0x0
-layer at (8,50) size 320x240
-  RenderVideo {VIDEO} at (0,0) size 320x240 [color=#FF0000]
-layer at (332,50) size 320x240
-  RenderVideo {VIDEO} at (324,0) size 320x240
-layer at (8,50) size 320x240
+layer at (18,42) size 320x240
+  RenderVideo {VIDEO} at (10,0) size 320x240
+layer at (8,282) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (18,42) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,270) size 320x20
-  RenderFlexibleBox {DIV} at (0,220) size 320x20
-    RenderButton {INPUT} at (0,0) size 20x20
-    RenderFlexibleBox {DIV} at (20,0) size 220x20
-      RenderFlexibleBox {DIV} at (0,0) size 65x20 [color=#000000]
-        RenderBlock (anonymous) at (5,5) size 55x10
-          RenderText {#text} at (0,0) size 55x11
-            text run at (0,0) width 55: "00:00 / 00:06"
-      RenderSlider {INPUT} at (65,0) size 155x20
-        RenderFlexibleBox {DIV} at (2,0) size 151x20
-          RenderBlock {DIV} at (0,4) size 151x12
-            RenderBlock {DIV} at (0,0) size 12x12
-    RenderButton {INPUT} at (240,0) size 20x20
-    RenderButton {INPUT} at (260,0) size 20x20
-    RenderButton {INPUT} at (280,0) size 20x20
-    RenderBlock {DIV} at (300,0) size 20x20
-layer at (308,270) size 20x20
-  RenderButton zI: 2 {INPUT} at (0,0) size 20x20
-layer at (332,50) size 320x240
+layer at (18,257) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
+    RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+    RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+    RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (67,265) size 217x10
+  RenderFlexibleBox {DIV} at (49,8) size 217x10
+layer at (67,265) size 45x10
+  RenderFlexibleBox {DIV} at (0,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (11,0) size 23x10
+      RenderText {#text} at (0,0) size 23x10
+        text run at (0,0) width 23: "00:00"
+layer at (239,265) size 45x10
+  RenderFlexibleBox {DIV} at (172,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (9,0) size 27x10
+      RenderText {#text} at (0,0) size 26x10
+        text run at (0,0) width 26: "-00:06"
+layer at (114,266) size 123x9
+  RenderFlexibleBox {DIV} at (47,0) size 123x10
+    RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
+      RenderFlexibleBox {DIV} at (0,0) size 123x9
+        RenderBlock {DIV} at (0,1) size 123x7
+layer at (114,267) size 6x6
+  RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (284,259) size 22x22
+  RenderFlexibleBox {DIV} at (266,2) size 22x22
+    RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (284,259) size 2x22
+  RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+    RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+      RenderFlexibleBox {DIV} at (1,1) size 0x8
+        RenderBlock {DIV} at (0,0) size 0x8
+layer at (270,266) size 8x8
+  RenderBlock {DIV} at (-8,0) size 8x8
+layer at (8,282) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (332,270) size 320x20
-  RenderFlexibleBox {DIV} at (0,220) size 320x20
-    RenderButton {INPUT} at (0,0) size 20x20
-    RenderFlexibleBox {DIV} at (20,0) size 220x20
-      RenderFlexibleBox {DIV} at (0,0) size 65x20
-        RenderBlock (anonymous) at (5,5) size 55x10
-          RenderText {#text} at (0,0) size 55x11
-            text run at (0,0) width 55: "00:00 / 00:06"
-      RenderSlider {INPUT} at (65,0) size 155x20
-        RenderFlexibleBox {DIV} at (2,0) size 151x20
-          RenderBlock {DIV} at (0,4) size 151x12
-            RenderBlock {DIV} at (0,0) size 12x12
-    RenderButton {INPUT} at (240,0) size 20x20
-    RenderButton {INPUT} at (260,0) size 20x20
-    RenderButton {INPUT} at (280,0) size 20x20
-    RenderBlock {DIV} at (300,0) size 20x20
-layer at (632,270) size 20x20
-  RenderButton zI: 2 {INPUT} at (0,0) size 20x20
+layer at (8,497) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
+    RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+    RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+    RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (57,505) size 217x10
+  RenderFlexibleBox {DIV} at (49,8) size 217x10
+layer at (57,505) size 45x10
+  RenderFlexibleBox {DIV} at (0,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (11,0) size 23x10
+      RenderText {#text} at (0,0) size 23x10
+        text run at (0,0) width 23: "00:00"
+layer at (229,505) size 45x10
+  RenderFlexibleBox {DIV} at (172,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (9,0) size 27x10
+      RenderText {#text} at (0,0) size 26x10
+        text run at (0,0) width 26: "-00:06"
+layer at (104,506) size 123x9
+  RenderFlexibleBox {DIV} at (47,0) size 123x10
+    RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
+      RenderFlexibleBox {DIV} at (0,0) size 123x9
+        RenderBlock {DIV} at (0,1) size 123x7
+layer at (104,507) size 6x6
+  RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (274,499) size 22x22
+  RenderFlexibleBox {DIV} at (266,2) size 22x22
+    RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (274,499) size 2x22
+  RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+    RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+      RenderFlexibleBox {DIV} at (1,1) size 0x8
+        RenderBlock {DIV} at (0,0) size 0x8
+layer at (260,506) size 8x8
+  RenderBlock {DIV} at (-8,0) size 8x8
index 292f197..d0b854e 100644 (file)
Binary files a/LayoutTests/platform/efl/media/controls-without-preload-expected.png and b/LayoutTests/platform/efl/media/controls-without-preload-expected.png differ
index 2f4770b..8ae6204 100644 (file)
@@ -12,21 +12,37 @@ layer at (8,42) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,262) size 320x20
-  RenderFlexibleBox {DIV} at (0,220) size 320x20
-    RenderButton {INPUT} at (0,0) size 20x20
-    RenderFlexibleBox {DIV} at (20,0) size 220x20
-      RenderFlexibleBox {DIV} at (0,0) size 65x20
-        RenderBlock (anonymous) at (5,5) size 55x10
-          RenderText {#text} at (0,0) size 55x11
-            text run at (0,0) width 55: "00:00 / 00:06"
-      RenderSlider {INPUT} at (65,0) size 155x20
-        RenderFlexibleBox {DIV} at (2,0) size 151x20
-          RenderBlock {DIV} at (0,4) size 151x12
-            RenderBlock {DIV} at (0,0) size 12x12
-    RenderButton {INPUT} at (240,0) size 20x20
-    RenderButton {INPUT} at (260,0) size 20x20
-    RenderButton {INPUT} at (280,0) size 20x20
-    RenderBlock {DIV} at (300,0) size 20x20
-layer at (308,262) size 20x20
-  RenderButton zI: 2 {INPUT} at (0,0) size 20x20
+layer at (8,257) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
+    RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+    RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+    RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (57,265) size 217x10
+  RenderFlexibleBox {DIV} at (49,8) size 217x10
+layer at (57,265) size 45x10
+  RenderFlexibleBox {DIV} at (0,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (11,0) size 23x10
+      RenderText {#text} at (0,0) size 23x10
+        text run at (0,0) width 23: "00:00"
+layer at (229,265) size 45x10
+  RenderFlexibleBox {DIV} at (172,0) size 45x10 [color=#FFFFFF]
+    RenderBlock (anonymous) at (9,0) size 27x10
+      RenderText {#text} at (0,0) size 26x10
+        text run at (0,0) width 26: "-00:06"
+layer at (104,266) size 123x9
+  RenderFlexibleBox {DIV} at (47,0) size 123x10
+    RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
+      RenderFlexibleBox {DIV} at (0,0) size 123x9
+        RenderBlock {DIV} at (0,1) size 123x7
+layer at (104,267) size 6x6
+  RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (274,259) size 22x22
+  RenderFlexibleBox {DIV} at (266,2) size 22x22
+    RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (274,259) size 2x22
+  RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+    RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+      RenderFlexibleBox {DIV} at (1,1) size 0x8
+        RenderBlock {DIV} at (0,0) size 0x8
+layer at (260,266) size 8x8
+  RenderBlock {DIV} at (-8,0) size 8x8
index af336b4..cdf97b5 100644 (file)
@@ -1,3 +1,59 @@
+2014-04-07  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Turn on ENABLE_MEDIA_CONTROLS_SCRIPT
+        https://bugs.webkit.org/show_bug.cgi?id=131257
+
+        Reviewed by Gyuyoung Kim.
+
+        no new tests. just rebased exisiting tests.
+
+        * PlatformEfl.cmake: Added the media controls script associated files.
+        * css/mediaControlsEfl.css: Removed.
+        * css/mediaControlsEflFullscreen.css: Removed.
+        * platform/efl/DefaultTheme/CMakeLists.txt:
+        * platform/efl/DefaultTheme/default.edc:
+        * platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreen_button.edc: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/mute_button.edc: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/mutebutton.png: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/unmutebutton.png: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/pausebutton.png: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playbutton.png: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playpause_button.edc: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforward_button.edc: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforwardbutton.png: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption.png: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png: Removed.
+        * platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc: Removed.
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::toEdjeGroup):
+        (WebCore::RenderThemeEfl::RenderThemeEfl):
+        (WebCore::RenderThemeEfl::adjustSliderThumbSize):
+        (WebCore::RenderThemeEfl::mediaControlsStyleSheet): Modified to load bundle style sheet.
+        (WebCore::RenderThemeEfl::mediaControlsScript): Added to load bundle scripts.
+        (WebCore::RenderThemeEfl::emitMediaButtonSignal): Deleted.
+        (WebCore::RenderThemeEfl::extraMediaControlsStyleSheet): Deleted.
+        (WebCore::RenderThemeEfl::extraFullScreenStyleSheet): Deleted.
+        (WebCore::RenderThemeEfl::formatMediaControlsCurrentTime): Deleted.
+        (WebCore::RenderThemeEfl::hasOwnDisabledStateHandlingFor): Deleted.
+        (WebCore::RenderThemeEfl::paintMediaFullscreenButton): Deleted.
+        (WebCore::RenderThemeEfl::paintMediaMuteButton): Deleted.
+        (WebCore::RenderThemeEfl::paintMediaPlayButton): Deleted.
+        (WebCore::RenderThemeEfl::paintMediaSeekBackButton): Deleted.
+        (WebCore::RenderThemeEfl::paintMediaSeekForwardButton): Deleted.
+        (WebCore::RenderThemeEfl::paintMediaSliderTrack): Deleted.
+        (WebCore::RenderThemeEfl::paintMediaSliderThumb): Deleted.
+        (WebCore::RenderThemeEfl::paintMediaVolumeSliderContainer): Deleted.
+        (WebCore::RenderThemeEfl::paintMediaVolumeSliderTrack): Deleted.
+        (WebCore::RenderThemeEfl::paintMediaVolumeSliderThumb): Deleted.
+        (WebCore::RenderThemeEfl::paintMediaCurrentTime): Deleted.
+        (WebCore::RenderThemeEfl::supportsClosedCaptioning): Deleted.
+        (WebCore::RenderThemeEfl::paintMediaToggleClosedCaptionsButton): Deleted.
+        * platform/efl/RenderThemeEfl.h:
+
 2014-04-07  Benjamin Poulain  <benjamin@webkit.org>
 
         CSS JIT: change the node flags directly instead of using function calls when possible
index 21b5e54..3bd92f2 100644 (file)
@@ -201,8 +201,7 @@ if (ENABLE_NETSCAPE_PLUGIN_API)
 endif ()
 
 list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
-    ${WEBCORE_DIR}/css/mediaControlsEfl.css
-    ${WEBCORE_DIR}/css/mediaControlsEflFullscreen.css
+    ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsApple.css
 )
 
 if (WTF_USE_TEXTURE_MAPPER)
@@ -211,6 +210,12 @@ if (WTF_USE_TEXTURE_MAPPER)
     )
 endif ()
 
+set(WebCore_USER_AGENT_SCRIPTS
+    ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsApple.js
+)
+
+set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/efl/RenderThemeEfl.cpp)
+
 list(APPEND WebCore_LIBRARIES
     ${CAIRO_LIBRARIES}
     ${ECORE_EVAS_LIBRARIES}
diff --git a/Source/WebCore/css/mediaControlsEfl.css b/Source/WebCore/css/mediaControlsEfl.css
deleted file mode 100644 (file)
index 2f153f4..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (C) 2009, 2010, 2011 Apple Inc.  All rights reserved.
- * Copyright (C) 2011 Samsung Electronics
- *
- * 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. ``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
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * 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. 
- */
-
-/* EFLWebKit media controls. Extends mediaControls.css */
-
-audio {
-    width: 300px;
-    height: 20px;
-}
-
-audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
-    display: -webkit-flex;
-    -webkit-flex-direction: row;
-    -webkit-align-items: center;
-    -webkit-user-select: none;
-    position: relative;
-    bottom: 0;
-    width: 100%;
-    z-index: 0;
-    overflow: hidden;
-    height: 20px;
-    text-align: right;
-}
-
-video:-webkit-full-page-media::-webkit-media-controls-panel {
-    bottom: 0px;
-}
-
-audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
-    -webkit-appearance: media-mute-button;
-    display: -webkit-flex;
-    width: 20px;
-    height: 20px;
-    position: relative;
-    z-index: 2;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-}
-
-audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
-    -webkit-appearance: media-play-button;
-    display: -webkit-flex;
-    width: 20px;
-    height: 20px;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-}
-
-audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container {
-    -webkit-appearance: media-controls-background;
-    display: -webkit-flex;
-    -webkit-flex-direction: row;
-    -webkit-align-items: center;
-    -webkit-justify-content: flex-end;
-    -webkit-flex: 1 1;
-    -webkit-user-select: none;
-    height: 20px;
-}
-
-audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display {
-    -webkit-appearance: media-current-time-display;
-    -webkit-user-select: none;
-    display: -webkit-flex;
-    height: 10px;
-
-    padding: 5px;
-
-    text-align: center;
-    font-size: 10px;
-
-    color: black;
-    letter-spacing: normal;
-    word-spacing: normal;
-    line-height: normal;
-    text-transform: none;
-    text-indent: 0;
-    text-shadow: none;
-    text-decoration: none;
-    font-style: normal;
-    font-weight: normal;
-    font-family: serif;
-}
-
-audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display {
-    display: none;
-}
-
-audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
-    -webkit-appearance: media-slider;
-    display: -webkit-flex;
-    -webkit-flex: 1 1;
-    height: 20px;
-    padding: 0px 2px;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-    margin: initial;
-}
-
-audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container {
-    -webkit-appearance: media-volume-slider-container;
-    position: absolute;
-    height: 100px;
-    width: 20px;
-    bottom: 20px;
-    z-index: 1;
-}
-
-audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider {
-    -webkit-appearance: media-volume-slider;
-    display: none;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-    margin: initial;
-}
-
-audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button {
-    -webkit-appearance: media-seek-back-button;
-    display: -webkit-flex;
-    width: 20px;
-    height: 20px;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-}
-
-audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button {
-    -webkit-appearance: media-seek-forward-button;
-    display: -webkit-flex;
-    width: 20px;
-    height: 20px;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-}
-
-audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button {
-    -webkit-appearance: media-fullscreen-button;
-    display: -webkit-flex;
-    width: 20px;
-    height: 20px;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-}
-
-audio::-webkit-media-controls-rewind-button, video::-webkit-media-controls-rewind-button {
-    display: none;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-}
-
-audio::-webkit-media-controls-return-to-realtime-button, video::-webkit-media-controls-return-to-realtime-button {
-    display: none;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-}
-
-audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button {
-    -webkit-appearance: media-toggle-closed-captions-button;
-    display: -webkit-flex;
-    width: 20px;
-    height: 20px;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-}
-
-audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-controls-volume-slider-mute-button {
-    -webkit-appearance: media-volume-slider-mute-button;
-    display: none;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-}
diff --git a/Source/WebCore/css/mediaControlsEflFullscreen.css b/Source/WebCore/css/mediaControlsEflFullscreen.css
deleted file mode 100644 (file)
index ecb677f..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics
- *
- * 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. ``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
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * 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. 
- */
-
-/* EFLWebKit media controls for fullscreen. */
-
-video:-webkit-full-screen:-webkit-full-page-media::-webkit-media-controls-panel {
-    display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-mute-button {
-    display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-time-remaining-display {
-    display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-volume-slider-container {
-    -webkit-appearance: media-volume-slider-container;
-    display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-volume-slider {
-    -webkit-appearance: media-volume-slider;
-    display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-seek-back-button {
-    display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-seek-forward-button {
-    display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-rewind-button {
-    display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-return-to-realtime-button {
-    display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-toggle-closed-captions-button {
-    display: none;
-}
index 76018e7..2ba8635 100644 (file)
@@ -42,22 +42,6 @@ macro(GENERATE_THEME _target_name _name _option)
             widget/entry/img_focused.png
             widget/entry/img_hovered.png
             widget/entry/img_normal.png
-            widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png
-            widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png
-            widget/mediacontrol/fullscreenbutton/fullscreen_button.edc
-            widget/mediacontrol/mutebutton/mute_button.edc
-            widget/mediacontrol/mutebutton/mutebutton.png
-            widget/mediacontrol/mutebutton/unmutebutton.png
-            widget/mediacontrol/playpausebutton/pausebutton.png
-            widget/mediacontrol/playpausebutton/playbutton.png
-            widget/mediacontrol/playpausebutton/playpause_button.edc
-            widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc
-            widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png
-            widget/mediacontrol/seekforwardbutton/seekforward_button.edc
-            widget/mediacontrol/seekforwardbutton/seekforwardbutton.png
-            widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png
-            widget/mediacontrol/togglecaptionsbutton/closedcaption.png
-            widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc
             widget/progressbar/bt_base.png
             widget/progressbar/progressbar.edc
             widget/progressbar/shelf_inset.png
index 9aa9229..f8d866b 100644 (file)
@@ -47,12 +47,6 @@ collections {
 #include "widget/combo/combo.edc"
 #include "widget/cursor/cursor.edc"
 #include "widget/entry/entry.edc"
-#include "widget/mediacontrol/fullscreenbutton/fullscreen_button.edc"
-#include "widget/mediacontrol/mutebutton/mute_button.edc"
-#include "widget/mediacontrol/playpausebutton/playpause_button.edc"
-#include "widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc"
-#include "widget/mediacontrol/seekforwardbutton/seekforward_button.edc"
-#include "widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc"
 #ifdef ENABLE_PROGRESS_ELEMENT
 #include "widget/progressbar/progressbar.edc"
 #endif
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png
deleted file mode 100644 (file)
index 6616c06..0000000
Binary files a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png and /dev/null differ
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png
deleted file mode 100644 (file)
index 4158dde..0000000
Binary files a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png and /dev/null differ
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreen_button.edc b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreen_button.edc
deleted file mode 100644 (file)
index 5ed9697..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-    Copyright (C) 2009,2010 ProFUSION embedded systems
-    Copyright (C) 2011 Samsung Electronics
-
-    This file is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This file is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-   group {
-      name: "webkit/widget/mediacontrol/fullscreen_button";
-
-      images {
-         image: "widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png" COMP;
-         image: "widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png" COMP;
-      }
-
-      parts {
-         part {
-            name: "fullscreen_button";
-            type: IMAGE;
-            description { state: "default" 0.0;
-               image.normal: "widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png";
-               min: 25 25;
-            }
-            description { state: "fullscreen_enter" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "fullscreen_exit" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png";
-            }
-         }
-      }
-
-      programs {
-         program {
-             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";
-         }
-      }
-   }
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/mute_button.edc b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/mute_button.edc
deleted file mode 100644 (file)
index abfb63a..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-    Copyright (C) 2008,2009 INdT - Instituto Nokia de Tecnologia
-    Copyright (C) 2009,2010 ProFUSION embedded systems
-    Copyright (C) 2011 Samsung Electronics
-
-    This file is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This file is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-   group {
-      name: "webkit/widget/mediacontrol/mute_button";
-
-      images {
-         image: "widget/mediacontrol/mutebutton/mutebutton.png" COMP;
-         image: "widget/mediacontrol/mutebutton/unmutebutton.png" COMP;
-      }
-
-      parts {
-         part {
-            name: "mute_button";
-            type: IMAGE;
-            description { state: "default" 0.0;
-               image.normal: "widget/mediacontrol/mutebutton/mutebutton.png";
-               min: 25 25;
-            }
-            description { state: "mute" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "sound" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "widget/mediacontrol/mutebutton/unmutebutton.png";
-            }
-         }
-      }
-
-      programs {
-         program {
-             signal: "mute";
-             action: STATE_SET "mute" 0.0;
-             target: "mute_button";
-         }
-         program {
-             signal: "sound";
-             action: STATE_SET "sound" 0.0;
-             target: "mute_button";
-         }
-      }
-   }
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/mutebutton.png b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/mutebutton.png
deleted file mode 100644 (file)
index 575acd6..0000000
Binary files a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/mutebutton.png and /dev/null differ
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/unmutebutton.png b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/unmutebutton.png
deleted file mode 100644 (file)
index 4282017..0000000
Binary files a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/unmutebutton.png and /dev/null differ
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/pausebutton.png b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/pausebutton.png
deleted file mode 100644 (file)
index b40cfea..0000000
Binary files a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/pausebutton.png and /dev/null differ
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playbutton.png b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playbutton.png
deleted file mode 100644 (file)
index b4bc661..0000000
Binary files a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playbutton.png and /dev/null differ
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playpause_button.edc b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playpause_button.edc
deleted file mode 100644 (file)
index 04a8229..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-    Copyright (C) 2008,2009 INdT - Instituto Nokia de Tecnologia
-    Copyright (C) 2009,2010 ProFUSION embedded systems
-    Copyright (C) 2011 Samsung Electronics
-
-    This file is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This file is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-   group {
-      name: "webkit/widget/mediacontrol/playpause_button";
-
-      images {
-         image: "widget/mediacontrol/playpausebutton/playbutton.png" COMP;
-         image: "widget/mediacontrol/playpausebutton/pausebutton.png" COMP;
-      }
-
-      parts {
-         part {
-            name: "playpause_button";
-            type: IMAGE;
-            description { state: "default" 0.0;
-               image.normal: "widget/mediacontrol/playpausebutton/playbutton.png";
-               min: 25 25;
-            }
-            description { state: "play" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "pause" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "widget/mediacontrol/playpausebutton/pausebutton.png";
-            }
-         }
-      }
-
-      programs {
-         program {
-             signal: "play";
-             action: STATE_SET "play" 0.0;
-             target: "playpause_button";
-         }
-         program {
-             signal: "pause";
-             action: STATE_SET "pause" 0.0;
-             target: "playpause_button";
-         }
-      }
-   }
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc
deleted file mode 100644 (file)
index e6b1d2d..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    Copyright (C) 2008,2009 INdT - Instituto Nokia de Tecnologia
-    Copyright (C) 2009,2010 ProFUSION embedded systems
-    Copyright (C) 2011 Samsung Electronics
-
-    This file is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This file is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-   group {
-      name: "webkit/widget/mediacontrol/seekbackward_button";
-
-      images {
-         image: "widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png" COMP;
-      }
-
-      parts {
-         part {
-            name: "seekbackward_button";
-            type: IMAGE;
-            description { state: "default" 0.0;
-               image.normal: "widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png";
-               min: 25 25;
-            }
-            description { state: "seekbackward" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-      }
-
-      programs {
-         program {
-             signal: "seekbackward";
-             action: STATE_SET "seekbackward" 0.0;
-             target: "seekbackward_button";
-         }
-      }
-   }
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png
deleted file mode 100644 (file)
index f3467cd..0000000
Binary files a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png and /dev/null differ
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforward_button.edc b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforward_button.edc
deleted file mode 100644 (file)
index acbf078..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    Copyright (C) 2008,2009 INdT - Instituto Nokia de Tecnologia
-    Copyright (C) 2009,2010 ProFUSION embedded systems
-    Copyright (C) 2011 Samsung Electronics
-
-    This file is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This file is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-   group {
-      name: "webkit/widget/mediacontrol/seekforward_button";
-
-      images {
-         image: "widget/mediacontrol/seekforwardbutton/seekforwardbutton.png" COMP;
-      }
-
-      parts {
-         part {
-            name: "seekforward_button";
-            type: IMAGE;
-            description { state: "default" 0.0;
-               image.normal: "widget/mediacontrol/seekforwardbutton/seekforwardbutton.png";
-               min: 25 25;
-            }
-            description { state: "seekforward" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-      }
-
-      programs {
-         program {
-             signal: "seekforward";
-             action: STATE_SET "seekforward" 0.0;
-             target: "seekforward_button";
-         }
-      }
-   }
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforwardbutton.png b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforwardbutton.png
deleted file mode 100644 (file)
index c2fe828..0000000
Binary files a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforwardbutton.png and /dev/null differ
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption.png b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption.png
deleted file mode 100644 (file)
index 2015749..0000000
Binary files a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption.png and /dev/null differ
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png
deleted file mode 100644 (file)
index a04b29d..0000000
Binary files a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png and /dev/null differ
diff --git a/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc b/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc
deleted file mode 100644 (file)
index 02e4928..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    Copyright (C) 2012 Intel Corporation
-
-    This file is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This file is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-   group {
-      name: "webkit/widget/mediacontrol/toggle_captions_button";
-
-      images {
-         image: "widget/mediacontrol/togglecaptionsbutton/closedcaption.png" COMP;
-         image: "widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png" COMP;
-      }
-
-      parts {
-         part {
-            name: "toggle_captions_button";
-            type: IMAGE;
-            description { state: "default" 0.0;
-               image.normal: "widget/mediacontrol/togglecaptionsbutton/closedcaption.png";
-               min: 25 25;
-            }
-            description { state: "show_captions" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "hide_captions" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png";
-            }
-         }
-      }
-
-      programs {
-         program {
-             signal: "show_captions";
-             action: STATE_SET "show_captions" 0.0;
-             target: "toggle_captions_button";
-         }
-         program {
-             signal: "hide_captions";
-             action: STATE_SET "hide_captions" 0.0;
-             target: "toggle_captions_button";
-         }
-      }
-   }
index f9d21c9..6fc463e 100755 (executable)
@@ -45,6 +45,7 @@
 #include "RenderSlider.h"
 #include "ScrollbarThemeEfl.h"
 #include "Settings.h"
+#include "UserAgentScripts.h"
 #include "UserAgentStyleSheets.h"
 #include <Ecore_Evas.h>
 #include <Edje.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
-#if ENABLE(VIDEO)
-#include "HTMLMediaElement.h"
-#include "HTMLNames.h"
-#include "TimeRanges.h"
-#endif
-
 namespace WebCore {
-#if ENABLE(VIDEO)
-using namespace HTMLNames;
-#endif
 
 // TODO: change from object count to ecore_evas size (bytes)
 // TODO: as objects are webpage/user defined and they can be very large.
@@ -84,11 +76,6 @@ static const double progressAnimationInterval = 0.125;
 
 static const int sliderThumbWidth = 29;
 static const int sliderThumbHeight = 11;
-#if ENABLE(VIDEO)
-static const int mediaSliderHeight = 14;
-static const int mediaSliderThumbWidth = 12;
-static const int mediaSliderThumbHeight = 12;
-#endif
 
 #define _ASSERT_ON_RELEASE_RETURN(o, fmt, ...) \
     do { if (!o) { EINA_LOG_CRIT(fmt, ## __VA_ARGS__); ASSERT(o); return; } } while (0)
@@ -115,16 +102,6 @@ static const char* toEdjeGroup(FormType type)
         "webkit/widget/slider/horizontal",
         "webkit/widget/slider/thumb_vertical",
         "webkit/widget/slider/thumb_horizontal",
-#if ENABLE(VIDEO)
-        "webkit/widget/mediacontrol/playpause_button",
-        "webkit/widget/mediacontrol/mute_button",
-        "webkit/widget/mediacontrol/seekforward_button",
-        "webkit/widget/mediacontrol/seekbackward_button",
-        "webkit/widget/mediacontrol/fullscreen_button",
-#endif
-#if ENABLE(VIDEO_TRACK)
-        "webkit/widget/mediacontrol/toggle_captions_button",
-#endif
         "webkit/widget/spinner",
         0
     };
@@ -620,10 +597,6 @@ RenderThemeEfl::RenderThemeEfl(Page* page)
     , m_inactiveSelectionForegroundColor(200, 200, 200)
     , m_focusRingColor(32, 32, 224, 224)
     , m_sliderThumbColor(Color::darkGray)
-#if ENABLE(VIDEO)
-    , m_mediaPanelColor(220, 220, 195) // light tannish color.
-    , m_mediaSliderColor(Color::white)
-#endif
     , m_supportsSelectionForegroundColor(false)
     , m_partCache(0)
 {
@@ -745,11 +718,6 @@ void RenderThemeEfl::adjustSliderThumbSize(RenderStyle* style, Element*) const
     } else if (part == SliderThumbHorizontalPart) {
         style->setWidth(Length(sliderThumbWidth, Fixed));
         style->setHeight(Length(sliderThumbHeight, Fixed));
-#if ENABLE(VIDEO)
-    } else if (part == MediaSliderThumbPart) {
-        style->setWidth(Length(mediaSliderThumbWidth, Fixed));
-        style->setHeight(Length(mediaSliderThumbHeight, Fixed));
-#endif
     }
 }
 
@@ -1064,234 +1032,14 @@ bool RenderThemeEfl::paintProgressBar(RenderObject* object, const PaintInfo& inf
 #endif
 
 #if ENABLE(VIDEO)
-bool RenderThemeEfl::emitMediaButtonSignal(FormType formType, MediaControlElementType mediaElementType, const IntRect& rect)
-{
-    loadThemeIfNeeded();
-    _ASSERT_ON_RELEASE_RETURN_VAL(edje(), false, "Could not paint native HTML part due to missing theme.");
-
-    ThemePartCacheEntry* entry = getThemePartFromCache(formType, rect.size());
-    _ASSERT_ON_RELEASE_RETURN_VAL(entry, false, "Could not paint native HTML part due to missing theme part.");
-
-    if (mediaElementType == MediaPlayButton)
-        edje_object_signal_emit(entry->edje(), "play", "");
-    else if (mediaElementType == MediaPauseButton)
-        edje_object_signal_emit(entry->edje(), "pause", "");
-    else if (mediaElementType == MediaMuteButton)
-        edje_object_signal_emit(entry->edje(), "mute", "");
-    else if (mediaElementType == MediaUnMuteButton)
-        edje_object_signal_emit(entry->edje(), "sound", "");
-    else if (mediaElementType == MediaSeekForwardButton)
-        edje_object_signal_emit(entry->edje(), "seekforward", "");
-    else if (mediaElementType == MediaSeekBackButton)
-        edje_object_signal_emit(entry->edje(), "seekbackward", "");
-    else if (mediaElementType == MediaEnterFullscreenButton)
-        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", "");
-    else if (mediaElementType == MediaHideClosedCaptionsButton)
-        edje_object_signal_emit(entry->edje(), "hide_captions", "");
-#endif
-    else
-        return false;
-
-    return true;
-}
-
-String RenderThemeEfl::extraMediaControlsStyleSheet()
-{
-    return String(mediaControlsEflUserAgentStyleSheet, sizeof(mediaControlsEflUserAgentStyleSheet));
-}
-
-#if ENABLE(FULLSCREEN_API)
-String RenderThemeEfl::extraFullScreenStyleSheet()
-{
-    return String(mediaControlsEflFullscreenUserAgentStyleSheet, sizeof(mediaControlsEflFullscreenUserAgentStyleSheet));
-}
-#endif
-
-String RenderThemeEfl::formatMediaControlsCurrentTime(float currentTime, float duration) const
-{
-    return formatMediaControlsTime(currentTime) + " / " + formatMediaControlsTime(duration);
-}
-
-bool RenderThemeEfl::hasOwnDisabledStateHandlingFor(ControlPart part) const
-{
-    return (part != MediaMuteButtonPart);
-}
-
-bool RenderThemeEfl::paintMediaFullscreenButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
-{
-    Node* mediaNode = object->node() ? object->node()->shadowHost() : 0;
-    if (!mediaNode)
-        mediaNode = object->node();
-    if (!mediaNode || !mediaNode->isElementNode() || !toElement(mediaNode)->isMediaElement())
-        return false;
-
-    HTMLMediaElement* mediaElement = toHTMLMediaElement(mediaNode);
-    if (!emitMediaButtonSignal(FullScreenButton, mediaElement->isFullscreen() ? MediaExitFullscreenButton : MediaEnterFullscreenButton, rect))
-        return false;
-
-    return paintThemePart(object, FullScreenButton, info, rect);
-}
-
-bool RenderThemeEfl::paintMediaMuteButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
-{
-    Node* mediaNode = object->node() ? object->node()->shadowHost() : 0;
-    if (!mediaNode)
-        mediaNode = object->node();
-    if (!mediaNode || !mediaNode->isElementNode() || !toElement(mediaNode)->isMediaElement())
-        return false;
-
-    HTMLMediaElement* mediaElement = toHTMLMediaElement(mediaNode);
-
-    if (!emitMediaButtonSignal(MuteUnMuteButton, mediaElement->muted() ? MediaMuteButton : MediaUnMuteButton, rect))
-        return false;
-
-    return paintThemePart(object, MuteUnMuteButton, info, rect);
-}
-
-bool RenderThemeEfl::paintMediaPlayButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
-{
-    Node* node = object->node();
-    if (!node || !node->isMediaControlElement())
-        return false;
-
-    if (!emitMediaButtonSignal(PlayPauseButton, mediaControlElementType(node), rect))
-        return false;
-
-    return paintThemePart(object, PlayPauseButton, info, rect);
-}
-
-bool RenderThemeEfl::paintMediaSeekBackButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
+String RenderThemeEfl::mediaControlsStyleSheet()
 {
-    Node* node = object->node();
-    if (!node || !node->isMediaControlElement())
-        return 0;
-
-    if (!emitMediaButtonSignal(SeekBackwardButton, mediaControlElementType(node), rect))
-        return false;
-
-    return paintThemePart(object, SeekBackwardButton, info, rect);
+    return ASCIILiteral(mediaControlsAppleUserAgentStyleSheet);
 }
 
-bool RenderThemeEfl::paintMediaSeekForwardButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
+String RenderThemeEfl::mediaControlsScript()
 {
-    Node* node = object->node();
-    if (!node || !node->isMediaControlElement())
-        return 0;
-
-    if (!emitMediaButtonSignal(SeekForwardButton, mediaControlElementType(node), rect))
-        return false;
-
-    return paintThemePart(object, SeekForwardButton, info, rect);
-}
-
-bool RenderThemeEfl::paintMediaSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
-{
-    GraphicsContext* context = info.context;
-
-    context->fillRect(FloatRect(rect), m_mediaPanelColor, ColorSpaceDeviceRGB);
-    context->fillRect(FloatRect(IntRect(rect.x(), rect.y() + (rect.height() - mediaSliderHeight) / 2,
-                                        rect.width(), mediaSliderHeight)), m_mediaSliderColor, ColorSpaceDeviceRGB);
-
-    RenderStyle* style = &object->style();
-    HTMLMediaElement* mediaElement = parentMediaElement(*object);
-
-    if (!mediaElement)
-        return false;
-
-    // Draw the buffered ranges. This code is highly inspired from
-    // Chrome for the gradient code.
-    float mediaDuration = mediaElement->duration();
-    RefPtr<TimeRanges> timeRanges = mediaElement->buffered();
-    IntRect trackRect = rect;
-    int totalWidth = trackRect.width();
-
-    trackRect.inflate(-style->borderLeftWidth());
-    context->save();
-    context->setStrokeStyle(NoStroke);
-
-    for (unsigned index = 0; index < timeRanges->length(); ++index) {
-        float start = timeRanges->start(index, IGNORE_EXCEPTION);
-        float end = timeRanges->end(index, IGNORE_EXCEPTION);
-        int width = ((end - start) * totalWidth) / mediaDuration;
-        IntRect rangeRect;
-        if (!index) {
-            rangeRect = trackRect;
-            rangeRect.setWidth(width);
-        } else {
-            rangeRect.setLocation(IntPoint(trackRect.x() + start / mediaDuration* totalWidth, trackRect.y()));
-            rangeRect.setSize(IntSize(width, trackRect.height()));
-        }
-
-        // Don't bother drawing empty range.
-        if (rangeRect.isEmpty())
-            continue;
-
-        IntPoint sliderTopLeft = rangeRect.location();
-        IntPoint sliderTopRight = sliderTopLeft;
-        sliderTopRight.move(0, rangeRect.height());
-
-        context->fillRect(FloatRect(rangeRect), m_mediaPanelColor, ColorSpaceDeviceRGB);
-    }
-    context->restore();
-    return true;
-}
-
-bool RenderThemeEfl::paintMediaSliderThumb(RenderObject*, const PaintInfo& info, const IntRect& rect)
-{
-    IntSize thumbRect(3, 3);
-    info.context->fillRoundedRect(FloatRoundedRect(rect, thumbRect, thumbRect, thumbRect, thumbRect), m_sliderThumbColor, ColorSpaceDeviceRGB);
-    return true;
-}
-
-bool RenderThemeEfl::paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&)
-{
-    notImplemented();
-    return false;
-}
-
-bool RenderThemeEfl::paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&)
-{
-    notImplemented();
-    return false;
-}
-
-bool RenderThemeEfl::paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&)
-{
-    notImplemented();
-    return false;
-}
-
-bool RenderThemeEfl::paintMediaCurrentTime(RenderObject*, const PaintInfo& info, const IntRect& rect)
-{
-    info.context->fillRect(FloatRect(rect), m_mediaPanelColor, ColorSpaceDeviceRGB);
-    return true;
-}
-#endif
-
-#if ENABLE(VIDEO_TRACK)
-bool RenderThemeEfl::supportsClosedCaptioning() const
-{
-    return true;
-}
-
-bool RenderThemeEfl::paintMediaToggleClosedCaptionsButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
-{
-    Node* mediaNode = object->node() ? object->node()->shadowHost() : 0;
-    if (!mediaNode)
-        mediaNode = object->node();
-    if (!mediaNode || (!mediaNode->hasTagName(videoTag)))
-        return false;
-
-    HTMLMediaElement* mediaElement = toHTMLMediaElement(mediaNode);
-    if (!emitMediaButtonSignal(ToggleCaptionsButton, mediaElement->webkitClosedCaptionsVisible() ? MediaShowClosedCaptionsButton : MediaHideClosedCaptionsButton, rect))
-        return false;
-
-    return paintThemePart(object, ToggleCaptionsButton, info, rect);
+    return ASCIILiteral(mediaControlsAppleJavaScript);
 }
 #endif
 
index 00f0bb7..9ba66ce 100644 (file)
@@ -30,9 +30,6 @@
 #ifndef RenderThemeEfl_h
 #define RenderThemeEfl_h
 
-#if ENABLE(VIDEO)
-#include "MediaControlElements.h"
-#endif
 #include "RenderTheme.h"
 
 #include <Eina.h>
@@ -59,16 +56,6 @@ enum FormType { // KEEP IN SYNC WITH edjeGroupFromFormType()
     SliderHorizontal,
     SliderThumbVertical,
     SliderThumbHorizontal,
-#if ENABLE(VIDEO)
-    PlayPauseButton,
-    MuteUnMuteButton,
-    SeekForwardButton,
-    SeekBackwardButton,
-    FullScreenButton,
-#endif
-#if ENABLE(VIDEO_TRACK)
-    ToggleCaptionsButton,
-#endif
     Spinner,
     FormTypeLast
 };
@@ -186,28 +173,11 @@ public:
 #endif
 
 #if ENABLE(VIDEO)
-    virtual String extraMediaControlsStyleSheet();
-#if ENABLE(FULLSCREEN_API)
-    virtual String extraFullScreenStyleSheet();
-#endif
-    virtual String formatMediaControlsCurrentTime(float currentTime, float duration) const;
-    virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const;
-
-    virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaSeekBackButton(RenderObject*, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaSeekForwardButton(RenderObject*, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaCurrentTime(RenderObject*, const PaintInfo&, const IntRect&);
+    virtual String mediaControlsStyleSheet();
+    virtual String mediaControlsScript();
 #endif
 #if ENABLE(VIDEO_TRACK)
-    virtual bool supportsClosedCaptioning() const override;
-    virtual bool paintMediaToggleClosedCaptionsButton(RenderObject*, const PaintInfo&, const IntRect&) override;
+    virtual bool supportsClosedCaptioning() const override { return true; }
 #endif
     virtual bool shouldShowPlaceholderWhenFocused() const override { return true; }
 
@@ -233,10 +203,6 @@ private:
     void applyEdjeRTLState(Evas_Object*, RenderObject*, FormType, const IntRect&);
     bool paintThemePart(RenderObject*, FormType, const PaintInfo&, const IntRect&);
 
-#if ENABLE(VIDEO)
-    bool emitMediaButtonSignal(FormType, MediaControlElementType, const IntRect&);
-#endif
-
     Page* m_page;
     Color m_activeSelectionBackgroundColor;
     Color m_activeSelectionForegroundColor;
@@ -245,11 +211,6 @@ private:
     Color m_focusRingColor;
     Color m_sliderThumbColor;
 
-#if ENABLE(VIDEO)
-    Color m_mediaPanelColor;
-    Color m_mediaSliderColor;
-#endif
-
     String m_themePath;
     // Order so that the canvas gets destroyed at last.
     EflUniquePtr<Ecore_Evas> m_canvas;
index 6fa659b..2247a9a 100644 (file)
@@ -74,6 +74,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE ON)