Changeset 160045 in webkit


Ignore:
Timestamp:
Dec 3, 2013 2:50:20 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Nix Upstream: Updating WebCore files
​https://bugs.webkit.org/show_bug.cgi?id=124981

Patch by Thiago de Barros Lacerda <​thiago.lacerda@openbossa.org> on 2013-12-03
Reviewed by Benjamin Poulain.

Just to sync our github repo files and the trunk, as part of the upstream process

No new tests needed.

  • PlatformNix.cmake:
  • css/mediaControlsNix.css:

(audio):
(video::-webkit-media-controls):
(audio::-webkit-media-controls-enclosure, video::-webkit-media-controls-enclosure):
(video::-webkit-media-controls-enclosure):
(audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel):
(video:-webkit-full-page-media):
(audio:-webkit-full-page-media, video:-webkit-full-page-media):
(audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button):
(audio::-webkit-media-controls-overlay-play-button, video::-webkit-media-controls-overlay-play-button):
(audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button):
(audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container):
(audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display):
(audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline):
(audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider):
(input[type="range"]::-webkit-media-slider-container):
(input[type="range"]::-webkit-media-slider-container > div):
(input[type="range"]::-webkit-media-slider-thumb):
(audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button):
(audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button):
(audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button):
(audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button):
(audio::-webkit-media-controls-fullscreen-volume-slider, video::-webkit-media-controls-fullscreen-volume-slider):
(audio::-webkit-media-controls-fullscreen-volume-min-button, video::-webkit-media-controls-fullscreen-volume-min-button):
(audio::-webkit-media-controls-fullscreen-volume-max-button, video::-webkit-media-controls-fullscreen-volume-max-button):
(video::-webkit-media-text-track-container):
(video::cue):
(video::-webkit-media-text-track-region):
(video::-webkit-media-text-track-region-container):
(video::-webkit-media-text-track-region-container.scrolling):
(video::-webkit-media-text-track-display):
(video::cue(:future)):
(video::-webkit-media-text-track-container b):
(video::-webkit-media-text-track-container u):
(video::-webkit-media-text-track-container i):

  • editing/Editor.cpp:

(WebCore::Editor::cut):
(WebCore::Editor::copy):
(WebCore::Editor::copyImage):

  • editing/Editor.h:
  • html/HTMLCanvasElement.h:
  • platform/Cursor.h:
  • platform/audio/FFTFrame.h:
  • platform/audio/nix/AudioBusNix.cpp:

(WebCore::AudioBus::loadPlatformResource):

  • platform/graphics/GLContext.h:
  • platform/nix/CursorNix.cpp:

(WebCore::Cursor::ensurePlatformCursor):

  • platform/nix/GamepadsNix.cpp:

(WebCore::sampleGamepads):

  • platform/nix/RenderThemeNix.cpp:

(WebCore::toIntSize):
(WebCore::toNixRect):
(WebCore::RenderThemeNix::platformActiveSelectionBackgroundColor):
(WebCore::RenderThemeNix::platformInactiveSelectionBackgroundColor):
(WebCore::RenderThemeNix::platformActiveSelectionForegroundColor):
(WebCore::RenderThemeNix::platformInactiveSelectionForegroundColor):
(WebCore::RenderThemeNix::platformActiveListBoxSelectionBackgroundColor):
(WebCore::RenderThemeNix::platformInactiveListBoxSelectionBackgroundColor):
(WebCore::RenderThemeNix::platformActiveListBoxSelectionForegroundColor):
(WebCore::RenderThemeNix::platformInactiveListBoxSelectionForegroundColor):
(WebCore::RenderThemeNix::platformActiveTextSearchHighlightColor):
(WebCore::RenderThemeNix::platformInactiveTextSearchHighlightColor):
(WebCore::RenderThemeNix::platformFocusRingColor):
(WebCore::RenderThemeNix::platformTapHighlightColor):
(WebCore::RenderThemeNix::paintButton):
(WebCore::RenderThemeNix::paintTextField):
(WebCore::RenderThemeNix::paintCheckbox):
(WebCore::RenderThemeNix::setCheckboxSize):
(WebCore::RenderThemeNix::paintRadio):
(WebCore::RenderThemeNix::setRadioSize):
(WebCore::RenderThemeNix::paintMenuList):
(WebCore::RenderThemeNix::paintProgressBar):
(WebCore::RenderThemeNix::paintSliderTrack):
(WebCore::RenderThemeNix::paintSliderThumb):
(WebCore::RenderThemeNix::paintInnerSpinButton):
(WebCore::RenderThemeNix::paintMeter):
(WebCore::RenderThemeNix::extraMediaControlsStyleSheet):
(WebCore::RenderThemeNix::paintMediaPlayButton):
(WebCore::RenderThemeNix::paintMediaMuteButton):
(WebCore::RenderThemeNix::paintMediaSeekBackButton):
(WebCore::RenderThemeNix::paintMediaSeekForwardButton):
(WebCore::RenderThemeNix::paintMediaSliderTrack):
(WebCore::RenderThemeNix::paintMediaVolumeSliderContainer):
(WebCore::RenderThemeNix::paintMediaVolumeSliderTrack):
(WebCore::RenderThemeNix::paintMediaRewindButton):

  • platform/nix/RenderThemeNix.h:
  • rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::canUseFor):

