<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164024] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164024">164024</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2014-02-13 03:28:34 -0800 (Thu, 13 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] MEDIA_CONTROLS_SCRIPT support
https://bugs.webkit.org/show_bug.cgi?id=123097
Reviewed by Jer Noble.
.:
Part of the Autotools and CMake structure to build the media
controls script.
* Source/autotools/SetupWebKitFeatures.m4: Activated the media
controls script by default.
* Source/cmake/OptionsGTK.cmake: Activated the media controls
script by default.
* Source/cmake/WebKitFeatures.cmake: Created the option to
activate the controls script.
* Source/cmakeconfig.h.cmake: Created the define template the the
media controls script.
Source/WebCore:
WebKitGTK+ multimedia controls are now managed from Javascript
code. Apple controls are kept as common code and GTK+ ones are
subclassed for the specific behavior.
Both CMake and Autotools build support is provided.
* CMakeLists.txt: Added support to build the media controls
script and their associated files.
* GNUmakefile.am: Added support to generate the C++ code from the
Javascript.
* GNUmakefile.list.am: Added the media controls script associated
files.
* Modules/mediacontrols/MediaControlsHost.cpp:
* Modules/mediacontrols/MediaControlsHost.h:
* Modules/mediacontrols/MediaControlsHost.idl:
(WebCore::MediaControlsHost::supportsFullscreen): Added attribute
to know if the element supports fullscreen.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.handleWrapperMouseMove):
(Controller.prototype.handleWrapperMouseOut):
(Controller.prototype.updatePlaying): Use clear and
resetHideControlsTimer.
(Controller.prototype.clearHideControlsTimer): Added.
(Controller.prototype.resetHideControlsTimer): Added.
* Modules/mediacontrols/mediaControlsGtk.js: Added.
(createControls): Calls ControllerGtk.
(ControllerGtk): Calls the superclass.
(contains): Defines a function to know if an object is contained
in an array.
(ControllerGtk.prototype.inheritFrom): Copies the method of the
superclass that are not reimplemented in the subclass.
(ControllerGtk.prototype.createControls): Calls the superclass and
create the remaining needed elements.
(ControllerGtk.prototype.configureInlineControls): Configures the
controls.
(ControllerGtk.prototype.setStatusHidden): Redefined empty.
(ControllerGtk.prototype.updateTime): Writes the duration and
current position. As it was so far, current time also includes
duration. If current time is bigger than 0 we show that.
(ControllerGtk.prototype.showCurrentTime): Shows current time and
hides duration label (that is included in current time).
(ControllerGtk.prototype.handlePlay): Calls the superclass and
force showing the current time.
(ControllerGtk.prototype.handleTimeUpdate): Always update the
time.
(ControllerGtk.prototype.handleMuteButtonMouseOver): Shows the
volume slider.
(ControllerGtk.prototype.handleVolumeBoxMouseOut): Hides the
volume slider.
(ControllerGtk.prototype.addControls): Adds the enclosure instead
of the panel directly. Panel is, of course, part of the enclosure.
(ControllerGtk.prototype.updateReadyState): Shows the fullscreen
button only if fullscreen is supported. Sets the volume in up or
down mode depending on its position in the document. Updates the
volume.
(ControllerGtk.prototype.setControlsType): Creates the controls it
they were not created before. Unlike Apple ones, WebKitGTK+
fullscreen and inline controls are the same.
(ControllerGtk.prototype.updatePlaying): Calls the superclass and
shows the controls if not playing.
(ControllerGtk.prototype.handleCaptionButtonClicked): Redefined
empty. To be coherent with volume, that also shows a popup, this
is handled with mouseover instead of click.
(ControllerGtk.prototype.buildCaptionMenu): Calls the superclass
to build the menu, sets some listeners, centers the popup with the
captions button, keeps the current height and sets the style to 0,
which is needed to animate it.
(ControllerGtk.prototype.destroyCaptionMenu): Hides the caption menu.
(ControllerGtk.prototype.showCaptionMenu): Resets the height to
its original. We don't animate it with CSS because we would need
to specify a height in the style and we don't know it in advance.
(ControllerGtk.prototype.hideCaptionMenu): Sets height to 0.
(ControllerGtk.prototype.captionMenuTransitionEnd): When the
captions menu transtition ends, it is destroyed.
(ControllerGtk.prototype.handleCaptionButtonMouseOver): Creates
the caption menu and shows it.
(ControllerGtk.prototype.handleCaptionButtonMouseOut): Hides the
captions menu.
(ControllerGtk.prototype.handleCaptionMouseOut): Hides the
captions menu.
* PlatformGTK.cmake: Added WebCore to the target link libraries
and initialized the variables needed at CMakelists.txt
* css/mediaControlsGtk.css:
(audio::-webkit-media-controls-panel)
(video::-webkit-media-controls-panel): Added transtion based on opacity.
(video::-webkit-media-controls-panel): Set video opacity to 0.
(video::-webkit-media-controls-panel.paused): Set video opacity to 1.
(audio::-webkit-media-controls-panel div.mute-box): Set the same
style as the mute button to preserve the layout.
(audio::-webkit-media-controls-panel div.mute-box.hidden): Sets
the display to none.
(audio::-webkit-media-controls-mute-button)
(video::-webkit-media-controls-mute-button): Removed the outline
and the margin that is managed by the mute box now.
(audio::-webkit-media-controls-play-button)
(video::-webkit-media-controls-play-button): Removed the outline.
(audio::-webkit-media-controls-time-remaining-display)
(video::-webkit-media-controls-time-remaining-display): Removed
the display.
(audio::-webkit-media-controls-current-time-display)
(video::-webkit-media-controls-current-time-display): Added the
display block.
(video::-webkit-media-controls-time-remaining-display): Set
display none.
(video::-webkit-media-controls-time-remaining-display.show): Set
display block.
(video::-webkit-media-controls-time-remaining-display.hidden): Set
display none.
(audio::-webkit-media-controls-timeline)
(video::-webkit-media-controls-timeline): Removed outline.
(audio::-webkit-media-controls-volume-slider-container)
(video::-webkit-media-controls-volume-slider-container): Set
overflow hidden and set a transition by height.
(video::-webkit-media-controls-volume-slider-container.hidden):
Set height 0.
(video::-webkit-media-controls-volume-slider-container.down): Set
bottom to be below the panel. Changed the border radius and
transition accordingly.
(video::-webkit-media-controls-panel .hidden.down): Sets default
bottom as 0.
(audio::-webkit-media-controls-volume-slider)
(video::-webkit-media-controls-volume-slider): Removed the outline.
(audio::-webkit-media-controls-toggle-closed-captions-button)
(video::-webkit-media-controls-toggle-closed-captions-button):
Removed the background that is painted from C++ and removed the
outline.
(video::-webkit-media-controls-closed-captions-container):
(video::-webkit-media-controls-closed-captions-container h3):
(video::-webkit-media-controls-closed-captions-container ul):
(video::-webkit-media-controls-closed-captions-container li):
(video::-webkit-media-controls-closed-captions-container li.selected): Changed
the style to make it more coherent with the rest of the controls.
(audio::-webkit-media-controls-fullscreen-button)
(video::-webkit-media-controls-fullscreen-button): Removed the outline.
(audio::-webkit-media-controls-panel button.hidden): Sets the
display to none.
* html/HTMLMediaElement.cpp: UserAgentScripts.h is not needed here
and build cmake build would need for changes to get this compiled.
* platform/gtk/RenderThemeGtk.cpp:
(WebCore::nodeHasPseudo): Added. Checks if a node has a certain
pseudo.
(WebCore::nodeHasClass): Added. Checks if a node has a certain
class.
(WebCore::supportsFocus): Removed some element types as outline is
now handled in CSS.
(WebCore::RenderThemeGtk::paintMediaPlayButton): Checks if the
play button has the class paused to show the play icon instead of
the pause one.
(WebCore::RenderThemeGtk::paintMediaToggleClosedCaptionsButton):
Added. Paints the captions icon.
(WebCore::RenderThemeGtk::mediaControlsScript): Added. Loads the
bundled scripts.
* platform/gtk/RenderThemeGtk.h: Added the mediaControlsScript
method and declared the redefinition of the method to play the
captions icon.
LayoutTests:
Tests infrastructure for the media controls script.
* media/click-volume-bar-not-pausing.html:
* media/media-volume-slider-rendered-normal.html:
* media/video-controls-captions-trackmenu-hide-on-click-outside.html:
* media/video-volume-slider.html: Fixed.
* platform/gtk-wk2/TestExpectations: Tests flagged.
* platform/gtk/TestExpectations: Changed tests flags.
* platform/gtk/accessibility/media-element-expected.txt:
* platform/gtk/fast/hidpi/video-controls-in-hidpi-expected.txt:
* platform/gtk/fast/layers/video-layer-expected.txt: Rebaseline.
* platform/gtk/fullscreen/video-controls-override-expected.txt: Added.
* platform/gtk/http/tests/media/video-buffered-range-contains-currentTime-expected.png:
* platform/gtk/media/audio-controls-rendering-expected.png:
* platform/gtk/media/audio-controls-rendering-expected.txt:
* platform/gtk/media/audio-repaint-expected.txt:
* platform/gtk/media/controls-after-reload-expected.png:
* platform/gtk/media/controls-after-reload-expected.txt:
* platform/gtk/media/controls-strict-expected.png:
* platform/gtk/media/controls-strict-expected.txt:
* platform/gtk/media/controls-styling-strict-expected.png:
* platform/gtk/media/controls-styling-strict-expected.txt:
* platform/gtk/media/controls-without-preload-expected.png:
* platform/gtk/media/controls-without-preload-expected.txt:
* platform/gtk/media/video-controls-rendering-expected.png:
* platform/gtk/media/video-controls-rendering-expected.txt:
* platform/gtk/media/video-display-toggle-expected.png:
* platform/gtk/media/video-display-toggle-expected.txt:
* platform/gtk/media/video-empty-source-expected.txt:
* platform/gtk/media/video-no-audio-expected.png:
* platform/gtk/media/video-no-audio-expected.txt:
* platform/gtk/media/video-volume-slider-expected.png:
* platform/gtk/media/video-volume-slider-expected.txt:
* platform/gtk/media/video-zoom-controls-expected.png:
* platform/gtk/media/video-zoom-controls-expected.txt:
Rebaseline.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediaclickvolumebarnotpausinghtml">trunk/LayoutTests/media/click-volume-bar-not-pausing.html</a></li>
<li><a href="#trunkLayoutTestsmediamediavolumesliderrenderednormalhtml">trunk/LayoutTests/media/media-volume-slider-rendered-normal.html</a></li>
<li><a href="#trunkLayoutTestsmediavideocontrolscaptionstrackmenuhideonclickoutsidehtml">trunk/LayoutTests/media/video-controls-captions-trackmenu-hide-on-click-outside.html</a></li>
<li><a href="#trunkLayoutTestsmediavideovolumesliderhtml">trunk/LayoutTests/media/video-volume-slider.html</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkaccessibilitymediaelementexpectedtxt">trunk/LayoutTests/platform/gtk/accessibility/media-element-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkfasthidpivideocontrolsinhidpiexpectedtxt">trunk/LayoutTests/platform/gtk/fast/hidpi/video-controls-in-hidpi-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkfastlayersvideolayerexpectedtxt">trunk/LayoutTests/platform/gtk/fast/layers/video-layer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkhttptestsmediavideobufferedrangecontainscurrentTimeexpectedpng">trunk/LayoutTests/platform/gtk/http/tests/media/video-buffered-range-contains-currentTime-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediaaudiocontrolsrenderingexpectedpng">trunk/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediaaudiocontrolsrenderingexpectedtxt">trunk/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediaaudiorepaintexpectedtxt">trunk/LayoutTests/platform/gtk/media/audio-repaint-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediacontrolsafterreloadexpectedpng">trunk/LayoutTests/platform/gtk/media/controls-after-reload-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediacontrolsafterreloadexpectedtxt">trunk/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediacontrolsstrictexpectedpng">trunk/LayoutTests/platform/gtk/media/controls-strict-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediacontrolsstrictexpectedtxt">trunk/LayoutTests/platform/gtk/media/controls-strict-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediacontrolsstylingstrictexpectedpng">trunk/LayoutTests/platform/gtk/media/controls-styling-strict-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediacontrolsstylingstrictexpectedtxt">trunk/LayoutTests/platform/gtk/media/controls-styling-strict-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediacontrolswithoutpreloadexpectedpng">trunk/LayoutTests/platform/gtk/media/controls-without-preload-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediacontrolswithoutpreloadexpectedtxt">trunk/LayoutTests/platform/gtk/media/controls-without-preload-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediavideocontrolsrenderingexpectedpng">trunk/LayoutTests/platform/gtk/media/video-controls-rendering-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediavideocontrolsrenderingexpectedtxt">trunk/LayoutTests/platform/gtk/media/video-controls-rendering-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediavideodisplaytoggleexpectedpng">trunk/LayoutTests/platform/gtk/media/video-display-toggle-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediavideodisplaytoggleexpectedtxt">trunk/LayoutTests/platform/gtk/media/video-display-toggle-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediavideoemptysourceexpectedtxt">trunk/LayoutTests/platform/gtk/media/video-empty-source-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediavideonoaudioexpectedpng">trunk/LayoutTests/platform/gtk/media/video-no-audio-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediavideonoaudioexpectedtxt">trunk/LayoutTests/platform/gtk/media/video-no-audio-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediavideovolumesliderexpectedpng">trunk/LayoutTests/platform/gtk/media/video-volume-slider-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediavideovolumesliderexpectedtxt">trunk/LayoutTests/platform/gtk/media/video-volume-slider-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediavideozoomcontrolsexpectedpng">trunk/LayoutTests/platform/gtk/media/video-zoom-controls-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediavideozoomcontrolsexpectedtxt">trunk/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkwk2TestExpectations">trunk/LayoutTests/platform/gtk-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefileam">trunk/Source/WebCore/GNUmakefile.am</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHosth">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostidl">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorecssmediaControlsGtkcss">trunk/Source/WebCore/css/mediaControlsGtk.css</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGtkcpp">trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGtkh">trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h</a></li>
<li><a href="#trunkSourceautotoolsSetupWebKitFeaturesm4">trunk/Source/autotools/SetupWebKitFeatures.m4</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkSourcecmakeconfighcmake">trunk/Source/cmakeconfig.h.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformgtkfullscreenvideocontrolsoverrideexpectedtxt">trunk/LayoutTests/platform/gtk/fullscreen/video-controls-override-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsGtkjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/ChangeLog 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-13 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [GTK] MEDIA_CONTROLS_SCRIPT support
+ https://bugs.webkit.org/show_bug.cgi?id=123097
+
+ Reviewed by Jer Noble.
+
+ Part of the Autotools and CMake structure to build the media
+ controls script.
+
+ * Source/autotools/SetupWebKitFeatures.m4: Activated the media
+ controls script by default.
+ * Source/cmake/OptionsGTK.cmake: Activated the media controls
+ script by default.
+ * Source/cmake/WebKitFeatures.cmake: Created the option to
+ activate the controls script.
+ * Source/cmakeconfig.h.cmake: Created the define template the the
+ media controls script.
+
</ins><span class="cx"> 2014-02-12 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GDB] Add .gdbinit to the list of files ignored by Git
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/ChangeLog 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2014-02-13 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [GTK] MEDIA_CONTROLS_SCRIPT support
+ https://bugs.webkit.org/show_bug.cgi?id=123097
+
+ Reviewed by Jer Noble.
+
+ Tests infrastructure for the media controls script.
+
+ * media/click-volume-bar-not-pausing.html:
+ * media/media-volume-slider-rendered-normal.html:
+ * media/video-controls-captions-trackmenu-hide-on-click-outside.html:
+ * media/video-volume-slider.html: Fixed.
+ * platform/gtk-wk2/TestExpectations: Tests flagged.
+ * platform/gtk/TestExpectations: Changed tests flags.
+ * platform/gtk/accessibility/media-element-expected.txt:
+ * platform/gtk/fast/hidpi/video-controls-in-hidpi-expected.txt:
+ * platform/gtk/fast/layers/video-layer-expected.txt: Rebaseline.
+ * platform/gtk/fullscreen/video-controls-override-expected.txt: Added.
+ * platform/gtk/http/tests/media/video-buffered-range-contains-currentTime-expected.png:
+ * platform/gtk/media/audio-controls-rendering-expected.png:
+ * platform/gtk/media/audio-controls-rendering-expected.txt:
+ * platform/gtk/media/audio-repaint-expected.txt:
+ * platform/gtk/media/controls-after-reload-expected.png:
+ * platform/gtk/media/controls-after-reload-expected.txt:
+ * platform/gtk/media/controls-strict-expected.png:
+ * platform/gtk/media/controls-strict-expected.txt:
+ * platform/gtk/media/controls-styling-strict-expected.png:
+ * platform/gtk/media/controls-styling-strict-expected.txt:
+ * platform/gtk/media/controls-without-preload-expected.png:
+ * platform/gtk/media/controls-without-preload-expected.txt:
+ * platform/gtk/media/video-controls-rendering-expected.png:
+ * platform/gtk/media/video-controls-rendering-expected.txt:
+ * platform/gtk/media/video-display-toggle-expected.png:
+ * platform/gtk/media/video-display-toggle-expected.txt:
+ * platform/gtk/media/video-empty-source-expected.txt:
+ * platform/gtk/media/video-no-audio-expected.png:
+ * platform/gtk/media/video-no-audio-expected.txt:
+ * platform/gtk/media/video-volume-slider-expected.png:
+ * platform/gtk/media/video-volume-slider-expected.txt:
+ * platform/gtk/media/video-zoom-controls-expected.png:
+ * platform/gtk/media/video-zoom-controls-expected.txt:
+ Rebaseline.
+
</ins><span class="cx"> 2014-02-12 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Another Windows test expectations update.
</span></span></pre></div>
<a id="trunkLayoutTestsmediaclickvolumebarnotpausinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/click-volume-bar-not-pausing.html (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/click-volume-bar-not-pausing.html 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/media/click-volume-bar-not-pausing.html 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -70,6 +70,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ internals.suspendAnimations(); // Volumebar can be animated and we would need a timeout to have it shown.
+
+ mediaElement.volume = 1;
+
</ins><span class="cx"> waitForEventAndFail("error");
</span><span class="cx"> waitForEventOnce('playing', playing);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediavolumesliderrenderednormalhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/media-volume-slider-rendered-normal.html (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-volume-slider-rendered-normal.html 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/media/media-volume-slider-rendered-normal.html 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -17,6 +17,7 @@
</span><span class="cx">
</span><span class="cx"> function init()
</span><span class="cx"> {
</span><ins>+ internals.suspendAnimations(); // Volumebar can be animated and we would need a timeout to have it shown.
</ins><span class="cx"> video = document.getElementsByTagName("video")[0];
</span><span class="cx"> video.src = findMediaFile("video", "content/test");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideocontrolscaptionstrackmenuhideonclickoutsidehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-controls-captions-trackmenu-hide-on-click-outside.html (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-controls-captions-trackmenu-hide-on-click-outside.html 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/media/video-controls-captions-trackmenu-hide-on-click-outside.html 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> findMediaElement();
</span><span class="cx"> video.src = findMediaFile('video', 'content/test');
</span><span class="cx"> waitForEvent('canplaythrough', function () { startTrackMenuTest(startTest); });
</span><ins>+
+ internals.suspendAnimations(); // Captions menu can be animated and allowing the animation can create flakyness.
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideovolumesliderhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-volume-slider.html (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-volume-slider.html 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/media/video-volume-slider.html 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -11,6 +11,8 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx">
</span><ins>+ internals.suspendAnimations(); // Volumebar can be animated and we would need a timeout to have it shown.
+
</ins><span class="cx"> video = document.getElementsByTagName("video")[0];
</span><span class="cx"> video.src = findMediaFile("video", "content/test");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -441,9 +441,7 @@
</span><span class="cx"> webkit.org/b/107818 media/controls-styling.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> # New chromium based controls
</span><del>-webkit.org/b/107825 fullscreen/video-controls-drag.html [ Failure ]
</del><span class="cx"> webkit.org/b/107825 media/audio-delete-while-step-button-clicked.html [ Failure ]
</span><del>-webkit.org/b/107825 media/media-volume-slider-rendered-below.html [ Failure ]
</del><span class="cx"> webkit.org/b/107825 media/nodesFromRect-shadowContent.html [ Failure ]
</span><span class="cx"> webkit.org/b/107825 media/video-controls-fullscreen-volume.html [ Failure ]
</span><span class="cx"> webkit.org/b/107825 media/media-controls-clone.html [ Failure ]
</span><span class="lines">@@ -993,7 +991,7 @@
</span><span class="cx"> webkit.org/b/44478 fast/text/hyphen-min-preferred-width.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> # GTK is moving from toggle button to a menu of tracks.
</span><del>-webkit.org/b/101670 media/video-controls-captions-trackmenu.html [ Failure ]
</del><ins>+webkit.org/b/101670 media/video-controls-captions-trackmenu.html [ Timeout Failure ]
</ins><span class="cx"> webkit.org/b/101670 media/track/track-user-preferences.html [ Failure ]
</span><span class="cx"> webkit.org/b/101670 media/video-controls-captions-trackmenu-includes-enabled-track.html [ Failure ]
</span><span class="cx">
</span><span class="lines">@@ -1484,7 +1482,7 @@
</span><span class="cx"> webkit.org/b/124507 fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-ink.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/124509 media/video-controls-captions-trackmenu-hide-on-click-outside.html [ Failure ]
</span><del>-webkit.org/b/124509 media/video-controls-captions-trackmenu-hide-on-click.html [ Failure ]
</del><ins>+webkit.org/b/124509 media/video-controls-captions-trackmenu-hide-on-click.html [ Timeout Failure ]
</ins><span class="cx">
</span><span class="cx"> webkit.org/b/124566 fast/dom/SelectorAPI/resig-SelectorsAPI-test.xhtml [ Failure ]
</span><span class="cx">
</span><span class="lines">@@ -1515,8 +1513,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/126519 inspector-protocol/model/highlight-shape-outside-margin.html [ Failure ]
</span><span class="cx">
</span><del>-webkit.org/b/126520 media/click-volume-bar-not-pausing.html [ Failure ]
-
</del><span class="cx"> webkit.org/b/126521 accessibility/menu-list-sends-change-notification.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/126619 http/tests/media/video-auth.html [ Failure ]
</span><span class="lines">@@ -1547,6 +1543,11 @@
</span><span class="cx"> webkit.org/b/128061 tables/mozilla_expected_failures/bugs/bug1055-2.html [ Failure ]
</span><span class="cx"> # End of subpixel failures.
</span><span class="cx">
</span><ins>+# After webkit.org/b/123097 we flag these tests that also fail in mac
+webkit.org/b/123097 media/track/track-cue-mutable-text.html [ Failure ]
+webkit.org/b/123097 media/video-controls-captions-trackmenu-sorted.html [ Failure ]
+webkit.org/b/123097 media/video-controls-toggling.html [ Timeout ]
+
</ins><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End of Tests failing
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkaccessibilitymediaelementexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/accessibility/media-element-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/accessibility/media-element-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/accessibility/media-element-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -9,28 +9,32 @@
</span><span class="cx"> role: AXRole: AXEmbedded
</span><span class="cx">
</span><span class="cx">
</span><del>- description: AXDescription: video playback
</del><ins>+ description: AXDescription: Video Playback
</ins><span class="cx"> role: AXRole: AXToolbar
</span><span class="cx">
</span><span class="cx">
</span><del>- description: AXDescription: video playback
- role: AXRole: AXToolbar
</del><ins>+ description: AXDescription: Play
+ role: AXRole: AXButton
</ins><span class="cx">
</span><span class="cx">
</span><del>- description: AXDescription: play
- role: AXRole: AXButton
</del><ins>+ description: AXDescription: Duration
+ role: AXRole: AXSlider
</ins><span class="cx">
</span><span class="cx">
</span><del>- description: AXDescription:
- role: AXRole: AXSlider
</del><ins>+ description: AXDescription: Remaining
+ role: AXRole: AXTimer
</ins><span class="cx">
</span><span class="cx">
</span><del>- description: AXDescription: enter fullscreen
- role: AXRole: AXButton
</del><ins>+ description: AXDescription: Display Full Screen
+ role: AXRole: AXButton
</ins><span class="cx">
</span><span class="cx">
</span><del>- description: AXDescription: mute
- role: AXRole: AXButton
</del><ins>+ description: AXDescription: Mute
+ role: AXRole: AXButton
</ins><span class="cx">
</span><span class="cx">
</span><ins>+ description: AXDescription: Volume
+ role: AXRole: AXSlider
</ins><span class="cx">
</span><ins>+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkfasthidpivideocontrolsinhidpiexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/fast/hidpi/video-controls-in-hidpi-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/fast/hidpi/video-controls-in-hidpi-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/fast/hidpi/video-controls-in-hidpi-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,110) size 300x40
</span><span class="cx"> layer at (13,140) size 290x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 290x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 179x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 179x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 191x12
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkfastlayersvideolayerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/fast/layers/video-layer-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/fast/layers/video-layer-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/fast/layers/video-layer-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,110) size 300x40
</span><span class="cx"> layer at (64,224) size 290x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 290x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 179x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 179x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 191x12
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkfullscreenvideocontrolsoverrideexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/gtk/fullscreen/video-controls-override-expected.txt (0 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/fullscreen/video-controls-override-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/fullscreen/video-controls-override-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+This tests that the video element's "controls" attribute is overridden in full screen mode, and that the controls are correctly hidden upon exiting full screen. Press any key to continue.
+
+
+EVENT(webkitfullscreenchange)
+EXPECTED (shadowRoot = internals.shadowRoot(video) != 'null') OK
+EXPECTED (panel = mediaControlsElement(shadowRoot.firstChild, '-webkit-media-controls-panel') != 'null') OK
+EXPECTED (internals.shadowPseudoId(panel) == '-webkit-media-controls-panel') OK
+EXPECTED (document.defaultView.getComputedStyle(panel)['display'] != 'none') OK
+EXPECTED (document.defaultView.getComputedStyle(panel)['height'] >= '20px') OK
+EVENT(webkitfullscreenchange)
+EXPECTED (document.defaultView.getComputedStyle(panel)['display'] == 'none'), OBSERVED '' FAIL
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkhttptestsmediavideobufferedrangecontainscurrentTimeexpectedpng"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/http/tests/media/video-buffered-range-contains-currentTime-expected.png (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/http/tests/media/video-buffered-range-contains-currentTime-expected.png 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/http/tests/media/video-buffered-range-contains-currentTime-expected.png 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -1,89 +1,66 @@
</span><span class="cx"> \x89PNG
</span><span class="cx">
</span><span class="cx">
-IHDR X ' )tEXtchecksum 444fe6700dd654f34204bd8cd6402ab5\xA2\xEFw\xAD bKGD \xFF \xFF \xFF\xA0\xBD\xA7\x93 IDATx\x9C\xED\xDD{\\x94u\xFE\xFF\xFF\xF78\x80\x9C\x91\x83@(\xA9\xA2\x82\xB8\x90x\xFA\xB4\xD4~2\!d5,݄\x8D>\xA6\xD9M\xB6\xFChm\xABXi\xD9U6ܴ\xFDض\xE6ᓺ\xA4\x9B\xA6\xE6#\xD1B\xDCU" TB@\xCE0\xD7\xEF\x8F\xEB\xFB\x9D/?\x98|\xA6\x8F\xFB_3\xEFy\xCF\xEBz\xCDu\xE1\xADgs\xBD\xE7\xBA4\x8A\xA2 \xC8ӯ\xAF \xB8\xD7\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $\xB3\xEA\xD1\xEC\xE3Ǐ\xEF\xFB
MMMw\xA8!\xE0\xFEakk\xEB\xEF\xEF 7~\xFC\xF8\xBE\xEE \x93FQ \xA7~\xF0\xC1۷o\xBF\xA3\xDD \xF7\xA79s\xE6̟?\xBF\xAF\xBB Hc\xE9)\xC2'N\x90\xAE\x80;d\xEB֭'O\x9E\xEC\xEB. \xD2X\xB0v\xED\xDAuG\xFB \xEEs\xFC\x80{\x89\xA5\xEB
w\xB4\xE0>\xC7?1 \xB8\x97X\xB0X\xD5\xDCQ\x8D\x8D\x8D}\xDD @.\xD3 @2 ́\xBE\xFA\xEA\xAB\xF6\xF6\xF6\xBEn \xD0\xC7zv\xA1Q\xFCYYY͟??22\xD2\xD5յ\xD3KUUU\xFB\xF7\xEF\xFF\xF0\xC3\xDB\xDA\xDA\x{29377EE}\xC6\xC6\xC6\xFC\xFC\xFC &t \xB4\xB7\xB7\xAF\xAB\xAB\xFB\xEE\xBB\xEF\xFC\xFD\xFD\xFB\xAA1 \xC0\xDD\xE0\xC7X ppp\xF0\xF3\xF34hЏ\xB09t\xF2\xCC3\xCF̜9\xD3\xE8K\xAE\xAE\xAEO?\xFD\xB4\xE2\x83>0SA\xA7\xD3M\x9F>\xDD\xCE\xCE\xEE\xDBo\xBF\xFDꫯ\xCC \x9A\x97N\xA7\x8B\x8B\x8B\xEB8\xE7\x93O>\xB9u\xEBV\xC7GG\xC7\xC0\xC0\xC0\x8Ḙ[\xA8\xBE\xBE>??\xBF\xA5\xA5\xC50r\xE0\xC0\x81!C\x86\x8C =\xFAԩSeee>>>vvv\xBD\xA8 \xB87\xFCH\xDF`\xD5\xD7\xD7899
- >\xDC\xD9\xD9YVY___ggg\xADV+\xAB\xE6\xBD'**\xCA\xFC\x84\xC7 \xDC|\xC0z\xF3\xCD7ׯ_\xFF\xFD\xF7߯^\xBDZQ\x94\xBC\xBC<S\x83\xE6\xDF\xE5\xE4\xE4\xF4\xE0\x83\x9E;wN\x9D\xF0\xF3\x9F\xFF\xFC\xAF\xFDk\xA7wM\x9C8\xB1\xBC\xBC\xBC\xAF\xB6n\x89\xC6\xC6\xC63g\xCEtLWB\x88~\xFD\xFA\x95\x94\x94xxxxyy\x95\x97\x97_\xBBv\xCD\xCFϯ\xC5 \xF7\x86 \xF5amm\xED\xE9ӧ
-4|\xF8p[[\xDB۬fcc3jԨk]\xBE|\xB9\xD3\xEDБN\xA73?\xA1\xEB\xA9ÎF\x8C\xE1\xE0\xE0PTT$\x848x\xF0\xE0\x8C3\xF2\xF2\xF2\x8C
</span><del>-!lllZ[[E1:\xA1\xB6\xB6\xF6/\xF9˕+W\x84?\xFB\xD9\xCF\xF6\xEEݫ\xD7\xEB;mnԨQ\xD9\xD9\xD9}\xB5u\xF3 8`t088x\xE8С\x97.]*--UVUU \xEEg}\xB0Ƚ\xA2\xA2\xE2\xE4ɓ\xDF}\xF7\xDDm\xAE\xF6\xF5\xF5\xBD~\xFDzyy9\xE9\xEA\x8E6l\x98\xE1+\xA5\x92\x92\x92\xE1Ç\x9BB\xFC\xCF\xFF\xFC\x8Fz:\xD2脺\xBA:5\xDF!\xA2\xA2\xA2rrr:mk\xC0\x80555 \xEF\x8F\xF9cn\xBD\xFF\xFE{///!\xC4͛7\x9D\x9C\x9C\xB5\x80\xFB^\xDF,r\xD7\xEB\xF5W\xAE\\xA9\xA9\xA9
+IHDR X ' )tEXtchecksum 55d87bb57f5025402122a1cf7c5a6a33\x92\x8C+\x81 bKGD \xFF \xFF \xFF\xA0\xBD\xA7\x93 IDATx\x9C\xED\xDD{\T\xE5\xDE\xFF\xFFk\x9C9\x8D"\x82@(\x92\xA9\xA2\x82$\x9E3\xDCB\xC8\xD6<\xB0\xE9!\xEC\xE86\xCD \xB2\xCB[;)Z\xDAA\xDA\xCAK\xEB\xB6\xDD6w\xEA&\xDD`j\x9E1-ĝy\xE0\xA0\x84\xA0 \x99\xF5\xFBc}\xBF\xF3\xE53À\x97b\xF2z\xFE5s\xCD5\x9F\xF5Yk
+\xDF\xCEZ\xB3\x96FQ y\xBAuv w \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d\xBAv\xCD>t\xE8жm\xDBN\x9F>]WWw\x8B\xBA;;;__ߘ\x98\x98\x91#Gvv/ \x994\x8A\xA2X9\xF5\xE3\x8F?i\xD3-\xED蚦M\x9B6s\xE6\xCC\xCE\xEE \x8D\xB5\x87 >L\xBAn\x91
+6 9r\xA4\xB3\xBB Hcm\xC0ںu\xEB-\xED\xE8\xE2\xF8\x80\xBB\x89\xB5\xEB\xF4\xE9ӷ\xB4\xA0\x8B\xE3O \xEE&\xD6,\xCEjn\xA9\xEBׯwv i\xB8L \x80d, \xC9X \x92\xB5\xEFB\xA3@k:\x9Dn\xE6̙\xE1\xE1\xE1\xBD{\xF7n\xF1REEŮ]\xBB>\xFD\xF4\xD37ntJo t\x8A\xDB\xB0v\xEF\xDE\xED\xE8\xE88`\xC0\x80>}\xFA܆\xC5\xE16{\xE6\x99g&O\x9El\xF2\xA5{?\xFD\xF4\xD3B\x88\x8F?\xFE\xD8B\xBD^?q\xE2D{{\xFB \xFC\xF1\xBBﾳ0h\xF9]z\xBD>&&\xA6\xF9\x9C/\xBE\xF8\xE2ڵk\xCDG\x9C\x9C\x9C\xFC\xFD\xFD\x9B\xBC\x9DK t\xB7\xE9\xAC\x9A\x9A\x9A\xBC\xBC\xBC =z 4\xC8\xD9\xD9YVY[[[ ggg\xADV+\xAB&\xDA+""\xC2\xF2\x84\xC7 {\xCCr\xC0z뭷V\xADZ\xF5\xCB/\xBF,[\xB6LQ\x94\x9C\x9C s\x83\x96\xDFգG\x8F{\xEF\xBD\xF7\xE4ɓ\xEA\x84G y\xE4\xEF\xFF{\x8Bw\x8D =\xBA\xB4\xB4\xB4\xB3\x96 \xE8"n\xEB!\xC2\xEA\xEA\xEAcǎ\xF5\xE9\xD3gРAvvv7Y\xCD\xD6\xD6v\xE8С/^<w\xEE\CC\x83\x8C\xD1z\xBD\xDE\xF2\x84և\x9B<x\xB0\xA3\xA3cAA\x81bϞ=\x93&M\xCA\xC9\xC919(\x84\xB0\xB5\xB5mllT\xC5\xE4\x84\xEA\xEA\xEAO>\xF9\xE4\xFC\xF9\xF3B\x88 |pǎ \x83\xA1\xC5\xE2\x86 \x9A\x99\x99\xD9YK t\x9Dp\x92{YYّ#G~\xFE\xF9禦\xA6\x9B\xA9\xE3\xE3\xE3s\xE9ҥ\xD2\xD2R\xD2\xD5\xEF\xDA\xC0\x81\x8D_)
+4\xC8ܠ\xE2\xFE\xE7\xD4Ñ&'\\xBDzU\xCD7B\x88\x88\x88\x88\xAC\xAC\xAC\xCB\xEAٳgUUU\xF3\xFBo\xDEΥ \xBA\x8E\xCE9\xC9\xDD`0\x9C?\xBE\xAA\xAA*88\xB8\xC3E\x9C\x9D\x9Dϝ;'\xAF)tgg\xE7\xFA\xFAz\xF5qMM\x8D\xFA}\x98\xC9A!Djj\xAA\xBA\xD3\xCDMP\x9F:u\xAA\xB1\xB1\xB1Ųƍw\xE0\xC0\x81\xCEZ: \xA0\xEB\xE02
+\xE8d\x83A\xA7\xFB?A_=gnPq\xF4\xE8\xD1˗/[\x98\xA0\x8A\x8C\x8C\xFC\xFE\xD5zY\xF7\xDF\xFF\xBF\xFF\xFD\xEF\xCEZ: \xA0\xEB蜀ekk\xEB\xE7\xE77bĈ\x9B)RUU\xE5\xE6\xE6&\xAB%t\x96\x8B/\xBF\xEAիץK\x97\xCC
+\xB6\xF9.U``\xE0/\xBF\xFCR[[\xDB\xE2-\xAE\xAE\xAE\x9D\xB5t @\x97r\xBBV\xB7n\xDD\xFA\xF7\xEF\xFF\xD0Cyyyi4\x9A\x9B)u\xE1\xC2OOO///[[[Y\xED\xE1\xF6;q\xE2D\xFF\xFE\xFD\xBBw\xEF.\x846l\xD8ѣG\xCD
</del><ins>+!\xFC\xFD\xFD{\xF6\xECia\x82\xE2\x8F\xFC\xE3?\xFF\xF9\xCF\xD6 \xFA\x8F\xFF\xF8\x8Fo\xBF\xFD\xB6\xB3\x96 \xE8Rn\xEB9X\xAE\xAE\xAE\x83
+rpp\x90R\xED\xFA\xF5\xEB?\xFE\x{8CF3CF}\x97\x97\x97i\xE8DW\xAF^\xB5\xFCC\xC2\xD6\xDF5WUU\xF5\xF1\xC7 ϛ7\xAF\xB0\xB0pРA\xC9\xC9\xC9\xE6\x85o\xBC\xF1\xC6\xF6\xED\xDB?\xFF\xFCssJJJ\xAA\xAA\xAAZ/h\xE0\xC0\x81[\xB6l鬥 \xBAM\xF3_TY\xF0裏vx\xBBwﶷ\xB7 8p \xBD+%$$\xA8W5gӦM\x96\xAF\x83%\x84\xE8\xBB\xBD\xBD\xFD\x95+W,\xBA\xB8\xB8TWW\xAF o\xF2]\xE6\xA8?!쬥[\xE3\x9Bo\xBE\x91U
+ йnG\xC0\xC2\xDDM\xA7\xD3=\xF3\xCC3\x8F=\xF6\xB7ʹI, \xB8k\xB0\x80; \xEE\\xA6 @2 \x80d, ɬ
+X7of \xD8\xDB\xDBwv i\xAC
+X~~~\xB7\xB4\xA0\x8B\xF3\xF5\xF5\xED\xEC \xD2X\xB0&M\x9AtK\xFB \xBA\xB8?\xFE\xF1\x8F\x9D\xDD @k\xD6ȑ#\xA7M\x9BvK[\xBA\xAC\xD8\xD8\xD8\xD0\xD0\xD0\xCE\xEE \x8D\xB5\xD7\xC1Reggoٲ\xE5\xF4\xE9\xD3ׯ_\xBFu=]\x84\xBD\xBD\xFD\xFD\xF7\xDF \xD2ٽ dj_\xC0 @\x9B\xB8L \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90L\xD7\xD9
+\x88˗/766\xEA\xF5\xFA\x9E={ޙo\x8F\xCA\xCAʚ\x9A\xADV\xEB\xE9\xE9\xD9|\xBC\xB8\xB8X\xE1\xE2\xE2\xE2\xE0\xE0Ю\x82%%%gϞ
+ trrj\xFD\xF4V\xB4
+ Tf\xD6\xE6͛
+
+L\xBE4f̘q\xE3\xC6\xC9\xEA\xE0\x87 ~\x98={\xF6ĉ\xDF{\xEF\xBD;\xB3\xA09YYYgϞMLL\x94R\xED
)))\x99\x99\x99\x97.]j>~\xF8\xF0\xE1\x993g\xFE\xEDo{\xE6\x99g\xAC\xAF\xF6\xB7\xBF\xFD\xED\xF8\xF1\xE3\x8D\xE6\x89'\x9E\x88\x89\x89i\xF1\xF4\xB5zw\x93\xBB\xBB;E\x9B\xD4w\xC1:\xC0 \xC2l\xC0ڸqcbbb\xEFmll"""-ZTWW\x97\x9B\x9B\xBBkv,EQ4\x8D\xB9\xF1\xC7 \xFC\x9E{\xEEiW\xD3\xD2 v\xCCƍ\x8F 9\xD2\xE6\xBFF\xE6\xBAma\xF8\xF0\xE1cƌ\xC9\xCC\xCCl1>y\xF2\xE4Y\xB3f\xB5\xAB\xB1\xDA\xDAڅ \xE6\xE7\xE7\xEB\xF5\xFAK\x97.\xB5xڮR\xEDj\xF5\xF7\xCE\xF2\x9E\xB2rwߙ\xD4Uk\xF3\x8F\xFAw\xBD\x8E pG1\xB0\xBC\xBD\xBDǏ \xAF>\xB6\xB5\xB5uqq B\xF8\xFB\xFB\xA7\xA6\xA6Z\xBF\x80m۶\x95\x96\x96Ξ=\xDB\xCA\xF1\xDB_\xB0\xC3>\xFE\xF8\xE37nX\x9E#\xAB\xABn\xDD\xDAq\xB6\xDCٳg\xAF^\xBD\xAA\xD7띝\x9D\x9D\x9D\x9D\xF3\xF3\xF3\x9B?\xBD\xC9Nn\x9B\xFA\xFAz\x83\xC1`oo{\xD7枲fwߙ\x8C\xAB\xD6\xE6 \xF5\xEFw \xE0Nc6`\xADZ\xB5\xCA丫\xAB\xEB\xE2ŋ\xD5Ǚ\x99\x99G\x8F uvv\x8E\x8D\x8D\xEDի\x97\xA2\xA8\xA8hӦM\xD5\xD5\xD5}\xFB\xF6\xFDӟ\xFET\\\xBCt\xE9\xD2\xC0\xC0\xC0M\x9B6EEE\xD9\xD9٩o,((h>.\x84\xD0j\xB5Ǐ \xCF\xC8\xC8\xE8{BBB\x8F =\x84\xF9\xF9\xF9\xFB\xF6\xED+//\xF7\xF4\xF4|\xFA\xE9\xA7\xF5z}\x8B7\xB6\xB7\xA0ɞ\x8D\xB2\xB3\xB3ϝ;w\xDF}\xF7\xE5\xE6\xE6\x9E?>000&&FM6\xAD;9}\xFA\xF4\xF1\xE3\xC7 &N\x9Cx\xF4\xE8ѳg\xCF6\xAC\xA1\xA1a\xE7Ν NNN\xAD\xBB5\xB9\xF4={\xF6\xEC۷\xCF`0\x9C?\xDE\xDC\xAA\xFA\xE0\x83***F\x8C1a\xC2!\xC47\xDF|S^^ \xE4\xEB\xEB\xFB\xFD\xF7\xDF\xFF\xFC\xF3\xCF...\x8F?\xFExeeeFF\x86b۶m\x8F?\xFEx\xF3\xA7S\xA6L\xD1h4-\xDA8t\xE8PQQѰa\xC3\xDC\xDD\xDD7m\xDA\xF4\xD4SO\xDDs\xCF= h\xB5u\x9D\xCA\xCA\xCA\xDB\xCDܶR+\xECڵ\xEB\xE8ѣMMM\xF6\xF6\xF6۷oy\xB3\x97\x97\x97彦\xFA\xEE\xBB\xEF 8\xF0\xDBo\xBF\xB9\xB9\xB9M\x980a\xE0\xC0\x81B\x88Ç <xPQ\x94ѣG\x8F5Ja\xE5\x9E*,,\xEC\xC0\xEEn\xFD\xF9o\x9D[\xF4y\xEE\xDC9\x93;\xB1Ŗ\xECӧOSS\x93\xE5 dͪ\xBD\xF3\xCE;&?]\xEA u\xF3u<r\xE4\xC8\xF9\xF3\xE7\x9A\x9A\x9A\xBE\xFA\xEA+''\xA7\xD8\xD8\xD8\xEBׯ\xEFر\xA3\xB4\xB4t\xE2ĉ\xC1\xC1\xC1m\xFEA@W\xD6\xF1_&%%\xADX\xB1bʔ)\x8A\xA2TTT\x94\x95\x95\x8D 9244t\xE6̙\xBBw\xEF\xBE|\xF9\xF2\x85 \x8A\x8B\x8Bu:\x9D\x9D\x9D]\xF3\x83/\xADǏ ;\xF6\xED\xB7\xDF\xF6\xEC\xD9355\xF5\xBF\xFE\xEB\xBF\xD4i |\xF0\x81\x87\x87\xC73\xCF<\xB3w\xEF\xDE)S\xA6\x98|c\xBB
+\xB6\xEE\xB9\xF9
+2dѢE\xAF\xBD\x{19AAEB}\xEB\x80^|\xF1E\xE3\xF7\xAD;0`\xC0\x993gԃw+V\xAC\x98;w\xEE{\xF5z\xFD\xBB\xEF\xBE;w\xEE\xDC\xD6]\x99\\xFA\x82 \xE6̙3~\xFC\xF8\x84\x84 s[;;;\xBBo߾^^^\xCF=\xF7\xDCs\xCF='\x84^\xB0`\xC1\x8E ;\xD4\xB2\xB3\xB3.\(\x84\xB8|\xF9rCC\x83\xA2{\xF7\xEEvvv-\x9E\x9A\xDCÇ_\xB1b\xC5\xF3\xCF??w\xEE\xDC\xCF>\x{3B2CB2C}c\xAD\xB6\xAE\xD3z\xBB\x99\xDBVjco\xBD\xF5Vll\xECĉ\xFF\xFAFFF\xAA\xE9\xCA\xF2^B,_\xBE<...,,,!!\xE1\xB7\xDF~\xFB\xFE%\x84HNN\x9E?\xFEO< \xFE\xC2 /$''[\xBF\xA7:\xB6\xBB[\xFE\xDB\xEC\xD3\xDCNl\xB1%===\xDB\xDCAV\xAE\x9A\xB9X\x8Bu :t\xE8ʕ+g͚\xB5}\xFBv\xADV\xBB|\xF9\xF2G y\xE4\xFD\xF7߯\xA9\xA99v\xEC\xD8\xC3?\UUeͮ\x80\xAEK\xB1B\xFF\xFE\xFD\xA7O\x9F\xDE|\xA4\xA8\xA8H\xAB\xD5\xE6\xE4\xE4(\x8Ab0\]]\xD3\xD2\xD2v\xEC\xD8\xE1\xEE\xEE~\xE3\xC6
+EQ\xD4S\xD4\x{1E69A6}\x9A\xACi 7n\RR\x92\xFAx\xE5ʕ\xFD\xFB\xF7W \xE7\xE5\xE5\xA96nܨ\xD7\xEB[\xBF\xB1]M\xF6ܢ\xC8\xF0\xE1×,Y\xA2>\xFE\xE2\x8B/t:]qq\xB1\xB9NV\xAF^\xED\xE5\xE5\xD5z\x89˖-\xF3\xF5\xF5mѕɥ\xDB\xD8\xD8ddd\xA8\x93]\xEB\xEE\xEE\xDEz\xD5z\xF7\xEE\xBDn\xDD:\xF5\xF1\x8E ;4MAA\x81\xA2(\xBE\xBE\xBE\xEF\xBE\xFB\xAE:\xBEdɒ\xE0\xE0`\xF5\xF1\x81\x84\x95\x95\x95\xAD\x9F\x9A\xDB\xC6\xFE\x8B\x8A\x8Arss;\xDCj\xF3:eee&\xB7\x9B\xC9me0\x9C\x9C\x9C֯_\xAF\x8E'$$\x84\x87\x87[\xB3\xD7JKKmllv\xECء>\xAD\xA8\xA8\xF8\xE2\x8B/JJJlmm :\xA4\xEEڵ\xCB\xD6ֶ\xA4\xA4Ě=\xA5ttw\x9B\xFC\xFC[\xEE\xD3\xC2Nl\xB1%\xDB\xDCAV\xAE\x9AQ\xEB?\xEA\xEB >w\xEE\\xF5qJJ\x8A\xF1\xAFR=\x8D\xEFȑ#\xD6\xFCA@\x97\xD5\xC1\xCB4\xE4\xE5\xE5555\xE5\xE5\xE5\x9D;wNaggw\xFE\xFC\x{120822B}W\xAF\x8E7nΜ9QQQݻw\xEF@e\x87\xBA\xBA:\xF5q@@\xC0O?\xFDt\xF1\xE2ż\xBC<\xF5k\x98\x9B)h\xB2g o|衇nܸ\x91\x97\x97\xE7\xE5\xE5ծN\x9C\x9C\x9C\x8C\xAB`dr\xE9999\x8D\x8D\x8D=\xF4\x90\xF5\xAB3v\xECXEQN\x9E<\xA9 k\xAF67B߾}\xA5\xB4ڷo_!\x84\x9B\x9B\x9B\xE5\xEDf\xDCV\x8A\xA2\xD4\xD7\xD7+\x8A\xA2\x8E߸qC\xFD\xBE\xAD͆ >\xDC\xD8\xD8\xF8\xE0\x83\xAAO]\\bbbv\xEE\xDC\xD9\xD0\xD00d\xC8u000\xB0\xA1\xA1\xE1\x87 ~h\xF1\xEB\x93{J\xB4\xF3\x83g,2l\xD80 \x9F\x93}Z\xAE\xACR\xB7d\xF3\xA7\xD6|\x92ͭZ\xC7\xE8\xF5zc5GGG!D]]]{\xFF\xA0 \xA0K\xE9\xE0!\xC2\xEA\xEAj!\x84^\xAF\xB7\xB3\xB3\xB3\xB3\xB3[\xBDzu\\\x9C\xB7\xB7wvv\xF6\x80|}} o\xA6\xB3\xAA\xAA\xAA#F\xACZ\xB5\xEA\xEAի:\x9D\x84\xEBu\x99\xEC\xD9\xC2|\xBD^/\x84\xB8z\xF5\xAA\x94NL.\xBD\xBC\xBC\\xA3Ѵ\xEBz]\xEA9a\xF5\xF5\xF5۸E\xAD\xB6k\xBBu\xEB\xD6mƌk֬9{\xF6\xECw\xDF}\xF7\xF5\xD7_?\xFB\xEC\xB3\xD64\xAC\xFEï\xEE,\xA3+W\xAE!\x8CG\xBD\x84\x98:(\xB7\xED\xE6,\xFEM\xF6\xD91\xED\xFD$\xDF"wH pg\xEA`\\xF0\xF0\xF0B\x8C1b\xC0\x80\xC6AEQ\x86 \xFA\xD9g\x9F]\xB9re̘1+W\xAE4w\xA6\xBC5\xD2\xD3\xD3գ!B\x88}\xD5f\xCF\xA8\x87B\xFA\xF7\xEF/\xA5\x93K/,,T\xA5\xAC\xAC\xACO\x9F>V\xD6)))B\xDC{\xEF\xBD۸E\xAD\xB6w\xBB-\\xB8\xF0\xC5_\\xB7n]Ϟ=\xBF\xF9曀\x80 k\xEE߿\xBF\xE2
~~~\xC6Aooo!Dee\xA5z)Բ\xB22\xE3\xA0\xF4\xB6\x8D,\xFEM\xF6\xD91\xED\xFD$\xDF"wH pg\xEA\xE07X!!!nnniii\xCD\xB7nݚ\x9D\x9D-\x84pvv \xB1\xB1\xB1B\xD8\xD8\xD8\\xBF~\xBDus\xE3F\x8A\xA2444\xA8_\xD54\xFFw\xAE\xC3M\xF6lAzz\xBA\x9F\x9F\xDF<`\xAEk\xBB2\xB9\xF4Q\xA3F\xE9\xF5\xFAիW[_p\xF3\xE6\xCD\xFE\xFE\xFE\xEA\x91&ggg\xF5\xE8\x8C\xF5\xAC\xD9\xB2Zm\xD7vSe #G\x8E\x8C\x8E\x8E\xD7j\xB5\xB6[s=\xF4Ѐ\x96-[\xD6\xD4\xD4\xD4||||\xBE\xFE\xFAk\xF5\xE9\xF6\xED\xDB \xA0^\x92\xC0 \xE3\x9E\xEA\xF0\xEE6\xF9\xF9\xB7ܧ\xB8e;\xB1\xB96\xFF4:\xC6\\xABV\xAD\xBA\x99\xFFY\xC0]\xC2\xF2)Z\xFB\xF7\xEFOJJrrr8p\xE0+\xAF\xBC\xF2\xCB/\xBF_ڵk\xD7=\xF7\xDC3}\xFA\xF4\xB3g\xCFfff\xDE{\xEF\xBD\xF9\xCB_\xE6̙RTT\xA4(ʬY\xB3\]]'O\x9E\xFC\xFD\xF7\xDF7\xAFl _\xB2d\x89\xB7\xB7\xF7ȑ# >|\xE6̙\xC8\xC8HGG\xC7\xCF?\xFF\xFC\xD7_\xF5\xF6\xF6\xF6\xF3\xF3{\xE2\x89'\xB5Z\xEDG }t3M\xF6\xDCb}\x87 \x96\x9C\x9C\xFC\xDCs\xCF
+2\xE4\xC7 T\xC5d'\xBBv튈\x88prrz\xF7\xDDw\xB7m\xDBf\\xE2\xA9S\xA7"""z\xF4\xE8\xB1y\xF3\xE6ݚ\\xFA֭[{\xF5\xEA5z\xF4\xE8I\x93&M\x9E<\xD9\xD1\xD1\xF1 \xFF\xF8G\x8B\xAE&L\x98\xF0\xD8c\x8F͟?\xEAԩAAA\xA7N\x9DR\xC7?\xF9\xE4\x9DN\xF7\xC0<\xFD\xF4\xD3O>\xF9\xA4\x87\x87Ƕm\xDB~\xF9\xE5\x97\xD8\xD8X!ċ/\xBE\xB8{\xF7\xEEOMn\x84\x9D;wz{{?\xF4\xD0Cj\xCF\xE66T\x9B\xAD\xB6\xA8cn\xBBY\xD8V\xCD?\x99\xCE\xCE\xCE\xDF~\xFB\xAD5{\xEDĉÇ\xF7\xF5\xF5\x9D4iRtt\xB4Z\xED\xBB\xEF\xBE \x9E3g\xCEs\xCF=t\xEC\xD81\xB5T\x9B{*##\xA3c\xBB\xDB\xE4\xE7\xBF\xCD>M\xEE\xC4[Қ dͪ\xA92\xE6\xFE\xA8\x9B\xAF\xE3_|\xE1\xE3\xE3\x92\x91\x91\x91\x9B\x9B;q\xE2DGGǔ\x94\x94\xEA\xEAj\xF5\xF7\x98\xFE\xF3\x9F\xCB\xCB\xCBM\xEE\x9AA\x83\xDDw\xDF}
+ tm\xE5\xFF\x9EV\xDC\x83\xA1\xA8\xA8H\xA7ө?\xA7B444;99$)\x8ARTTԫW\xAFg\x9F\x98o\xEEƍ%%%\x9E\x9E\x9E\xB6\xB6\xB6m\xBEњ\x82&{nN\xBD\xF6\xD5\xF4\xE9ӵZm\xBF~\xFD\x8C?k7ى5Zter\xE9\x83\xA1\xB4\xB4\xD4\xC3\xC3\xC3\xC2?\xEA\x86\xED{\x8B\xB6+**\xDA{O@\xCB\xC1\xC2 kZm\xCE\xFA\xED\xA6(\xCA\xF4\xE9\xD3\xE7Ν\xAB\x9E\x99^__?c\xC6 \x97\xCF?\xFF\xDCʆ/]\xBATSSӯ_\xBF\xE6\xCB*//\xD7j\xB5\xD6\\x9F\xA9\xF9\x9E\xEA\xF0\xEEn\xFD\xF9\xB7\xA6\xCF[\xB7UV\xFEitL\xEB6\xD4\xEBS\xB8\xBB\xBBK_ \xFC\x8E\xDCT\xC0\xBA\xFB\xA8\xEB\xD5W_\xED\xECF\xBA\x9C}\xFB\xF6͚5+??\xDF82u\xEAT \x9Fe˖ubW t\x8C\x84_\xE7\xDD5\xAF^\xBD\xDA\xD4Ԥ\xD5j;\xBB\x9D\xAE\xC5\xCF\xCF\xEF\xEAի ~\xF8\xE1\x83>x\xEDڵ\xED۷\xB4\xEB\xA6L \xDC9\xF8\xEB\xFFٹs\xE7\x85 \x84^^^\xF8\xC3 :\xBB\x9D.\xE7\xEAի;w\xEE\xBCx\xF1b\xF7\xEE\xDDF\x8F m\xCDM\xB2 \xB8\xB0 $\xEB\xF8\xBD ` @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90L\xD7\xD9
+\xC8a0\xAE\\xB9R[[\xAB\xD3\xE9<<<:\\xA7\xB2\xB2\xB2\xA6\xA6F\xAB\xD5zzzʝ,\xC5\xCD/\xD1`0t\xEBF\xAA \xE0\xD62\xB0\xF6\xEF߿\xFF\xFE\xD6\xE3111~~~\xEB֭+))QG&L\x98(\x84hjjz\xE7\x9Dw\x9A\x9A\x9A\x84O=\xF5TEE\x85\x85
+\xC6\xFA \xEAK\xF9\xF9\xF9\xE9\xE9銢h4\x9Ag\x9F}vϞ=&\xDB3f̸q\xE3\xD4\xC7YYY\x99\x99\x99ӦM[\xB1b\xC5\xE1Çϝ;g\xF5\xEA\xB7t\xE1
\x94\x94\x94\xCC\xCC\xCCK\x97.ɝ,\xC5\xCD/1===??\xE1
Z\xADVno \xC0\xC8l\xC0;v\xAC\xC1`x\xF8\xE1\x87\xDF~\xFB\xED\xB1c\xC7655\xD5\xD5ե\xA7\xA7\x9F<y\xD2\xCF\xCF/66\xF6\xF5\xD7__\xB6lف\xD4t%\x84\xD0j\xB5\xF3\xE6\xCD u\xAB\xAF\xAF\xAF\xC2B\xB5~TTTUU\x95\x8B\x8BKtt\xB4bȐ!^^^aaa999\x8E\x8E\x8E7nLLL\xECݻ\xB7\x8D\x8DMDDD``\xE0\xA2E\x8B\xEA\xEA\xEArssw\xEDڥ\xAC\xB5k\xD7feemڴI\xABՆ\x85\x85 >|\xF8f6\xC7\xF0\xE1\xC3nj\x93\x99\x99)}\xB2ej\xA6\x94\xB5D բ\xA3\xA3\xEB\xEB룣\xA3\xB7l\xD9bccӑ^ @[, "tvvB <\xF8\xA1\x87 RGE\xB9r\xE5\x8AB\xA7ӽ\xF0\xC2 \xEF\xBD\xF7\xDE\xE6͛G\x8F m|ˉ'\xFC\xFD\xFD\xD5te\xB9\x82\xFAjdddqqqbbbXX\x98zh\xCF\xD9\xD9\xD9\xD6\xD6\xD6\xD1\xD1Q\xE1\xED\xED=~\xFCxu\xB2\xAD\xAD\xAD\x8B\x8BKHH\x88\xC2\xDF\xDF?55Uq\xECر\xA4\xA4\xA4ӧO\xFF\xAE\xBF\x8Fٶm[ii\xE9\xECٳoO\xB5\xA9S\xA7n۶-99yɒ%R\x96 Zh\xDF9X\xE1\xE1ኢ\xA8\x8F=<<bbb>\xFB\xEC\xB3\xE5˗\xAByH\xB1z\xF5\xEA\xE7\x9F\xDE\xCA
+B\x8DF\xB3nݺaÆ\xC5\xC7\xC7\xF5\xD5W-&\xAFZ\xB5\xCAdWW\xD7ŋ !-Z4i\xD2$s'$ >|\xF8\xE0\xC1\x83\x8A\xA2\x8C =zԨQ\xEA`~~\xFE\xBE}\xFB\xCA\xCB\xCB===\x9F~\xFAi\xBD^\xAF\x8E\xEFٳg߾}\x83\xE1\xFC\xF9\xF3͋dff =z\xD4\xD9\xD9966\xB6W\xAF^\xE6& 9r\xE4\xFC\xF9\xF3MMM_}\x{1554D3}Sll\xEC\xF5\xEB\xD7w\xEC\xD8QZZ:q\xE2\xC4\xE0\xE0`\x93
+
+\x96.]\xB8iӦ\xA8\xA8\xA8\xC2\xC2B\xEB\xDBk\xBD.VV\x9B9sfLLLRR\x92\x9A\x80 \x80\\xED8\xDFyy\x8D\xA6\xF9)ҳgϮ\xAE\xAEްa\x83\xFA\xB4\xB2\xB2\xF2ԩS\xC6S\xA3\xAC\xA9 \x84\xF0\xF6\xF6^\xB9r\xE5Ν;?\xFA\xE8\xA3v\xB5^[[\x9B\x95\x95\xA5~\xA7\xD5Zrr\xF2\xFC\xF9\xF3\x9Fx\xE2\x89\xF0\xF0\xF0^x!99Y \xFF\xE0\x83<<<\x9Ey晽{\xF7N\x992E \\xB0`\xC1\x9C9sƏ \x9F\x90\x90\xE0\xE3\xE3c,\x92\x94\x94\xB4bŊ)S\xA6(\x8APQQan\xF2СCW\xAE\9k֬\xED۷k\xB5\xDA\xE5˗?\xF2\xC8#\xEF\xBF\xFF~MMͱc\xC7 ~\xF8᪪*\x93/\\xB8P\\\xAC\xD3\xE9\xEC\xEC\xEC4M\xBB\xDAk=ٚjB\x88\xE0\xE0\xE0\xDA\xDAZ)7 \x80 \x8AyǏ B\x84\x84\x84DFFFFF\xDE\xFF\xFD\xAD\xE7\xA9\x8FSRR\xD2\xD2Ҭ\xAFp\xFC\xF8\xF1\xB8\xB88\xF5qTT\x94\xA3\xA3cAA\x81\xA2(Ço\xBD\xA0\xFE\xFD\xFBO\x9F>\xBD\xF9Hnn\xAE"33\xD38\x92\x9A\x9AڿEQJJJlmm :\xA4\x8E\xEFڵ\xCB\xD6ֶ\xA4\xA4DQ\x94\xBC\xBC<up\xE3ƍz\xBD^Q\x94\xE2\xE2b\x9B\x8C\x8C u|\xEDڵ\xEE\xEEi\xB5ڜ\x9C EQ \x83\xAB\xABkZZ\x9A\xB9Ɋ\xA2\x84\x87\x87ϝ;)\xD4NEQOH?r\xE4\x88ɂꪥ\xA6\xA6\xAA\x93\xADo\xCF\xE4\xE46\xAB\xF5\xE8\xD1\xE3\x95W^i\xBD\x9D \xC0\xCDk\xFB\xE1\xFC\xF9\xF3'N\x9C(\x84\x981cF\xEBWgϞ \x9F\x9D\x9D \xBAaÆ\xBD{\x{1F6DC2}j͚5C\x86 \x89\x8D\x8D=x\xF0\xA0\x95Ѱ\xBC\xBC\aoo\xDF\xFA\xA5'N444 2D}\xD8\xD0\xD0\xF0\xC3?\xDCs\xCF=?\xFD\xF4\xD3ŋ\xF3\xF2\xF2\x84999\x8D\x8D\x8DƳČ\xF2\xF2\xF2\xF2\xF2ԟ%\xDA\xD9ٝ?\xDE\xDC\xE4\xF4z}]]\x9D\xFAX=~ZWWg\xB2`\x8B7Zߞ\xC9\xC9\xD6OpppP7 \x90\xAE\xEDC\x84ݺu\xD3\xE9t:\x9D\xCEx\x94\xAD\xB9\xA9S\xA7\xBA\xB8\xB8\xA4\xA5\xA5\xEDٳ'44\xD4\xC9ɩ\xBDTnnnk֬\xC9\xCE\xCE~뭷\xACl]\xBD \x84\xC9\xD3\xDB\xD5\xF3\xE8\xBBw\xEF\xAE>uppP\xAB\xAA\xAAF\x8C\xB1jժ\xABW\xAF\xEAt\xFF'\\x96\x97\x97k4\x9A\x9E={\xB6(R]]-\x84\xD0\xEB\xF5vvvvvv\xABW\xAF\x8E\x8B\x8B37\xD9& 6\x9FЮ\xF6LN\xB6~\x82\x8D\x8D\x8D\xBA \x80t\xED8\xC9}\xF0\xE0\xC1B\x88\x94\x94\x94y\xF3\xE6\xED\xED\xED\xE3\xE3\xE3SSSKKK͝\x93n\xB9\x82QTTT\\ܒ%K
+dM?j\xE60~QԜ\xB7\xB7\xB7\xA2\xB2\xB2R=\xFF\xBD\xAC\xACL LOO/**R\x8F-\xBF\xD1\xF1\xF0\xF0P\xA5\xAC\xAC\xACO\x9F>͋\xA8\xBFj 1bĀ\x8C\x83\x85\x85\x85&'[\xC3d\xC1\xE6\xDA՞\xC9\xC9\xD6O\xB8~\xFDz\xC7b" hS\xBB/\xEA\xDD\xFA\xB7~\xB3f\xCDjhh0 \xFE\xFE\xFE \xAB`\xB4j\xD5*OOO+\xBFYQs\x98\x9EZ \xF1\xF1\xF1\xF9\xFA\xEB\xAFէ۷o 0`@HH\x88\xA2(
-\xEDugg\xE7˗/\xCBk
</ins><del>-\xC69;;777\xAB\x8F\xEB\xEB\xEB\xD5\xEFÌ
-!\xD2\xD3\xD3Ճbj\x82*44\xF4\xFC\xF9\x9D\xB65eʔ\xA3G\x8F\xF6\xD5\xD6{\xAD\xA1\xA1\xA1\xFF\xFEB\x88\xD6\xD6V+++\x8DF\xA3~\x91\xA6\xD1hdm \xF0\xD3\xC2e\xD0
-\xBD^oe\xF5\x82\xB8z\xCEԠ\xE2ԩS7n\xDC03A \xFD\x8F\xFC\xA3\xEB\xB6 ~\xF8\xE1\xFE\xF3\x9F}\xB5\xF5^\xB3\xB7\xB7WM[[\x9B\xA2(\xD6\xD6֤+ \xB8\x9F\xF5M\xC0\xB2\xB1\xB1 ;v\xEC\xED\xA9\xA9\xA9qww\x97\xD5L\xB9v\xED\x9A\xE1\xA0\x81^\xBF~\xDD\xD4`\xB7\xEFR\xFF\xFD\xF7
-
-\x9D\xDE\xE2\xE6\xE6VUU\xD5W[\xBF ~~~]B8;;\xD7\xD6\xD6
-!\xF8 ! \xDC\xE7~\xEC\x80կ_\xBF\xA1C\x87>\xF2\xC8#\xDE\xDE\xF9\xBF\xF8W\xAF^\xF5\xF2\xF2\xF2\xF6\x{1B6C71}\x91\xD5 \xBA:{\xF6\xECСC\xD5S`\xEAeL
-! `f\x82\xE2W\xBF\xFA\xD5\xDF\xFF\xFE\xF7\xAE\xFA\x8F\xFF\xF8\x8F/\xBF\xFC\xB2\xAF\xB6n\x89\xC8\xC8\xC8\xC8\xC8\xC8\xF1\xE3ǫ\x95
-\x83\xAE\xAE\xAE\xEA\xEA\xAE\xC1\x83\xAB_\xA1\x99\xFF\xDD \xE0\x9E\xF7\xA3\xAE\xC1rss>|\xB8\xBD\xBD\xBD\x94j\x8D\x8D\x8D\xDF~\x{3B6FBEF}\xB7\xB77\x97i0\xA3\xAE\xAE\xCE\xFC \xBB~o\xD4QMM\xCD |\xB0dɒ\xE2\xE2\xE2\xE1Ç\xA7\xA6\xA6\x9AB\xFC\xFE\xF7\xBF߳g\xCF\xC7 ljBPPPYYYMMM\xD7
-
-6l\xE7Ν}\xB5u\xCB\xD9\xDBۏ7.??\xBF\xE3Jv\xBD^\xEF\xE3\xE3\xA3\xD5j\xAF]\xBB\xA6\xD1h\xD45\xEF \x80\xFB\x96\xA6\xE3/\xB6\xCCx\xEC\xB1\xC7z\xBD\x8D\xD8\xD9\xD9
-6\x8C \x8D\x{189924}$\xF5j\xA2\xA6l߾\xDD\xFCu\xB0\x84\xFD\xFB\x{1F7CF3}\xBBy\xF3\xA6\xF9A\x97\xDA\xDAZ\xC3u\xCB\xF5'\x84}\xB5\xF5\x9Ejjj\xCA\xCFϏ\x88\x88\xE88x\xF2\xE4Ɇ\x86\x86\xC1\x83\xF7\xEEJ\xEE_|\xF1\x85\xA4\xEE }\xEC\xC7X\xE8[VVV\xCF<\xF3\xCC\xE3\x8F?έr\xEE\xB4899\x85\x86\x86\xF6\xEBכ\x93\xEF, \xB8g\xB0\x80\xBB \xEE\\xA6 @2 \x80d, \xC9,
-X\xB7of fpmR \xB8\x97X\xB0\xEEh \xC0}\xAEwWv ܝ,
-X3f̸\xA3} \xF7\xB9_\xFD\xEAW}\xDD @K\xD6\xF8\xF1\xE3\xE7̙sG[\xEE[\xF1\xF1\xF1\xE1\xE1\xE1}\xDD @K\xAF\x83\xA5\xCA\xCD\xCDݹs\xE7\x85 :\xDE$@\xEF\xD8\xD9\xD9=\xFC\xF0\xC3qqqaaa}\xDD @\xA6\x9E, t\x8B\xCB4 HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, ɬ\xFA\xBAq\xE3ƍ\xD6\xD6V\x9DN7`\xC0\x80\xBB\xB3\xE0\x8F\xA3\xBA\xBA\xBA\xBE\xBE^\xAB\xD5zyyu /--B\xB8\xB8\xB8\xD8\xDB\xDB\xF7\xA8`YY٥K\x97\x82\x83\x83 \xBB>\xBD\xAD \x95ɀ\xB5cǎ\xA2\xA2"\xA3/M\x9A4iʔ)\xB2:\xF8\xE6\x9Bo.\8}\xFA\xF4w\xDF}\xF7\xEE,hJNNΥK\x97\x92\x93\x93\xA5T\xBBz\xF5jZZZvv\xF6\xF5\xEB\xD7;\x8E\x9F8qb\xFE\xFC\xF9\xFAӟ\x9Ey\xE6˫\xFD\xE9O:s\xE6\x8CF\xA3y\xE2\x89'\xE2\xE2\xE2:=\xBDC\xAD\xDE\xDB\xE4 \xEE>\xD1\xED?\xEA{\xE03\xC0]\xC2d\xC0ڶm[rr\xB2\xAB\xAB\xAB\xB5\xB5uTTTpp\xF0\x8A+\x9A\x9A\x9A\xF2\xF3\xF3\xF7\xEF\xDFߣ\x80\xA5(\x8AF\xA315\xFE\x8B_\xFC\xE2\x81 \xE8Q\xD3\xD2 \xF6ζm\xDBN\x9E<\xD9\xED\x8DLu\xDBɘ1c&M\x9A\x94\x9D\x9D\xDDi|\xE6̙ ,\xE8Qc
-
-
-˗//,,\xD4\xE9tׯ_\xEF\xF4\xB4G\xA5z\xD4\xEAO\x9D\xF9#e\xE1\xE1\xBE;\xA9 \xAD\xDB\xD4?\xE9\xCF w\x93\xCB\xC7\xC7g\xEAԩ\xEAc\x97\xB0\xB00!D```zz\xBA\xE5ؽ{wyy\xF9
- \xFF\xF1 \xF6\xDA |\xD0\xD6\xD6f~\x8E\xAC\xAE\xFA\xF5\xEB\xC1j\xB9K\x97.\xD5\xD5\xD5\xE9t:ggggg\xE7\xC2\xC2Oo\xB3\x93 Mss\xB3^\xAF\xB7\xB3\xB3\xFBq6\xD7푲\xE4pߝ \xAD\xDB\xD4?\xDD\xCF w\x93k\xFD\xFA\xF5F\xC7\xDD\xDC\xDCV\xAE\\xA9>\xCE\xCE\xCE>uꔳ\xB3s||\xFC\xC0\x81\x85%%%۷o\xAF\xAD\xAD <x\xF0\xAF\xFD\xEB\xD2\xD2\xD2\xD7_=88x\xFB\xF6\xED111\xB6\xB6\xB6\xEA\x8B\x8A\x8A:\x8E !\xB4Z\xED\x993g\xB2\xB2\xB2\xFA\xF7\x94\xE4\xE4\xE4$\x84(,,<|\xF8pee\xA5\x97\x97\xD7\xD3O?\xAD\xD3\xE9:\xBD\xB1\xA7\x8D\xF6l\x90\x9B\x9B{\xF9\xF2\xE5\x87 z(??\xFFʕ+\xC1\xC1\xC1qqqj\xB2\xE9\xDAɅ Μ9coo?}\xFA\xF4S\xA7N]\xBAti\xF4\xE8\xD1---\xFB\xF6\x{DCF7}\xB7OJJrtt\xECڭѭ <x\xF0\xF0\xE1\xC3z\xBD\xFEʕ+\xA6GMM\xCD{\xEF\xBDWUU5v\xEC\xD8iӦ !\xBE\xF8\xE2\x8B\xCA\xCAʐ\x90\xFF\xAF\xBF\xFE\xFA\xBB\xEF\xBEsqq\xF9\xC5/~Q]]\x9D\x95\x95%\x84ؽ{\xB7\xBD\xBD\xFD/~\xF1\x8B\x8EOg͚\xA5\xD1h:\xB5q\xFC\xF8ѣG{xxl߾\xFD\xA9\xA7\x9Ez\xE0\x81z\xD1j\xD7:\xD5\xD5՝\xF6\x9B\xA9}\xA5Vؿ\xFF\xA9S\xA7\xDA\xDB\xDB\xED\xEC\xEC\xF6\xECٳc\xC7ooo\xF3GM\xF5\xD5W_ =z\xF4\x87 ~pww\x9F6mڰaÄ'N\x9C8v옢('N\x9C0a\x82\xC2\xC2#U\\܋\xC3\xDD\xF5\xEF\xBFk:\xEC\xD4\xE7\xE5˗\x8D \xC4N{rРA\xED\xED\xED\xE6\x90% \xED\xED\xB7\xDF6\xFAץ\xFE\xA3\xEE\xF8O\x9E<y\xE5ʕ\xA0\xA0\xA0\xF6\xF6\xF6\xCF>\xFB\xCC\xD1\xD11>>\xBE\xB1\xB1q\xEF\xE5\xE5\xE5ӧO
-
-\xED\xF6 \xDC\xCFz\xFF+\x94\x94\xB5k\xD7Κ5KQ\x94\xA0\xA0\xA0\xAA\xAA\xAA\x8A\x8A\x8A\xF1\xE3LJ\x87\x87ϟ?\xFF\xC0\x817nܸz\xF5jii\xA9\x95\x95\x95\xAD\xADmǓ/]\xC7O\x9F>\xFD\xE5\x97_0 ==\xFD\xBF\xFE\xEB\xBF\xD4i\xEF\xBD\x{1DE9E7}\xE73\xCF<s\xE8СY\xB3f}c\x8F
-v\xED\xB9\xE3'9r\xE4\x8A+~\xF7\xBB߹\xB9\xB9\xF9\xF9\xF9\xBD\xF8⋆\xEF3\xBAv\xE2\xE7\xE7w\xF1\xE2E\xF5\xE4]PP\xD0ڵk/^|\xE8\xD0!\x9DN\xF7\xCE;\xEF,^\xBC\xB8kWF\xB7\xBElٲE\x8BM\x9D:5))\xC9\xD7\xD7\xD7\xD4\xDE\xCE\xCD\xCD <x\xB0\xB7\xB7\xF7s\xCF=\xF7\xDCs\xCF !BCC\x97-[\xB6w\xEF^\xB5\x81\xDC\xDC\xDC\xE5˗ !nܸ\xD1\xD2\xD2"\x84\xE8߿\xBF\xAD\xADm\xA7\xA7Fw1c֮]\xFB\xFC\xF3\xCF/^\xBC\xF8\xA3\x8F>\xAA\xA8\xA8\xE8]\xAB]\xEBt\xDDo\xA6\xF6\x95\xDA؛o\xBE ?}\xFA\xF4?\xFE\xF1\x8F\xD1\xD1\xD1j\xBA2Ԅk֬IHH\x88\x88\x88HJJ\xFA\xE1\x87 \xFE\xF1\x8F!RSS\x97.]\xFA\xC4ODFF\xBE\xF0\xC2 \xA9\xA9\xA9\x96 \xA9\xDE \xEE\xAE\xFF\xDD\xF6i\xEA vړ^^^\xDD ?\x9A\xA9?\xB0N\x9FqԨQ\xEB֭[\xB0`\xC1\x9E={\xB4Z\xED\x9A5k~\xFE\xF3\x9F\xFF\xE1\xA8\xAF\xAF?}\xFA\xF4\xA3\x8F>ZSScɡ\x80\xFB\x97b\x81\xA1C\x87Ν;\xB7\xE3HII\x89V\xAB\xCD\xCB\xCBSE\xAF\xB9\xB9edd\xECݻ\xD7\xC3ã\xAD\xADMQu\xE9\x8F\xFA\xDE\xF4\xF4t\xA35
-\xE3S\xA6LIIIQ \xAF[\xB7n\xE8С\xEAも\xF5\xC1\xB6m\xDBt:]\xD77\xF6\xA8\xA0ў;3f̪U\xAB\xD4ǟ|Uii\xA9\xA9N6l\xD8\xE0\xED\xED\xDDu\x8B\xABW\xAF\xF6\xF7\xF7\xEFԕѭ\x97\x96\x96Z[[gee\xA9\x937m\xDA\xE4\xE1\xE1\xD1\x{163E7A}\xBAnY}\xBCw\xEF^\x8DFSTT\xA4(\x8A\xBF\xBF\xFF;Ｃ\x8E\xAFZ\xB5*44T}|\xF4\xE8Q!Duuuק\xA6v\x82\xA1\xFF\x92\x92\x92\xFC\xFC\xFC^\xB7ڱNEE\x85\xD1\xFDft_\xE9\xF5zGG\xC7-[\xB6\xA8\xE3III\x91\x91\x91\x96 \xB5\xF2\xF2rkk\xEB\xBD{\xF7\xAAO\xAB\xAA\xAA>\xF9䓲\xB22\x9B\xE3Ǐ\xAB\x83\xFB\xF7ﷱ\xB1)++\xB3\xE4H)\xBD=\xDCF\xFF\xFE\xCD\xF7i\xE6 vړ\xDD ?\x9AA\xD7ԝ>cdd\xE4\xE2ŋ\xD5\xC7iii\x86\x95\xEA2\xBE\x93'OZ\xF2
- \xEE[\xBD\xBCLCAAA{{{AA\xC1\xE5˗\x85\xB6\xB6\xB6W\xAE\\x89\x8A\x8A\xAA\xAB\xAB\x9B2eʢE\x8Bbbb\xFA\xF7\xEFߋ\xCA\xF6\xF6\xF6MMM\xEA㠠\xA0\xFD\xEB_]+((P\xBF\x86\xB9\x9D\x82F{6\xF3\xC6G y\xA4\xAD\xAD\xAD\xA0\xA0\xC0\xDBۻG\x9D8::>\x82\x81ѭ\xE7\xE5嵶\xB6>\xF2\xC8#\x96\x9Cɓ'+\x8Ar\xEE\xDC9\xF5,XOu\xBB ,\xA5\xD5\xC1\x83 !\xDC\xDD\xDD\xCD\xEF7þR\xA5\xB9\xB9YQu\xBC\xAD\xADM\xFD\xBE\xADۆO\x9C8\xD1\xDA\xDA\xFA\xB3\x9F\xFDL}\xEA\xE2\xE2\xB7o߾\x96\x96\x96\x91#G\xAA\x83\xC1\xC1\xC1---\xDF|\xF3M\xA7_?=R\xA2\x87x\x86"\xA3G\x8F6\xF3\xF7o\xB4O\xF3\x95U\xEA\x9E\xEC\xF8Ԓ\xBFdS \xADwt:\x9D\xA1\x9A\x83\x83\x83\xA2\xA9\xA9\xA9\xA7\xFF\xA0 \xE0\xBE\xD2\xCBS\x84\xB5\xB5\xB5B\x9DNgkkkkk\xBBaÆ\x84\x84 \x9F\xDC\xDC\??\xBF\xA4\xA4$\xFF\xE2\xE2\xE2\xDB鬦\xA6f\xECر\xEBׯ\xAF\xAB\xAB\xB3\xB2\x92p\xBD.\xA3=\x9B\x99\xAF\xD3\xE9\x84uuuR:1\xBA\xF5\xCA\xCAJ\x8DFӣ\xEBu\xA9k\x9B\x9B%\xB6q\x87Z\xED\xD1~\xEBׯy\xF36n\xDCx\xE9ҥ\xAF\xBE\xFA\xEA\xF3\xCF?\xF6\xD9g-iX\xFD\xBFz\xB0 n)\x840D \xF5b\xEA\xA0ܶ;2\xFF\xF7o\xB4\xCF\xDE\xE9\xE9_\xF2 r\x97\xB4 w\xA7^\xC6OOO!\xC4رc\xFD\xFC\xFC \x83\x8A\xA2\x8C5꣏>\xBAy\xF3\xE6\xA4I\x93֭[gj\xA5\xBC%233ճ!B\x88^}\xD5m\xCFf\xA8\xA7B\x86 *\xA5\xA3[/..V\xA5\xA2\xA2bРA\xD6)++B<\xF8\xE0\x83۸C\xAD\xF6t\xBF-_\xBE\xFC\xC5_ܼy\xF3\x80\xBE\xF8⋠\xA0 K :t\xA8\xE2\xEAի\x86A !Duu\xB5z)Ԋ\x8A
-à\xF4\xB6
-\xCC\xFF\xFD\xED\xB3wz\xFA\x97|\x87\xDC%m \xC0ݩ\x97\xDF`\x85\x85\x85\xB9\xBB\xBBgddt ܵkWnn\xAE\xC2\xD9\xD99,,\xCC\xDA\xDAZamm\xDD\xD8\xD8ص\x82\xA9qEQZZZԯj:\xFEw\xAE\xD7\x8D\xF6lFfff@@\xC0\xB8q\xE3Lub CWF\xB7>a\xC2\x9DN\xB7a\xC3\xCB \xEEر#00P=\xD3\xE4\xEC쬞\x9D\xB1\x9C%;AV\xAB=\xDAo\x8A\xA2L\x9B6m\xFC\xF8\x91\x91\x91Z\xAD\xD6\xCC~\xEB\xE8\x91G \xF1\xF3\xF3[\xBDzu{{{Ǐ\xE0\xEB\xEB\xFB\xF9矫O\xF7\xEC\xD9\xE3\xE7\xE7\xA7^\x92\xC0Ñ\xEA\xF5\xE16\xFA\xF7o\xBEOq\xC7bG\xDD\xFE\xD3\xE8 Sm\xAC_\xBF\xFEv\xFE\xCF
- \xEE\xE6\x97h 9r$%%\xC5\xD1\xD1qذa\xAF\xBC\xF2\xCA\xF7\xDFoxi\xFF\xFE\xFD<\xF0@xxx\\\xDCܹs/]\xBA\x94\x9D\x9D\xFD\xE0\x83\xFE\xF6\xB7\xBF]\xB4hQXXXII\x89\xA2( ,pss\x9B9s\xE6\xD7_ݱ\xB2a|ժU>>>\xE3Ǐ?q\xE2\xC4ŋ\xA3\xA3\xA3 >\xFE\xF8\xE3\xFF\xFB\xDF>>>O<\xF1Drr\xB2V\xAB}\xFF\xFD\xF7o\xA7\xA0ў;}\xDE1c\xC6DDD\xA4\xA6\xA6>\xF7\xDCs#G\x8E\xFC\xF6\xDBoE1\xDA\xC9\xFE\xFD\xFB\xA3\xA2\xA2 \xDFy\xE7\x9Dݻw\xB6x\xFE\xFC\xF9\xA8\xA8(''\xA7 ;vt\xEA\xD6\xE8\xD6w\xED\xDA5p\xE0\xC0\x89'Θ1c\xE6̙\xFB\xDB\xDF:u5mڴ\xC7 |\xE9ҥ\xB3g\xCF 9\xFE\xBC:\xFE\x97\xBF\xFC\xC5\xCA\xCAjܸqO?\xFD\xF4\x93O>\xE9\xE9\xE9\xB9{\xF7\xEE\xEF\xBF\xFF>>>^\xF1\xE2\x8B/ 8p\xA0\xD3S\xA3;a߾}>>>\x8F<\xF2\x88ڳ\xA9 \xD5m\xAB\x9D\xEA\x98\xDAof\xF6UǿLgg\xE7/\xBF\xFCҒ\xA3v\xF6\xEC\xD91c\xC6\xF8\xFB\xFBϘ1#66V\xAD\xF6\xD5W_\x85\x86\x86.Z\xB4\xE8\xB9\xE7\x9E 9}\xFA\xB4Z\xAA\xDB#\x95\x95\x95ջ\xC3m\xF4\xEF\xBF\xDB>\x8D \xC4N{Ғd\xC9GS\xFFɘ\xFAG\xDD\xF13~\xF2\xC9'\xBE\xBE\xBEaaaYYY\xF9\xF9\xF9ӧOwppHKK\xAB\xAD\xADU\x8F\xF9\x9B\xDF\xFC\xA6\xB2\xB2\xD2\xE8\xA1>|\xF8C=\xA4 \xC0\xFDM\xA3\xFC\xDFeŽ\xA0\xD7\xEBKJJ\xAC\xAC\xACԟ\xD3 !ZZZJKK
-'\x92E)))8p`\xA7\xD5'\xA6\xC6;jkk+++\xF3\xF2\xE9\xF6\x8D\x964\xDAsG굯\xE6Ν\xAB\xD5j\x87 b\xF8Y\xBB\xD1N,ѩ+\xA3[\xD7\xEB\xF5\xE5\xE5垞\x9EfV\xFC\xA8;\xB6\xFF\xFE\x9Dڮ\xAA\xAAjii\xE9\xE9=\xCD\xEF3s,i\xB5#\xCB\xF7\x9B\xA2(s\xE7\xCE]\xBCx\xB1\xBA2\xBD\xB9\xB9yy... \xFC\xB1\x85
-_\xBF~\xBD\xBE\xBE~Ȑ! \xB7UYY\xA9\xD5j-\xB9>S\xC7#\xD5\xEB\xC3\xDD\xF5\xEFߒ>\xEF\xDCATY\xF8O\xA3w\xBA\xB6\xA1^\x9F\xC2\xC3\xC3C\xFA\xB6 \xE0'\xE4\xB6ֽG
-X\xAF\xBE\xFAj_7r\xDF9|\xF8\xF0\x82
-
-#\xB3g\xCF\xF6\xF5\xF5]\xBDzu v @\xEFH\xF8u\xDE=\xA3\xA5\xA5\xA5\xB5\xB5\xB5\xAE\xAE\xAE\xBD\xBD]\xAB\xD5\xF6u;\x{1D7000}\x80\xBA\xBA\xBA?\xFF\xF9\xCF?\xFB\xD9\xCFnݺ\xB5gϞ\xA2\xA2\xA2 ݔ \x80\xBB\xDF`\xFD?\xFB\xF6\xED\xBBz\xF5\xAA\xC2\xDB\xDB\xFB\x97\xBF\xFCe_\xB7sߩ\xAB\xAB۷oߵk\xD7\xFA\xF7\xEF 4q\xE2DKn\x92
- \xC0]\x88\x80 Y\xEF\xEFE \xA3X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80dV}݀ z\xBD\xFE\xE6͛
-
-
-VVV\x9E\x9E\x9E\xBD\xAES]]]__\xAF\xD5j\xBD\xBC\xBC\xE4N\x96\xE2\xF6\xB7\xA8\xD7\xEB\xFB\xF5#U pg\x99 XG\x8E 9r\xE4H\xD7\x80\x80\x80͛7\x97\x95\x95\xA9#ӦM B\xB4\xB7\xB7\xBF\xFD\xF6\xDB\xED\xED\xEDB\x88\xA7\x9Ez\xAA\xAA\xAA\xCALC}OOϤ\xA4$\xF5\xA5\xC2\xC2\xC2\xCC\xCCLEQ4ͳ\xCF>{\xF0\xE0\xC1\xA2\xA2"\xA3\xEDM\x9A4iʔ)\xEA㜜\x9C\xEC\xEC\xEC9s\xE6\xAC]\xBB\xF6ĉ\x97/_\xB6\xF8\xE3wv\xF5\xEAմ\xB4\xB4\xEC\xEC\xEC\xEBׯ˝,\xC5\xEDo133\xB3\xB0\xB0p\xF9\xF2\xE5Z\xADVno \xC0\xC0d\xC0\x9A<y\xB2^\xAF\xF4\xD1G\xDFz\xEB\xADɓ'\xB7\xB7\xB7755eff\x9E;w. >>\xFE\xB5\xD7^[\xBDz\xF5ѣG\xD5t%\x84\xD0j\xB5K\x96,
-
-ݵk\x97\xBF\xBF\xBF\xC2L\xB5~LLLMM\x8D\x8B\x8BKll\xACb\xE4ȑ\xDE\xDE\xDEyyy۶mKNNvuu\xB5\xB6\xB6\x8E\x8A\x8A
-^\xB1bESSS~~\xFE\xFE\xFD\xFBՀ\xB5iӦ\x9C\x9C\x9C\xED۷k\xB5ڈ\x88\x88'N\xDC\xCE\xEE3f̤I\x93\xB2\xB3\xB3\xA5O6O͔\xB2\xB6h\xA6Zlllsssll\xECΝ;\xAD\xAD\xAD{\xD3+ 莹S\x84\xCE\xCE\xCEB\x88#F<\xF2\xC8#ꈢ(7o\xDEBXYY\xBD\xF0\xC2 \xEF\xBE\xFB\xEE\x8E ;&N\x9Chx\xCBٳg\xD5te\xBE\x82\xFAjtttiiirrrDD\x84zj\xCF\xD9\xD9\xD9\xC6\xC6\xC6\xC1\xC1A\xE1\xE3\xE33u\xEATu\xB2\x8D\x8D\x8D\x8B\x8BKXX\x98"000==]q\xFA\xF4锔\x94 .\xFC\xA4\xBF\x8Fٽ{wyy\xF9
\x9Cj\xB3g\xCF{wjj\xEA\xAAU\xAB\xA4l tҳ5X\x91\x91\x91\x8A\xA2\xA8\x8F===\xE3\xE2\xE2>\xFA\xE8\xA35k֨yH\xB1aÆ\xE7\x9F\xDE\xC2
-B\x8DF\xB3y\xF3\xE6ѣG'&&~\xF6\xD9g\x9D&\xAF_\xBF\xDEh77\xB7\x95+W
-!V\xACX1c\xC6 S \x92N\x9C8q\xEC\xD81EQ&N\x9C8a\xC2u\xB0\xB0\xB0\xF0\xF0\xE1Õ\x95\x95^^^O?\xFD\xB4N\xA7S\xC7 <x\xF8\xF0a\xBD^\xE5ʕ\x8EE\xB2\xB3\xB3O\x9D:\xE5\xEC\xEC ?p\xE0@S\x93O\x9E<y\xE5ʕ\xA0\xA0\xA0\xF6\xF6\xF6\xCF>\xFB\xCC\xD1\xD11>>\xBE\xB1\xB1q\xEF\xE5\xE5\xE5ӧO
-
-5Z\xB0\xA8\xA8\xE8\xF5\xD7_}{LLLqq\xB1\xE5\xEDu\xFD,V\x9B?~\\\JJ\x8A\x9A\x80 \x80\=X\xEF\xBCd\xC9\x8DF\xD3q\x89\xF4
kkk\xB7nݪ>\xAD\xAE\xAE>\xFE\xBCai\x94%\x84>>>\xEB֭۷o\xDF\xFB\xEF\xBFߣ\xD6rrr\xD4ﴺJMM]\xBAt\xE9O<\xF9\xC2 /\xA4\xA6\xA6\xAA\xE3\xEF\xBD\x{1DE9E7}\xE73\xCF<s\xE8СY\xB3f\xA9\x83˖-[\xB4h\xD1ԩS\x93\x92\x92|}}
-ERRR֮];k\xD6,EQ\x82\x82\x82\xAA\xAA\xAALM 5jԺu\xEB,X\xB0g\xCF \xADV\xBBf͚\x9F\xFF\xFC\xE7\xF8\xC3 \xEA\xEB\xEBO\x9F>\xFD裏\xD6\xD4\xD4-x\xF5\xEA\xD5\xD2\xD2R+++[[[\x8DFӣ\xF6\xBAN\xB6\xA4\x9A"44\xB4\xA1\xA1A\xCA\xC9M `\x84bڙ3g\x84aaa\xD1\xD1\xD1\xD1\xD1\xD1?\xFCp\xD79!!!!!!\xEA㴴\xB4\x8C\x8C \xCB+\x9C9s&!!A} \xE3\xE0\xE0PTT\xA4(ʘ1c\xBAnh\xE8Сs\xE7\xCE\xED8\x92\x9F\x9F/\x84\xC8\xCE\xCE6\x8C\xA4\xA7\xA7 :TQ\x94\xB2\xB22\x9B\xE3Ǐ\xAB\xE3\xFB\xF7ﷱ\xB1)++S\xA5\xA0\xA0@ ܶm\x9BN\xA7S\xA5\xB4\xB4\xD4\xDA\xDA:++K ߴi\x93\x87\x87\x87\xA2(%%%Z\xAD6//OQ\xBD^\xEF\xE6斑\x91aj\xB2\xA2(\x91\x91\x91\x8B/6\xEC
-\xB5EQ\xD4\xE9'O\x9E4ZP\xFDh\xE9\xE9\xE9\xEAd\xCB\xDB3:\xB9\xDBjNNN\xAF\xBC\xF2J\xD7\xFD n_\xF7\xA7\x97.]:}\xFAt!ļyp\xE1\xC2\xC4\xC4\xC4\xDC\xDC\xDC\xF0\xF0\xF0\xAD[\xB7 :t\xA8\xA7T7n 9rd||\xFC\xB1c\xC7,\x8C\x86\x95\x95\x95B;;\xBB\xAE/\x9D={\xB6\xA5\xA5e\xE4ȑ\xEA\xD3\xE0\xE0\xE0\x96\x96\x96o\xBE\xF9\xE6\x81
</del><ins>+\xF5\xF5\xF5\xA2Y\xE65j\x94^\xAF_\xBDzu\xEB"nnniii\xCD\xCDM\xB6\x86ɂB\x9B\xEBׯ !\xDA՞\xC9\xC9mVS566\xFE\xF6\xDBoj\xDE \xF2\x99;9k߾}ӦMB<\xF0\xC0\x8F=\xF6\xD8ȑ# \xDCz\xF2 \xFE\xF0\x87-[\xB6\xB4\xAB\x82\xFA\xEA\xE0\xC1\x83-Zt\xE3\xC6
+\xE3\xBB\xF6\xEC\xD9\xD3\xE2\\xF8\xFD\xFB\xF7'%%999
+ 8\xF0\x95W^\xF9\xE5\x97_\x8C/\xFD\xF7\xFF\xB7\xFA833s\xFC\xF8\xF1=z\xF4x\xEF\xBD\xF7\xAE]\xBB\xF6\xDDw\xDFϙ3\xE7\xB9\xE7\x9E
</ins><span class="cx">
</span><del>-\xFA\xFEu\xEDڵ\x82\x82\x82\x96\x96!D^^^kk\xABa\x95\x98AAAA{{{AA\x81\xFA\xB3D[[\xDB+W\xAE\x98\x9A܉N\xA7kjjR \xAB\xE7O\x9B\x9A\x9A\x8C\xEC\xF4F\xCB\xDB3:\xD9\xF2 \xF6\xF6\xF6\xEA \xD2u\x8A\xB0_\xBF~VVVVVV\x86\xB3l ͞=\xDB\xC5\xC5%##\xE3\xE0\xC1\x83\xE1\xE1ᎎ\x8E=\xAD\xA0rww߸qcnn\xEE\x9Bo\xBEia\xEB\xEA\xF5 \x8C.oW\xD7\xD1\xF7\xEF\xDF_}joo\xAF\xD6\xD4Ԍ ;v\xFD\xFA\xF5uuuVV\xFF'\VVVj4\x9At*R[[+\x84\xD0\xE9t\xB6\xB6\xB6\xB6\xB6\xB66lHHH05\xD9F v\x9CУ\xF6\x8CN\xB6|\x82\xB5\xB5\xB5\xBA \x80t=X\xE4>b\xC4!DZZڒ%K \x83vvv\x89\x89\x89\xE9\xE9\xE9\xE5\xE5\xE5\xA6֤\x9B\xAF`\x93\x90\x90\xB0jժ\xE1Ç[ҏ\x9A9 _u\xE4\xE3\xE3#\x84\xA8\xAE\xAEVWTT\xA8\x83\x99\x99\x99%%%\xEA\xB9E\xC37:\x9E\x9E\x9E\x8A\xA2TTT 4\xA8c\xF5W\x8Dcǎ\xF5\xF3\xF33 \x9Dl \xA3;\xEAQ{F'[>\xA1\xB1\xB1\xB1w1 t\xAB\xC7\xF5\xEE\xFA[\xBF \xB4\xB4\xB4\xE8\xF5\xFA\xC0\xC0\xC0\xDEU0X\xBF~\xBD\x97\x97\x97\x85߬\xA89L
-O\x9D\x84\x85\x85\xF9\xFA\xFA~\xFE\xF9\xE7\xEA\xD3={\xF6\xF8\xF9\xF9\x85\x85\x85)\x8A\xD2\xD2\xD2\xD2\xDC\xDC,:d\x8E &\xE8t\xBA
-6t-\xE2\xEE\x91\xD1q\xD0\xD4dK-(\x84\xB0\xB6\xB6nllB\xF4\xA8=\xA3\x93\xBB\xAD\xA6jmm\xFD\xE1\x87 Լ \xE43\xB58\xEB\xF0\xE1\xC3s\xE6\xCCB\x8C7.*****\xEA\xF1\xC7 ?~\xFC\x88#\xBAN\xFE\xE5/\xB9s\xE7\xCE UP_ 1bĊ+\xDA\xDA\xDA \xEF:x\xF0`\xA7\xB5\xF0G\x8E IIIqtt 6l\xD8+\xAF\xBC\xF2\xFD\xF7\xDF^
- \xF9\xEF\xFF\xFEo\xF5qvv\xF6ԩS\x9D\x9C\x9C\xDE}\xF7\xDD[\xB7n}\xF5\xD5W\xA1\xA1\xA1\x8B-z\xEE\xB9\xE7BBBN\x9F>\xAD(ʿ\xFF\xFDo \x9F\x80\x80\x80'\x9Ex"99Y\xABվ\xFF\xFE\xFB\x8A\xA2\xECڵk\xE0\xC0\x81'N\x9C1c\xC6̙3 \xFE\xF6\xB7\xBF)\x8A\xB2\xFF\xFE x <<<..n\xEEܹ\x97.]259++\xCB\xD7\xD77,,,+++??\xFA\xF4\xE9iii\xB5\xB5\xB5\xEA\x89\xD1\xDF\xFC\xE67\x95\x95\x95F .X\xB0\xC0\xCD\xCDm\xE6̙YYY\x96\xB7g\xEA\xB3h>\xF0D IDATt[MQ\x94\xAF\xBF\xFEZ\xFC\xDFo\xE3 \x80t\xA5\xC3U\xA9z\xAD\xAC\xAC\xCC\xC3\xC3\xC3\xE8J\xA0;j˖-+W\xAE\xBCx\xF1\xA2\xA9 \x97WVVj\xB5Z\xC3\xF5\xAB\x84mmmeee^^^666 g\xEA\xF5\xFA\xF2\xF2rOO\xCFN\x9FB\xAFח\x94\x94XYYy{{w;\xD9] *\x8ARRR2p\xE0@\x9DNף\xF6\x8CN\xB6\xA4\xDA\xCB/\xBF|\xF1\xE2\xC5\xCC\xCC̞6 ,!'`\xF5\xA1Y\xB3f\x85\x87\x87]\xD4\xA3.\\xB8 }\xE0\xC0\x81\x8E\x91 H\xD4\xE35Xw\x9B-[\xB6\\xBDzu\xEDڵ}\xDD\xC8OC^^\xDEK/\xBD\x94\x95\x95E\xBA \xE0\xCE\xF9\xC9\x83\xA5*..~衇\x{2E8B7C0}˗/2\xE4'}\xEBF \xEE~\xF7H\xC0 \xB8{\xFC\xD8\xCB\xD2\xEF\xBD^\xDF\xE9\x87=RUU\xD5\xD8\xD8hgg\xE7\xEA\xEAڣ7VWW\xD7\xD7\xD7k\xB5Z//\xAF\xDB\xEC \xDC3L\xAC#G\x8E 9r\xA4\xEBx\\\@@\xC0\xE6͛\xCB\xCA\xCAԑiӦ !\xDA\xDB\xDB\xDF~\xFBm\xF5*VO=\xF5TUU\x95\x99
-\x86\xFA\x9E\x9E\x9EIII\xEAK\x85\x85\x85\x99\x99\x99\x8A\xA2h4\x9Ag\x9F}\xF6\xE0\xC1\x83EEEFۛ4i\x92\xE1\xAE\xD2999\xD9\xD9ٷ\xB3 \xAB\xB8\xB8xɒ%nnn=\xFDa\xDDիW\xD3\xD2Ҳ\xB3\xB3\xAF_\xBF\x9E\x99\x99YXX\xB8|\xF9rN\xC0 p\x9F3\xB0&O\x9E\xAC\xD7\xEB }\xF4ѷ\xDEzk\xF2\xE4\xC9\xED\xED\xEDMMM\x99\x99\x99\xE7Ν \x88\x8F\x8F\xED\xB5\xD7V\xAF^}\xF4\xE8Q5] !\xB4Z\xED\x92%KBCCw\xED\xDA\xE5\xEF\xEF/\x840SA\xAD SSS\xE3\xE2\xE2+\x849r\xA4\xB7\xB7wDDD^^\x9E\x83\x83ömے\x93\x93]]]\xAD\xAD\xAD\xA3\xA2\xA2\x82\x83\x83W\xACX\xD1\xD4Ԕ\x9F\x9F\xBF\xFF~5`mڴ)''g\xFB\xF6\x{DDF3}\xC2\xC2\xC2zqo\xBE1c\xC6L\x9A4);;[\xDB\xDC\xDC \xBBs\xE7Nkk\xEB\xDB\xE9 \xFC\xA4\x99;E\xE8\xEC\xEC,\x841b\x84\xE1NÊ\xA2\xA8\xB7\xF9\xB3\xB2\xB2z\xE1\x85\xDE}\xF7\xDD ;vL\x9C8\xD1\xF0\x96\xB3g\xCF\xAA\xE9\xCA|\xF5\xD5\xE8\xE8\xE8\xD2\xD2\xD2\xE4\xE4䈈\xF5N2\xCE\xCE\xCE666\xEA
-\x92}||\xA6N\x9D\xAAN\xB6\xB1\xB1qqq B\xA6\xA7\xA7 !N\x9F>\x9D\x92\x92r\xE1
\xBB\xE4K\xA3ٳg\xEF;55uժU}\xDD \xE83=[\x83iX\xEF\xE9\xE9\xF7\xD1G \xADY\xB3F\xCDCB\x88
-6<\xFF\xFC\xF3VBh4\x9A͛7\x8F =:11\xB1\xEB-tL\xDD\xDC\xD0\xCD\xCDm\xE5ʕB\x88+V̘1C\xBD\xE1\xA0\xA2\xA4\xA4d\xFB\xF6\x{DD75}\xB5\x83\xFE\xF5\xAFmgg'\x84\xC8\xCE\xCE>uꔳ\xB3s||\xBCኣFU\xAD\xAD\xAD\xBBv\xEDB\x8E =\xDA\xD4\xE4\x83 >|X\xAF\xD7_\xB9r\xA5\xE3\xDB\xE7ϟ \x97\x92\x92\xA2\x86K p \xEA\xC1\xA2\xEC%K\x96h4\x9A\x8E\xEB\xB8.\X[[\xBBu\xEBV\xF5iuu\xF5\xF9\xF3\xE7
-K\xA3,\xA9 \x84\xF0\xF1\xF1Y\xB7nݾ}\xFB\xDE\xFF\xFD \xB5\xDE\xD0А\x93\x93\xA3~\xA7%\x84\xA8\xA8\xA8?~|xx\xF8\xFC\xF9\xF3 8p\xE3\xC6
-!DJJ\xCAڵkg͚\xA5(JPPPUU\x95\xA9Akk\xEB\xBD{\x{1F6D75}\xA9\xDF\xC3\x9D\xBClٲE\x8BM\x9D:5))\xC9\xD7\xE3\xDBCCCԓ\x86 \xE0>e\xE66:gΜB\x84\x85\x85EGGGGGw\xBAE\xA0*$$$$$D}\x9C\x96\x96\x96\x91\x91ay\x853g\xCE$$$\xA8\x8Fcbb \x8A\x8A\x8AE3fL\xD7
-
- :t\xEEܹ G\xF2\xF3\xF3\x85\xD9\xD9\xD9\xEAӽ{\xF7zxx\xA8\xB75\xBC~\xFDzCCCII\x89V\xAB\xCD\xCB\xCBSE\xAF\xB9\xB9edd T%111::ZQ\x947\xDExcǎ jM\xA3\x93KKK\xAD\xAD\xAD\xB3\xB2\xB2\xD49\x9B6m\xF2\xF0\xF0\xE8ؘ\x93\x93\xD3+\xAF\xBCbf\xC7 \x80{[\xF7\xA7\x97.]:}\xFAt!ļyp\xE1\xC2\xC4\xC4\xC4\xDC\xDC\xDC\xF0\xF0\xF0\xAD[\xB7 :t\xA8\xA7T7n 9rd||\xFC\xB1c\xC7,\x8C\x86\xEA\x9At\xF5<\xA0b\xF4\xE8\xD1uuuS\xA6LY\xB4hQLLL\xFF\xFE\xFD
</del><ins>+:v옢(\xBF\xFE\x{2AF7DF7}\x9F\x9F\xDFO<\x91\x98\x98\xA8\xD5j?\xFA\xE8#EQ\xB6n\xDDګW\xAFѣGO\x9A4i\xF2\xE4Ɏ\x8E\x8E\xFF\xF8\xC7?Eٵk\xD7=\xF7\xDC3}\xFA\xF4\xB3gϚ\x9B\x9C\x91\x91\xE1\xE3\xE3\x92\x91\x91\x91\x9B\x9B;q\xE2DGGǔ\x94\x94\xEA\xEAj\xF5\xC0\xE8\x9F\xFF\xFC\xE7\xF2\xF2r\x93g͚\xE5\xEA\xEA:y\xF2䌌 \xEB\xDB3\xB7.mVS\xE5\xFB\xEF\xBF\xFF\xF7\xDB8 \x9DFivU\xAA+))qww7y&\xD0-\xB5~\xFD\xFAŋ\x9F9s\xC6܅\xCB\xCB\xCB˵Z\xAD\xF1\xFAUB\x887n\x94\x94\x94xzz\xDA\xDA\xDA6\x9Fi0JKK=<<Z\xAC\x85\xC1`(**\xD2\xE9t^^^mN\xB6F낊\xA2\xF5\xEA\xD5K\xAF\xAB=\x93\x93\xAD\xA9\xF6\xF2\xCB/\x9F9s&==\xBD\xBD\xCD k\xC8 X\x9Dhʔ)\xA1\xA1\xA1&O\xEA\x82I\xA7O\x9F\x8E\x8C\x8Cܽ{w\xF3\xC8 $j\xF79Xw\x9A\xF5\xEB\xD7_\xB8paŊ\x9D\xDD\xC8\xEFCNN\xCEK/\xBD\x94\x91\x91A\xBA \xE0\xD6\xF9\xDD\x83\xA5*,,\xBC\xEF\xBE\xFB:\xBB\x8B߁s\xE7\xCE\xF5\xEB\xD7\xEFw}\xEBF \xEE|wI\xC0 \xB8s\xDC\xEE\xD3\xD2o\x83\xC1\xD0\xE2\x87\xEDRQQq\xFD\xFAu{{\xFB{\xB7덕\x95\x95555Z\xAD\xD6\xD3\xD3\xF3&{ w
+\xB3k\xFF\xFE\xFD\xFB\xF7\xEFo= \xE3\xE7\xE7\xB7nݺ\x92\x92B@ \xFF \xE1IDATud \x81\x81\x81B\x88\xA6\xA6\xA6w\xDEyG\xBD\x8A\xD5SO=UQQa\xA1\x82\xB1\xBE\x87\x87GBB\x82\xFAR~~~zz\xBA\xA2(\x8D\xE6\xD9g\x9FݳgOAA\x81\xC9\xF6ƌc\xBC\xABtVVVff\xE6͜\x86UXX8o\xDE<WW\xD7\xF6\xFE\xB0\xEE
)))\x99\x99\x99\x97.]JOO\xCF\xCF\xCF_\xB8p!\xE0 \xE8\xE2\xCC\xAC\xB1c\xC7 \x86\x87 ~\xF8\xED\xB7\xDF ;vlSSS]]]zz\xFAɓ'\xFD\xFC\xFCbcc_\xFD\xF5e˖ 8p@MWB\xADV;o\xE0\xE0\xE0\xAD[\xB7\xFA\xFA\xFA
+!,TP\xEBGEEUUU\xB9\xB8\xB8DGG !\x86 \xE2\xE5\xE5\x96\x93\x93\xE3\xE8\xE8\xB8q\xE3\xC6\xC4\xC4\xC4{\xDB\xD8\xD8DDD.Z\xB4\xA8\xAE\xAE.77w]j\xC0Z\xBBvmVV֦M\x9Bnf+\x84\x84\x84\xF8\xF9\xF9u\xE0\xDE|Ç 3fLff\xA6"::\xBA\xBE\xBE>::z˖-6667\xD3 \xF8]\xB3t\x88\xD0\xD9\xD9Y1x\xF0`㝆EQo\xF3\xA7\xD3\xE9^x\xE1\x85\xF7\xDE{o\xF3\xE6ͣG\x8F6\xBE\xE5ĉ\xFE\xFE\xFEj\xBA\xB2\A}522\xB2\xB8\xB88111,,L\xBD\x93\x8C\xB3\xB3\xB3\xAD\xAD\xADz\x83doo\xEF\xF1\xE3ǫ\x93mmm]\\BBB\x84\xFE\xFE\xFE\xA9\xA9\xA9B\x88cǎ%%%\x9D>}\xFA\xF9\xD2h\xEAԩ۶mKNN^\xB2dIg\xF7 :M\xFB\xCE\xC1
+7\x9E\xEF\xE1\xE1\xF3\xD9g\x9F-_\xBE\\xCDCB\x88իW?\xFF\xFC\xF3VVBh4\x9Au\xEB\xD6
+6,>>\xBE\xF5-t\xCC\xDD\xDC\xD0\xD5\xD5u\xF1\xE2\xC5B\x88E\x8BM\x9A4I\xBD\xE1\xA0\xA2\xA8\xA8hӦM\xD5\xD5\xD5}\xFB\xF6\xFDӟ\xFEdoo/\x84\xC8\xCC\xCC<z\x{128CF3}sll\xAC\xF1\x8A\xA3&U\x8D\x8D\x8D[\xB7nB\xF8\xFB\xFB6\xCC\xDC\xE4={\xF6\xEC۷\xCF`0\x9C?\xBE\xF9\xDBgΜ\x93\x94\x94\xA4\x86K \xD0\xB5\xE3\xA4\xECy\xF3\xE6i4\x9A\xE6\xE7qϞ=\xBB\xBA\xBAzÆ
+\xEA\xD3\xCA\xCA\xCAS\xA7NO\x8D\xB2\xA6\x82\xC2\xDB\xDB{\xE5ʕ;w\xEE\xFC裏\xDA\xD5zmmmVV\x96\xFA\x9D\x96\xA2\xAC\xACl\xE4ȑ\xA1\xA1\xA13g\xCEܽ{\xF7\xE5˗\x85III+V\xAC\x982e\x8A\xA2(\xE6\x8Dlllv\xEC\xD8q\xE3\xC6
+\xF5{8\x93\x93,X0gΜ\xF1\xE3\xC7'$$\xF8\xF8\xF84{pppmm\xADz\xD0 tQn\xA3s\xFC\xF8q!DHHHdddddd\x8B[\xAA\x82\x82\x82\x82\x82\x82\xD4\xC7)))iii\xD6W8~\xFCx\\\x9C\xFA8**\xCA\xD1ѱ\xA0\xA0@Q\x94\xE1Ç\xB7^P\xFF\xFE\xFD\xA7O\x9F\xDE|$77W\x91\x99\x99\xA9>ݱc\x87\xBB\xBB\xBBz[\xC3K\x97.\xD5\xD6\xD6i\xB5ڜ\x9C EQ \x83\xAB\xABkZZ\x9A\xC9AEQ\xE2\xE3\xE3###Ey\xF3\xCD77oެ\xD649\xB9\xB8\xB8\xD8\xC6\xC6&##C\x9D\xB3v\xEDZww\xF7\xE6\x8D\xF5\xE8\xD1\xE3\x95W^\xB1\xB0a \xC0ݭ\xEDC\x84\xF3\xE7ϟ8q\xA2bƌ\xAD_\x9D={v|||vvvhh\xE8\x86
+\xF6\xEE\xDD\xDB\xDE
+\xAA5k\xD6 2$66\xF6\xE0\xC1\x83VFC\xF5\x9Ct\xF58\xA0bذaW\xAF^ 7nܜ9s\xA2\xA2\xA2\xBAw\x97\xD7\xD4Ԕ\x97\x97w\xEE\xDC9!\x84\x9D\x9D\xDD\xF9\xF3\xE7Mk\xA6\xA6\xA6 <xp\xE1
\xEAS\x93\x93srr\x8Dg\x95\xB5\xE6\xE0\xE0Ё\xF3\xE5 \xC0]\xA3\xEDC\x84ݺu\xD3\xE9t:\x9D.99\xB9\xF5\xABS\xA7NuqqIKK۳gOhh\xA8\x93\x93S{+\xA8\xDC\xDC\xDC֬Y\x93\x9D\x9D\xFD\xD6[oYٺz=\xE3\xE9\xED\xDE\xDE\xDE\xD9\xD9\xD9 HHH\xF0\xF5\xF5-,,\xAC\xAE\xAEB\xE8\xF5z;;;;;\xBBիW\xC7\xC5ř T+ 9r$///333++K 19\xB9\xBC\xBC\\xA3\xD1\xF4\xEC\xD9\xD3\c666jo \xA0kj\xC7I\xEE\x83B\xA4\xA4\xA44\xBF\xB3\xB2\xBD\xBD}|||jjjii\xA9\xB9s\xD2-W0\x8A\x8A\x8A\x8A\x8B\x8B[\xB2dɠA\x83\xAC\xE9G\x8D8uuu\xEASEQ\x86 \xFA\xD9g\x9F]\xB9re̘1+W\xAE\x9C4i\x92bĈ 0\xBE\xAB\xAC\xAC\xAC\xF5\xA0* `͚5vvv\xCF>\xFBl~~\xBE\xA3\xA3\xA3\xFA\xC3\xC6\x93 E)++\xEBӧ\x8F\xC9Ʈ_\xBFn!~ \x80\xBB^\xBB\xAF<\xDE\xFA\xB7~\xB3f\xCDjhh0 \xFE\xFE\xFE \xAB`\xB4j\xD5*OOO+\xBF\xFEQs\x98\x98\x84[\xB7n\xCD\xCE\xCEB8;;\x87\x84\x84\xD8\xD8\x84\x84\xB8\xB9\xB9\xA5\xA5\xA55\x97\xC9A\x95^\xAFB\xBC\xF9\xE6\x9B\x83a\xC1\x82\xE6&\x8F5J\xAFׯ^\xBD\xDAdW\x8D\x8D\x8D\xBF\xFD\xF6\x9B% @\xD7d\xE9J\xEE\xEA\xCF\xFA\xDE|\xF3͏?\xFEX\xD1\xD0\xD0p\xEDڵ\xBF\xB9B\xF8\xF8\xF8DDD\xB4YYA}\xF5\xFB\xEF\xBF_\xBCx\xAA \xE9\xEBѣǧ\x9F~\xDA\xE2B \xF8\xF2\xCB/+**\x8E =\xFAꫯ\xC6\xC7\xC7\xDF{\xEF\xBDBWWנ\xA0\xA0 ~\xF8\xE1駟V\xDF;mڴI\x93&\xD5\xD7ן<yr\xEB֭\xF6\xF6\xF66l\x88\x8B\x8B;x\xF0`\xBF~\xFD\xBAw\xEF\xBEt\xE9R \x9Fփ\x97.]\xCA\xCDͭ\xAD\xAD=~\xFCxPPP``\xE0 |\xE0\xEA\xEA\xFA\xFA믛\xAC\xF0駟&$$|\xF3\xCD7\xEE\xEE\xEEZ\xAD\xF6ڵk\xEBׯW\xCF0\xFB\xF1\xC7
+ã\x8F>z\x93; \xFC~ɹ\xD9sII\x89\xBB\xBB\xBBNw\xBB\xEFl\xB8~\xFD\xFAŋ\x9F9sF\xA3\xD1!\x8A\x8B\x8B\x9D\x9C\x9C\x9A \xBC3 EEE:\x9D\xCE\xCB\xCB\xCB\xF2\xA09\xE6*\x94\x96\x96zxx\xB4X\xEB\x97_~\xF9̙3\xED\xBD\xE5 \xB8\x9B\xC8 X\x9Dhʔ)\xA1\xA1\xA1&O\xEA\xBA\xFDN\x9F> \xB9{\xF7nkr \xB8[\xB5\xFB \xAC;\xCD\xFA\xF5\xEB/\\xB8p3wz\x96%''祗^\xCA\xC8\xC8 ] \xD0\xC5\xFD\xEE\xBF\xC1R\xDEw\xDF}\x9D\xDBùs\xE7\xFA\xF5\xEBw\x87\xDC t\xA2\xBB$` \xDC9n\xF7i鷈\xC1`hq\x8BC\xEBUVV\xD6\xD4\xD4h\xB5Z\xE3M\xA3\xAD\x9C|3 w1K\x97iؿ\xEB\xF1\x98\x98??\xBFu\xEB֕\x94\x94\xA8#&L B455\xBD\xF3\xCE;\xEAU\xAC\x9Ezꩊ\x8A
+ \x8C\xF5=<<ԗ\xF2\xF3\xF3\xD3\xD3\xD3E\xD1h4\xCF>\xFB\xEC\x9E={
</ins><span class="cx">
</span><del>-\xDA\xDB\xDB
</del><span class="cx">
</span><del>-._\xBE,\x84\xB0\xB5\xB5\xBDr\xE5\x8A\xD1AC\xCD\xF4\xF4\xF4cǎ-_\xBE\}jtr^^^kk\xABaUYW\xF6\xF6\xF6\xBDX/ \xEEݟ"\xECׯ\x9F\x95\x95\x95\x95\x95Ujjj\xD7WgϞ\xED\xE2⒑\x91q\xF0\xE0\xC1\xF0\xF0pGGǞVP\xB9\xBB\xBBoܸ177\xF7\xCD7ߴ\xB0u\xF5z\x86\xE5\xED>>>\xB9\xB9\xB9~~~III\xFE\xFE\xFE\xC5\xC5ŵ\xB5\xB5B\x9DNgkkkkk\xBBaÆ\x84\x84\xA3\x83j\x85\x93'Odgg\xE7\xE4\xE4\xA8#F'WVVj4\x9A\x98j\xCC\xDA\xDAZ\xED
- ܟz\xB0\xC8}ĈB\x88\xB4\xB4\xB4\x8EwV\xB6\xB3\xB3KLLLOO///7\xB5&\xDD|\x83\x98\x98\x98\x84\x84\x84U\xABV
- >ܒ~Ԉ\xD3\xD4Ԥ>UeԨQ }\xF4\xD1͛7'M\x9A\xB4nݺ3f!Ǝ \xEB\xE7\xE7gxWEEE\xD7AUPP\xD0ƍmmm\x9F}\xF6\xD9\xC2\xC2B\x{14735D}&+\x8ARQQ1h\xD0 \xA3\x8D566\x9A\x89_ \xE0\x9E\xD7\xE3+\x8Fw\xFD\xAD߂ ZZZ\xF4z}```\xEF*\xAC_\xBF\xDE\xCB\xCB\xCB¯\xD4 \xA6&!Į]\xBBrss\x85\xCE\xCE\xCEaaa\xD6\xD6\xD6aaa\xEE\xEE\xEE \xDFetP\xA5\xD3\xE9\x84o\xBC\xF1\x86^\xAF_\xB6l\x99\xA9\xC9&L\xD0\xE9t6l0\xDAUkk\xEB?\xFC\xA0FI p2w%w\xF5g}o\xBC\xF1\xC6 | \x84hii\xB9u\xEBV\xA7\xDF\xDC !|}}\xA3\xA2\xA2 '\xDA,\xAC\xA0\xBE\xFA\xF5\xD7_\xAF\\xB9\xF2\xD5W_U\xCF\xF4999}\xF8ᇝ.\xF4p\xF4\xE8\xD1O?\xFD\xB4\xAA\xAA\xEAԩS\xAF\xBE\xFAjbb\xE2\x83>(\x84pss \xF9\xE6\x9Bo\x9E~\xFAi\xF5\xBDs\xE6̙1cFss\xF3\xB9s\xE7v\xED\xDAegg\xB7u\xEBք\x84\x84cǎ
-2\xA4\xFF\xFE\xAF\xBF\xFE\xBA\xAF\xAFo\xD7\xC1\xEBׯ\xE7\xE7\xE7744\x9C9s&$$$88\xF8\xBD\xF7\xDEsss{\xED\xB5V\xF8\xF0\xC3\x93\x92\x92\xBE\xF8\xE2 \xADV{\xEB֭-[\xB6\xA8+̾\xFD\xF6[\xBD^\xFF\xD8c\x8F\xDD\xE6\x81 ?]rn\xF6\VV\xE6\xE1\xE1ae\xF5c\xDF\xD9p˖-+W\xAE\xBCx\xF1\xA2F\xA3B\xB4\xB4\xB4\x94\x96\x96:::v<y\xA7\xD7\xEBKJJ\xAC\xAC\xAC\xBC\xBD\xBD\xCD\x9Ab\xAAByy\xB9\xA7\xA7g\xA7O\xFD\xF2\xCB/_\xBCx\xB1\xA7\xB7\xDC \xF79\xAB͚5+<<\xDC袮 ߅ \xA2\xA3\xA3 8`In \xF7\xAA \xAF\xC1\xBA\xDBlٲ\xE5\xEAի\xB7s\xA7gY\xF2\xF2\xF2^z饬\xAC,\xD2 \xF7\xB9\x9F\xFC7X\xAA\xE2\xE2\xE2\x87 z\xA8o{\xB8|\xF9\xF2\x90!C" \x80>t\x8F, \x80\xBBǏ\xBD,\xFD\xD1\xEB\xF5\x9Dnqh\xB9\xEA\xEA\xEA\xFA\xFAz\xADVk\xB8i\xB4\x85\x93og\xA3 \xE0 f\xEE2
-G\x8E \xE9: \xB0y\xF3沲2udڴi\xC1\xC1\xC1B\x88\xF6\xF6\xF6\xB7\xDF~[\xBD\x8A\xD5SO=UUUe\xA6\x82\xA1\xBE\xA7\xA7gRR\x92\xFARaaaff\xA6\xA2(\x8D\xE6\xD9g\x9F=x\xF0`QQ\x91\xD1\xF6&M\x9Ad\xB8\xABtNNNvvv\xAF\x97a]\xBDz5---;;\xFB\xFA\xF5\xEB=\x9A\x9C\x99\x99YXX\xB8|\xF9rN \x80\x8EL\xACɓ'\xEB\xF5\xFAG }\xF4\xAD\xB7ޚ<yr{{{SSSff\xE6\xB9s\xE7\xE2\xE3\xE3_{\xED\xB5իW =zTMWB\xADV\xBBdɒ\xD0\xD0\xD0]\xBBv\xF9\xFB\xFB !\xCCTP\xEB\xC7\xC4\xC4\xD4\xD4Ը\xB8\xB8\xC4\xC6\xC6
-!F\x8E \xE9\xED\xED \x91\x97\x97\xE7\xE0\xE0\xB0m۶\xE4\xE4dWWWkk먨\xA8\xE0\xE0\xE0+V455\xE5\xE7\xE7\xEF߿_
-X\x9B6m\xCA\xC9\xC9پ}{\xAFw\xC1\x981c&M\x9A\x94\x9D\x9D\xDD\xD3ɱ\xB1\xB1\xCD\xCDͱ\xB1\xB1;w\xB6\xEEu \xE0 c\xEE\xA1\xB3\xB3\xB3bĈ\x86+\x8Ar\xF3\xE6M!\x84\x95\x95\xD5 /\xBC\xF0\xEE\xBB\xEF\xEEرc\xE2ĉ\x86\xB7\x9C={600PMW\xE6+\xA8\xAFFGG\x97\x96\x96&''GDD\xA8\xF7\xA5qvv\xB6\xB1\xB1qppB\xF8\xF8\xF8L\x9D:U\x9Dlcc\xE3\xE2\xE2&\x84 LOOB\x9C>}:%%\xE5
}\xF5 \xD2\xECٳw\xEFޝ\x9A\x9A\xBAjժ>i ܅z\xB6+22Ұ(\xDE\xD3\xD33..>Z\xB3f\x8D\x9A\x87\x846l\xE8t v3\x84\x8Df\xF3\xE6ͣG\x8FNLL\xECz S77tss[\xB9r\xA5bŊ3f\xCC\xE8\xB8v*;;\xFBԩS\xCE\xCE\xCE\xF1\xF1\xF1<u\xEAԥK\x97F\x8F \xDD\xD2Ҳo\xDF>{{\xFB\xA4\xA4$\xC3 \xA9 <x\xF8\xF0a\xBD^\xE5ʕ\x8E\xF5;1?y\xFE\xFC\xF9qqq)))j\x9A \xE8\xC1\xED%K\x96h4\x9A\x8E˺.\X[[\xBBu\xEBV\xF5iuu\xF5\xF9\xF3\xE7
-K\xA3,\xA9 \x84\xF0\xF1\xF1Y\xB7nݾ}\xFB\xD4\xFB\xEAX\xAE\xA1\xA1!''G\xFDNK\x95\x92\x92\xB2v\xED\xDAY\xB3f)\x8ATUU\xB4v\xED\xDAŋ :tH\xA7ӽ\xF3\xCE;\x8B/V'/[\xB6lѢES\xA7NMJJ\xF2\xF5\xF55S\xC4\xCCd!DhhhCC\x83\x85g \xC0}A1\xED̙3B\x88\xB0\xB0\xB0\xE8\xE8\xE8\xE8\xE8\xE8\x87 ~\xB8뜐\x90\x90\x90\x90\xF5qZZZFF\x86\xE5Μ9\x93\x90\x90\xA0>\x8E\x89\x89qpp(**Re̘1]74t\xE8йs\xE7v \xC9\xCF\xCFBdgg\xABOKJJ\xB4Zm^^\x9E\xA2(z\xBD\xDE\xCD\xCDMmfʔ))))\xEA\x9CիW\xFB\xFB\xFB+\x8ARZZjmm\x9D\x95\x95\xA5\x8Eoڴ\xC9\xC3\xC3\xC3TS\x93
-\x9C\x9C\x9C^y\xE53{ \xDCW\xBA?E\xB8t\xE9\xD2\xE9ӧ !ԛw\xB2p\xE1\xC2\xC4\xC4\xC4\xDC\xDC\xDC\xF0\xF0\xF0\xAD[\xB7 :t\xA8\xA7T7n 9rd||\xFC\xB1c\xC7,\x8C\x86\x95\x95\x95B;;;\xF5iAAA{{{AA\xC1\xE5˗\x85\xB6\xB6\xB6\x9D\xCE\xE5 ! \x9B\x9A\x9A\x84yyy\xAD\xAD\xAD\x86\x95aF\x8B\x98\x9Al`oo\xAF6 ,Y\x83կ_?\xF5~Ʃ\xA9\xA9]_\x9D={\xF6K/\xBD\x94\x91\x91Q__ nX\xDEdy\x95\xBB\xBB\xFBƍ\x9Fz\xEA\xA97\xDF|\xD3\xC2\xD6\xD5\xEBA\x96\xB7\xD7\xD6\xD6
-!t:\x9D\xAD\xAD\xADbÆ
-f\xAE\xED^YY\xA9\xD1h \xD0i\xDCh\x91\xE3Ǐ\x9Dl`mm\xAD6 z\xB4\xC8}ĈB\x88\xB4\xB4\xB4\x8EwV\xB6\xB3\xB3KLLLOO///7\xB5&\xDD|\x83\x98\x98\x98\x84\x84\x84U\xABV
- >ܒ~\xD4ģ~#%\x84P\x848v\xECX??\xBFn\xDF\xEB\xE9\xE9\xA9(JEEŠA\x83:\x8Dw-R\\lt\xB2Acc\xA3\x99\xF8 \xEE7=\xBEy\xD7\xDF\xFA-X\xB0\xA0\xA5\xA5E\xAF\xD7\xF6\xAE\x82\xC1\xFA\xF5뽼\xBC,\xFC6H\xCDa\xEAӰ\xB00ww\xF7\x8C\x8C K\xDE;a\xC2\x9DN\xB7aÆN\xE3F\x8B\x98\x9A\xACjmm\xFD\xE1\x87 \xD4\xEC \xCC_\xC9]\xFDY\xDFo\xBC\xF1\xC1 !ZZZnݺ\xA5\xFE\xAA\xAE#__ߨ\xA8\xA8\x84\x84\x84 UP_\xFD\xFA\xEB\xAFW\xAE\\xF9ꫯ\xAAg\xFA\x9C\x9C\x9C>\xFC\xF0\xC3Nz8z\xF4觟~ZUUu\xEAԩW_}511\xF1\xC1 B\xB8\xB9\xB9\x85\x84\x84|\xF3\xCD7O?\xFD\xB4\xC2\xCE\xCEn\xEB֭ ǎ 2dH\xFF\xFE\xFD_\xFD\xF5\xEF\xBE\xFB\xEEҥK---'O\x9Etvv\xCE\xCAʪ\xAE\xAE\xFE\xDF\xFF\xFDߙ3g~\xF8\xE1\x87III_|\x87V\xAB\xBDu\xEB֖-[\xE6͛\x88\xAF\xAF\xAF\xA9\xC9B\x88o\xBF\xFDV\xAF\xD7?\xF6\xD8c\xB7y$ \xC0=C\xCE͞\xCB\xCA\xCA<<<ԅV?\xA6-[\xB6\xAC\\xB9\xF2\xE2ŋ\x8DF \xD1\xEB\xF5%%%VVV\xDE\xDE\xDEݾ]\xAFח\x97\x97{zzv\xEA\xDChS\x93_~\xF9\xE5\x8B/fff\xCA\xF8@ \xE0^ '`\xF5\xA1Y\xB3f\x85\x87\x87]\xD4\xF5#\xB8p\xE1Btt\xF4\x81,\xC9s \xE0>\xD1\xE35Xw\x9B-[\xB6\\xBDz\xB5\xD7wz\xBE yyy/\xBD\xF4RVV\xE9
- t\xF4\x93\xFFKU\\l\xE6\xA2 w\xC8\xE5˗\x87 \xD2W\xB7A w\xAD{$` \xDC=~\xF2\xA7 \xEE6\xE6.\xD3p\xE4ȑ\xAE\xE3qqq\x86W===\x93\x92\x92ԗ
- 333E\xD1h4\xCF>\xFB\xEC?\xFF\xF9ώ\xAC\xAD\xAD]]]CBBBCC\xCD\x{1D46DB}{\xE8Сk\xF5\xEF\xDF\xE4ȑ111\xCE\xCEΖtex\xBAcǎ\xA2\xA2"\xA3\xC5'M\x9A\xA4\xD1h\xBA-r\xE9ҥݻw\x97\x94\x94\xD8\xDB\xDB2d\xFA\xF4\xE9\xDE\xDE\xDE\xE6˚\xB9\xCB5 \xB8\xAF\x98 X\x93'O\xD6\xEB\xF5\x8F>\xFA\xE8[o\xBD5y\xF2\xE4\xF6\xF6\x{1A69A6}\xCC\xCC\xCCs\xE7\xCE\xA8\xAF\xC6\xC4\xC4\xD4\xD4Ը\xB8\xB8\xC4\xC6\xC6
-!F\x8E \xE9\xED\xED \x91\x97\x97\xE7\xE0\xE0\xE0\xEE\xEEޱBMM\xCD\xE9ӧ\xE3\xE2\xE2 \xFE\xFA\x8DY
+L\xB67f\xCC\xE3]\xA5\xB3\xB2\xB2233;|օ RRR233/]\xBAԮ\xC9\xE9\xE9\xE9\xF9\xF9\xF9 .\xE4\xB0 h\xCEl\xC0;v\xAC\xC1`x\xF8\xE1\x87\xDF~\xFB\xED\xB1c\xC7655\xD5\xD5ե\xA7\xA7\x9F<y\xD2\xCF\xCF/66\xF6\xF5\xD7__\xB6lف\xD4t%\x84\xD0j\xB5\xF3\xE6\xCD u\xAB\xAF\xAF\xAF\xC2B\xB5~TTTUU\x95\x8B\x8BKtt\xB4bȐ!^^^aaa999\x8E\x8E\x8E7nLLL\xECݻ\xB7\x8D\x8DMDDD``\xE0\xA2E\x8B\xEA\xEA\xEArssw\xEDڥ\xAC\xB5k\xD7feemڴ\xA9Û`\xF8\xF0\xE1cƌ\xC9\xCC\xCCl\xEF\xE4\xE8\xE8\xE8\xFA\xFA\xFA\xE8\xE8\xE8-[\xB6\xD8\xD8\xD8t\xB8 p\x97\xB1t\x88\xD0\xD9\xD9Y1x\xF0`㍍E\xB9r\xE5\x8AB\xA7ӽ\xF0\xC2 \xEF\xBD\xF7\xDE\xE6͛G\x8F m|ˉ'\xFC\xFD\xFD\xD5te\xB9\x82\xFAjdddqqqbbbXX\x98z_ggg[[[GGG!\x84\xB7\xB7\xF7\xF8\xF1\xE3\xD5ɶ\xB6\xB6...!!!B\xFF\xD4\xD4T!ıcǒ\x92\x92N\x9F>\xDDY\xDF!M\x9D:u۶m\xC9\xC9\xC9K\x96,\xE9\x94 \xC0 \xA8}\xE7`\x85\x87\x87O\x8A\xF7\xF0\xF0\x88\x89\x89\xF9\xEC\xB3ϖ/_\xAE\xE6!!\xC4\xEAի[\\x87\xDDB!\x84F\xA3Y\xB7nݰa\xC3\xE2\xE3\xE3[\xDFB\xC7\xDC\xCD
+]]]/^,\x84X\xB4hѤI\x93\x9A\x9F;\x95\x99\x99y\xF4\xE8Qgg\xE7\xD8\xD8\xD8^\xBDz =z\xF4\xECٳÆ
+khhعs\xA7\x83\x83CBB\x82\xF1\x8E\xD4{\xF6\xECٷo\x9F\xC1`8\xFE|\xF3\xFA-\x8AX\x9E<s\xE6̘\x98\x98\xA4\xA4$5M \xB4\xE3 \xEDy\xF3\xE6i4\x9A\xE6\xA7uϞ=\xBB\xBA\xBAzÆ
+\xEA\xD3\xCA\xCA\xCAS\xA7NO\x8D\xB2\xA6\x82\xC2\xDB\xDB{\xE5ʕ;w\xEET\xEF\xABc\xBD\xDA\xDAڬ\xAC,\xF5;-URRҊ+\xA6L\x99\xA2(J@@@EEE@@\xC0\x8A+\xE6Ν\xBBw\xEF^\xBD^\xFF\xEE\xBB\xEFΝ;W\x9D\xBC`\xC1\x829s\xE6\x8C ?>!!\xC1\xC7\xC7\xC7B \x93\x85\xC1\xC1\xC1\xB5\xB5\xB5V a ]\x82b\xDE\xF1\xE3Dž!!!\x91\x91\x91\x91\x91\x91\xF7\xDF\xEB9AAAAAA\xEA㔔\x94\xB4\xB44\xEB+ ?~<..N} \xE5\xE8\xE8XPP\xA0(\xCA\xF0\xE1\xC3[/\xA8\xFF\xFEӧOo>\x92\x9B\x9B+\x84\xC8\xCC\xCCT\x9Fi\xB5ڜ\x9C EQ \x83\xAB\xAB\xAB\xDA̸q㒒\x92\xD49˖-\xF3\xF5\xF5U\xA5\xB8\xB8\xD8\xC6\xC6&##C _\xBBv\xAD\xBB\xBB\xBB\xB9"\xE6&\xF5\xE8\xD1\xE3\x95W^\xB1\xB0% @\x97\xD2\xF6!\xC2\xF9\xF3\xE7O\x9C8Q\xA1\xDE̸\x85ٳg\xC7\xC7\xC7ggg\x87\x86\x86nذa\xEF\x{DB60}Z\xB3f͐!Cbcc <he4,//B\xD8\xDB۫O\xF3\xF2\xF2\xF2\xF2Ν;'\x84\xB0\xB3\xB3kq,O\xE1\xE4\xE4TWW'\x84\xC8\xC9\xC9ill4\x9Efd\xB2\x88\xB9\xC9Fj3 s\xB0\xBAu\xEB\xA6\xDE\xCF899\xB9\xF5\xABS\xA7N}饗\xD2\xD2\xD2jjjBCC\x8D\xA77Y_A\xE5\xE6\xE6\xB6f͚\xA7\x9Ezꭷ\xB2u\xF5z\xC6\xD3۫\xAB\xAB\x85z\xBD\xDE\xCE\xCEN\xB1z\xF5j \xD7v///\xD7h4={\xF6l1n\xB2ȡC\x87LN6\xB2\xB1\xB1Q\x9B \xED:\xC9}\xF0\xE0\xC1B\x88\x94\x94\x94\xE6wV\xB6\xB7\xB7\x8F\x8F\x8FOMM---5wN\xBA\xE5
</del><ins>+FQQQqqqK\x96,4h\x905\xFD\xA8\x89G\xFDFJ\xA1\xFEqĈ h\xF3\xBD \x8A\xA2\x94\x95\x95\xF5\xE9ӧ\xC5x\xEB"\x85\x85\x85&']\xBF~\xDDB\xFC ]M\xBB/D\xDE\xFA\xB7~\xB3f\xCDjhh0 \xFE\xFE\xFE \xAB`\xB4j\xD5*OOO+\xBF
+RsXYY\x99\xFA4$$\xC4\xCD\xCD---͚\xF7\x8E5J\xAFׯ^\xBD\xBAŸ\xC9"\xE6&\xAB\xFB\xED75; \xCBWrW\xD6\xF7\xE6\x9Bo~\xFC\xF1\xC7B\x88\x86\x86\x86k\xA9\xBF\xAAk\xCE\xC7\xC7'"""..\xAE]\xD4W\xBF\xFF\xFE\xFBŋ\xBF\xFA\xEA\xABꑾ =z|\xFA\xE9\xA7-.\xF4p\xE0\xC0\x81/\xBF\xFC\xB2\xA2\xA2\xE2\xE8ѣ\xAF\xBE\xFAj||\xFC\xBD\xF7\xDE+\x84puu
+
+\xFA\xE1\x87 \x9E~\xFAi!\x84\xBD\xBD\xFD\x86
+\xE2\xE2\xE2 <د_\xBF\xEEݻ/]\xBA\xF4\xE7\x9F>{\xF6lCCÑ#G\x9C\x9D\x9D322*++\xFF\xF7\xFFw\xF2\xE4ɟ~\xFAiBB\xC27\xDF|\xE3\xEE\xEE\xAE\xD5j\xAF]\xBB\xB6~\xFD\xFA3f\xB4.\xE2\xE3\xE3cn\xB2\xE2\xC7 4 \x8F>\xFA\xE8M\xEE pאs\xB3璒www\xF5D\xAB\xDBi\xFD\xFA\xF5\x8B/>s\xE6\x8CF\xA3QG CQQ\x91N\xA7\xF3\xF2\xF2j\xF3\xED\x83\xA1\xB4\xB4\xD4\xC3ãE\xE7&\x8B\x98\x9B\xFC\xF2\xCB/\x9F9s&==]\xC6
+ \x80\xBB\x81\x9C\x80Չ\xA6L\x99j\xF2\xA4\xAE\xDB\xE0\xF4\xE9ӑ\x91\x91\xBBw\xEF\xB6&\xCF \x80.\xA2\xDD\xE7`\xDDi֯_\xE1
\xDF\xE9\xF9f\xE4\xE4\xE4\xBC\xF4\xD2K\xA4+ \xD0\xDC\xEF\xFE,Uaa\xA1\x85\x8B2\xDC"\xE7Ν\xEBׯ_g\xDD ܱ p\xE7\xF8\xDD " \xB8\xD3X\xBAL\xC3\xFE\xFD\xFB[\x8F\xC7\xC4\xC4\xF8\xF9\xF9_\xF5\xF0\xF0HHHP_\xCA\xCF\xCFOOOWE\xA3\xD1<\xFB\xEC\xB3\xFF\xFE\xF7\xBF\x9BW\xB0\xB1\xB1\xE9ݻwPPPpp\xB0垲\xB3\xB3\xF7\xEE\xDD{\xF1\xE2\xC5\xEEݻ2$**\xCA\xD9\xD9ٚ\xAE\x8CO7o\xDE\PP`\xB2\xF8\x981c4M\x9BEΞ=\xBBm۶\xA2\xA2"\x87~\xFD\xFAM\x9C8\xD1\xCB\xCB\xCBrY w\xB9 ]\x8Aـ5v\xECX\x83\xC1\xF0\xF0\xC3\xBF\xFD\xF6\xDBcǎmjj\xAA\xAB\xABKOO?y\x9F\xFAjTTTUU\x95\x8B\x8BKtt\xB4bȐ!^^^aaa999\x8E\x8E\x8Ennn\xCD+TUU ;v,&&\xC6\xD1\xD1\xF1\xEF\xFF\xBBɘU[[;eʔ+W\xAE,_\xBE< \xA0\xA6\xA6\xE6\x9F\xFF\xFC\xA7\xBF\xBFZZZTTT\x9B]\xEBlܸ111\xB1w\xEF\xDE666\x81\x81\x81\x8B-\xAA\xAB\xAB\xCB\xCD\xCDݵk\xD7ҥK-\xF9\xF2\xCB/\xFF\xA5\xA5M\x9B6\xAD\xA8\xA8h\xE9ҥz\xBD~ƌ\x96\xCB\xB0 \x80\xCAҕ\xAB\xD4\xEF\x8D l\xBCϱ\xA2(W\xAE\1\xBEY\\\x9C\x98\x98\xA6\xDEd\xC6\xD9\xD9\xD9\xD6\xD6\xD6\xD1\xD1\xD1d\x85\xFF\xFC\xCF\xFF|\xE1\x85\x9E|\xF2\xC9G }\xF4\xC7 \xECׯ_\x8B%\xBE\xF4\xD2K'N\x9C\xF8駟\xD4
+={\xF6|\xFE\xF9\xE7 \xA6N\x9D\xFA\xC3?\xA8WK\xB7ܕ\xCA\xDB\xDB{\xFC\xF8\xF1\xEAc[[[\x97\x90\x90!\x84\xBF\xBFjjj\x9BE\x92\x93\x93\x9F{\xEE\xB9\xC7 {L\xE1\xE9\xE9\xB9`\xC1\x82\x92\x92k\xCA \x88\xF6\x9E\x83 \xAE~Y\xA5\xD2h4\xEB֭kll\x8C\x8F\x8F\xB7\xB2\x82\x93\x93\xD3ڵk\xAF\\xB9\xD2\xFA\xC2
+]\xFB\xE4\x93O\xA6M\x9Bf\xCCg\xAA\xE9ӧk4\x9A>\xF8\xC0ʮ\x84\xE6\xEE\x8A\xE8\xEA\xEA\xBAx\xF1\xE26\x8B\xD4\xD6\xD6\xEEݻ\xD7`0\xA8OG\x8E ӱ\xB2 \xA0 jG\xC0\x9A7o\x9EF\xA3\xE9\xD6\xED\xFF\xF7oo\xEF\x95+W\xEEܹS\xBD+\x8E5|}}}}}\xBF\xFD\xF6\xDB㹹\xB9\xF5\xF5\xF5l1nkk\xEB\xED\xED}\xE8\xD0!\x93ղ\xB2\xB2\xCA\xCB\xCB[t\xD5^-V-&&櫯\xBEz\xE0\x81֭[w\xF5\xEA՛\xA9 \xBA\xA0\xB6sɲeˢ\xA2\xA2\xA2\xA2\xA2222LN\x88\x8B\x8B\x8B\x8A\x8AJJJ\xFA\xF9短\\xAA\x97\x97\x97\xF1&\xCDF\xBF\xFE\xFA\xAB\xA2w\xEFޭ绹\xB9\xB5\x98\x9F\x99\x99\xF9\xE1\x87 ~\xF8\xE1\x87+V\xAC\xA8\xA9\xA9\xB1r\xB9-\x98[\xB57\xDEx#99\xF9ܹs3gμ\xE7\x9E{\xDEx\xE3\x8D7ntl \xA0 j;`͟?˖-[\xB6l6l\x98\xB99k֬qpp\x88\x8D\x8Dmjj\xB2f\xA9
-\xB3fͺy\xF3\xE6\x9A5k\x82\x82\x82\xEA\xEB\xEB\xFF\xFE\xF7\xBFfdd\xC4\xC4\xC4tە\xA1ζmے\x93\x93]]]\xAD\xAD\xAD\xA3\xA2\xA2\x82\x83\x83W\xACX\xD1\xD4Ԕ\x9F\x9F\xBF\xFF\xFE\xD7_\xDD|\x91O?\xFD\xF4\xB7\xBF\xFDmFFƜ9sJJJ^\xFDu\x9DN7o\xDE<\xF3e X @e\xEE\xCAU\xEA\xF7F#F\x8C0\xDC\xE7XQ\x94\x9B7o^\x8D\x8E\x8E.--MNN\x8E\x88\x88Po2\xE3\xEC\xEClcc\xE3\xE0\xE0`\xB4\xC2\xFE\xE7\xBE\xF0\xC2 O>\xF9\xE4c\x8F=\xF6\xED\xB7\xDF2\xA4\xD3_z饳g\xCF\xFE\xEB_\xFFR+ 0\xE0\xF9矷\xB7\xB7\x9F={\xF67\xDF|\xA3^-\xDD|W* \x9F\xA9S\xA7\xAA\x8Fmll\\\\xC2\xC2\x81\x81\x81\xE9\xE9\xE9\xDDIMM}\xEE\xB9\xE7 \xFCq!\x84\x97\x97ײe\xCB\xCA\xCA\xCA,) z\xBA+22R\xFD\xB2J\xA5\xD1h6o\xDE\xDC\xDAښ\x98\x98haGG\xC7M\x9B6ݼy\xB3\xEB\x85nݺ\xF5\x97\xBF\xFCeΜ9\x86|\xA6\x9A;w\xAEF\xA3y\xEF\xBD\xF7,\xECJaꮈnnn+W\xAE\xEC\xB6HCCáC\x87\xF4z\xBD\xFAt\xFC\xF8\xF1qqq\xBD+ \xEEC=XK\x96,\xD1h4\xFD\xFA\xFD\xFF\xDE\xE2\xE3\xE3\xB3nݺ}\xFB\xF6\xA9wű\x84\xBF\xBF\xBF\xBF\xBF\xFF\x97_~\xD9i<??\xBF\xB9\xB9yذa\x9D\xC6mll|||\x8E ?n\xB4ZNNNeee\xA7\xAEz\xAA\xD3G\x8B\x8B\x8B\xFB\xEC\xB3\xCFƍ\xB7y\xF3溺\xBA۩ \xEEC\xDD\xE7\x92իW\xC7\xC4\xC4\xC4\xC4\xC4dee\x9D\x90\x90\x90\x93\x92\x92\xF2\xDDw\xDFY\xB8Uooo\xC3M\x9A
-\xFE\xFD\xEF !\]]\xBB\xCEwww\xEF4?;;\xFB\xCF\xFE\xF3\x9F\xFF\xFC\xE7\xB5k\xD7\xD6\xD7\xD7[\xB8\xDDNL}\xB4\xDF\xFF\xFE\x{1E9A69}\x97/_\x9E?\xFE<\xF0\xFB\xDF\xFF\xBE\xAD\xAD\xADw\x9B \xF7\xA1\xEE\xD6ҥKw\xEEܹs\xE7\xCEѣG\x9B\x9A\xB3q\xE3F{{\xFB\xF8\xF8\xF8\xF6\xF6vK\xB6\xDA\xD2\xD2bgg\xD7i\xD0\xD6\xD6V\xD1\xD8\xD8\xD8u~CC\x83\x{2A81AEB}\xEB\xE0\xC1\x83 \xEC\xE4\xE4d\xC9\x8D2\xF5Ѭ\xAC\xAC~\xF7\xBBߕ\x97\x97\xF2\xC9'\xA3F\x8DJMM}\xE3\x8D7z\xBD p\xBF\xE9>`\xF5\xEB\xD7\xCF\xCA\xCA\xCA\xCA\xCA*55\xD5\xD4 ww\xF7\x8D7\xE6\xE6\xE6\xBE\xF9曖l\xF5\xBB\xEF\xBE{\xF8\xE1\x87;
-\xAA'\xD5\xEF\xB1:\xB9qㆺ\xC2\xDD`ܸqӦM\x9B6mڋ/\xBE\xD8\xEB\x8Ce\xFE\xA3\xD9\xDA\xDA\xC6\xC5\xC5 =z422r˖-\xBD\xDB \xB8\xF5`\xE9\x92q\xD2\xD2Ҍ\xBE\x93\x90\x90\xB0jժ\xD6\xD6V\xF3u\x8E ?~\xFD\xFA\xF5ٳgw\xF7\xF7\xF7 <|\xF8p\xA7\xF1\xE2\xE2Ⲳ\xB2N\xCB\xD8
-&L\x98\xE0\xE2\xE2b\xD10\xAD\xD3G\xEB\xB5Zmdd\xA4\xBD\xBD\xFDmn \xDC?z\xBC6\xFC\xB3\xCF>3\xF5\xD2\xFA\xF5뽼\xBC̟%,**\x9A?~ll\xEC\x9C9s\xBA\xBE\x9A\x9E\x9E\xFE\xF9\xE7\x9F\xE7\xE4\xE4F\xDA\xDAږ,Y \xDF\xD3V{\xCA\xF0\xD1>\xFD\xF4\xD3[\xB7n\xC6 :\xF4\xE4\x93O\xDE\xE9\xAD \x80{\x86\xC9{ 9r\xE4\xFD\xF7\xDFߺu\xEB\xB8q\xE3<<<\x84---\xB7nݪ\xAA\xAA\xBAp\xE1\x82\xFA\xEA\xD7_=gΜW_}\xD5p\xC3\xE3C\x87=\xFF\xFC\xF3\xE7ϟ\xEFXa\xECر>>>\x8D\xE6\xE6͛\xCD\xCD\xCD\xF3\xE6\xCDKNN6\xF5\xBB\xBF'N\xFC\xEEw\xBF4hP@@@}}\xFDɓ'\xC3\xC2\xC2RSS\xD5k7\x9C>}\xFA\xF8\xC3\xC7 <u\xEAԈ\x88\x88\x97_~\xD9\xC6\xC6\xC6\xD4g;z\xF4觟~\xFA\xFE\xFB\xEF{zzΚ5+11\xF1\xC1 \xEC\xF6\xA3 !bccϜ9\xF3\xE4\x93O:99 ?~<00\xF0\x8F\xFC\xA3a\x98\xA9\xB2 \xAA;~\xB3\xE7\xF6\xF6\xF6\xB6\xB66EQ\xFA\xF5\xEBg& uR__\xE3\xC6
-[[[///\x8DFsG;4\xAA\xBD\xBD\xFDڵk\xCD\xCD\xCD^^^\x9C =r\xC7 \xC0\xFD涮\xCF \x80\xAEX \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 \xD9\xFF=\x8E\xB8\xAF\xBBZ IEND\xAEB`\x82
</ins><span class="cx">\ No newline at end of file
</span><ins>+\xF6\xF6\xF6-\xED\xEC\xEC\x84ׯ_o=\xBF\xB6\xB6V}ըw\xEF\xDE}\xFB\xF6\xED۷o\x8F =\xACY\xA2I\xE6VM\xA7ӽ\xF6\xDAk\xA5\xA5\xA5_|\xF1\xC5СC\x93\x93\x93\xDF|\xF3\xCD/ t5m\xACnݺ\xE9t:\x9DN\x97\x9C\x9Cln\x8E\x9B\x9Bۚ5k\xB2\xB3\xB3\xDFz\xEB-k\x96\xFA\xF3\xCF?\xDF\xFF\xFD-Ճ\x83\xEA\xF7X-\\xBE|Y=\xC3\xDD\xE8\x81 \x980a ^|\xF1\xC5g,˫fggs\xE0\xC0\x81\xF0\xF0\xF0\xF5\xEB\xD7wl \xA0 jǩKj\xC4III1\xF9jTTT\\ܒ%K-\xD79t\xE8ХK\x97\xA6N\x9D\xDAb\xDC\xD7\xD7\xD7\xDF\xDF߾}-\xC6 KJJZ\x9C\xC6n4j\xD4(\xABV\xC0\xBC\xAB\xD6<&j\xB5\xDA\xF0\xF0p\x87\x9B\ \xE8:\xDA}n\xF8W_}e\xEE\xA5U\xABVyzzZ>JXPP0s\xE6\xCC\xE8\xE8\xE8iӦ\xB5~555\xF5믿\xCE\xCA\xCA2\x8Eܸqcyaaa\xB1\xB1\xB1\xEDm\xB5\xBD\x8C\xAB\xF6\xE5\x97_^\xBBv\xCD8\xBEw\xEF\xDE'\x9F|\xF2V/ \xDC5\xCCދp\xFF\xFE\xFD }\xF4ц
+ x\xE0www!DCCõk\xD7***N\x9F>\xAD\xBE\xFA\xFD\xF7\xDFO\x9B6\xED\xD5W_5\xDE\xF0x\xEF\xCF?\xFF\xFC\xA9S\xA7\x9AW1b\x84\xB7\xB7\xB7F\xA3\xB9r\xE5J}}\xFD\x8C3\xCD\xFD\xEE\xEF\xF0\xE1ï\xBD\xF6Z\x9F>}\xFC\xFC\xFCjjj\x8E 9\x92\x9C\x9C\xAC^\xBB\xE1رc\xEF\xBF\xFF\xFE\xE7\x9F>~\xFC\x{C30C17}_~\xD9\xD6\xD6\xD6ܺ 8p\xE0\xCB/\xBF\xFC裏<<<\xA6L\x99 \xEF\xBD\xF7\xB6\xB9jB\x88\xE8\xE8\xE8\xE3Ǐ?\xF9\xE4\x93=z\xF48t萿\xBF\xFF_\xFF\xFAW\xE3I`\xE6\xCA \xA8n\xF9͞\x9B\x9A\x9Anܸ\xA1(J\xB7n\xDD,\x84\xA1jjj._\xBElgg\xE7\xE9\xE9\xA9\xD1hni\x87&555]\xBCx\xB1\xBE\xBE\xDE\xD3ӓ\xE3\x83 \xA0]ny\xC0 \xE8jn\xEA\xFA\x9C h\x8D\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xB0 $#` HF\xC0 \x90\x8C\x80 @2 \x80d, \xC9X \x92\xFDa
+\xFF\x87\xFAO\x8C2 IEND\xAEB`\x82
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediaaudiocontrolsrenderingexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediaaudiocontrolsrenderingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 300x30
</span><span class="cx"> layer at (8,41) size 300x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 157x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 169x12
</span><span class="lines">@@ -27,13 +27,14 @@
</span><span class="cx"> RenderBlock {DIV} at (221,0) size 32x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 32x15
</span><span class="cx"> text run at (0,7) width 32: "00:07"
</span><del>- RenderButton {INPUT} at (261,0) size 30x30
</del><ins>+ RenderFlexibleBox {DIV} at (261,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins><span class="cx"> layer at (8,88) size 320x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x30
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 320x30
</span><span class="cx"> layer at (8,88) size 320x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 177x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 177x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 189x12
</span><span class="lines">@@ -41,7 +42,8 @@
</span><span class="cx"> RenderBlock {DIV} at (241,0) size 32x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 32x15
</span><span class="cx"> text run at (0,7) width 32: "00:07"
</span><del>- RenderButton {INPUT} at (281,0) size 30x30
</del><ins>+ RenderFlexibleBox {DIV} at (281,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins><span class="cx"> layer at (8,135) size 320x100
</span><span class="cx"> RenderMedia {AUDIO} at (8,135) size 320x100 [bgcolor=#0000FF]
</span><span class="cx"> layer at (8,135) size 320x100
</span><span class="lines">@@ -49,7 +51,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,70) size 320x30
</span><span class="cx"> layer at (8,205) size 320x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 177x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 177x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 189x12
</span><span class="lines">@@ -57,4 +59,5 @@
</span><span class="cx"> RenderBlock {DIV} at (241,0) size 32x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 32x15
</span><span class="cx"> text run at (0,7) width 32: "00:07"
</span><del>- RenderButton {INPUT} at (281,0) size 30x30
</del><ins>+ RenderFlexibleBox {DIV} at (281,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediaaudiorepaintexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/media/audio-repaint-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/media/audio-repaint-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/media/audio-repaint-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 300x30
</span><span class="cx"> layer at (8,71) size 300x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 115x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 115x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 127x12
</span><span class="lines">@@ -27,13 +27,14 @@
</span><span class="cx"> RenderBlock {DIV} at (179,0) size 74x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 74x15
</span><span class="cx"> text run at (0,7) width 74: "00:00 / 00:01"
</span><del>- RenderButton {INPUT} at (261,0) size 30x30
</del><ins>+ RenderFlexibleBox {DIV} at (261,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins><span class="cx"> layer at (8,41) size 300x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 300x30
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 300x30
</span><span class="cx"> layer at (8,41) size 300x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 115x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 115x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 127x12
</span><span class="lines">@@ -41,7 +42,8 @@
</span><span class="cx"> RenderBlock {DIV} at (179,0) size 74x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 74x15
</span><span class="cx"> text run at (0,7) width 74: "00:00 / 00:01"
</span><del>- RenderButton {INPUT} at (261,0) size 30x30
</del><ins>+ RenderFlexibleBox {DIV} at (261,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins><span class="cx"> layer at (8,153) size 300x30
</span><span class="cx"> RenderMedia {AUDIO} at (0,112) size 300x30
</span><span class="cx"> layer at (8,153) size 300x30
</span><span class="lines">@@ -49,7 +51,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 300x30
</span><span class="cx"> layer at (8,153) size 300x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 115x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 115x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 127x12
</span><span class="lines">@@ -57,4 +59,5 @@
</span><span class="cx"> RenderBlock {DIV} at (179,0) size 74x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 74x15
</span><span class="cx"> text run at (0,7) width 74: "00:00 / 00:01"
</span><del>- RenderButton {INPUT} at (261,0) size 30x30
</del><ins>+ RenderFlexibleBox {DIV} at (261,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediacontrolsafterreloadexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/gtk/media/controls-after-reload-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediacontrolsafterreloadexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,200) size 320x40
</span><span class="cx"> layer at (13,246) size 310x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 310x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 93x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 93x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 105x12
</span><span class="lines">@@ -23,5 +23,6 @@
</span><span class="cx"> RenderBlock {DIV} at (157,0) size 74x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 74x15
</span><span class="cx"> text run at (0,7) width 74: "00:00 / 00:06"
</span><del>- RenderButton {INPUT} at (239,0) size 30x30
- RenderButton {INPUT} at (271,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (239,0) size 30x30
+ RenderFlexibleBox {DIV} at (271,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediacontrolsstrictexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/gtk/media/controls-strict-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediacontrolsstrictexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/media/controls-strict-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/media/controls-strict-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/media/controls-strict-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,200) size 320x40
</span><span class="cx"> layer at (13,254) size 310x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 310x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 93x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 93x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 105x12
</span><span class="lines">@@ -23,5 +23,6 @@
</span><span class="cx"> RenderBlock {DIV} at (157,0) size 74x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 74x15
</span><span class="cx"> text run at (0,7) width 74: "00:00 / 00:06"
</span><del>- RenderButton {INPUT} at (239,0) size 30x30
- RenderButton {INPUT} at (271,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (239,0) size 30x30
+ RenderFlexibleBox {DIV} at (271,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediacontrolsstylingstrictexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/gtk/media/controls-styling-strict-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediacontrolsstylingstrictexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/media/controls-styling-strict-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/media/controls-styling-strict-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/media/controls-styling-strict-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,200) size 320x40
</span><span class="cx"> layer at (13,254) size 310x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 310x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 93x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 93x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 105x12
</span><span class="lines">@@ -27,14 +27,15 @@
</span><span class="cx"> RenderBlock {DIV} at (157,0) size 74x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 74x15
</span><span class="cx"> text run at (0,7) width 74: "00:00 / 00:06"
</span><del>- RenderButton {INPUT} at (239,0) size 30x30
- RenderButton {INPUT} at (271,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (239,0) size 30x30
+ RenderFlexibleBox {DIV} at (271,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins><span class="cx"> layer at (332,49) size 320x240
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> RenderBlock {DIV} at (0,200) size 320x40
</span><span class="cx"> layer at (337,254) size 310x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 310x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 93x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 93x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 105x12
</span><span class="lines">@@ -42,5 +43,6 @@
</span><span class="cx"> RenderBlock {DIV} at (157,0) size 74x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 74x15
</span><span class="cx"> text run at (0,7) width 74: "00:00 / 00:06"
</span><del>- RenderButton {INPUT} at (239,0) size 30x30
- RenderButton {INPUT} at (271,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (239,0) size 30x30
+ RenderFlexibleBox {DIV} at (271,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediacontrolswithoutpreloadexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/gtk/media/controls-without-preload-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediacontrolswithoutpreloadexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/media/controls-without-preload-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/media/controls-without-preload-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/media/controls-without-preload-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,200) size 320x40
</span><span class="cx"> layer at (13,246) size 310x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 310x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 93x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 93x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 105x12
</span><span class="lines">@@ -23,5 +23,6 @@
</span><span class="cx"> RenderBlock {DIV} at (157,0) size 74x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 74x15
</span><span class="cx"> text run at (0,7) width 74: "00:00 / 00:06"
</span><del>- RenderButton {INPUT} at (239,0) size 30x30
- RenderButton {INPUT} at (271,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (239,0) size 30x30
+ RenderFlexibleBox {DIV} at (271,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediavideocontrolsrenderingexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/gtk/media/video-controls-rendering-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediavideocontrolsrenderingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/media/video-controls-rendering-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/media/video-controls-rendering-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/media/video-controls-rendering-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,200) size 320x40
</span><span class="cx"> layer at (13,246) size 310x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 310x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 93x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 93x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 105x12
</span><span class="lines">@@ -28,14 +28,15 @@
</span><span class="cx"> RenderBlock {DIV} at (157,0) size 74x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 74x15
</span><span class="cx"> text run at (0,7) width 74: "00:00 / 00:06"
</span><del>- RenderButton {INPUT} at (239,0) size 30x30
- RenderButton {INPUT} at (271,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (239,0) size 30x30
+ RenderFlexibleBox {DIV} at (271,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins><span class="cx"> layer at (8,281) size 320x240
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> RenderBlock {DIV} at (0,200) size 320x40
</span><span class="cx"> layer at (13,486) size 310x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 310x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 93x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 93x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 105x12
</span><span class="lines">@@ -43,8 +44,9 @@
</span><span class="cx"> RenderBlock {DIV} at (157,0) size 74x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 74x15
</span><span class="cx"> text run at (0,7) width 74: "00:00 / 00:06"
</span><del>- RenderButton {INPUT} at (239,0) size 30x30
- RenderButton {INPUT} at (271,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (239,0) size 30x30
+ RenderFlexibleBox {DIV} at (271,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins><span class="cx"> layer at (8,521) size 320x240
</span><span class="cx"> RenderVideo {VIDEO} at (8,521) size 320x240
</span><span class="cx"> layer at (8,521) size 320x240
</span><span class="lines">@@ -52,7 +54,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,200) size 320x40
</span><span class="cx"> layer at (13,726) size 310x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 310x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 93x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 93x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 105x12
</span><span class="lines">@@ -60,5 +62,6 @@
</span><span class="cx"> RenderBlock {DIV} at (157,0) size 74x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 74x15
</span><span class="cx"> text run at (0,7) width 74: "00:00 / 00:06"
</span><del>- RenderButton {INPUT} at (239,0) size 30x30
- RenderButton {INPUT} at (271,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (239,0) size 30x30
+ RenderFlexibleBox {DIV} at (271,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediavideodisplaytoggleexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/gtk/media/video-display-toggle-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediavideodisplaytoggleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/media/video-display-toggle-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/media/video-display-toggle-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/media/video-display-toggle-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,200) size 320x40
</span><span class="cx"> layer at (13,230) size 310x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 310x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 135x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 135x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 147x12
</span><span class="lines">@@ -22,5 +22,6 @@
</span><span class="cx"> RenderBlock {DIV} at (199,0) size 32x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 32x15
</span><span class="cx"> text run at (0,7) width 32: "00:06"
</span><del>- RenderButton {INPUT} at (239,0) size 30x30
- RenderButton {INPUT} at (271,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (239,0) size 30x30
+ RenderFlexibleBox {DIV} at (271,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediavideoemptysourceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/media/video-empty-source-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/media/video-empty-source-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/media/video-empty-source-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,110) size 300x40
</span><span class="cx"> layer at (14,157) size 290x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 290x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 179x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 179x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 191x12
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediavideonoaudioexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/gtk/media/video-no-audio-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediavideonoaudioexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/media/video-no-audio-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/media/video-no-audio-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/media/video-no-audio-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,248) size 352x40
</span><span class="cx"> layer at (13,294) size 342x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 342x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 199x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 199x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 211x12
</span><span class="lines">@@ -23,4 +23,4 @@
</span><span class="cx"> RenderBlock {DIV} at (263,0) size 32x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 32x15
</span><span class="cx"> text run at (0,7) width 32: "00:09"
</span><del>- RenderButton {INPUT} at (303,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (303,0) size 30x30
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediavideovolumesliderexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/gtk/media/video-volume-slider-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediavideovolumesliderexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/media/video-volume-slider-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/media/video-volume-slider-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/media/video-volume-slider-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -6,21 +6,21 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 433x17
</span><span class="cx"> text run at (0,0) width 433: "Tests if the volume slider is rendererd properly. This test assumes the"
</span><span class="cx"> RenderBR {BR} at (433,14) size 0x0
</span><del>- RenderText {#text} at (0,17) size 453x17
- text run at (0,17) width 453: "volume slider is implemented and mouse over the right bottom corner of"
- RenderBR {BR} at (453,31) size 0x0
- RenderText {#text} at (0,34) size 270x17
- text run at (0,34) width 270: "video element will show the volume slider."
- RenderBR {BR} at (270,48) size 0x0
</del><ins>+ RenderText {#text} at (0,18) size 453x17
+ text run at (0,18) width 453: "volume slider is implemented and mouse over the right bottom corner of"
+ RenderBR {BR} at (453,32) size 0x0
+ RenderText {#text} at (0,36) size 270x17
+ text run at (0,36) width 270: "video element will show the volume slider."
+ RenderBR {BR} at (270,50) size 0x0
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>-layer at (8,59) size 320x240
- RenderVideo {VIDEO} at (0,51) size 320x240
-layer at (8,59) size 320x240
</del><ins>+layer at (8,62) size 320x240
+ RenderVideo {VIDEO} at (0,54) size 320x240
+layer at (8,62) size 320x240
</ins><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> RenderBlock {DIV} at (0,200) size 320x40
</span><del>-layer at (13,264) size 310x30
</del><ins>+layer at (13,267) size 310x30
</ins><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 310x30 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (9,0) size 30x30
</del><ins>+ RenderButton {BUTTON} at (9,0) size 30x30
</ins><span class="cx"> RenderSlider {INPUT} at (49,11) size 135x8 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 135x8 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-2) size 147x12
</span><span class="lines">@@ -28,11 +28,12 @@
</span><span class="cx"> RenderBlock {DIV} at (199,0) size 32x30 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,7) size 32x15
</span><span class="cx"> text run at (0,7) width 32: "00:06"
</span><del>- RenderButton {INPUT} at (239,0) size 30x30
- RenderButton {INPUT} at (271,0) size 30x30
-layer at (284,164) size 30x100
- RenderBlock (positioned) zI: 2 {DIV} at (271,-100) size 30x100
</del><ins>+ RenderButton {BUTTON} at (239,0) size 30x30
+ RenderFlexibleBox {DIV} at (271,0) size 30x30
+ RenderButton {BUTTON} at (0,0) size 30x30
+layer at (284,167) size 30x100
+ RenderBlock (positioned) zI: 2 {DIV} at (271,-100) size 30x100 [bgcolor=#141414CC]
</ins><span class="cx"> RenderSlider {INPUT} at (11,10) size 8x80 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 8x80 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (-2,-6) size 12x92
</span><del>- RenderBlock {DIV} at (0,24) size 12x13 [color=#FFFFFF]
</del><ins>+ RenderBlock {DIV} at (0,24) size 12x12 [color=#FFFFFF]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediavideozoomcontrolsexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/gtk/media/video-zoom-controls-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediavideozoomcontrolsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,120) size 240x60
</span><span class="cx"> layer at (65,211) size 225x45
</span><span class="cx"> RenderFlexibleBox {DIV} at (7,7) size 226x46 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (13,0) size 46x45
</del><ins>+ RenderButton {BUTTON} at (13,0) size 46x45
</ins><span class="cx"> RenderSlider {INPUT} at (73,16) size 38x13 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-3) size 57x18
</span><span class="lines">@@ -21,8 +21,9 @@
</span><span class="cx"> RenderBlock {DIV} at (133,0) size 109x45 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,11) size 108x22
</span><span class="cx"> text run at (0,11) width 108: "00:00 / 00:06"
</span><del>- RenderButton {INPUT} at (253,0) size 46x45
- RenderButton {INPUT} at (301,0) size 46x45
</del><ins>+ RenderButton {BUTTON} at (253,0) size 46x45
+ RenderFlexibleBox {DIV} at (301,0) size 46x45
+ RenderButton {BUTTON} at (0,0) size 45x45
</ins><span class="cx"> layer at (57,308) size 240x180
</span><span class="cx"> RenderVideo {VIDEO} at (45,296) size 240x180
</span><span class="cx"> layer at (57,308) size 240x180
</span><span class="lines">@@ -30,7 +31,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,120) size 240x60
</span><span class="cx"> layer at (65,436) size 225x45
</span><span class="cx"> RenderFlexibleBox {DIV} at (7,7) size 226x46 [bgcolor=#141414CC]
</span><del>- RenderButton {INPUT} at (13,0) size 46x45
</del><ins>+ RenderButton {BUTTON} at (13,0) size 46x45
</ins><span class="cx"> RenderSlider {INPUT} at (73,16) size 38x13 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (1,-3) size 57x18
</span><span class="lines">@@ -38,5 +39,6 @@
</span><span class="cx"> RenderBlock {DIV} at (133,0) size 109x45 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,11) size 108x22
</span><span class="cx"> text run at (0,11) width 108: "00:00 / 00:06"
</span><del>- RenderButton {INPUT} at (253,0) size 46x45
- RenderButton {INPUT} at (301,0) size 46x45
</del><ins>+ RenderButton {BUTTON} at (253,0) size 46x45
+ RenderFlexibleBox {DIV} at (301,0) size 46x45
+ RenderButton {BUTTON} at (0,0) size 45x45
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk-wk2/TestExpectations (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk-wk2/TestExpectations 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/LayoutTests/platform/gtk-wk2/TestExpectations 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -474,6 +474,8 @@
</span><span class="cx">
</span><span class="cx"> Bug(GTK) fast/media/view-mode-media-feature.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><ins>+Bug(GTK) media/video-volume-slider.html [ ImageOnlyFailure ]
+
</ins><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End of Tests failing
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/Modules/indexeddb"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/indexeddb/leveldb"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/indieui"
</span><ins>+ "${WEBCORE_DIR}/Modules/mediacontrols/"
</ins><span class="cx"> "${WEBCORE_DIR}/Modules/mediasource"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/mediastream"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/navigatorcontentutils"
</span><span class="lines">@@ -185,6 +186,8 @@
</span><span class="cx"> Modules/indexeddb/IDBVersionChangeEvent.idl
</span><span class="cx"> Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl
</span><span class="cx">
</span><ins>+ Modules/mediacontrols/MediaControlsHost.idl
+
</ins><span class="cx"> Modules/mediasource/DOMURLMediaSource.idl
</span><span class="cx"> Modules/mediasource/MediaSource.idl
</span><span class="cx"> Modules/mediasource/SourceBuffer.idl
</span><span class="lines">@@ -831,6 +834,8 @@
</span><span class="cx"> Modules/indexeddb/leveldb/IDBLevelDBCoding.cpp
</span><span class="cx"> Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp
</span><span class="cx">
</span><ins>+ Modules/mediacontrols/MediaControlsHost.cpp
+
</ins><span class="cx"> Modules/mediasource/DOMURLMediaSource.cpp
</span><span class="cx"> Modules/mediasource/MediaSource.cpp
</span><span class="cx"> Modules/mediasource/MediaSourceRegistry.cpp
</span><span class="lines">@@ -2983,8 +2988,6 @@
</span><span class="cx"> set(DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/DedicatedWorkerGlobalScopeConstructors.idl)
</span><span class="cx"> set(IDL_ATTRIBUTES_FILE ${WEBCORE_DIR}/bindings/scripts/IDLAttributes.txt)
</span><span class="cx">
</span><del>-include(${WEBCORE_DIR}/UseJSC.cmake)
-
</del><span class="cx"> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
</span><span class="cx">
</span><span class="cx"> # ANGLE tokenizer & parser
</span><span class="lines">@@ -3133,6 +3136,22 @@
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp)
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h)
</span><span class="cx">
</span><ins>+if (WebCore_USER_AGENT_SCRIPTS)
+ # Necessary variables:
+ # WebCore_USER_AGENT_SCRIPTS containing the JavaScript sources list
+ # WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES containing the source file that will load the scripts to add the proper
+ # dependency and having them built at the right moment
+
+ add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScriptsData.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.h
+ MAIN_DEPENDENCY ${WEBCORE_DIR}/Scripts/make-js-file-arrays.py
+ DEPENDS ${WebCore_USER_AGENT_SCRIPTS}
+ COMMAND "PYTHONPATH=${WebCore_INSPECTOR_SCRIPTS_DIR}" ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/Scripts/make-js-file-arrays.py ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScriptsData.cpp ${WebCore_USER_AGENT_SCRIPTS}
+ VERBATIM)
+ list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScriptsData.cpp)
+ ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES} UserAgentScriptsData.cpp UserAgentScripts.h)
+endif ()
+
</ins><span class="cx"> # Generate plug-in resources
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResources.h
</span><span class="lines">@@ -3151,6 +3170,7 @@
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp)
</span><span class="cx">
</span><span class="cx">
</span><ins>+include(${WEBCORE_DIR}/UseJSC.cmake)
</ins><span class="cx">
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/WebCore/ChangeLog 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -1,3 +1,166 @@
</span><ins>+2014-02-13 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [GTK] MEDIA_CONTROLS_SCRIPT support
+ https://bugs.webkit.org/show_bug.cgi?id=123097
+
+ Reviewed by Jer Noble.
+
+ WebKitGTK+ multimedia controls are now managed from Javascript
+ code. Apple controls are kept as common code and GTK+ ones are
+ subclassed for the specific behavior.
+
+ Both CMake and Autotools build support is provided.
+
+ * CMakeLists.txt: Added support to build the media controls
+ script and their associated files.
+ * GNUmakefile.am: Added support to generate the C++ code from the
+ Javascript.
+ * GNUmakefile.list.am: Added the media controls script associated
+ files.
+ * Modules/mediacontrols/MediaControlsHost.cpp:
+ * Modules/mediacontrols/MediaControlsHost.h:
+ * Modules/mediacontrols/MediaControlsHost.idl:
+ (WebCore::MediaControlsHost::supportsFullscreen): Added attribute
+ to know if the element supports fullscreen.
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.handleWrapperMouseMove):
+ (Controller.prototype.handleWrapperMouseOut):
+ (Controller.prototype.updatePlaying): Use clear and
+ resetHideControlsTimer.
+ (Controller.prototype.clearHideControlsTimer): Added.
+ (Controller.prototype.resetHideControlsTimer): Added.
+ * Modules/mediacontrols/mediaControlsGtk.js: Added.
+ (createControls): Calls ControllerGtk.
+ (ControllerGtk): Calls the superclass.
+ (contains): Defines a function to know if an object is contained
+ in an array.
+ (ControllerGtk.prototype.inheritFrom): Copies the method of the
+ superclass that are not reimplemented in the subclass.
+ (ControllerGtk.prototype.createControls): Calls the superclass and
+ create the remaining needed elements.
+ (ControllerGtk.prototype.configureInlineControls): Configures the
+ controls.
+ (ControllerGtk.prototype.setStatusHidden): Redefined empty.
+ (ControllerGtk.prototype.updateTime): Writes the duration and
+ current position. As it was so far, current time also includes
+ duration. If current time is bigger than 0 we show that.
+ (ControllerGtk.prototype.showCurrentTime): Shows current time and
+ hides duration label (that is included in current time).
+ (ControllerGtk.prototype.handlePlay): Calls the superclass and
+ force showing the current time.
+ (ControllerGtk.prototype.handleTimeUpdate): Always update the
+ time.
+ (ControllerGtk.prototype.handleMuteButtonMouseOver): Shows the
+ volume slider.
+ (ControllerGtk.prototype.handleVolumeBoxMouseOut): Hides the
+ volume slider.
+ (ControllerGtk.prototype.addControls): Adds the enclosure instead
+ of the panel directly. Panel is, of course, part of the enclosure.
+ (ControllerGtk.prototype.updateReadyState): Shows the fullscreen
+ button only if fullscreen is supported. Sets the volume in up or
+ down mode depending on its position in the document. Updates the
+ volume.
+ (ControllerGtk.prototype.setControlsType): Creates the controls it
+ they were not created before. Unlike Apple ones, WebKitGTK+
+ fullscreen and inline controls are the same.
+ (ControllerGtk.prototype.updatePlaying): Calls the superclass and
+ shows the controls if not playing.
+ (ControllerGtk.prototype.handleCaptionButtonClicked): Redefined
+ empty. To be coherent with volume, that also shows a popup, this
+ is handled with mouseover instead of click.
+ (ControllerGtk.prototype.buildCaptionMenu): Calls the superclass
+ to build the menu, sets some listeners, centers the popup with the
+ captions button, keeps the current height and sets the style to 0,
+ which is needed to animate it.
+ (ControllerGtk.prototype.destroyCaptionMenu): Hides the caption menu.
+ (ControllerGtk.prototype.showCaptionMenu): Resets the height to
+ its original. We don't animate it with CSS because we would need
+ to specify a height in the style and we don't know it in advance.
+ (ControllerGtk.prototype.hideCaptionMenu): Sets height to 0.
+ (ControllerGtk.prototype.captionMenuTransitionEnd): When the
+ captions menu transtition ends, it is destroyed.
+ (ControllerGtk.prototype.handleCaptionButtonMouseOver): Creates
+ the caption menu and shows it.
+ (ControllerGtk.prototype.handleCaptionButtonMouseOut): Hides the
+ captions menu.
+ (ControllerGtk.prototype.handleCaptionMouseOut): Hides the
+ captions menu.
+ * PlatformGTK.cmake: Added WebCore to the target link libraries
+ and initialized the variables needed at CMakelists.txt
+ * css/mediaControlsGtk.css:
+ (audio::-webkit-media-controls-panel)
+ (video::-webkit-media-controls-panel): Added transtion based on opacity.
+ (video::-webkit-media-controls-panel): Set video opacity to 0.
+ (video::-webkit-media-controls-panel.paused): Set video opacity to 1.
+ (audio::-webkit-media-controls-panel div.mute-box): Set the same
+ style as the mute button to preserve the layout.
+ (audio::-webkit-media-controls-panel div.mute-box.hidden): Sets
+ the display to none.
+ (audio::-webkit-media-controls-mute-button)
+ (video::-webkit-media-controls-mute-button): Removed the outline
+ and the margin that is managed by the mute box now.
+ (audio::-webkit-media-controls-play-button)
+ (video::-webkit-media-controls-play-button): Removed the outline.
+ (audio::-webkit-media-controls-time-remaining-display)
+ (video::-webkit-media-controls-time-remaining-display): Removed
+ the display.
+ (audio::-webkit-media-controls-current-time-display)
+ (video::-webkit-media-controls-current-time-display): Added the
+ display block.
+ (video::-webkit-media-controls-time-remaining-display): Set
+ display none.
+ (video::-webkit-media-controls-time-remaining-display.show): Set
+ display block.
+ (video::-webkit-media-controls-time-remaining-display.hidden): Set
+ display none.
+ (audio::-webkit-media-controls-timeline)
+ (video::-webkit-media-controls-timeline): Removed outline.
+ (audio::-webkit-media-controls-volume-slider-container)
+ (video::-webkit-media-controls-volume-slider-container): Set
+ overflow hidden and set a transition by height.
+ (video::-webkit-media-controls-volume-slider-container.hidden):
+ Set height 0.
+ (video::-webkit-media-controls-volume-slider-container.down): Set
+ bottom to be below the panel. Changed the border radius and
+ transition accordingly.
+ (video::-webkit-media-controls-panel .hidden.down): Sets default
+ bottom as 0.
+ (audio::-webkit-media-controls-volume-slider)
+ (video::-webkit-media-controls-volume-slider): Removed the outline.
+ (audio::-webkit-media-controls-toggle-closed-captions-button)
+ (video::-webkit-media-controls-toggle-closed-captions-button):
+ Removed the background that is painted from C++ and removed the
+ outline.
+ (video::-webkit-media-controls-closed-captions-container):
+ (video::-webkit-media-controls-closed-captions-container h3):
+ (video::-webkit-media-controls-closed-captions-container ul):
+ (video::-webkit-media-controls-closed-captions-container li):
+ (video::-webkit-media-controls-closed-captions-container li.selected): Changed
+ the style to make it more coherent with the rest of the controls.
+ (audio::-webkit-media-controls-fullscreen-button)
+ (video::-webkit-media-controls-fullscreen-button): Removed the outline.
+ (audio::-webkit-media-controls-panel button.hidden): Sets the
+ display to none.
+ * html/HTMLMediaElement.cpp: UserAgentScripts.h is not needed here
+ and build cmake build would need for changes to get this compiled.
+ * platform/gtk/RenderThemeGtk.cpp:
+ (WebCore::nodeHasPseudo): Added. Checks if a node has a certain
+ pseudo.
+ (WebCore::nodeHasClass): Added. Checks if a node has a certain
+ class.
+ (WebCore::supportsFocus): Removed some element types as outline is
+ now handled in CSS.
+ (WebCore::RenderThemeGtk::paintMediaPlayButton): Checks if the
+ play button has the class paused to show the play icon instead of
+ the pause one.
+ (WebCore::RenderThemeGtk::paintMediaToggleClosedCaptionsButton):
+ Added. Paints the captions icon.
+ (WebCore::RenderThemeGtk::mediaControlsScript): Added. Loads the
+ bundled scripts.
+ * platform/gtk/RenderThemeGtk.h: Added the mediaControlsScript
+ method and declared the redefinition of the method to play the
+ captions icon.
+
</ins><span class="cx"> 2014-02-11 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't crash when SerializedScriptValue deserialization fails
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.am (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.am 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/WebCore/GNUmakefile.am 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> -I$(srcdir)/Source/WebCore/Modules/indexeddb \
</span><span class="cx"> -I$(srcdir)/Source/WebCore/Modules/indexeddb/leveldb \
</span><span class="cx"> -I$(srcdir)/Source/WebCore/Modules/indieui \
</span><ins>+ -I$(srcdir)/Source/WebCore/Modules/mediacontrols \
</ins><span class="cx"> -I$(srcdir)/Source/WebCore/Modules/mediasource \
</span><span class="cx"> -I$(srcdir)/Source/WebCore/Modules/mediastream \
</span><span class="cx"> -I$(srcdir)/Source/WebCore/Modules/navigatorcontentutils \
</span><span class="lines">@@ -264,6 +265,12 @@
</span><span class="cx"> $(AM_V_GEN)
</span><span class="cx"> $(AM_V_at)perl -I $(WebCore)/bindings/scripts $(WebCore)/css/makegrammar.pl --extraDefines "$(feature_defines)" --outputDir $(GENSOURCES_WEBCORE) --bison "$(BISON)" --symbolsPrefix cssyy $<
</span><span class="cx">
</span><ins>+USER_AGENT_SCRIPT_FILES = $(WebCore)/Modules/mediacontrols/mediaControlsApple.js $(WebCore)/Modules/mediacontrols/mediaControlsGtk.js
+DerivedSources/WebCore/UserAgentScriptsData.cpp: DerivedSources/WebCore/UserAgentScripts.h
+DerivedSources/WebCore/UserAgentScripts.h: PYTHONPATH=$(INSPECTOR_SCRIPTS_DIR)
+DerivedSources/WebCore/UserAgentScripts.h: $(WebCore)/Scripts/make-js-file-arrays.py $(USER_AGENT_SCRIPT_FILES)
+ $(AM_V_GEN)$(PYTHON) $< $@ DerivedSources/WebCore/UserAgentScriptsData.cpp $(USER_AGENT_SCRIPT_FILES)
+
</ins><span class="cx"> # user agent style sheets
</span><span class="cx"> USER_AGENT_STYLE_SHEETS = \
</span><span class="cx"> $(WebCore)/css/html.css \
</span><span class="lines">@@ -398,6 +405,7 @@
</span><span class="cx"> $(WebCore)/Modules/gamepad \
</span><span class="cx"> $(WebCore)/Modules/geolocation \
</span><span class="cx"> $(WebCore)/Modules/indexeddb \
</span><ins>+ $(WebCore)/Modules/mediacontrols \
</ins><span class="cx"> $(WebCore)/Modules/mediasource \
</span><span class="cx"> $(WebCore)/Modules/mediastream \
</span><span class="cx"> $(WebCore)/Modules/notifications \
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -463,6 +463,8 @@
</span><span class="cx"> DerivedSources/WebCore/JSLocation.h \
</span><span class="cx"> DerivedSources/WebCore/JSMediaController.cpp \
</span><span class="cx"> DerivedSources/WebCore/JSMediaController.h \
</span><ins>+ DerivedSources/WebCore/JSMediaControlsHost.cpp \
+ DerivedSources/WebCore/JSMediaControlsHost.h \
</ins><span class="cx"> DerivedSources/WebCore/JSMediaElementAudioSourceNode.cpp \
</span><span class="cx"> DerivedSources/WebCore/JSMediaElementAudioSourceNode.h \
</span><span class="cx"> DerivedSources/WebCore/JSMediaError.cpp \
</span><span class="lines">@@ -854,6 +856,8 @@
</span><span class="cx"> DerivedSources/WebCore/PlugInsResourcesData.cpp \
</span><span class="cx"> DerivedSources/WebCore/PlugInsResources.h \
</span><span class="cx"> DerivedSources/WebCore/SettingsMacros.h \
</span><ins>+ DerivedSources/WebCore/UserAgentScriptsData.cpp \
+ DerivedSources/WebCore/UserAgentScripts.h \
</ins><span class="cx"> DerivedSources/WebCore/UserAgentStyleSheetsData.cpp \
</span><span class="cx"> DerivedSources/WebCore/UserAgentStyleSheets.h \
</span><span class="cx"> DerivedSources/WebCore/XLinkNames.cpp \
</span><span class="lines">@@ -1200,6 +1204,7 @@
</span><span class="cx"> $(WebCore)/Modules/indexeddb/IDBTransaction.idl \
</span><span class="cx"> $(WebCore)/Modules/indexeddb/IDBVersionChangeEvent.idl \
</span><span class="cx"> $(WebCore)/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl \
</span><ins>+ $(WebCore)/Modules/mediacontrols/MediaControlsHost.idl \
</ins><span class="cx"> $(WebCore)/Modules/mediasource/DOMURLMediaSource.idl \
</span><span class="cx"> $(WebCore)/Modules/mediasource/MediaSource.idl \
</span><span class="cx"> $(WebCore)/Modules/mediasource/SourceBuffer.idl \
</span><span class="lines">@@ -1879,6 +1884,8 @@
</span><span class="cx"> Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.h \
</span><span class="cx"> Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp \
</span><span class="cx"> Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h \
</span><ins>+ Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp \
+ Source/WebCore/Modules/mediacontrols/MediaControlsHost.h \
</ins><span class="cx"> Source/WebCore/Modules/mediasource/MediaSource.cpp \
</span><span class="cx"> Source/WebCore/Modules/mediasource/MediaSource.h \
</span><span class="cx"> Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -153,6 +153,11 @@
</span><span class="cx"> return !m_mediaElement->mediaSession().requiresFullscreenForVideoPlayback(*m_mediaElement);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MediaControlsHost::supportsFullscreen()
+{
+ return m_mediaElement->supportsFullscreen();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> Element* textTrackContainer();
</span><span class="cx"> void updateTextTrackContainer();
</span><span class="cx"> bool mediaPlaybackAllowsInline() const;
</span><ins>+ bool supportsFullscreen();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MediaControlsHost(HTMLMediaElement*);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -37,4 +37,5 @@
</span><span class="cx"> readonly attribute HTMLElement textTrackContainer;
</span><span class="cx"> void updateTextTrackContainer();
</span><span class="cx"> readonly attribute boolean mediaPlaybackAllowsInline;
</span><ins>+ readonly attribute boolean supportsFullscreen;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> thumbnailTrack: 'thumbnail-track',
</span><span class="cx"> volumeBox: 'volume-box',
</span><span class="cx"> noVideo: 'no-video',
</span><ins>+ down: 'down',
</ins><span class="cx"> },
</span><span class="cx"> KeyCodes: {
</span><span class="cx"> enter: 13,
</span><span class="lines">@@ -572,9 +573,7 @@
</span><span class="cx"> handleWrapperMouseMove: function(event)
</span><span class="cx"> {
</span><span class="cx"> this.showControls();
</span><del>- if (this.hideTimer)
- clearTimeout(this.hideTimer);
- this.hideTimer = setTimeout(this.hideControls.bind(this), this.HideControlsDelay);
</del><ins>+ this.resetHideControlsTimer();
</ins><span class="cx">
</span><span class="cx"> if (!this.isDragging)
</span><span class="cx"> return;
</span><span class="lines">@@ -587,8 +586,7 @@
</span><span class="cx"> handleWrapperMouseOut: function(event)
</span><span class="cx"> {
</span><span class="cx"> this.hideControls();
</span><del>- if (this.hideTimer)
- clearTimeout(this.hideTimer);
</del><ins>+ this.clearHideControlsTimer();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleWrapperMouseUp: function(event)
</span><span class="lines">@@ -864,9 +862,7 @@
</span><span class="cx"> this.controls.playButton.setAttribute('aria-label', this.UIString('Pause'));
</span><span class="cx">
</span><span class="cx"> this.hideControls();
</span><del>- if (this.hideTimer)
- clearTimeout(this.hideTimer);
- this.hideTimer = setTimeout(this.hideControls.bind(this), this.HideControlsDelay);
</del><ins>+ this.resetHideControlsTimer();
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -1152,4 +1148,17 @@
</span><span class="cx"> return this.video instanceof HTMLAudioElement;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ clearHideControlsTimer: function()
+ {
+ if (this.hideTimer)
+ clearTimeout(this.hideTimer);
+ this.hideTimer = null;
+ },
+
+ resetHideControlsTimer: function()
+ {
+ if (this.hideTimer)
+ clearTimeout(this.hideTimer);
+ this.hideTimer = setTimeout(this.hideControls.bind(this), this.HideControlsDelay);
+ },
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsGtkjs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js (0 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js (rev 0)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -0,0 +1,217 @@
</span><ins>+function createControls(root, video, host)
+{
+ return new ControllerGtk(root, video, host);
+};
+
+function ControllerGtk(root, video, host)
+{
+ Controller.call(this, root, video, host);
+};
+
+function contains(list, obj)
+{
+ var i = list.length;
+ while (i--)
+ if (list[i] === obj)
+ return true;
+ return false;
+};
+
+ControllerGtk.prototype = {
+
+ inheritFrom: function(parent) {
+ for (var property in parent) {
+ if (!this.hasOwnProperty(property))
+ this[property] = parent[property];
+ }
+ },
+
+ createControls: function()
+ {
+ Controller.prototype.createControls.apply(this);
+
+ this.controls.currentTime.classList.add(this.ClassNames.hidden);
+
+ this.controls.volumeBox.setAttribute('pseudo', '-webkit-media-controls-volume-slider-container');
+ this.controls.volumeBox.classList.add(this.ClassNames.hidden);
+
+ this.listenFor(this.controls.muteBox, 'mouseout', this.handleVolumeBoxMouseOut);
+ this.listenFor(this.controls.muteButton, 'mouseover', this.handleMuteButtonMouseOver);
+ this.listenFor(this.controls.volumeBox, 'mouseover', this.handleMuteButtonMouseOver);
+ this.listenFor(this.controls.volume, 'mouseover', this.handleMuteButtonMouseOver);
+ this.listenFor(this.controls.captionButton, 'mouseover', this.handleCaptionButtonMouseOver);
+ this.listenFor(this.controls.captionButton, 'mouseout', this.handleCaptionButtonMouseOut);
+
+ var enclosure = this.controls.enclosure = document.createElement('div');
+ enclosure.setAttribute('pseudo', '-webkit-media-controls-enclosure');
+ },
+
+ configureInlineControls: function()
+ {
+ this.controls.panel.appendChild(this.controls.playButton);
+ this.controls.panel.appendChild(this.controls.timeline);
+ this.controls.panel.appendChild(this.controls.currentTime);
+ this.controls.panel.appendChild(this.controls.remainingTime);
+ this.controls.panel.appendChild(this.controls.captionButton);
+ this.controls.panel.appendChild(this.controls.fullscreenButton);
+ this.controls.panel.appendChild(this.controls.muteBox);
+ this.controls.muteBox.appendChild(this.controls.muteButton);
+ this.controls.muteBox.appendChild(this.controls.volumeBox);
+ this.controls.volumeBox.appendChild(this.controls.volume);
+ this.controls.enclosure.appendChild(this.controls.panel);
+ },
+
+ setStatusHidden: function(hidden)
+ {
+ },
+
+ updateTime: function()
+ {
+ var currentTime = this.video.currentTime;
+ var duration = this.video.duration;
+
+ this.controls.currentTime.innerText = this.formatTime(currentTime);
+ this.controls.timeline.value = currentTime;
+ if (duration === Infinity || duration === NaN) {
+ this.controls.remainingTime.classList.remove(this.ClassNames.show);
+ } else {
+ this.controls.currentTime.innerText += " / " + this.formatTime(duration);
+ this.controls.remainingTime.innerText = this.formatTime(duration);
+ this.controls.remainingTime.classList.add(this.ClassNames.show);
+ }
+
+ if (currentTime > 0)
+ this.showCurrentTime();
+ },
+
+ showCurrentTime: function()
+ {
+ this.controls.currentTime.classList.remove(this.ClassNames.hidden);
+ this.controls.remainingTime.classList.add(this.ClassNames.hidden);
+ },
+
+ handlePlay: function(event)
+ {
+ Controller.prototype.handlePlay.apply(this, arguments);
+ this.showCurrentTime();
+ },
+
+ handleTimeUpdate: function(event)
+ {
+ this.updateTime();
+ },
+
+ handleMuteButtonMouseOver: function(event)
+ {
+ this.controls.volumeBox.classList.remove(this.ClassNames.hidden);
+ },
+
+ handleVolumeBoxMouseOut: function(event)
+ {
+ this.controls.volumeBox.classList.add(this.ClassNames.hidden);
+ },
+
+ addControls: function()
+ {
+ this.base.appendChild(this.controls.enclosure);
+ },
+
+ updateReadyState: function()
+ {
+ if (this.host.supportsFullscreen && this.video.videoTracks.length) {
+ this.controls.fullscreenButton.classList.remove(this.ClassNames.hidden);
+ } else {
+ this.controls.fullscreenButton.classList.add(this.ClassNames.hidden);
+ }
+ if (this.video.offsetTop + this.controls.enclosure.offsetTop < 105)
+ this.controls.volumeBox.classList.add(this.ClassNames.down);
+ else
+ this.controls.volumeBox.classList.remove(this.ClassNames.down);
+ this.updateVolume();
+ },
+
+ setControlsType: function(type)
+ {
+ if (!this.controls.configured) {
+ this.configureInlineControls();
+ this.controls.configured = true;
+ this.addControls();
+ }
+ },
+
+ updatePlaying: function()
+ {
+ Controller.prototype.updatePlaying.apply(this, arguments);
+ if (!this.canPlay()) {
+ this.showControls();
+ }
+ },
+
+ handleCaptionButtonClicked: function(event)
+ {
+ // Handled with mouseover and mouseout.
+ },
+
+ buildCaptionMenu: function()
+ {
+ Controller.prototype.buildCaptionMenu.apply(this, arguments);
+
+ this.listenFor(this.captionMenu, 'mouseout', this.handleCaptionMouseOut);
+ this.listenFor(this.captionMenu, 'transitionend', this.captionMenuTransitionEnd);
+
+ this.captionMenu.captionMenuTreeElements = this.captionMenu.getElementsByTagName("*");
+
+ // Caption menu has to be centered to the caption button.
+ var captionButtonCenter = this.controls.panel.offsetLeft + this.controls.captionButton.offsetLeft +
+ this.controls.captionButton.offsetWidth / 2;
+ this.captionMenu.style.left = (captionButtonCenter - this.captionMenu.offsetWidth / 2);
+ // As height is not in the css, it needs to be specified to animate it.
+ this.captionMenu.height = this.captionMenu.offsetHeight;
+ this.captionMenu.style.height = 0;
+ },
+
+ destroyCaptionMenu: function()
+ {
+ this.hideCaptionMenu();
+ },
+
+ showCaptionMenu: function()
+ {
+ this.captionMenu.style.height = this.captionMenu.height;
+ },
+
+ hideCaptionMenu: function()
+ {
+ this.captionMenu.style.height = 0;
+ },
+
+ captionMenuTransitionEnd: function(event)
+ {
+ if (this.captionMenu.offsetHeight === 0)
+ Controller.prototype.destroyCaptionMenu.apply(this, arguments);
+ },
+
+ handleCaptionButtonMouseOver: function(event)
+ {
+ if (!this.captionMenu)
+ this.buildCaptionMenu();
+ if (!contains(this.captionMenu.captionMenuTreeElements, event.relatedTarget))
+ this.showCaptionMenu();
+ },
+
+ handleCaptionButtonMouseOut: function(event)
+ {
+ if (this.captionMenu && !contains(this.captionMenu.captionMenuTreeElements, event.relatedTarget))
+ this.hideCaptionMenu();
+ },
+
+ handleCaptionMouseOut: function(event)
+ {
+ if (event.relatedTarget != this.controls.captionButton &&
+ !contains(this.captionMenu.captionMenuTreeElements, event.relatedTarget))
+ this.hideCaptionMenu();
+ },
+};
+
+ControllerGtk.prototype.inheritFrom(Object.create(Controller.prototype));
+Object.defineProperty(ControllerGtk.prototype, 'constructor', { enumerable:false, value:ControllerGtk });
</ins></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -295,6 +295,13 @@
</span><span class="cx"> ${WEBCORE_DIR}/css/mediaControlsGtk.css
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+set(WebCore_USER_AGENT_SCRIPTS
+ ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsApple.js
+ ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsGtk.js
+)
+
+set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/gtk/RenderThemeGtk.cpp)
+
</ins><span class="cx"> list(APPEND WebCore_LIBRARIES
</span><span class="cx"> ${ATK_LIBRARIES}
</span><span class="cx"> ${CAIRO_LIBRARIES}
</span><span class="lines">@@ -455,6 +462,7 @@
</span><span class="cx"> ${GDK_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="cx"> target_link_libraries(WebCorePlatformGTK
</span><ins>+ WebCore
</ins><span class="cx"> ${WebCore_LIBRARIES}
</span><span class="cx"> ${GTK_LIBRARIES}
</span><span class="cx"> ${GDK_LIBRARIES}
</span></span></pre></div>
<a id="trunkSourceWebCorecssmediaControlsGtkcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/mediaControlsGtk.css (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/mediaControlsGtk.css 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/WebCore/css/mediaControlsGtk.css 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -79,8 +79,33 @@
</span><span class="cx"> background-color: rgba(20, 20, 20, 0.8);
</span><span class="cx"> border-radius: 5px;
</span><span class="cx"> overflow: visible;
</span><ins>+ transition: opacity 0.25s linear;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+video::-webkit-media-controls-panel {
+ opacity: 0;
+}
+
+video::-webkit-media-controls-panel.show,
+video::-webkit-media-controls-panel.paused {
+ opacity: 1;
+}
+
+video::-webkit-media-controls-panel div.mute-box,
+audio::-webkit-media-controls-panel div.mute-box {
+ display: -webkit-flex;
+ -webkit-flex: none;
+ box-sizing: border-box;
+ width: 30px;
+ height: 30px;
+ margin: 0 9px 0 -7px;
+}
+
+video::-webkit-media-controls-panel div.mute-box.hidden,
+audio::-webkit-media-controls-panel div.mute-box.hidden {
+ display: none;
+}
+
</ins><span class="cx"> audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
</span><span class="cx"> -webkit-appearance: media-mute-button;
</span><span class="cx"> display: -webkit-flex;
</span><span class="lines">@@ -90,7 +115,7 @@
</span><span class="cx"> width: 30px;
</span><span class="cx"> height: 30px;
</span><span class="cx"> line-height: 30px;
</span><del>- margin: 0 9px 0 -7px;
</del><ins>+ outline: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
</span><span class="lines">@@ -103,6 +128,7 @@
</span><span class="cx"> height: 30px;
</span><span class="cx"> line-height: 30px;
</span><span class="cx"> margin: 0 9px;
</span><ins>+ outline: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display,
</span><span class="lines">@@ -110,7 +136,6 @@
</span><span class="cx"> -webkit-appearance: media-current-time-display;
</span><span class="cx"> -webkit-user-select: none;
</span><span class="cx"> -webkit-flex: none;
</span><del>- display: block;
</del><span class="cx"> border: none;
</span><span class="cx"> cursor: default;
</span><span class="cx">
</span><span class="lines">@@ -132,6 +157,27 @@
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display {
+ display: block;
+}
+
+audio::-webkit-media-controls-time-remaining-display,
+video::-webkit-media-controls-time-remaining-display {
+ display: none;
+}
+
+audio::-webkit-media-controls-time-remaining-display.show,
+video::-webkit-media-controls-time-remaining-display.show {
+ display: block;
+}
+
+audio::-webkit-media-controls-current-time-display.hidden,
+video::-webkit-media-controls-current-time-display.hidden,
+audio::-webkit-media-controls-time-remaining-display.hidden,
+video::-webkit-media-controls-time-remaining-display.hidden {
+ display: none;
+}
+
</ins><span class="cx"> audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
</span><span class="cx"> -webkit-appearance: media-slider;
</span><span class="cx"> display: -webkit-flex;
</span><span class="lines">@@ -143,10 +189,12 @@
</span><span class="cx"> min-width: 25px;
</span><span class="cx"> border-radius: 4px;
</span><span class="cx"> color: rgba(230, 230, 230, 0.35);
</span><ins>+ outline: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container {
</span><span class="cx"> -webkit-appearance: media-volume-slider-container;
</span><ins>+ overflow: hidden;
</ins><span class="cx"> position: absolute;
</span><span class="cx"> padding: 0;
</span><span class="cx"> height: 100px;
</span><span class="lines">@@ -156,8 +204,26 @@
</span><span class="cx"> background-color: rgba(20, 20, 20, 0.8);
</span><span class="cx"> right: 9px;
</span><span class="cx"> border-radius: 5px 5px 0px 0px;
</span><ins>+ transition: height 0.10s linear;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+audio::-webkit-media-controls-volume-slider-container.hidden,
+video::-webkit-media-controls-volume-slider-container.hidden {
+ height: 0;
+}
+
+audio::-webkit-media-controls-volume-slider-container.down,
+video::-webkit-media-controls-volume-slider-container.down {
+ bottom: -100px;
+ border-radius: 0px 0px 5px 5px;
+ transition: height 0.10s linear, bottom 0.10s linear;
+}
+
+audio::-webkit-media-controls-panel .hidden.down,
+video::-webkit-media-controls-panel .hidden.down {
+ bottom: 0;
+}
+
</ins><span class="cx"> audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider {
</span><span class="cx"> -webkit-appearance: media-volume-slider;
</span><span class="cx"> display: -webkit-flex;
</span><span class="lines">@@ -170,6 +236,7 @@
</span><span class="cx"> border-radius: 4px;
</span><span class="cx"> background-color: transparent;
</span><span class="cx"> color: rgba(230, 230, 230, 0.35);
</span><ins>+ outline: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> audio::-webkit-media-controls-volume-slider-container input[type="range"]::-webkit-media-slider-container > div, video::-webkit-media-controls-volume-slider-container input[type="range"]::-webkit-media-slider-container > div {
</span><span class="lines">@@ -222,68 +289,56 @@
</span><span class="cx"> height: 30px;
</span><span class="cx"> line-height: 30px;
</span><span class="cx"> margin: 0 9px 0 -7px;
</span><del>- background-repeat:no-repeat;
- background-position:center;
- background-image: url('data:image/svg+xml,<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata id="metadata90"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title>Gnome Symbolic Icon Theme</dc:title></cc:Work></rdf:RDF></metadata><g id="layer9" transform="translate(-101,-357)"><path id="path12148" style="block-progression:tb;color:#bebebe;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" fill="#bebebe" d="m104.75,357.06c-2.0602,0-3.75,1.6898-3.75,3.75v4.4375c0,2.0602,1.6898,3.75,3.75,3.75h4.9375l3.75,2.6562,1.5938,1.125v-1.9688l-0.0313-2.5c1.1106-0.59715,1.9688-1.6526,1.9688-3.0625v-4.4375c0-2.0602-1.6898-3.75-3.75-3.75h-8.4688zm0,2,8.4688,0c0.9868,0,1.75,0.7632,1.75,1.75v4.4375c0,0.86273-0.63508,1.541-1.125,1.625l-0.84,0.12v0.84375,1.0312l-2.4062-1.6875-0.25-0.1875h-0.3125-5.2812c-0.9868,0-1.75-0.7632-1.75-1.75v-4.4375c0-0.9868,0.7632-1.75,1.75-1.75z"/></g></svg>');
</del><ins>+ outline: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-closed-captions-container {
</span><span class="cx"> -webkit-appearance: media-closed-captions-container;
</span><ins>+ display: -webkit-flex;
</ins><span class="cx"> position: absolute;
</span><del>- display: block;
- right: 38px;
</del><span class="cx"> bottom: 35px;
</span><ins>+ z-index: 2;
+ background-color: rgba(20, 20, 20, 0.8);
+ border-radius: 5px 5px 0px 0px;
+ overflow: hidden;
</ins><span class="cx"> max-width: -webkit-calc(100% - 48px); /* right + 10px */
</span><span class="cx"> max-height: -webkit-calc(100% - 35px); /* bottom + 10px */
</span><del>- overflow-x: hidden;
- overflow-y: auto;
- background-color: rgba(20, 20, 20, 0.8);
- border-radius: 10px;
</del><span class="cx"> cursor: default;
</span><del>- z-index: 2;
-}
-
-video::-webkit-media-controls-closed-captions-track-list {
- display: block;
- font-family: "Helvetica Bold", Helvetica;
</del><ins>+ font-family: -webkit-small-control;
</ins><span class="cx"> font-size: 10pt;
</span><ins>+ font-weight: normal;
+ font-style: normal;
+ color: white;
</ins><span class="cx"> -webkit-user-select: none;
</span><ins>+ transition: height 0.10s linear;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-closed-captions-track-list h3 {
- margin: 1px 30px;
- color: #757575;
- text-shadow: 0 1px 0 black;
- padding-top: 0px;
- font-weight: bold;
- font-size: 10pt;
</del><ins>+video::-webkit-media-controls-closed-captions-container h3 {
+ margin: 1px 10px;
+ padding-top: 4px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-closed-captions-track-list ul {
</del><ins>+video::-webkit-media-controls-closed-captions-container ul {
</ins><span class="cx"> list-style-type: none;
</span><span class="cx"> margin: 0 0 4px 0;
</span><span class="cx"> padding: 0;
</span><del>- font-weight: bold;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-closed-captions-track-list li {
</del><ins>+video::-webkit-media-controls-closed-captions-container li {
</ins><span class="cx"> position: relative;
</span><span class="cx"> color: white;
</span><del>- background-image: none;
- text-shadow: 0 1px 0 black;
</del><span class="cx"> margin: 0;
</span><del>- padding-left: 37px;
- padding-right: 35px;
</del><ins>+ padding-left: 17px;
+ padding-right: 15px;
</ins><span class="cx"> padding-top: 0.15em;
</span><span class="cx"> padding-bottom: 0.2em;
</span><span class="cx"> box-sizing: border-box;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> white-space: nowrap;
</span><span class="cx"> text-overflow: ellipsis;
</span><del>- border-top: 1px solid rgba(0, 0, 0, 0);
- border-bottom: 1px solid rgba(0, 0, 0, 0);
</del><ins>+ outline: none;
</ins><span class="cx"> }
</span><del>-video::-webkit-media-controls-closed-captions-track-list li.selected {
</del><ins>+video::-webkit-media-controls-closed-captions-container li.selected {
</ins><span class="cx"> background-color: rgba(230, 230, 230, 0.15);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -297,4 +352,10 @@
</span><span class="cx"> height: 30px;
</span><span class="cx"> line-height: 30px;
</span><span class="cx"> margin: 0 9px 0 -7px;
</span><ins>+ outline: none;
</ins><span class="cx"> }
</span><ins>+
+video::-webkit-media-controls-panel button.hidden,
+audio::-webkit-media-controls-panel button.hidden {
+ display: none;
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -141,7 +141,6 @@
</span><span class="cx"> #include "JSMediaControlsHost.h"
</span><span class="cx"> #include "MediaControlsHost.h"
</span><span class="cx"> #include "ScriptGlobalObject.h"
</span><del>-#include "UserAgentScripts.h"
</del><span class="cx"> #include <bindings/ScriptObject.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -36,12 +36,14 @@
</span><span class="cx"> #include "HTMLMediaElement.h"
</span><span class="cx"> #include "LocalizedStrings.h"
</span><span class="cx"> #include "MediaControlElements.h"
</span><ins>+#include "NamedNodeMap.h"
</ins><span class="cx"> #include "PaintInfo.h"
</span><span class="cx"> #include "PlatformContextCairo.h"
</span><span class="cx"> #include "RenderBox.h"
</span><span class="cx"> #include "RenderObject.h"
</span><span class="cx"> #include "StringTruncator.h"
</span><span class="cx"> #include "TimeRanges.h"
</span><ins>+#include "UserAgentScripts.h"
</ins><span class="cx"> #include "UserAgentStyleSheets.h"
</span><span class="cx"> #include <cmath>
</span><span class="cx"> #include <gdk/gdk.h>
</span><span class="lines">@@ -49,6 +51,7 @@
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><ins>+#include <wtf/text/StringBuilder.h>
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><span class="cx"> #include "RenderProgress.h"
</span><span class="lines">@@ -101,6 +104,18 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+static bool nodeHasPseudo(Node* node, const char* pseudo)
+{
+ RefPtr<Node> attributeNode = node->attributes()->getNamedItem("pseudo");
+
+ return attributeNode ? attributeNode->nodeValue() == pseudo : false;
+}
+
+static bool nodeHasClass(Node* node, const char* className)
+{
+ return node->isElementNode() ? toElement(node)->classNames().contains(className) : false;
+}
+
</ins><span class="cx"> PassRefPtr<RenderTheme> RenderThemeGtk::create()
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(new RenderThemeGtk());
</span><span class="lines">@@ -139,11 +154,6 @@
</span><span class="cx"> case CheckboxPart:
</span><span class="cx"> case SliderHorizontalPart:
</span><span class="cx"> case SliderVerticalPart:
</span><del>- case MediaPlayButtonPart:
- case MediaVolumeSliderPart:
- case MediaMuteButtonPart:
- case MediaEnterFullscreenButtonPart:
- case MediaSliderPart:
</del><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="lines">@@ -525,13 +535,14 @@
</span><span class="cx"> Node* node = renderObject->node();
</span><span class="cx"> if (!node)
</span><span class="cx"> return false;
</span><del>- if (!node->isMediaControlElement())
</del><ins>+
+ if (!nodeHasPseudo(node, "-webkit-media-controls-play-button"))
</ins><span class="cx"> return false;
</span><ins>+ bool showPlayButton = nodeHasClass(node, "paused");
</ins><span class="cx">
</span><del>- bool play = mediaControlElementType(node) == MediaPlayButton;
</del><span class="cx"> return paintMediaButton(renderObject, paintInfo.context, rect,
</span><del>- play ? "media-playback-start-symbolic" : "media-playback-pause-symbolic",
- play ? GTK_STOCK_MEDIA_PLAY : GTK_STOCK_MEDIA_PAUSE);
</del><ins>+ showPlayButton ? "media-playback-start-symbolic" : "media-playback-pause-symbolic",
+ showPlayButton ? GTK_STOCK_MEDIA_PLAY : GTK_STOCK_MEDIA_PAUSE);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderThemeGtk::paintMediaSeekBackButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</span><span class="lines">@@ -544,6 +555,13 @@
</span><span class="cx"> return paintMediaButton(renderObject, paintInfo.context, rect, "media-seek-forward-symbolic", GTK_STOCK_MEDIA_FORWARD);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO_TRACK)
+bool RenderThemeGtk::paintMediaToggleClosedCaptionsButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
+{
+ return paintMediaButton(renderObject, paintInfo.context, rect, "user-invisible-symbolic", GTK_STOCK_JUSTIFY_FILL);
+}
+#endif
+
</ins><span class="cx"> static RoundedRect::Radii borderRadiiFromStyle(RenderStyle* style)
</span><span class="cx"> {
</span><span class="cx"> return RoundedRect::Radii(
</span><span class="lines">@@ -726,4 +744,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+String RenderThemeGtk::mediaControlsScript()
+{
+ StringBuilder scriptBuilder;
+ scriptBuilder.append(mediaControlsAppleJavaScript, sizeof(mediaControlsAppleJavaScript));
+ scriptBuilder.append(mediaControlsGtkJavaScript, sizeof(mediaControlsGtkJavaScript));
+ return scriptBuilder.toString();
</ins><span class="cx"> }
</span><ins>+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -88,6 +88,7 @@
</span><span class="cx"> virtual String extraMediaControlsStyleSheet();
</span><span class="cx"> virtual String formatMediaControlsCurrentTime(float currentTime, float duration) const;
</span><span class="cx"> virtual bool supportsClosedCaptioning() const override { return true; }
</span><ins>+ virtual String mediaControlsScript();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> virtual String extraFullScreenStyleSheet();
</span><span class="lines">@@ -174,7 +175,10 @@
</span><span class="cx"> virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx"> virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx"> virtual bool paintMediaCurrentTime(RenderObject*, const PaintInfo&, const IntRect&);
</span><ins>+#if ENABLE(VIDEO_TRACK)
+ virtual bool paintMediaToggleClosedCaptionsButton(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><span class="cx"> virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const;
</span></span></pre></div>
<a id="trunkSourceautotoolsSetupWebKitFeaturesm4"></a>
<div class="modfile"><h4>Modified: trunk/Source/autotools/SetupWebKitFeatures.m4 (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/autotools/SetupWebKitFeatures.m4 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/autotools/SetupWebKitFeatures.m4 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -131,6 +131,7 @@
</span><span class="cx"> ENABLE_LINK_PREFETCH=0 \
</span><span class="cx"> ENABLE_MATHML=1 \
</span><span class="cx"> ENABLE_MEDIA_CAPTURE=0 \
</span><ins>+ ENABLE_MEDIA_CONTROLS_SCRIPT=1 \
</ins><span class="cx"> ENABLE_MEDIA_SOURCE=0 \
</span><span class="cx"> ENABLE_MEDIA_STATISTICS=0 \
</span><span class="cx"> ENABLE_MEDIA_STREAM=0 \
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS ON)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_LLINT_C_LOOP "Force use of the llint c loop" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_MATHML "Toggle MathML support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_CAPTURE "Toggle Media Capture support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_CONTROLS_SCRIPT "Toggle definition of media controls in Javascript" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_SOURCE "Toggle Media Source support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_STATISTICS "Toggle Media Statistics support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_STREAM "Toggle Media Stream API support" OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmakeconfig.h.cmake (164023 => 164024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmakeconfig.h.cmake 2014-02-13 08:42:21 UTC (rev 164023)
+++ trunk/Source/cmakeconfig.h.cmake 2014-02-13 11:28:34 UTC (rev 164024)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx"> #cmakedefine01 ENABLE_LLINT_C_LOOP
</span><span class="cx"> #cmakedefine01 ENABLE_MATHML
</span><span class="cx"> #cmakedefine01 ENABLE_MEDIA_CAPTURE
</span><ins>+#cmakedefine01 ENABLE_MEDIA_CONTROLS_SCRIPT
</ins><span class="cx"> #cmakedefine01 ENABLE_MEDIA_SOURCE
</span><span class="cx"> #cmakedefine01 ENABLE_MEDIA_STATISTICS
</span><span class="cx"> #cmakedefine01 ENABLE_MEDIA_STREAM
</span></span></pre>
</div>
</div>
</body>
</html>