Location:
trunk/Source/WebCore
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r160044 r160045  
     12013-12-03  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        Nix Upstream: Updating WebCore files
     4        https://bugs.webkit.org/show_bug.cgi?id=124981
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Just to sync our github repo files and the trunk, as part of the upstream process
     9
     10        No new tests needed.
     11
     12        * PlatformNix.cmake:
     13        * css/mediaControlsNix.css:
     14        (audio):
     15        (video::-webkit-media-controls):
     16        (audio::-webkit-media-controls-enclosure, video::-webkit-media-controls-enclosure):
     17        (video::-webkit-media-controls-enclosure):
     18        (audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel):
     19        (video:-webkit-full-page-media):
     20        (audio:-webkit-full-page-media, video:-webkit-full-page-media):
     21        (audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button):
     22        (audio::-webkit-media-controls-overlay-play-button, video::-webkit-media-controls-overlay-play-button):
     23        (audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button):
     24        (audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container):
     25        (audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display):
     26        (audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline):
     27        (audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider):
     28        (input[type="range"]::-webkit-media-slider-container):
     29        (input[type="range"]::-webkit-media-slider-container > div):
     30        (input[type="range"]::-webkit-media-slider-thumb):
     31        (audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button):
     32        (audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button):
     33        (audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button):
     34        (audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button):
     35        (audio::-webkit-media-controls-fullscreen-volume-slider, video::-webkit-media-controls-fullscreen-volume-slider):
     36        (audio::-webkit-media-controls-fullscreen-volume-min-button, video::-webkit-media-controls-fullscreen-volume-min-button):
     37        (audio::-webkit-media-controls-fullscreen-volume-max-button, video::-webkit-media-controls-fullscreen-volume-max-button):
     38        (video::-webkit-media-text-track-container):
     39        (video::cue):
     40        (video::-webkit-media-text-track-region):
     41        (video::-webkit-media-text-track-region-container):
     42        (video::-webkit-media-text-track-region-container.scrolling):
     43        (video::-webkit-media-text-track-display):
     44        (video::cue(:future)):
     45        (video::-webkit-media-text-track-container b):
     46        (video::-webkit-media-text-track-container u):
     47        (video::-webkit-media-text-track-container i):
     48        * editing/Editor.cpp:
     49        (WebCore::Editor::cut):
     50        (WebCore::Editor::copy):
     51        (WebCore::Editor::copyImage):
     52        * editing/Editor.h:
     53        * html/HTMLCanvasElement.h:
     54        * platform/Cursor.h:
     55        * platform/audio/FFTFrame.h:
     56        * platform/audio/nix/AudioBusNix.cpp:
     57        (WebCore::AudioBus::loadPlatformResource):
     58        * platform/graphics/GLContext.h:
     59        * platform/nix/CursorNix.cpp:
     60        (WebCore::Cursor::ensurePlatformCursor):
     61        * platform/nix/GamepadsNix.cpp:
     62        (WebCore::sampleGamepads):
     63        * platform/nix/RenderThemeNix.cpp:
     64        (WebCore::toIntSize):
     65        (WebCore::toNixRect):
     66        (WebCore::RenderThemeNix::platformActiveSelectionBackgroundColor):
     67        (WebCore::RenderThemeNix::platformInactiveSelectionBackgroundColor):
     68        (WebCore::RenderThemeNix::platformActiveSelectionForegroundColor):
     69        (WebCore::RenderThemeNix::platformInactiveSelectionForegroundColor):
     70        (WebCore::RenderThemeNix::platformActiveListBoxSelectionBackgroundColor):
     71        (WebCore::RenderThemeNix::platformInactiveListBoxSelectionBackgroundColor):
     72        (WebCore::RenderThemeNix::platformActiveListBoxSelectionForegroundColor):
     73        (WebCore::RenderThemeNix::platformInactiveListBoxSelectionForegroundColor):
     74        (WebCore::RenderThemeNix::platformActiveTextSearchHighlightColor):
     75        (WebCore::RenderThemeNix::platformInactiveTextSearchHighlightColor):
     76        (WebCore::RenderThemeNix::platformFocusRingColor):
     77        (WebCore::RenderThemeNix::platformTapHighlightColor):
     78        (WebCore::RenderThemeNix::paintButton):
     79        (WebCore::RenderThemeNix::paintTextField):
     80        (WebCore::RenderThemeNix::paintCheckbox):
     81        (WebCore::RenderThemeNix::setCheckboxSize):
     82        (WebCore::RenderThemeNix::paintRadio):
     83        (WebCore::RenderThemeNix::setRadioSize):
     84        (WebCore::RenderThemeNix::paintMenuList):
     85        (WebCore::RenderThemeNix::paintProgressBar):
     86        (WebCore::RenderThemeNix::paintSliderTrack):
     87        (WebCore::RenderThemeNix::paintSliderThumb):
     88        (WebCore::RenderThemeNix::paintInnerSpinButton):
     89        (WebCore::RenderThemeNix::paintMeter):
     90        (WebCore::RenderThemeNix::extraMediaControlsStyleSheet):
     91        (WebCore::RenderThemeNix::paintMediaPlayButton):
     92        (WebCore::RenderThemeNix::paintMediaMuteButton):
     93        (WebCore::RenderThemeNix::paintMediaSeekBackButton):
     94        (WebCore::RenderThemeNix::paintMediaSeekForwardButton):
     95        (WebCore::RenderThemeNix::paintMediaSliderTrack):
     96        (WebCore::RenderThemeNix::paintMediaVolumeSliderContainer):
     97        (WebCore::RenderThemeNix::paintMediaVolumeSliderTrack):
     98        (WebCore::RenderThemeNix::paintMediaRewindButton):
     99        * platform/nix/RenderThemeNix.h:
     100        * rendering/SimpleLineLayout.cpp:
     101        (WebCore::SimpleLineLayout::canUseFor):
     102
    11032013-12-03  Ralph Thomas  <ralpht@gmail.com>
    2104

  • trunk/Source/WebCore/PlatformNix.cmake

    r160001 r160045  
    55    "${WEBCORE_DIR}/platform/graphics/freetype"
    66    "${WEBCORE_DIR}/platform/graphics/glx"
    7     "${WEBCORE_DIR}/platform/graphics/harfbuzz/"
    8     "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
    97    "${WEBCORE_DIR}/platform/graphics/nix"
    108    "${WEBCORE_DIR}/platform/graphics/opengl"
    119    "${WEBCORE_DIR}/platform/graphics/opentype"
    1210    "${WEBCORE_DIR}/platform/graphics/surfaces"
    13     "${WEBCORE_DIR}/platform/graphics/texmap"
    1411    "${WEBCORE_DIR}/platform/linux"
    1512    "${WEBCORE_DIR}/platform/mediastream/gstreamer"
    … …  
    1815
    1916list(APPEND WebCore_SOURCES
    20     css/WebKitCSSArrayFunctionValue.cpp
    21     css/WebKitCSSMatFunctionValue.cpp
    22     css/WebKitCSSMatrix.cpp
    23     css/WebKitCSSMixFunctionValue.cpp
    24 
    2517    editing/SmartReplaceICU.cpp
    2618
    … …  
    3628    platform/ContextMenuNone.cpp
    3729    platform/Cursor.cpp
    38     platform/LocalizedStrings.cpp
    39     platform/PlatformStrategies.cpp
    4030
    4131    platform/cairo/WidgetBackingStoreCairo.cpp
    4232
    43     platform/graphics/ImageSource.cpp
    4433    platform/graphics/OpenGLShims.cpp
    4534    platform/graphics/WOFFFileFormat.cpp
    … …  
    6554    platform/graphics/cairo/TransformationMatrixCairo.cpp
    6655
    67     platform/graphics/filters/CustomFilterMeshGenerator.cpp
    68     platform/graphics/filters/CustomFilterValidatedProgram.cpp
    69 
    7056    platform/graphics/freetype/FontCacheFreeType.cpp
    7157    platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
    … …  
    9480    platform/gtk/SharedBufferGtk.cpp
    9581
    96     platform/image-decoders/ImageDecoder.cpp
    97 
    98     platform/image-decoders/bmp/BMPImageDecoder.cpp
    99     platform/image-decoders/bmp/BMPImageReader.cpp
    100 
    10182    platform/image-decoders/cairo/ImageDecoderCairo.cpp
    102 
    103     platform/image-decoders/gif/GIFImageDecoder.cpp
    104     platform/image-decoders/gif/GIFImageReader.cpp
    105 
    106     platform/image-decoders/ico/ICOImageDecoder.cpp
    107 
    108     platform/image-decoders/jpeg/JPEGImageDecoder.cpp
    109 
    110     platform/image-decoders/png/PNGImageDecoder.cpp
    111 
    112     platform/image-decoders/webp/WEBPImageDecoder.cpp
    11383
    11484    platform/linux/GamepadDeviceLinux.cpp
    … …  
    140110    platform/text/nix/TextBreakIteratorInternalICUNix.cpp
    141111
    142     plugins/PluginDatabase.cpp
    143     plugins/PluginDebug.cpp
    144112    plugins/PluginPackage.cpp
    145113    plugins/PluginPackageNone.cpp
    146     plugins/PluginStream.cpp
    147     plugins/PluginView.cpp
    148114    plugins/PluginViewNone.cpp
    149 
    150     rendering/style/StyleCachedShader.cpp
    151     rendering/style/StyleCustomFilterProgram.cpp
    152     rendering/style/StyleCustomFilterProgramCache.cpp
    153115)
    154116
    … …  
    187149else ()
    188150    list(APPEND WebCore_INCLUDE_DIRECTORIES
     151        platform/graphics/surfaces/efl
    189152        platform/graphics/surfaces/glx
    190         platform/graphics/surfaces/efl
    191153        ${X11_X11_INCLUDE_PATH}
    192154    )
    … …  
    227189    ${CAIRO_LIBRARIES}
    228190    ${FONTCONFIG_LIBRARIES}
    229     ${FREETYPE_LIBRARIES}
     191    ${FREETYPE2_LIBRARIES}
    230192    ${GLIB_GIO_LIBRARIES}
    231193    ${GLIB_GMODULE_LIBRARIES}
    … …  
    243205
    244206list(APPEND WebCore_INCLUDE_DIRECTORIES
     207    ${CAIRO_INCLUDE_DIRS}
    245208    ${FONTCONFIG_INCLUDE_DIR}
    246     ${CAIRO_INCLUDE_DIRS}
    247     ${FREETYPE_INCLUDE_DIRS}
     209    ${FREETYPE2_INCLUDE_DIRS}
     210    ${GLIB_INCLUDE_DIRS}
     211    ${HARFBUZZ_INCLUDE_DIRS}
    248212    ${LIBXML2_INCLUDE_DIR}
    249213    ${LIBXSLT_INCLUDE_DIR}
    250214    ${SQLITE_INCLUDE_DIR}
    251     ${GLIB_INCLUDE_DIRS}
    252215    ${ZLIB_INCLUDE_DIRS}
    253     ${HARFBUZZ_INCLUDE_DIRS}
    254216)
    255217
    … …  
    285247        platform/network/curl/CookieStorageCurl.cpp
    286248        platform/network/curl/CredentialStorageCurl.cpp
     249        platform/network/curl/CurlCacheEntry.cpp
     250        platform/network/curl/CurlCacheManager.cpp
    287251        platform/network/curl/DNSCurl.cpp
    288252        platform/network/curl/FormDataStreamCurl.cpp
    … …  
    292256        platform/network/curl/ResourceHandleCurl.cpp
    293257        platform/network/curl/ResourceHandleManager.cpp
     258        platform/network/curl/SSLHandle.cpp
    294259        platform/network/curl/SocketStreamHandleCurl.cpp
    295260        platform/network/curl/SynchronousLoaderClientCurl.cpp
    … …  
    298263    list(APPEND WebCore_LIBRARIES
    299264        ${CURL_LIBRARIES}
     265        ${OPENSSL_LIBRARIES}
    300266    )
    301267else ()

  • trunk/Source/WebCore/css/mediaControlsNix.css

    r155360 r160045  
    11/*
    2  * Copyright (C) 2009, 2010, 2011 Apple Inc.  All rights reserved.
    3  * Copyright (C) 2011 Samsung Electronics
    4  * Copyright (C) 2012-2013 Nokia Corporation and/or its subsidiary(-ies).
     2 * Copyright (C) 2009 Apple Inc.  All rights reserved.
     3 * Copyright (C) 2009 Google Inc.
     4 * Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
    55 *
    66 * Redistribution and use in source and binary forms, with or without
    … …  
    2525 */
    2626
    27 /* NixWebKit media controls. Extends mediaControls.css */
     27/* Nix default media controls */
    2828
    2929audio {
    3030    width: 300px;
    31     height: 20px;
     31    height: 30px;
     32}
     33
     34audio::-webkit-media-controls,
     35video::-webkit-media-controls {
     36    width: inherit;
     37    height: inherit;
     38    position: relative;
     39    direction: ltr;
     40    display: flex;
     41    flex-direction: row;
     42    justify-content: flex-end;
     43    align-items: center;
     44}
     45
     46audio::-webkit-media-controls-enclosure, video::-webkit-media-controls-enclosure {
     47    width: 100%;
     48    max-width: 800px;
     49    height: 30px;
     50    flex-shrink: 0;
     51    bottom: 0;
     52    text-indent: 0;
     53    padding: 0;
     54    box-sizing: border-box;
     55}
     56
     57video::-webkit-media-controls-enclosure {
     58    padding: 0px 5px 5px 5px;
     59    height: 35px;
     60    flex-shrink: 0;
    3261}
    3362
    3463audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
    35     display: -webkit-box;
    36     -webkit-box-orient: horizontal;
    37     -webkit-box-align: center;
     64    display: flex;
     65    flex-direction: row;
     66    align-items: center;
     67    /* We use flex-start here to ensure that the play button is visible even
     68     * if we are too small to show all controls.
     69     */
     70    justify-content: flex-start;
    3871    -webkit-user-select: none;
    3972    position: relative;
    40     bottom: 0;
    4173    width: 100%;
    4274    z-index: 0;
    4375    overflow: hidden;
    44     height: 20px;
    4576    text-align: right;
    46 }
    47 
     77    bottom: auto;
     78    height: 30px;
     79    background-color: rgba(20, 20, 20, 0.8);
     80    border-radius: 5px;
     81}
     82
     83video:-webkit-full-page-media {
     84    margin: auto;
     85    position: absolute;
     86    top: 0;
     87    right: 0;
     88    bottom: 0;
     89    left: 0;
     90}
     91
     92audio:-webkit-full-page-media, video:-webkit-full-page-media {
     93    max-height: 100%;
     94    max-width: 100%;
     95}
     96
     97audio:-webkit-full-page-media::-webkit-media-controls-panel,
    4898video:-webkit-full-page-media::-webkit-media-controls-panel {
    4999    bottom: 0px;
    … …  
    52102audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
    53103    -webkit-appearance: media-mute-button;
    54     display: -webkit-box;
    55     width: 20px;
    56     height: 20px;
    57     position: relative;
    58     z-index: 2;
    59     background-color: initial;
    60     border: initial;
    61     color: inherit;
     104    display: flex;
     105    flex: none;
     106    border: none;
     107    box-sizing: border-box;
     108    width: 35px;
     109    height: 30px;
     110    line-height: 30px;
     111    margin: 0 6px 0 0;
     112    padding: 0;
     113    background-color: initial;
     114    color: inherit;
     115}
     116
     117audio::-webkit-media-controls-overlay-play-button, video::-webkit-media-controls-overlay-play-button {
     118    display: none;
    62119}
    63120
    64121audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
    65122    -webkit-appearance: media-play-button;
    66     display: -webkit-box;
    67     width: 20px;
    68     height: 20px;
    69     background-color: initial;
    70     border: initial;
     123    display: flex;
     124    flex: none;
     125    border: none;
     126    box-sizing: border-box;
     127    width: 30px;
     128    height: 30px;
     129    line-height: 30px;
     130    margin-left: 9px;
     131    margin-right: 9px;
     132    padding: 0;
     133    background-color: initial;
    71134    color: inherit;
    72135}
    … …  
    74137audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container {
    75138    -webkit-appearance: media-controls-background;
    76     display: -webkit-box;
    77     -webkit-box-orient: horizontal;
    78     -webkit-box-align: center;
    79     -webkit-box-pack: end;
    80     -webkit-box-flex: 1;
     139    display: flex;
     140    flex-direction: row;
     141    align-items: center;
     142    justify-content: flex-end;
     143    flex: 1 1;
    81144    -webkit-user-select: none;
    82     height: 20px;
    83 }
    84 
    85 audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display {
     145    height: 16px;
     146    min-width: 0;
     147}
     148
     149audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display,
     150audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display {
    86151    -webkit-appearance: media-current-time-display;
    87152    -webkit-user-select: none;
    88     display: -webkit-box;
    89     height: 20px;
    90 
    91     padding: 4px;
    92 
    93     text-align: center;
    94     font-size: 10px;
    95 
    96     color: black;
     153    -webkit-flex: none;
     154    display: -webkit-flex;
     155    border: none;
     156    cursor: default;
     157
     158    height: 30px;
     159    margin: 0 9px 0 0;
     160    padding: 0;
     161
     162    line-height: 30px;
     163    font-family: Arial, Helvetica, sans-serif;
     164    font-size: 13px;
     165    font-weight: bold;
     166    font-style: normal;
     167    color: white;
     168
    97169    letter-spacing: normal;
    98170    word-spacing: normal;
    99     line-height: normal;
     171    text-align: center
    100172    text-transform: none;
    101173    text-indent: 0;
    102174    text-shadow: none;
    103175    text-decoration: none;
    104     font-style: normal;
    105     font-weight: normal;
    106     font-family: serif;
    107 }
    108 
    109 audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display {
    110     display: none;
    111176}
    112177
    113178audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
    114179    -webkit-appearance: media-slider;
    115     display: -webkit-box;
    116     -webkit-box-flex: 1;
    117     height: 20px;
    118     padding: 0px 2px;
    119     background-color: initial;
    120     border: initial;
    121     color: inherit;
    122     margin: initial;
    123 }
    124 
    125 audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container {
    126     -webkit-appearance: media-volume-slider-container;
    127     position: absolute;
    128     height: 100px;
    129     width: 20px;
    130     bottom: 20px;
    131     z-index: 1;
     180    display: flex;
     181    flex: 1 1 auto;
     182    height: 8px;
     183    margin: 0 15px 0 0;
     184    padding: 0;
     185    background-color: black;
     186    min-width: 25px;
     187    border: initial;
     188    border-radius: 4px;
     189    color: inherit;
    132190}
    133191
    134192audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider {
    135193    -webkit-appearance: media-volume-slider;
    136     display: none;
    137     background-color: initial;
    138     border: initial;
    139     color: inherit;
    140     margin: initial;
     194    display: flex;
     195    /* The 1.9 value was empirically chosen to match old-flexbox behaviour
     196     * and be aesthetically pleasing.
     197     */
     198    flex: 1 1.9 auto;
     199    height: 8px;
     200    max-width: 70px;
     201    margin: 0 15px 0 0;
     202    padding: 0;
     203    min-width: 15px;
     204    border: initial;
     205    color: inherit;
     206    background-color: black;
     207    border-radius: 4px;
     208}
     209
     210input[type="range"]::-webkit-media-slider-container {
     211    display: flex;
     212    align-items: center;
     213    flex-direction: row; /* This property is updated by C++ code. */
     214    box-sizing: border-box;
     215    height: 100%;
     216    width: 100%;
     217    border: 1px solid rgba(230, 230, 230, 0.35);
     218    border-radius: 4px;
     219    background-color: transparent; /* Background drawing is managed by C++ code to draw ranges. */
     220}
     221
     222/* The negative right margin causes the track to overflow its container. */
     223input[type="range"]::-webkit-media-slider-container > div {
     224    margin-right: -14px;
     225}
     226
     227input[type="range"]::-webkit-media-slider-thumb {
     228    margin-left: -7px;
     229    margin-right: -7px;
     230    background-color: white;
     231    border-radius: 3px;
    141232}
    142233
    143234audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button {
    144235    -webkit-appearance: media-seek-back-button;
    145     display: -webkit-box;
    146     width: 20px;
    147     height: 20px;
     236    display: flex;
     237    width: 16px;
     238    height: 16px;
    148239    background-color: initial;
    149240    border: initial;
    … …  
    153244audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button {
    154245    -webkit-appearance: media-seek-forward-button;
    155     display: -webkit-box;
    156     width: 20px;
    157     height: 20px;
     246    display: flex;
     247    width: 16px;
     248    height: 16px;
    158249    background-color: initial;
    159250    border: initial;
    … …  
    162253
    163254audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button {
    164     -webkit-appearance: media-fullscreen-button;
    165     display: -webkit-box;
    166     width: 20px;
    167     height: 20px;
    168     background-color: initial;
    169     border: initial;
     255    -webkit-appearance: media-enter-fullscreen-button;
     256    display: flex;
     257    flex: none;
     258    border: none;
     259    box-sizing: border-box;
     260    width: 30px;
     261    height: 30px;
     262    line-height: 30px;
     263    margin-left: -5px;
     264    margin-right: 9px;
     265    padding: 0;
     266    background-color: initial;
    170267    color: inherit;
    171268}
    … …  
    187284audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button {
    188285    -webkit-appearance: media-toggle-closed-captions-button;
    189     display: -webkit-box;
    190     width: 20px;
    191     height: 20px;
    192     background-color: initial;
    193     border: initial;
     286    display: flex;
     287    flex: none;
     288    border: none;
     289    box-sizing: border-box;
     290    width: 30px;
     291    height: 30px;
     292    line-height: 30px;
     293    margin-left: -5px;
     294    margin-right: 9px;
     295    padding: 0;
     296    background-color: initial;
    194297    color: inherit;
    195298}
    … …  
    202305    color: inherit;
    203306}
     307
     308audio::-webkit-media-controls-fullscreen-volume-slider, video::-webkit-media-controls-fullscreen-volume-slider {
     309    display: none;
     310}
     311
     312audio::-webkit-media-controls-fullscreen-volume-min-button, video::-webkit-media-controls-fullscreen-volume-min-button {
     313    display: none;
     314}
     315
     316audio::-webkit-media-controls-fullscreen-volume-max-button, video::-webkit-media-controls-fullscreen-volume-max-button {
     317    display: none;
     318}
     319
     320video::-webkit-media-text-track-container {
     321    position: relative;
     322    width: 100%;
     323    overflow: hidden;
     324    padding-bottom: 5px;
     325
     326    font: 22px sans-serif;
     327    text-align: center;
     328    color: rgba(255, 255, 255, 1);
     329
     330    letter-spacing: normal;
     331    word-spacing: normal;
     332    text-transform: none;
     333    text-indent: 0;
     334    text-decoration: none;
     335    pointer-events: none;
     336    -webkit-user-select: none;
     337    word-break: break-word;
     338
     339    flex: 1 1;
     340}
     341
     342video::cue {
     343    display: inline;
     344
     345    background-color: rgba(0, 0, 0, 0.8);
     346    padding: 2px 2px;
     347}
     348
     349video::-webkit-media-text-track-region {
     350    position: absolute;
     351    line-height: 5.33vh;
     352    writing-mode: horizontal-tb;
     353    background: rgba(0, 0, 0, 0.8);
     354    color: rgba(255, 255, 255, 1);
     355    word-wrap: break-word;
     356    overflow-wrap: break-word;
     357    overflow: hidden;
     358}
     359
     360video::-webkit-media-text-track-region-container {
     361    position: relative;
     362
     363    display: flex;
     364    flex-flow: column;
     365    flex-direction: column;
     366}
     367
     368video::-webkit-media-text-track-region-container.scrolling {
     369    transition: top 433ms linear;
     370}
     371
     372
     373video::-webkit-media-text-track-display {
     374    position: absolute;
     375    overflow: hidden;
     376    white-space: pre-wrap;
     377    -webkit-box-sizing: border-box;
     378    flex: 0 0 auto;
     379}
     380video::cue(:future) {
     381    color: gray;
     382}
     383
     384video::-webkit-media-text-track-container b {
     385    font-weight: bold;
     386}
     387
     388video::-webkit-media-text-track-container u {
     389    text-decoration: underline;
     390}
     391
     392video::-webkit-media-text-track-container i {
     393    font-style: italic;
     394}
     395

  • trunk/Source/WebCore/editing/Editor.cpp

    r159856 r160045  
    436436#endif
    437437
    438 #if !PLATFORM(MAC) && !PLATFORM(EFL)
     438#if !PLATFORM(MAC) && !PLATFORM(EFL) && !PLATFORM(NIX)
    439439void Editor::pasteWithPasteboard(Pasteboard* pasteboard, bool allowPlainText)
    440440{
    … …  
    10621062            Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForClipboard(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
    10631063        else {
    1064 #if PLATFORM(MAC) || PLATFORM(EFL)
     1064#if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
    10651065            writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
    10661066#else
    … …  
    10891089    } else {
    10901090        if (HTMLImageElement* imageElement = imageElementFromImageDocument(document())) {
    1091 #if (PLATFORM(MAC) && !PLATFORM(IOS)) || PLATFORM(EFL)
     1091#if (PLATFORM(MAC) && !PLATFORM(IOS)) || PLATFORM(EFL) || PLATFORM(NIX)
    10921092            writeImageToPasteboard(*Pasteboard::createForCopyAndPaste(), *imageElement, document().url(), document().title());
    10931093#else
    … …  
    10951095#endif
    10961096        } else {
    1097 #if (PLATFORM(MAC) && !PLATFORM(IOS)) || PLATFORM(EFL)
     1097#if (PLATFORM(MAC) && !PLATFORM(IOS)) || PLATFORM(EFL) || PLATFORM(NIX)
    10981098            writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
    10991099#else
    … …  
    11981198        url = result.absoluteImageURL();
    11991199
    1200 #if PLATFORM(MAC) || PLATFORM(EFL)
     1200#if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
    12011201    writeImageToPasteboard(*Pasteboard::createForCopyAndPaste(), *element, url, result.altDisplayString());
    12021202#else

  • trunk/Source/WebCore/editing/Editor.h

    r159856 r160045  
    410410#endif
    411411
    412 #if PLATFORM(MAC) || PLATFORM(EFL)
     412#if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
    413413    void writeSelectionToPasteboard(Pasteboard&);
    414414    void writeImageToPasteboard(Pasteboard&, Element& imageElement, const URL&, const String& title);

  • trunk/Source/WebCore/html/HTMLCanvasElement.h

    r159791 r160045  
    3434#include <wtf/Forward.h>
    3535
    36 #if USE(CG)
     36#if USE(CG) || PLATFORM(NIX)
    3737#define DefaultInterpolationQuality InterpolationLow
    3838#else

  • trunk/Source/WebCore/platform/Cursor.h

    r156795 r160045  
    7878#elif PLATFORM(GTK)
    7979    typedef GRefPtr<GdkCursor> PlatformCursor;
    80 #elif PLATFORM(EFL) || PLATFORM(NIX)
     80#elif PLATFORM(EFL)
    8181    typedef const char* PlatformCursor;
     82#elif PLATFORM(NIX)
     83    typedef unsigned PlatformCursor;
    8284#elif PLATFORM(BLACKBERRY)
    8385    typedef BlackBerry::Platform::BlackBerryCursor PlatformCursor;

  • trunk/Source/WebCore/platform/audio/FFTFrame.h

    r156015 r160045  
    185185
    186186#if PLATFORM(NIX)
    187     void scalePlanarData(float scale);
    188187    OwnPtr<Nix::FFTFrame> m_fftFrame;
    189188#endif // PLATFORM(NIX)

  • trunk/Source/WebCore/platform/audio/nix/AudioBusNix.cpp

    r158235 r160045  
    3131
    3232#include "AudioFileReader.h"
     33#include "FileSystem.h"
    3334#include <cstdio>
    3435#include <public/MultiChannelPCMData.h>
    … …  
    5455    // FIXME: This assumes the file system uses latin1 or UTF-8 encoding, but this comment also assumes
    5556    // that non-ascii file names would appear here.
    56     const CString absoluteFilename(makeString(DATA_DIR, "/webaudio/resources/", name, ".wav").utf8());
     57    CString absoluteFilename(makeString(DATA_DIR, "/webaudio/resources/", name, ".wav").utf8());
    5758    struct stat statData;
     59    if (::stat(absoluteFilename.data(), &statData) == -1)
     60        absoluteFilename = makeString(UNINSTALLED_AUDIO_RESOURCES_DIR, "/", name, ".wav").utf8();
    5861    if (::stat(absoluteFilename.data(), &statData) == -1)
    5962        return nullptr;
    … …  
    6568    WTF::Vector<char> fileContents;
    6669    fileContents.resize(statData.st_size);
    67     size_t bytesRead = fread(&fileContents[0], fileContents.size(), 1, file);
     70    size_t bytesRead = fread(&fileContents[0], 1, fileContents.size(), file);
    6871    fclose(file);
    6972    if (bytesRead < fileContents.size())
    … …  
    8992
    9093#endif // ENABLE(WEB_AUDIO)
     94

  • trunk/Source/WebCore/platform/graphics/GLContext.h

    r153492 r160045  
    2626#include <wtf/PassOwnPtr.h>
    2727
    28 #if USE(EGL) && !PLATFORM(GTK)
     28#if USE(EGL) && !PLATFORM(GTK) && !PLATFORM(NIX)
    2929#include "eglplatform.h"
    3030typedef EGLNativeWindowType GLNativeWindowType;

  • trunk/Source/WebCore/platform/nix/CursorNix.cpp

    r155360 r160045  
    77 * Copyright (C) 2009-2010 ProFUSION embedded systems
    88 * Copyright (C) 2009-2010 Samsung Electronics
    9  * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
     9 * Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
    1010 *
    1111 * All rights reserved.
    … …  
    3636#include "Cursor.h"
    3737
    38 #include "NotImplemented.h"
    39 
    4038namespace WebCore {
    4139
    … …  
    6159}
    6260
    63 static const char* cursorString(Cursor::Type type)
    64 {
    65     static const char* cursorStrings[] = {
    66         "cursor/pointer",
    67         "cursor/cross",
    68         "cursor/hand",
    69         "cursor/i_beam",
    70         "cursor/wait",
    71         "cursor/help",
    72         "cursor/east_resize",
    73         "cursor/north_resize",
    74         "cursor/north_east_resize",
    75         "cursor/north_west_resize",
    76         "cursor/south_resize",
    77         "cursor/south_east_resize",
    78         "cursor/south_west_resize",
    79         "cursor/west_resize",
    80         "cursor/north_south_resize",
    81         "cursor/east_west_resize",
    82         "cursor/north_east_south_west_resize",
    83         "cursor/north_west_south_east_resize",
    84         "cursor/column_resize",
    85         "cursor/row_resize",
    86         "cursor/middle_panning",
    87         "cursor/east_panning",
    88         "cursor/north_panning",
    89         "cursor/north_east_panning",
    90         "cursor/north_west_panning",
    91         "cursor/south_panning",
    92         "cursor/south_east_panning",
    93         "cursor/south_west_panning",
    94         "cursor/west_panning",
    95         "cursor/move",
    96         "cursor/vertical_text",
    97         "cursor/cell",
    98         "cursor/context_menu",
    99         "cursor/alias",
    100         "cursor/progress",
    101         "cursor/no_drop",
    102         "cursor/copy",
    103         "cursor/none",
    104         "cursor/not_allowed",
    105         "cursor/zoom_in",
    106         "cursor/zoom_out",
    107         "cursor/grab",
    108         "cursor/grabbing",
    109         ""}; // FIXME: Just return "" for custom type. We don't support it now.
    110     return cursorStrings[type];
    111 }
    112 
    11361void Cursor::ensurePlatformCursor() const
    11462{
    11563    if (m_platformCursor)
    11664        return;
    117     m_platformCursor = cursorString(m_type);
     65    m_platformCursor = m_type;
    11866}
    11967
    120 }
     68} // namespace WebCore
     69

  • trunk/Source/WebCore/platform/nix/GamepadsNix.cpp

    r156567 r160045  
    11/*
    22 * Copyright (C) 2011, Google Inc. All rights reserved.
     3 * Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
    34 *
    45 * Redistribution and use in source and binary forms, with or without
    … …  
    4849            if (!gamepad)
    4950                gamepad = Gamepad::create();
    50             gamepad->id(nixGamepad.id);
     51            gamepad->id(String::fromUTF8(nixGamepad.id));
    5152            gamepad->index(i);
    5253            gamepad->timestamp(nixGamepad.timestamp);
    … …  
    5960}
    6061
    61 }
     62} // namespace WebCore
    6263
    63 #endif
     64#endif // ENABLE(GAMEPAD)
     65

  • trunk/Source/WebCore/platform/nix/RenderThemeNix.cpp

    r156567 r160045  
    11/*
    2  * Copyright (C) 2012-2013 Nokia Corporation and/or its subsidiary(-ies).
     2 * Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2727#include "RenderThemeNix.h"
    2828
     29#include "HTMLMediaElement.h"
    2930#include "InputTypeNames.h"
    3031#include "PaintInfo.h"
    3132#include "PlatformContextCairo.h"
     33#include "UserAgentStyleSheets.h"
    3234#include "public/Canvas.h"
    3335#include "public/Platform.h"
    … …  
    4446namespace WebCore {
    4547
    46 static const unsigned defaultButtonBackgroundColor = 0xffdddddd;
    47 
    4848static void setSizeIfAuto(RenderStyle* style, const IntSize& size)
    4949{
    … …  
    5454}
    5555
    56 Color toColor(const Nix::Color& color)
    57 {
    58     return WebCore::Color(RGBA32(color));
    59 }
    60 
    6156static Nix::ThemeEngine* themeEngine()
    6257{
    … …  
    6762{
    6863    return info.context->platformContext()->cr();
     64}
     65
     66static IntSize toIntSize(const Nix::Size& size)
     67{
     68    return IntSize(size.width, size.height);
     69}
     70
     71static Nix::Rect toNixRect(const IntRect& rect)
     72{
     73    return Nix::Rect(rect.x(), rect.y(), rect.width(), rect.height());
    6974}
    7075
    … …  
    106111Color RenderThemeNix::platformActiveSelectionBackgroundColor() const
    107112{
    108     return toColor(themeEngine()->activeSelectionBackgroundColor());
     113    return themeEngine()->activeSelectionBackgroundColor().argb32();
    109114}
    110115
    111116Color RenderThemeNix::platformInactiveSelectionBackgroundColor() const
    112117{
    113     return toColor(themeEngine()->inactiveSelectionBackgroundColor());
     118    return themeEngine()->inactiveSelectionBackgroundColor().argb32();
    114119}
    115120
    116121Color RenderThemeNix::platformActiveSelectionForegroundColor() const
    117122{
    118     return toColor(themeEngine()->activeSelectionForegroundColor());
     123    return themeEngine()->activeSelectionForegroundColor().argb32();
    119124}
    120125
    121126Color RenderThemeNix::platformInactiveSelectionForegroundColor() const
    122127{
    123     return toColor(themeEngine()->inactiveSelectionForegroundColor());
     128    return themeEngine()->inactiveSelectionForegroundColor().argb32();
    124129}
    125130
    126131Color RenderThemeNix::platformActiveListBoxSelectionBackgroundColor() const
    127132{
    128     return toColor(themeEngine()->activeListBoxSelectionBackgroundColor());
     133    return themeEngine()->activeListBoxSelectionBackgroundColor().argb32();
    129134}
    130135
    131136Color RenderThemeNix::platformInactiveListBoxSelectionBackgroundColor() const
    132137{
    133     return toColor(themeEngine()->inactiveListBoxSelectionBackgroundColor());
     138    return themeEngine()->inactiveListBoxSelectionBackgroundColor().argb32();
    134139}
    135140
    136141Color RenderThemeNix::platformActiveListBoxSelectionForegroundColor() const
    137142{
    138     return toColor(themeEngine()->activeListBoxSelectionForegroundColor());
     143    return themeEngine()->activeListBoxSelectionForegroundColor().argb32();
    139144}
    140145
    141146Color RenderThemeNix::platformInactiveListBoxSelectionForegroundColor() const
    142147{
    143     return toColor(themeEngine()->inactiveListBoxSelectionForegroundColor());
     148    return themeEngine()->inactiveListBoxSelectionForegroundColor().argb32();
    144149}
    145150
    146151Color RenderThemeNix::platformActiveTextSearchHighlightColor() const
    147152{
    148     return toColor(themeEngine()->activeTextSearchHighlightColor());
     153    return themeEngine()->activeTextSearchHighlightColor().argb32();
    149154}
    150155
    151156Color RenderThemeNix::platformInactiveTextSearchHighlightColor() const
    152157{
    153     return toColor(themeEngine()->inactiveTextSearchHighlightColor());
     158    return themeEngine()->inactiveTextSearchHighlightColor().argb32();
    154159}
    155160
    156161Color RenderThemeNix::platformFocusRingColor() const
    157162{
    158     return toColor(themeEngine()->focusRingColor());
     163    return themeEngine()->focusRingColor().argb32();
    159164}
    160165
    … …  
    162167Color RenderThemeNix::platformTapHighlightColor() const
    163168{
    164     return toColor(themeEngine()->tapHighlightColor());
     169    return themeEngine()->tapHighlightColor().argb32();
    165170}
    166171#endif
    … …  
    187192    extraParams.isDefault = isDefault(o);
    188193    extraParams.hasBorder = true;
    189     extraParams.backgroundColor = defaultButtonBackgroundColor;
    190     if (o->hasBackground())
    191         extraParams.backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor).rgb();
    192 
    193     themeEngine()->paintButton(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect), extraParams);
     194    themeEngine()->paintButton(webCanvas(i), getWebThemeState(this, o), toNixRect(rect), extraParams);
    194195    return false;
    195196}
    … …  
    199200    // WebThemeEngine does not handle border rounded corner and background image
    200201    // so return true to draw CSS border and background.
    201     if (o->style()->hasBorderRadius() || o->style()->hasBackgroundImage())
     202    if (o->style().hasBorderRadius() || o->style().hasBackgroundImage())
    202203        return true;
    203204
    204     themeEngine()->paintTextField(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect));
     205    themeEngine()->paintTextField(webCanvas(i), getWebThemeState(this, o), toNixRect(rect));
    205206    return false;
    206207}
    … …  
    217218    extraParams.indeterminate = isIndeterminate(o);
    218219
    219     themeEngine()->paintCheckbox(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect), extraParams);
     220    themeEngine()->paintCheckbox(webCanvas(i), getWebThemeState(this, o), toNixRect(rect), extraParams);
    220221    return false;
    221222}
    … …  
    227228        return;
    228229
    229     IntSize size = themeEngine()->getCheckboxSize();
     230    IntSize size = toIntSize(themeEngine()->getCheckboxSize());
    230231    setSizeIfAuto(style, size);
    231232}
    … …  
    237238    extraParams.indeterminate = isIndeterminate(o);
    238239
    239     themeEngine()->paintRadio(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect), extraParams);
     240    themeEngine()->paintRadio(webCanvas(i), getWebThemeState(this, o), toNixRect(rect), extraParams);
    240241    return false;
    241242}
    … …  
    247248        return;
    248249
    249     IntSize size = themeEngine()->getRadioSize();
     250    IntSize size = toIntSize(themeEngine()->getRadioSize());
    250251    setSizeIfAuto(style, size);
    251252}
    … …  
    253254bool RenderThemeNix::paintMenuList(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    254255{
    255     themeEngine()->paintMenuList(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect));
     256    themeEngine()->paintMenuList(webCanvas(i), getWebThemeState(this, o), toNixRect(rect));
    256257    return false;
    257258}
    … …  
    287288    extraParams.animationProgress = renderProgress->animationProgress();
    288289    extraParams.animationStartTime = renderProgress->animationStartTime();
    289     themeEngine()->paintProgressBar(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect), extraParams);
     290    themeEngine()->paintProgressBar(webCanvas(i), getWebThemeState(this, o), toNixRect(rect), extraParams);
    290291
    291292    return false;
    … …  
    305306bool RenderThemeNix::paintSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    306307{
    307     themeEngine()->paintSliderTrack(webCanvas(info), getWebThemeState(this, object), rect);
     308    themeEngine()->paintSliderTrack(webCanvas(info), getWebThemeState(this, object), toNixRect(rect));
    308309#if ENABLE(DATALIST_ELEMENT)
    309310    paintSliderTicks(object, info, rect);
    … …  
    319320bool RenderThemeNix::paintSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    320321{
    321     themeEngine()->paintSliderThumb(webCanvas(info), getWebThemeState(this, object), rect);
     322    themeEngine()->paintSliderThumb(webCanvas(info), getWebThemeState(this, object), toNixRect(rect));
    322323
    323324    return false;
    … …  
    389390    extraParams.readOnly = isReadOnlyControl(o);
    390391
    391     themeEngine()->paintInnerSpinButton(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect), extraParams);
     392    themeEngine()->paintInnerSpinButton(webCanvas(i), getWebThemeState(this, o), toNixRect(rect), extraParams);
    392393    return false;
    393394}
    … …  
    433434    extraParams.optimum = e->optimum();
    434435
    435     themeEngine()->paintMeter(webCanvas(i), getWebThemeState(this, o), rect, extraParams);
    436 
    437     return false;
    438 }
    439 #endif
    440 
    441 }
     436    themeEngine()->paintMeter(webCanvas(i), getWebThemeState(this, o), toNixRect(rect), extraParams);
     437
     438    return false;
     439}
     440#endif
     441
     442#if ENABLE(VIDEO)
     443String RenderThemeNix::extraMediaControlsStyleSheet()
     444{
     445    return String(mediaControlsNixUserAgentStyleSheet, sizeof(mediaControlsNixUserAgentStyleSheet));
     446}
     447
     448bool RenderThemeNix::paintMediaPlayButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
     449{
     450    auto state = toHTMLMediaElement(o->node()->shadowHost())->canPlay() ? Nix::ThemeEngine::StatePaused : Nix::ThemeEngine::StatePlaying;
     451    themeEngine()->paintMediaPlayButton(webCanvas(i), state, toNixRect(rect));
     452    return false;
     453}
     454
     455bool RenderThemeNix::paintMediaMuteButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
     456{
     457    auto state = toHTMLMediaElement(o->node()->shadowHost())->muted() ? Nix::ThemeEngine::StateMuted : Nix::ThemeEngine::StateNotMuted;
     458    themeEngine()->paintMediaMuteButton(webCanvas(i), state, toNixRect(rect));
     459    return false;
     460}
     461
     462bool RenderThemeNix::paintMediaSeekBackButton(RenderObject*, const PaintInfo& i, const IntRect& rect)
     463{
     464    themeEngine()->paintMediaSeekBackButton(webCanvas(i), toNixRect(rect));
     465    return false;
     466}
     467
     468bool RenderThemeNix::paintMediaSeekForwardButton(RenderObject*, const PaintInfo& i, const IntRect& rect)
     469{
     470    themeEngine()->paintMediaSeekForwardButton(webCanvas(i), toNixRect(rect));
     471    return false;
     472}
     473
     474bool RenderThemeNix::paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&)
     475{
     476    return false;
     477}
     478
     479bool RenderThemeNix::paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&)
     480{
     481    return false;
     482}
     483
     484bool RenderThemeNix::paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&)
     485{
     486    return false;
     487}
     488
     489bool RenderThemeNix::paintMediaRewindButton(RenderObject*, const PaintInfo& i, const IntRect& rect)
     490{
     491    themeEngine()->paintMediaRewindButton(webCanvas(i), toNixRect(rect));
     492    return false;
     493}
     494#endif // ENABLE(VIDEO)
     495
     496} // namespace WebCore
     497

  • trunk/Source/WebCore/platform/nix/RenderThemeNix.h

    r152428 r160045  
    11/*
    2  * Copyright (C) 2012-2013 Nokia Corporation and/or its subsidiary(-ies).
     2 * Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    104104#endif
    105105
     106#if ENABLE(VIDEO)
     107    virtual String extraMediaControlsStyleSheet() OVERRIDE;
     108    virtual bool usesVerticalVolumeSlider() const OVERRIDE { return false; }
     109    virtual bool usesMediaControlStatusDisplay() OVERRIDE { return true; }
     110    virtual bool usesMediaControlVolumeSlider() const OVERRIDE { return false; }
     111
     112    virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
     113    virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
     114    virtual bool paintMediaSeekBackButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
     115    virtual bool paintMediaSeekForwardButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
     116    virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
     117    virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
     118    virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
     119    virtual bool paintMediaRewindButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
     120#endif
     121
    106122    virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
    107123    virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const OVERRIDE;
    … …  
    124140};
    125141
    126 }
     142} // namespace WebCore
    127143
    128144#endif // RenderThemeNix_h

  • trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

    r159666 r160045  
    9191bool canUseFor(const RenderBlockFlow& flow)
    9292{
    93 #if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)
     93#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(NIX)
    9494    // FIXME: Non-mac platforms are hitting ASSERT(run.charactersLength() >= run.length())
    9595    // https://bugs.webkit.org/show_bug.cgi?id=123338
Note: See TracChangeset for help on using the changeset viewer.