Attachment #218336 for bug #124981

View Details Raw Unified Return to Bug 124981

| Differences between



2013-12-03  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>

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

        Reviewed by NOBODY (OOPS!).

        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):

2013-12-03  Alexey Proskuryakov  <ap@apple.com>

        Support exporting private WebCrypto RSA keys



    "${WEBCORE_DIR}/platform/graphics/cairo"
    "${WEBCORE_DIR}/platform/graphics/freetype"
    "${WEBCORE_DIR}/platform/graphics/glx"
    "${WEBCORE_DIR}/platform/graphics/harfbuzz/"
    "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
    "${WEBCORE_DIR}/platform/graphics/nix"
    "${WEBCORE_DIR}/platform/graphics/opengl"
    "${WEBCORE_DIR}/platform/graphics/opentype"
    "${WEBCORE_DIR}/platform/graphics/surfaces"
    "${WEBCORE_DIR}/platform/graphics/texmap"
    "${WEBCORE_DIR}/platform/linux"
    "${WEBCORE_DIR}/platform/mediastream/gstreamer"
    "${PLATFORM_DIR}/nix/"
)

list(APPEND WebCore_SOURCES
    css/WebKitCSSArrayFunctionValue.cpp
    css/WebKitCSSMatFunctionValue.cpp
    css/WebKitCSSMatrix.cpp
    css/WebKitCSSMixFunctionValue.cpp

    editing/SmartReplaceICU.cpp

    editing/nix/EditorNix.cpp

    platform/ContextMenuItemNone.cpp
    platform/ContextMenuNone.cpp
    platform/Cursor.cpp
    platform/LocalizedStrings.cpp
    platform/PlatformStrategies.cpp

    platform/cairo/WidgetBackingStoreCairo.cpp

    platform/graphics/ImageSource.cpp
    platform/graphics/OpenGLShims.cpp
    platform/graphics/WOFFFileFormat.cpp


    platform/graphics/cairo/TiledBackingStoreBackendCairo.cpp
    platform/graphics/cairo/TransformationMatrixCairo.cpp

    platform/graphics/filters/CustomFilterMeshGenerator.cpp
    platform/graphics/filters/CustomFilterValidatedProgram.cpp

    platform/graphics/freetype/FontCacheFreeType.cpp
    platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
    platform/graphics/freetype/FontPlatformDataFreeType.cpp

    platform/gtk/LoggingGtk.cpp
    platform/gtk/SharedBufferGtk.cpp

    platform/image-decoders/ImageDecoder.cpp

    platform/image-decoders/bmp/BMPImageDecoder.cpp
    platform/image-decoders/bmp/BMPImageReader.cpp

    platform/image-decoders/cairo/ImageDecoderCairo.cpp

    platform/image-decoders/gif/GIFImageDecoder.cpp
    platform/image-decoders/gif/GIFImageReader.cpp

    platform/image-decoders/ico/ICOImageDecoder.cpp

    platform/image-decoders/jpeg/JPEGImageDecoder.cpp

    platform/image-decoders/png/PNGImageDecoder.cpp

    platform/image-decoders/webp/WEBPImageDecoder.cpp

    platform/linux/GamepadDeviceLinux.cpp

    platform/nix/CursorNix.cpp


    platform/text/nix/TextBreakIteratorInternalICUNix.cpp

    plugins/PluginDatabase.cpp
    plugins/PluginDebug.cpp
    plugins/PluginPackage.cpp
    plugins/PluginPackageNone.cpp
    plugins/PluginStream.cpp
    plugins/PluginView.cpp
    plugins/PluginViewNone.cpp

    rendering/style/StyleCachedShader.cpp
    rendering/style/StyleCustomFilterProgram.cpp
    rendering/style/StyleCustomFilterProgramCache.cpp
)

if (WTF_USE_OPENGL_ES_2)

    list(APPEND WebCore_LIBRARIES ${EGL_LIBRARY})
else ()
    list(APPEND WebCore_INCLUDE_DIRECTORIES
        platform/graphics/surfaces/glx
        platform/graphics/surfaces/efl
        platform/graphics/surfaces/glx
        ${X11_X11_INCLUDE_PATH}
    )
    list(APPEND WebCore_SOURCES

list(APPEND WebCore_LIBRARIES
    ${CAIRO_LIBRARIES}
    ${FONTCONFIG_LIBRARIES}
    ${FREETYPE2_LIBRARIES}
    ${GLIB_GIO_LIBRARIES}
    ${GLIB_GMODULE_LIBRARIES}
    ${GLIB_GOBJECT_LIBRARIES}

)

list(APPEND WebCore_INCLUDE_DIRECTORIES
    ${FONTCONFIG_INCLUDE_DIR}
    ${CAIRO_INCLUDE_DIRS}
    ${FONTCONFIG_INCLUDE_DIR}
    ${FREETYPE2_INCLUDE_DIRS}
    ${GLIB_INCLUDE_DIRS}
    ${HARFBUZZ_INCLUDE_DIRS}
    ${LIBXML2_INCLUDE_DIR}
    ${LIBXSLT_INCLUDE_DIR}
    ${SQLITE_INCLUDE_DIR}
    ${GLIB_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIRS}
    ${HARFBUZZ_INCLUDE_DIRS}
)

add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}")

        platform/network/curl/CookieNode.cpp
        platform/network/curl/CookieStorageCurl.cpp
        platform/network/curl/CredentialStorageCurl.cpp
        platform/network/curl/CurlCacheEntry.cpp
        platform/network/curl/CurlCacheManager.cpp
        platform/network/curl/DNSCurl.cpp
        platform/network/curl/FormDataStreamCurl.cpp
        platform/network/curl/MultipartHandle.cpp

        platform/network/curl/ProxyServerCurl.cpp
        platform/network/curl/ResourceHandleCurl.cpp
        platform/network/curl/ResourceHandleManager.cpp
        platform/network/curl/SSLHandle.cpp
        platform/network/curl/SocketStreamHandleCurl.cpp
        platform/network/curl/SynchronousLoaderClientCurl.cpp
    )

    list(APPEND WebCore_LIBRARIES
        ${CURL_LIBRARIES}
        ${OPENSSL_LIBRARIES}
    )
else ()
    list(APPEND WebCore_SOURCES



/*
 * Copyright (C) 2009 Apple Inc.  All rights reserved.
 * Copyright (C) 2009 Google Inc.
 * Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

/* Nix default media controls */

audio {
    width: 300px;
    height: 30px;
}

audio::-webkit-media-controls,
video::-webkit-media-controls {
    width: inherit;
    height: inherit;
    position: relative;
    direction: ltr;
    display: flex;
    flex-direction: row;
    justify-content: flex-end;
    align-items: center;
}

audio::-webkit-media-controls-enclosure, video::-webkit-media-controls-enclosure {
    width: 100%;
    max-width: 800px;
    height: 30px;
    flex-shrink: 0;
    bottom: 0;
    text-indent: 0;
    padding: 0;
    box-sizing: border-box;
}

video::-webkit-media-controls-enclosure {
    padding: 0px 5px 5px 5px;
    height: 35px;
    flex-shrink: 0;
}

audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
    display: flex;
    flex-direction: row;
    align-items: center;
    /* We use flex-start here to ensure that the play button is visible even
     * if we are too small to show all controls.
     */
    justify-content: flex-start;
    -webkit-user-select: none;
    position: relative;
    bottom: 0;
    width: 100%;
    z-index: 0;
    overflow: hidden;
    height: 20px;
    text-align: right;
    bottom: auto;
    height: 30px;
    background-color: rgba(20, 20, 20, 0.8);
    border-radius: 5px;
}

video:-webkit-full-page-media {
    margin: auto;
    position: absolute;
    top: 0;
    right: 0;
    bottom: 0;
    left: 0;
}

audio:-webkit-full-page-media, video:-webkit-full-page-media {
    max-height: 100%;
    max-width: 100%;
}

audio:-webkit-full-page-media::-webkit-media-controls-panel,
video:-webkit-full-page-media::-webkit-media-controls-panel {
    bottom: 0px;
}

audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
    -webkit-appearance: media-mute-button;
    display: flex;
    flex: none;
    border: none;
    box-sizing: border-box;
    width: 35px;
    height: 30px;
    line-height: 30px;
    margin: 0 6px 0 0;
    padding: 0;
    background-color: initial;
    border: initial;
    color: inherit;
}

audio::-webkit-media-controls-overlay-play-button, video::-webkit-media-controls-overlay-play-button {
    display: none;
}

audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
    -webkit-appearance: media-play-button;
    display: flex;
    flex: none;
    border: none;
    box-sizing: border-box;
    width: 30px;
    height: 30px;
    line-height: 30px;
    margin-left: 9px;
    margin-right: 9px;
    padding: 0;
    background-color: initial;
    border: initial;
    color: inherit;
}

audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container {
    -webkit-appearance: media-controls-background;
    display: flex;
    flex-direction: row;
    align-items: center;
    justify-content: flex-end;
    flex: 1 1;
    -webkit-user-select: none;
    height: 16px;
    min-width: 0;
}

audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display,
audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display {
    -webkit-appearance: media-current-time-display;
    -webkit-user-select: none;
    -webkit-flex: none;
    display: -webkit-flex;
    border: none;
    cursor: default;

    height: 30px;
    margin: 0 9px 0 0;
    padding: 0;

    line-height: 30px;
    font-family: Arial, Helvetica, sans-serif;
    font-size: 13px;
    font-weight: bold;
    font-style: normal;
    color: white;

    color: black;
    letter-spacing: normal;
    word-spacing: normal;
    text-align: center
    text-transform: none;
    text-indent: 0;
    text-shadow: none;
    text-decoration: none;
    font-style: normal;
    font-weight: normal;
    font-family: serif;
}

audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display {
    display: none;
}

audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
    -webkit-appearance: media-slider;
    display: flex;
    flex: 1 1 auto;
    height: 8px;
    margin: 0 15px 0 0;
    padding: 0;
    background-color: black;
    min-width: 25px;
    border: initial;
    border-radius: 4px;
    color: inherit;
    margin: initial;
}

audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container {
    -webkit-appearance: media-volume-slider-container;
    position: absolute;
    height: 100px;
    width: 20px;
    bottom: 20px;
    z-index: 1;
}

audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider {
    -webkit-appearance: media-volume-slider;
    display: flex;
    /* The 1.9 value was empirically chosen to match old-flexbox behaviour
     * and be aesthetically pleasing.
     */
    flex: 1 1.9 auto;
    height: 8px;
    max-width: 70px;
    margin: 0 15px 0 0;
    padding: 0;
    min-width: 15px;
    border: initial;
    color: inherit;
    background-color: black;
    border-radius: 4px;
}

input[type="range"]::-webkit-media-slider-container {
    display: flex;
    align-items: center;
    flex-direction: row; /* This property is updated by C++ code. */
    box-sizing: border-box;
    height: 100%;
    width: 100%;
    border: 1px solid rgba(230, 230, 230, 0.35);
    border-radius: 4px;
    background-color: transparent; /* Background drawing is managed by C++ code to draw ranges. */
}

/* The negative right margin causes the track to overflow its container. */
input[type="range"]::-webkit-media-slider-container > div {
    margin-right: -14px;
}

input[type="range"]::-webkit-media-slider-thumb {
    margin-left: -7px;
    margin-right: -7px;
    background-color: white;
    border-radius: 3px;
}

audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button {
    -webkit-appearance: media-seek-back-button;
    display: flex;
    width: 16px;
    height: 16px;
    background-color: initial;
    border: initial;
    color: inherit;


audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button {
    -webkit-appearance: media-seek-forward-button;
    display: flex;
    width: 16px;
    height: 16px;
    background-color: initial;
    border: initial;
    color: inherit;
}

audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button {
    -webkit-appearance: media-enter-fullscreen-button;
    display: flex;
    flex: none;
    border: none;
    box-sizing: border-box;
    width: 30px;
    height: 30px;
    line-height: 30px;
    margin-left: -5px;
    margin-right: 9px;
    padding: 0;
    background-color: initial;
    border: initial;
    color: inherit;
}



audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button {
    -webkit-appearance: media-toggle-closed-captions-button;
    display: flex;
    flex: none;
    border: none;
    box-sizing: border-box;
    width: 30px;
    height: 30px;
    line-height: 30px;
    margin-left: -5px;
    margin-right: 9px;
    padding: 0;
    background-color: initial;
    border: initial;
    color: inherit;
}


    border: initial;
    color: inherit;
}

audio::-webkit-media-controls-fullscreen-volume-slider, video::-webkit-media-controls-fullscreen-volume-slider {
    display: none;
}

audio::-webkit-media-controls-fullscreen-volume-min-button, video::-webkit-media-controls-fullscreen-volume-min-button {
    display: none;
}

audio::-webkit-media-controls-fullscreen-volume-max-button, video::-webkit-media-controls-fullscreen-volume-max-button {
    display: none;
}

video::-webkit-media-text-track-container {
    position: relative;
    width: 100%;
    overflow: hidden;
    padding-bottom: 5px;

    font: 22px sans-serif;
    text-align: center;
    color: rgba(255, 255, 255, 1);

    letter-spacing: normal;
    word-spacing: normal;
    text-transform: none;
    text-indent: 0;
    text-decoration: none;
    pointer-events: none;
    -webkit-user-select: none;
    word-break: break-word;

    flex: 1 1;
}

video::cue {
    display: inline;

    background-color: rgba(0, 0, 0, 0.8);
    padding: 2px 2px;
}

video::-webkit-media-text-track-region {
    position: absolute;
    line-height: 5.33vh;
    writing-mode: horizontal-tb;
    background: rgba(0, 0, 0, 0.8);
    color: rgba(255, 255, 255, 1);
    word-wrap: break-word;
    overflow-wrap: break-word;
    overflow: hidden;
}

video::-webkit-media-text-track-region-container {
    position: relative;

    display: flex;
    flex-flow: column;
    flex-direction: column;
}

video::-webkit-media-text-track-region-container.scrolling {
    transition: top 433ms linear;
}


video::-webkit-media-text-track-display {
    position: absolute;
    overflow: hidden;
    white-space: pre-wrap;
    -webkit-box-sizing: border-box;
    flex: 0 0 auto;
}
video::cue(:future) {
    color: gray;
}

video::-webkit-media-text-track-container b {
    font-weight: bold;
}

video::-webkit-media-text-track-container u {
    text-decoration: underline;
}

video::-webkit-media-text-track-container i {
    font-style: italic;
}





#endif

#if !PLATFORM(MAC) && !PLATFORM(EFL) && !PLATFORM(NIX)
void Editor::pasteWithPasteboard(Pasteboard* pasteboard, bool allowPlainText)
{
    RefPtr<Range> range = selectedRange();

        if (enclosingTextFormControl(m_frame.selection().start()))
            Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForClipboard(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
        else {
#if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
            writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
#else
            // FIXME: Convert all other platforms to match Mac and delete this.

            canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
    } else {
        if (HTMLImageElement* imageElement = imageElementFromImageDocument(document())) {
#if (PLATFORM(MAC) && !PLATFORM(IOS)) || PLATFORM(EFL) || PLATFORM(NIX)
            writeImageToPasteboard(*Pasteboard::createForCopyAndPaste(), *imageElement, document().url(), document().title());
#else
            Pasteboard::createForCopyAndPaste()->writeImage(*imageElement, document().url(), document().title());
#endif
        } else {
#if (PLATFORM(MAC) && !PLATFORM(IOS)) || PLATFORM(EFL) || PLATFORM(NIX)
            writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
#else
            // FIXME: Convert all other platforms to match Mac and delete this.

    if (url.isEmpty())
        url = result.absoluteImageURL();

#if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
    writeImageToPasteboard(*Pasteboard::createForCopyAndPaste(), *element, url, result.altDisplayString());
#else
    Pasteboard::createForCopyAndPaste()->writeImage(*element, url, result.altDisplayString());

Lines 409-415 public: a/Source/WebCore/editing/Editor.h_sec1
- a/Source/WebCore/editing/Editor.h -1 / +1 lines
409	PassRefPtr<DocumentFragment> webContentFromPasteboard(Pasteboard&, Range& context, bool allowPlainText, bool& chosePlainText);	409	PassRefPtr<DocumentFragment> webContentFromPasteboard(Pasteboard&, Range& context, bool allowPlainText, bool& chosePlainText);
410	#endif	410	#endif
411		411
412	#if PLATFORM(MAC) \|\| PLATFORM(EFL)	412	#if PLATFORM(MAC) \|\| PLATFORM(EFL) \|\| PLATFORM(NIX)
413	void writeSelectionToPasteboard(Pasteboard&);	413	void writeSelectionToPasteboard(Pasteboard&);
414	void writeImageToPasteboard(Pasteboard&, Element& imageElement, const URL&, const String& title);	414	void writeImageToPasteboard(Pasteboard&, Element& imageElement, const URL&, const String& title);
415	#endif	415	#endif

Lines 33-39 a/Source/WebCore/html/HTMLCanvasElement.h_sec1
- a/Source/WebCore/html/HTMLCanvasElement.h -1 / +1 lines
33	#include "IntSize.h"	33	#include "IntSize.h"
34	#include <wtf/Forward.h>	34	#include <wtf/Forward.h>
35		35
36	#if USE(CG)	36	#if USE(CG) \|\| PLATFORM(NIX)
37	#define DefaultInterpolationQuality InterpolationLow	37	#define DefaultInterpolationQuality InterpolationLow
38	#else	38	#else
39	#define DefaultInterpolationQuality InterpolationDefault	39	#define DefaultInterpolationQuality InterpolationDefault

Lines 77-84 namespace WebCore { a/Source/WebCore/platform/Cursor.h_sec1
- a/Source/WebCore/platform/Cursor.h -1 / +3 lines
77	typedef NSCursor *PlatformCursor;	77	typedef NSCursor *PlatformCursor;
78	#elif PLATFORM(GTK)	78	#elif PLATFORM(GTK)
79	typedef GRefPtr<GdkCursor> PlatformCursor;	79	typedef GRefPtr<GdkCursor> PlatformCursor;
80	#elif PLATFORM(EFL) \|\| PLATFORM(NIX)	80	#elif PLATFORM(EFL)
81	typedef const char* PlatformCursor;	81	typedef const char* PlatformCursor;
		82	#elif PLATFORM(NIX)
		83	typedef unsigned PlatformCursor;
82	#elif PLATFORM(BLACKBERRY)	84	#elif PLATFORM(BLACKBERRY)
83	typedef BlackBerry::Platform::BlackBerryCursor PlatformCursor;	85	typedef BlackBerry::Platform::BlackBerryCursor PlatformCursor;
84	#else	86	#else

Lines 184-190 private: a/Source/WebCore/platform/audio/FFTFrame.h_sec1
- a/Source/WebCore/platform/audio/FFTFrame.h -1 lines
184	#endif // USE(WEBAUDIO_IPP)	184	#endif // USE(WEBAUDIO_IPP)
185		185
186	#if PLATFORM(NIX)	186	#if PLATFORM(NIX)
187	void scalePlanarData(float scale);
188	OwnPtr<Nix::FFTFrame> m_fftFrame;	187	OwnPtr<Nix::FFTFrame> m_fftFrame;
189	#endif // PLATFORM(NIX)	188	#endif // PLATFORM(NIX)
190		189

Lines 30-35 a/Source/WebCore/platform/audio/nix/AudioBusNix.cpp_sec1
- a/Source/WebCore/platform/audio/nix/AudioBusNix.cpp -2 / +6 lines
30	#include "AudioBus.h"	30	#include "AudioBus.h"
31		31
32	#include "AudioFileReader.h"	32	#include "AudioFileReader.h"
		33	#include "FileSystem.h"
33	#include <cstdio>	34	#include <cstdio>
34	#include <public/MultiChannelPCMData.h>	35	#include <public/MultiChannelPCMData.h>
35	#include <public/Platform.h>	36	#include <public/Platform.h>
Lines 53-61 PassRefPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, float samp a/Source/WebCore/platform/audio/nix/AudioBusNix.cpp_sec2
53	{	54	{
54	// FIXME: This assumes the file system uses latin1 or UTF-8 encoding, but this comment also assumes	55	// FIXME: This assumes the file system uses latin1 or UTF-8 encoding, but this comment also assumes
55	// that non-ascii file names would appear here.	56	// 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());
57	struct stat statData;	58	struct stat statData;
58	if (::stat(absoluteFilename.data(), &statData) == -1)	59	if (::stat(absoluteFilename.data(), &statData) == -1)
		60	absoluteFilename = makeString(UNINSTALLED_AUDIO_RESOURCES_DIR, "/", name, ".wav").utf8();
		61	if (::stat(absoluteFilename.data(), &statData) == -1)
59	return nullptr;	62	return nullptr;
60		63
61	FILE* file = fopen(absoluteFilename.data(), "rb");	64	FILE* file = fopen(absoluteFilename.data(), "rb");
Lines 64-70 PassRefPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, float samp a/Source/WebCore/platform/audio/nix/AudioBusNix.cpp_sec3
64		67
65	WTF::Vector<char> fileContents;	68	WTF::Vector<char> fileContents;
66	fileContents.resize(statData.st_size);	69	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);
68	fclose(file);	71	fclose(file);
69	if (bytesRead < fileContents.size())	72	if (bytesRead < fileContents.size())
70	fileContents.resize(bytesRead);	73	fileContents.resize(bytesRead);
Lines 88-90 PassRefPtr<AudioBus> createBusFromInMemoryAudioFile(const void* data, size_t dat a/Source/WebCore/platform/audio/nix/AudioBusNix.cpp_sec4
88	} // namespace WebCore	91	} // namespace WebCore
89		92
90	#endif // ENABLE(WEB_AUDIO)	93	#endif // ENABLE(WEB_AUDIO)
		94

Lines 25-31 a/Source/WebCore/platform/graphics/GLContext.h_sec1
- a/Source/WebCore/platform/graphics/GLContext.h -1 / +1 lines
25	#include <wtf/Noncopyable.h>	25	#include <wtf/Noncopyable.h>
26	#include <wtf/PassOwnPtr.h>	26	#include <wtf/PassOwnPtr.h>
27		27
28	#if USE(EGL) && !PLATFORM(GTK)	28	#if USE(EGL) && !PLATFORM(GTK) && !PLATFORM(NIX)
29	#include "eglplatform.h"	29	#include "eglplatform.h"
30	typedef EGLNativeWindowType GLNativeWindowType;	30	typedef EGLNativeWindowType GLNativeWindowType;
31	#else	31	#else



 * Copyright (C) 2008 Kenneth Rohde Christiansen
 * Copyright (C) 2009-2010 ProFUSION embedded systems
 * Copyright (C) 2009-2010 Samsung Electronics
 * Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
 *
 * All rights reserved.
 *

#include "config.h"
#include "Cursor.h"

#include "NotImplemented.h"

namespace WebCore {

Cursor::Cursor(const Cursor& other)

    return *this;
}

static const char* cursorString(Cursor::Type type)
{
    static const char* cursorStrings[] = {
        "cursor/pointer",
        "cursor/cross",
        "cursor/hand",
        "cursor/i_beam",
        "cursor/wait",
        "cursor/help",
        "cursor/east_resize",
        "cursor/north_resize",
        "cursor/north_east_resize",
        "cursor/north_west_resize",
        "cursor/south_resize",
        "cursor/south_east_resize",
        "cursor/south_west_resize",
        "cursor/west_resize",
        "cursor/north_south_resize",
        "cursor/east_west_resize",
        "cursor/north_east_south_west_resize",
        "cursor/north_west_south_east_resize",
        "cursor/column_resize",
        "cursor/row_resize",
        "cursor/middle_panning",
        "cursor/east_panning",
        "cursor/north_panning",
        "cursor/north_east_panning",
        "cursor/north_west_panning",
        "cursor/south_panning",
        "cursor/south_east_panning",
        "cursor/south_west_panning",
        "cursor/west_panning",
        "cursor/move",
        "cursor/vertical_text",
        "cursor/cell",
        "cursor/context_menu",
        "cursor/alias",
        "cursor/progress",
        "cursor/no_drop",
        "cursor/copy",
        "cursor/none",
        "cursor/not_allowed",
        "cursor/zoom_in",
        "cursor/zoom_out",
        "cursor/grab",
        "cursor/grabbing",
        ""}; // FIXME: Just return "" for custom type. We don't support it now.
    return cursorStrings[type];
}

void Cursor::ensurePlatformCursor() const
{
    if (m_platformCursor)
        return;
    m_platformCursor = m_type;
}

} // namespace WebCore


Lines 1-5 a/Source/WebCore/platform/nix/GamepadsNix.cpp_sec1
- a/Source/WebCore/platform/nix/GamepadsNix.cpp -3 / +5 lines
1	/*	1	/*
2	* Copyright (C) 2011, Google Inc. All rights reserved.	2	* Copyright (C) 2011, Google Inc. All rights reserved.
		3	* Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
3	*	4	*
4	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
Lines 47-53 void sampleGamepads(GamepadList* into) a/Source/WebCore/platform/nix/GamepadsNix.cpp_sec2
47	RefPtr<Gamepad> gamepad = into->item(i);	48	RefPtr<Gamepad> gamepad = into->item(i);
48	if (!gamepad)	49	if (!gamepad)
49	gamepad = Gamepad::create();	50	gamepad = Gamepad::create();
50	gamepad->id(nixGamepad.id);	51	gamepad->id(String::fromUTF8(nixGamepad.id));
51	gamepad->index(i);	52	gamepad->index(i);
52	gamepad->timestamp(nixGamepad.timestamp);	53	gamepad->timestamp(nixGamepad.timestamp);
53	gamepad->axes(nixGamepad.axesLength, nixGamepad.axes);	54	gamepad->axes(nixGamepad.axesLength, nixGamepad.axes);
Lines 58-63 void sampleGamepads(GamepadList* into) a/Source/WebCore/platform/nix/GamepadsNix.cpp_sec3
58	}	59	}
59	}	60	}
60		61
61	}	62	} // namespace WebCore
		63
		64	#endif // ENABLE(GAMEPAD)
62		65
63	#endif



/*
 * Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions

#include "config.h"
#include "RenderThemeNix.h"

#include "HTMLMediaElement.h"
#include "InputTypeNames.h"
#include "PaintInfo.h"
#include "PlatformContextCairo.h"

#include "HTMLMeterElement.h"
#include "RenderMeter.h"
#endif
#include "UserAgentStyleSheets.h"

namespace WebCore {

static const unsigned defaultButtonBackgroundColor = 0xffdddddd;

static void setSizeIfAuto(RenderStyle* style, const IntSize& size)
{
    if (style->width().isIntrinsicOrAuto())

        style->setHeight(Length(size.height(), Fixed));
}

Color toColor(const Nix::Color& color)
{
    return WebCore::Color(RGBA32(color));
}

static Nix::ThemeEngine* themeEngine()
{
    return Nix::Platform::current()->themeEngine();

    return info.context->platformContext()->cr();
}

static IntSize toIntSize(const Nix::Size& size)
{
    return IntSize(size.width, size.height);
}

static Nix::Rect toNixRect(const IntRect& rect)
{
    return Nix::Rect(rect.x(), rect.y(), rect.width(), rect.height());
}

PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page*)
{
    return RenderThemeNix::create();


Color RenderThemeNix::platformActiveSelectionBackgroundColor() const
{
    return themeEngine()->activeSelectionBackgroundColor().argb32();
}

Color RenderThemeNix::platformInactiveSelectionBackgroundColor() const
{
    return themeEngine()->inactiveSelectionBackgroundColor().argb32();
}

Color RenderThemeNix::platformActiveSelectionForegroundColor() const
{
    return themeEngine()->activeSelectionForegroundColor().argb32();
}

Color RenderThemeNix::platformInactiveSelectionForegroundColor() const
{
    return themeEngine()->inactiveSelectionForegroundColor().argb32();
}

Color RenderThemeNix::platformActiveListBoxSelectionBackgroundColor() const
{
    return themeEngine()->activeListBoxSelectionBackgroundColor().argb32();
}

Color RenderThemeNix::platformInactiveListBoxSelectionBackgroundColor() const
{
    return themeEngine()->inactiveListBoxSelectionBackgroundColor().argb32();
}

Color RenderThemeNix::platformActiveListBoxSelectionForegroundColor() const
{
    return themeEngine()->activeListBoxSelectionForegroundColor().argb32();
}

Color RenderThemeNix::platformInactiveListBoxSelectionForegroundColor() const
{
    return themeEngine()->inactiveListBoxSelectionForegroundColor().argb32();
}

Color RenderThemeNix::platformActiveTextSearchHighlightColor() const
{
    return themeEngine()->activeTextSearchHighlightColor().argb32();
}

Color RenderThemeNix::platformInactiveTextSearchHighlightColor() const
{
    return themeEngine()->inactiveTextSearchHighlightColor().argb32();
}

Color RenderThemeNix::platformFocusRingColor() const
{
    return themeEngine()->focusRingColor().argb32();
}

#if ENABLE(TOUCH_EVENTS)
Color RenderThemeNix::platformTapHighlightColor() const
{
    return themeEngine()->tapHighlightColor().argb32();
}
#endif


    Nix::ThemeEngine::ButtonExtraParams extraParams;
    extraParams.isDefault = isDefault(o);
    extraParams.hasBorder = true;
    themeEngine()->paintButton(webCanvas(i), getWebThemeState(this, o), toNixRect(rect), extraParams);
    if (o->hasBackground())
        extraParams.backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor).rgb();

    themeEngine()->paintButton(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect), extraParams);
    return false;
}


{
    // WebThemeEngine does not handle border rounded corner and background image
    // so return true to draw CSS border and background.
    if (o->style().hasBorderRadius() || o->style().hasBackgroundImage())
        return true;

    themeEngine()->paintTextField(webCanvas(i), getWebThemeState(this, o), toNixRect(rect));
    return false;
}


    extraParams.checked = isChecked(o);
    extraParams.indeterminate = isIndeterminate(o);

    themeEngine()->paintCheckbox(webCanvas(i), getWebThemeState(this, o), toNixRect(rect), extraParams);
    return false;
}


    if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
        return;

    IntSize size = toIntSize(themeEngine()->getCheckboxSize());
    setSizeIfAuto(style, size);
}


    extraParams.checked = isChecked(o);
    extraParams.indeterminate = isIndeterminate(o);

    themeEngine()->paintRadio(webCanvas(i), getWebThemeState(this, o), toNixRect(rect), extraParams);
    return false;
}


    if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
        return;

    IntSize size = toIntSize(themeEngine()->getRadioSize());
    setSizeIfAuto(style, size);
}

bool RenderThemeNix::paintMenuList(RenderObject* o, const PaintInfo& i, const IntRect& rect)
{
    themeEngine()->paintMenuList(webCanvas(i), getWebThemeState(this, o), toNixRect(rect));
    return false;
}


    extraParams.position = renderProgress->position();
    extraParams.animationProgress = renderProgress->animationProgress();
    extraParams.animationStartTime = renderProgress->animationStartTime();
    themeEngine()->paintProgressBar(webCanvas(i), getWebThemeState(this, o), toNixRect(rect), extraParams);

    return false;
}


bool RenderThemeNix::paintSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
{
    themeEngine()->paintSliderTrack(webCanvas(info), getWebThemeState(this, object), toNixRect(rect));
#if ENABLE(DATALIST_ELEMENT)
    paintSliderTicks(object, info, rect);
#endif


bool RenderThemeNix::paintSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
{
    themeEngine()->paintSliderThumb(webCanvas(info), getWebThemeState(this, object), toNixRect(rect));

    return false;
}

    extraParams.spinUp = isSpinUpButtonPartPressed(o);
    extraParams.readOnly = isReadOnlyControl(o);

    themeEngine()->paintInnerSpinButton(webCanvas(i), getWebThemeState(this, o), toNixRect(rect), extraParams);
    return false;
}


    extraParams.high = e->high();
    extraParams.optimum = e->optimum();

    themeEngine()->paintMeter(webCanvas(i), getWebThemeState(this, o), toNixRect(rect), extraParams);

    return false;
}
#endif

#if ENABLE(VIDEO)
String RenderThemeNix::extraMediaControlsStyleSheet()
{
    return String(mediaControlsNixUserAgentStyleSheet, sizeof(mediaControlsNixUserAgentStyleSheet));
}

bool RenderThemeNix::paintMediaPlayButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
{
    auto state = toHTMLMediaElement(o->node()->shadowHost())->canPlay() ? Nix::ThemeEngine::StatePaused : Nix::ThemeEngine::StatePlaying;
    themeEngine()->paintMediaPlayButton(webCanvas(i), state, toNixRect(rect));
    return false;
}

bool RenderThemeNix::paintMediaMuteButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
{
    auto state = toHTMLMediaElement(o->node()->shadowHost())->muted() ? Nix::ThemeEngine::StateMuted : Nix::ThemeEngine::StateNotMuted;
    themeEngine()->paintMediaMuteButton(webCanvas(i), state, toNixRect(rect));
    return false;
}

bool RenderThemeNix::paintMediaSeekBackButton(RenderObject*, const PaintInfo& i, const IntRect& rect)
{
    themeEngine()->paintMediaSeekBackButton(webCanvas(i), toNixRect(rect));
    return false;
}

bool RenderThemeNix::paintMediaSeekForwardButton(RenderObject*, const PaintInfo& i, const IntRect& rect)
{
    themeEngine()->paintMediaSeekForwardButton(webCanvas(i), toNixRect(rect));
    return false;
}

bool RenderThemeNix::paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&)
{
    return false;
}

bool RenderThemeNix::paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&)
{
    return false;
}

bool RenderThemeNix::paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&)
{
    return false;
}

bool RenderThemeNix::paintMediaRewindButton(RenderObject*, const PaintInfo& i, const IntRect& rect)
{
    themeEngine()->paintMediaRewindButton(webCanvas(i), toNixRect(rect));
    return false;
}
#endif // ENABLE(VIDEO)

} // namespace WebCore




/*
 * Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions

    virtual bool paintMeter(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
#endif

#if ENABLE(VIDEO)
    virtual String extraMediaControlsStyleSheet() OVERRIDE;
    virtual bool usesVerticalVolumeSlider() const OVERRIDE { return false; }
    virtual bool usesMediaControlStatusDisplay() OVERRIDE { return true; }
    virtual bool usesMediaControlVolumeSlider() const OVERRIDE { return false; }

    virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
    virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
    virtual bool paintMediaSeekBackButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
    virtual bool paintMediaSeekForwardButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
    virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
    virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
    virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
    virtual bool paintMediaRewindButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
#endif

    virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
    virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const OVERRIDE;


    RenderThemeNix();
};

} // namespace WebCore

#endif // RenderThemeNix_h

Lines 90-96 static bool canUseForText(const RenderText& textRenderer, const SimpleFontData& a/Source/WebCore/rendering/SimpleLineLayout.cpp_sec1
- a/Source/WebCore/rendering/SimpleLineLayout.cpp -1 / +1 lines
90		90
91	bool canUseFor(const RenderBlockFlow& flow)	91	bool canUseFor(const RenderBlockFlow& flow)
92	{	92	{
93	#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)	93	#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(NIX)
94	// FIXME: Non-mac platforms are hitting ASSERT(run.charactersLength() >= run.length())	94	// FIXME: Non-mac platforms are hitting ASSERT(run.charactersLength() >= run.length())
95	// https://bugs.webkit.org/show_bug.cgi?id=123338	95	// https://bugs.webkit.org/show_bug.cgi?id=123338
96	return false;	96	return false;

Return to Bug 124981

Lines 435-441 String Editor::plainTextFromPasteboard(const PasteboardPlainText& text) a/Source/WebCore/editing/Editor.cpp_sec1
- a/Source/WebCore/editing/Editor.cpp -5 / +5 lines
435		435
436	#endif	436	#endif
437		437
438	#if !PLATFORM(MAC) && !PLATFORM(EFL)	438	#if !PLATFORM(MAC) && !PLATFORM(EFL) && !PLATFORM(NIX)
439	void Editor::pasteWithPasteboard(Pasteboard* pasteboard, bool allowPlainText)	439	void Editor::pasteWithPasteboard(Pasteboard* pasteboard, bool allowPlainText)
440	{	440	{
441	RefPtr<Range> range = selectedRange();	441	RefPtr<Range> range = selectedRange();
Lines 1061-1067 void Editor::cut() a/Source/WebCore/editing/Editor.cpp_sec2
1061	if (enclosingTextFormControl(m_frame.selection().start()))	1061	if (enclosingTextFormControl(m_frame.selection().start()))
1062	Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForClipboard(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);	1062	Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForClipboard(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
1063	else {	1063	else {
1064	#if PLATFORM(MAC) \|\| PLATFORM(EFL)	1064	#if PLATFORM(MAC) \|\| PLATFORM(EFL) \|\| PLATFORM(NIX)
1065	writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());	1065	writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
1066	#else	1066	#else
1067	// FIXME: Convert all other platforms to match Mac and delete this.	1067	// FIXME: Convert all other platforms to match Mac and delete this.
Lines 1088-1100 void Editor::copy() a/Source/WebCore/editing/Editor.cpp_sec3
1088	canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);	1088	canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
1089	} else {	1089	} else {
1090	if (HTMLImageElement* imageElement = imageElementFromImageDocument(document())) {	1090	if (HTMLImageElement* imageElement = imageElementFromImageDocument(document())) {
1091	#if (PLATFORM(MAC) && !PLATFORM(IOS)) \|\| PLATFORM(EFL)	1091	#if (PLATFORM(MAC) && !PLATFORM(IOS)) \|\| PLATFORM(EFL) \|\| PLATFORM(NIX)
1092	writeImageToPasteboard(Pasteboard::createForCopyAndPaste(), imageElement, document().url(), document().title());	1092	writeImageToPasteboard(Pasteboard::createForCopyAndPaste(), imageElement, document().url(), document().title());
1093	#else	1093	#else
1094	Pasteboard::createForCopyAndPaste()->writeImage(*imageElement, document().url(), document().title());	1094	Pasteboard::createForCopyAndPaste()->writeImage(*imageElement, document().url(), document().title());
1095	#endif	1095	#endif
1096	} else {	1096	} else {
1097	#if (PLATFORM(MAC) && !PLATFORM(IOS)) \|\| PLATFORM(EFL)	1097	#if (PLATFORM(MAC) && !PLATFORM(IOS)) \|\| PLATFORM(EFL) \|\| PLATFORM(NIX)
1098	writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());	1098	writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
1099	#else	1099	#else
1100	// FIXME: Convert all other platforms to match Mac and delete this.	1100	// FIXME: Convert all other platforms to match Mac and delete this.
Lines 1197-1203 void Editor::copyImage(const HitTestResult& result) a/Source/WebCore/editing/Editor.cpp_sec4
1197	if (url.isEmpty())	1197	if (url.isEmpty())
1198	url = result.absoluteImageURL();	1198	url = result.absoluteImageURL();
1199		1199
1200	#if PLATFORM(MAC) \|\| PLATFORM(EFL)	1200	#if PLATFORM(MAC) \|\| PLATFORM(EFL) \|\| PLATFORM(NIX)
1201	writeImageToPasteboard(Pasteboard::createForCopyAndPaste(), element, url, result.altDisplayString());	1201	writeImageToPasteboard(Pasteboard::createForCopyAndPaste(), element, url, result.altDisplayString());
1202	#else	1202	#else
1203	Pasteboard::createForCopyAndPaste()->writeImage(*element, url, result.altDisplayString());	1203	Pasteboard::createForCopyAndPaste()->writeImage(*element, url, result.altDisplayString());

Lines 1-5 a/Source/WebCore/platform/nix/RenderThemeNix.h_sec1
- a/Source/WebCore/platform/nix/RenderThemeNix.h -2 / +18 lines
1	/*	1	/*
2	* Copyright (C) 2012-2013 Nokia Corporation and/or its subsidiary(-ies).	2	* Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
3	*	3	*
4	* Redistribution and use in source and binary forms, with or without	4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions	5	* modification, are permitted provided that the following conditions
Lines 103-108 protected: a/Source/WebCore/platform/nix/RenderThemeNix.h_sec2
103	virtual bool paintMeter(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;	103	virtual bool paintMeter(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
104	#endif	104	#endif
105		105
		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
106	virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;	122	virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
107	virtual void adjustSliderTrackStyle(StyleResolver, RenderStyle, Element*) const OVERRIDE;	123	virtual void adjustSliderTrackStyle(StyleResolver, RenderStyle, Element*) const OVERRIDE;
108		124
Lines 123-128 private: a/Source/WebCore/platform/nix/RenderThemeNix.h_sec3
123	RenderThemeNix();	139	RenderThemeNix();
124	};	140	};
125		141
126	}	142	} // namespace WebCore
127		143
128	#endif // RenderThemeNix_h	144	#endif // RenderThemeNix_h

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +102 lines
		1	2013-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 NOBODY (OOPS!).
		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
1	2013-12-03 Alexey Proskuryakov <ap@apple.com>	103	2013-12-03 Alexey Proskuryakov <ap@apple.com>
2		104
3	Support exporting private WebCrypto RSA keys	105	Support exporting private WebCrypto RSA keys

Lines 4-27 list(APPEND WebCore_INCLUDE_DIRECTORIES a/Source/WebCore/PlatformNix.cmake_sec1
- a/Source/WebCore/PlatformNix.cmake -44 / +10 lines
4	"${WEBCORE_DIR}/platform/graphics/cairo"	4	"${WEBCORE_DIR}/platform/graphics/cairo"
5	"${WEBCORE_DIR}/platform/graphics/freetype"	5	"${WEBCORE_DIR}/platform/graphics/freetype"
6	"${WEBCORE_DIR}/platform/graphics/glx"	6	"${WEBCORE_DIR}/platform/graphics/glx"
7	"${WEBCORE_DIR}/platform/graphics/harfbuzz/"
8	"${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
9	"${WEBCORE_DIR}/platform/graphics/nix"	7	"${WEBCORE_DIR}/platform/graphics/nix"
10	"${WEBCORE_DIR}/platform/graphics/opengl"	8	"${WEBCORE_DIR}/platform/graphics/opengl"
11	"${WEBCORE_DIR}/platform/graphics/opentype"	9	"${WEBCORE_DIR}/platform/graphics/opentype"
12	"${WEBCORE_DIR}/platform/graphics/surfaces"	10	"${WEBCORE_DIR}/platform/graphics/surfaces"
13	"${WEBCORE_DIR}/platform/graphics/texmap"
14	"${WEBCORE_DIR}/platform/linux"	11	"${WEBCORE_DIR}/platform/linux"
15	"${WEBCORE_DIR}/platform/mediastream/gstreamer"	12	"${WEBCORE_DIR}/platform/mediastream/gstreamer"
16	"${PLATFORM_DIR}/nix/"	13	"${PLATFORM_DIR}/nix/"
17	)	14	)
18		15
19	list(APPEND WebCore_SOURCES	16	list(APPEND WebCore_SOURCES
20	css/WebKitCSSArrayFunctionValue.cpp
21	css/WebKitCSSMatFunctionValue.cpp
22	css/WebKitCSSMatrix.cpp
23	css/WebKitCSSMixFunctionValue.cpp
24
25	editing/SmartReplaceICU.cpp	17	editing/SmartReplaceICU.cpp
26		18
27	editing/nix/EditorNix.cpp	19	editing/nix/EditorNix.cpp
Lines 35-46 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformNix.cmake_sec2
35	platform/ContextMenuItemNone.cpp	27	platform/ContextMenuItemNone.cpp
36	platform/ContextMenuNone.cpp	28	platform/ContextMenuNone.cpp
37	platform/Cursor.cpp	29	platform/Cursor.cpp
38	platform/LocalizedStrings.cpp
39	platform/PlatformStrategies.cpp
40		30
41	platform/cairo/WidgetBackingStoreCairo.cpp	31	platform/cairo/WidgetBackingStoreCairo.cpp
42		32
43	platform/graphics/ImageSource.cpp
44	platform/graphics/OpenGLShims.cpp	33	platform/graphics/OpenGLShims.cpp
45	platform/graphics/WOFFFileFormat.cpp	34	platform/graphics/WOFFFileFormat.cpp
46		35
Lines 64-72 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformNix.cmake_sec3
64	platform/graphics/cairo/TiledBackingStoreBackendCairo.cpp	53	platform/graphics/cairo/TiledBackingStoreBackendCairo.cpp
65	platform/graphics/cairo/TransformationMatrixCairo.cpp	54	platform/graphics/cairo/TransformationMatrixCairo.cpp
66		55
67	platform/graphics/filters/CustomFilterMeshGenerator.cpp
68	platform/graphics/filters/CustomFilterValidatedProgram.cpp
69
70	platform/graphics/freetype/FontCacheFreeType.cpp	56	platform/graphics/freetype/FontCacheFreeType.cpp
71	platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp	57	platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
72	platform/graphics/freetype/FontPlatformDataFreeType.cpp	58	platform/graphics/freetype/FontPlatformDataFreeType.cpp
Lines 93-116 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformNix.cmake_sec4
93	platform/gtk/LoggingGtk.cpp	79	platform/gtk/LoggingGtk.cpp
94	platform/gtk/SharedBufferGtk.cpp	80	platform/gtk/SharedBufferGtk.cpp
95		81
96	platform/image-decoders/ImageDecoder.cpp
97
98	platform/image-decoders/bmp/BMPImageDecoder.cpp
99	platform/image-decoders/bmp/BMPImageReader.cpp
100
101	platform/image-decoders/cairo/ImageDecoderCairo.cpp	82	platform/image-decoders/cairo/ImageDecoderCairo.cpp
102		83
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
113
114	platform/linux/GamepadDeviceLinux.cpp	84	platform/linux/GamepadDeviceLinux.cpp
115		85
116	platform/nix/CursorNix.cpp	86	platform/nix/CursorNix.cpp
Lines 139-155 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformNix.cmake_sec5
139		109
140	platform/text/nix/TextBreakIteratorInternalICUNix.cpp	110	platform/text/nix/TextBreakIteratorInternalICUNix.cpp
141		111
142	plugins/PluginDatabase.cpp
143	plugins/PluginDebug.cpp
144	plugins/PluginPackage.cpp	112	plugins/PluginPackage.cpp
145	plugins/PluginPackageNone.cpp	113	plugins/PluginPackageNone.cpp
146	plugins/PluginStream.cpp
147	plugins/PluginView.cpp
148	plugins/PluginViewNone.cpp	114	plugins/PluginViewNone.cpp
149
150	rendering/style/StyleCachedShader.cpp
151	rendering/style/StyleCustomFilterProgram.cpp
152	rendering/style/StyleCustomFilterProgramCache.cpp
153	)	115	)
154		116
155	if (WTF_USE_OPENGL_ES_2)	117	if (WTF_USE_OPENGL_ES_2)
Lines 186-193 if (WTF_USE_EGL) a/Source/WebCore/PlatformNix.cmake_sec6
186	list(APPEND WebCore_LIBRARIES ${EGL_LIBRARY})	148	list(APPEND WebCore_LIBRARIES ${EGL_LIBRARY})
187	else ()	149	else ()
188	list(APPEND WebCore_INCLUDE_DIRECTORIES	150	list(APPEND WebCore_INCLUDE_DIRECTORIES
189	platform/graphics/surfaces/glx
190	platform/graphics/surfaces/efl	151	platform/graphics/surfaces/efl
		152	platform/graphics/surfaces/glx
191	${X11_X11_INCLUDE_PATH}	153	${X11_X11_INCLUDE_PATH}
192	)	154	)
193	list(APPEND WebCore_SOURCES	155	list(APPEND WebCore_SOURCES
Lines 226-232 list(APPEND WebCore_USER_AGENT_STYLE_SHEETS a/Source/WebCore/PlatformNix.cmake_sec7
226	list(APPEND WebCore_LIBRARIES	188	list(APPEND WebCore_LIBRARIES
227	${CAIRO_LIBRARIES}	189	${CAIRO_LIBRARIES}
228	${FONTCONFIG_LIBRARIES}	190	${FONTCONFIG_LIBRARIES}
229	${FREETYPE_LIBRARIES}	191	${FREETYPE2_LIBRARIES}
230	${GLIB_GIO_LIBRARIES}	192	${GLIB_GIO_LIBRARIES}
231	${GLIB_GMODULE_LIBRARIES}	193	${GLIB_GMODULE_LIBRARIES}
232	${GLIB_GOBJECT_LIBRARIES}	194	${GLIB_GOBJECT_LIBRARIES}
Lines 242-256 list(APPEND WebCore_LIBRARIES a/Source/WebCore/PlatformNix.cmake_sec8
242	)	204	)
243		205
244	list(APPEND WebCore_INCLUDE_DIRECTORIES	206	list(APPEND WebCore_INCLUDE_DIRECTORIES
245	${FONTCONFIG_INCLUDE_DIR}
246	${CAIRO_INCLUDE_DIRS}	207	${CAIRO_INCLUDE_DIRS}
247	${FREETYPE_INCLUDE_DIRS}	208	${FONTCONFIG_INCLUDE_DIR}
		209	${FREETYPE2_INCLUDE_DIRS}
		210	${GLIB_INCLUDE_DIRS}
		211	${HARFBUZZ_INCLUDE_DIRS}
248	${LIBXML2_INCLUDE_DIR}	212	${LIBXML2_INCLUDE_DIR}
249	${LIBXSLT_INCLUDE_DIR}	213	${LIBXSLT_INCLUDE_DIR}
250	${SQLITE_INCLUDE_DIR}	214	${SQLITE_INCLUDE_DIR}
251	${GLIB_INCLUDE_DIRS}
252	${ZLIB_INCLUDE_DIRS}	215	${ZLIB_INCLUDE_DIRS}
253	${HARFBUZZ_INCLUDE_DIRS}
254	)	216	)
255		217
256	add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}")	218	add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}")
Lines 284-289 if (WTF_USE_CURL) a/Source/WebCore/PlatformNix.cmake_sec9
284	platform/network/curl/CookieNode.cpp	246	platform/network/curl/CookieNode.cpp
285	platform/network/curl/CookieStorageCurl.cpp	247	platform/network/curl/CookieStorageCurl.cpp
286	platform/network/curl/CredentialStorageCurl.cpp	248	platform/network/curl/CredentialStorageCurl.cpp
		249	platform/network/curl/CurlCacheEntry.cpp
		250	platform/network/curl/CurlCacheManager.cpp
287	platform/network/curl/DNSCurl.cpp	251	platform/network/curl/DNSCurl.cpp
288	platform/network/curl/FormDataStreamCurl.cpp	252	platform/network/curl/FormDataStreamCurl.cpp
289	platform/network/curl/MultipartHandle.cpp	253	platform/network/curl/MultipartHandle.cpp
Lines 291-302 if (WTF_USE_CURL) a/Source/WebCore/PlatformNix.cmake_sec10
291	platform/network/curl/ProxyServerCurl.cpp	255	platform/network/curl/ProxyServerCurl.cpp
292	platform/network/curl/ResourceHandleCurl.cpp	256	platform/network/curl/ResourceHandleCurl.cpp
293	platform/network/curl/ResourceHandleManager.cpp	257	platform/network/curl/ResourceHandleManager.cpp
		258	platform/network/curl/SSLHandle.cpp
294	platform/network/curl/SocketStreamHandleCurl.cpp	259	platform/network/curl/SocketStreamHandleCurl.cpp
295	platform/network/curl/SynchronousLoaderClientCurl.cpp	260	platform/network/curl/SynchronousLoaderClientCurl.cpp
296	)	261	)
297		262
298	list(APPEND WebCore_LIBRARIES	263	list(APPEND WebCore_LIBRARIES
299	${CURL_LIBRARIES}	264	${CURL_LIBRARIES}
		265	${OPENSSL_LIBRARIES}
300	)	266	)
301	else ()	267	else ()
302	list(APPEND WebCore_SOURCES	268	list(APPEND WebCore_SOURCES

Lines 1-7 a/Source/WebCore/css/mediaControlsNix.css_sec1
- a/Source/WebCore/css/mediaControlsNix.css -74 / +266 lines
1	/*	1	/*
2	* Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.	2	* Copyright (C) 2009 Apple Inc. All rights reserved.
3	* Copyright (C) 2011 Samsung Electronics	3	* Copyright (C) 2009 Google Inc.
4	* Copyright (C) 2012-2013 Nokia Corporation and/or its subsidiary(-ies).	4	* Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
5	*	5	*
6	* Redistribution and use in source and binary forms, with or without	6	* Redistribution and use in source and binary forms, with or without
7	* modification, are permitted provided that the following conditions	7	* modification, are permitted provided that the following conditions
Lines 24-150 a/Source/WebCore/css/mediaControlsNix.css_sec2
24	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	24	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25	*/	25	*/
26		26
27	/* NixWebKit media controls. Extends mediaControls.css */	27	/* Nix default media controls */
28		28
29	audio {	29	audio {
30	width: 300px;	30	width: 300px;
31	height: 20px;	31	height: 30px;
		32	}
		33
		34	audio::-webkit-media-controls,
		35	video::-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
		46	audio::-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
		57	video::-webkit-media-controls-enclosure {
		58	padding: 0px 5px 5px 5px;
		59	height: 35px;
		60	flex-shrink: 0;
32	}	61	}
33		62
34	audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {	63	audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
35	display: -webkit-box;	64	display: flex;
36	-webkit-box-orient: horizontal;	65	flex-direction: row;
37	-webkit-box-align: center;	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;
38	-webkit-user-select: none;	71	-webkit-user-select: none;
39	position: relative;	72	position: relative;
40	bottom: 0;
41	width: 100%;	73	width: 100%;
42	z-index: 0;	74	z-index: 0;
43	overflow: hidden;	75	overflow: hidden;
44	height: 20px;
45	text-align: right;	76	text-align: right;
		77	bottom: auto;
		78	height: 30px;
		79	background-color: rgba(20, 20, 20, 0.8);
		80	border-radius: 5px;
		81	}
		82
		83	video:-webkit-full-page-media {
		84	margin: auto;
		85	position: absolute;
		86	top: 0;
		87	right: 0;
		88	bottom: 0;
		89	left: 0;
46	}	90	}
47		91
		92	audio:-webkit-full-page-media, video:-webkit-full-page-media {
		93	max-height: 100%;
		94	max-width: 100%;
		95	}
		96
		97	audio:-webkit-full-page-media::-webkit-media-controls-panel,
48	video:-webkit-full-page-media::-webkit-media-controls-panel {	98	video:-webkit-full-page-media::-webkit-media-controls-panel {
49	bottom: 0px;	99	bottom: 0px;
50	}	100	}
51		101
52	audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {	102	audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
53	-webkit-appearance: media-mute-button;	103	-webkit-appearance: media-mute-button;
54	display: -webkit-box;	104	display: flex;
55	width: 20px;	105	flex: none;
56	height: 20px;	106	border: none;
57	position: relative;	107	box-sizing: border-box;
58	z-index: 2;	108	width: 35px;
		109	height: 30px;
		110	line-height: 30px;
		111	margin: 0 6px 0 0;
		112	padding: 0;
59	background-color: initial;	113	background-color: initial;
60	border: initial;
61	color: inherit;	114	color: inherit;
62	}	115	}
63		116
		117	audio::-webkit-media-controls-overlay-play-button, video::-webkit-media-controls-overlay-play-button {
		118	display: none;
		119	}
		120
64	audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {	121	audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
65	-webkit-appearance: media-play-button;	122	-webkit-appearance: media-play-button;
66	display: -webkit-box;	123	display: flex;
67	width: 20px;	124	flex: none;
68	height: 20px;	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;
69	background-color: initial;	133	background-color: initial;
70	border: initial;
71	color: inherit;	134	color: inherit;
72	}	135	}
73		136
74	audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container {	137	audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container {
75	-webkit-appearance: media-controls-background;	138	-webkit-appearance: media-controls-background;
76	display: -webkit-box;	139	display: flex;
77	-webkit-box-orient: horizontal;	140	flex-direction: row;
78	-webkit-box-align: center;	141	align-items: center;
79	-webkit-box-pack: end;	142	justify-content: flex-end;
80	-webkit-box-flex: 1;	143	flex: 1 1;
81	-webkit-user-select: none;	144	-webkit-user-select: none;
82	height: 20px;	145	height: 16px;
		146	min-width: 0;
83	}	147	}
84		148
85	audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display {	149	audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display,
		150	audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display {
86	-webkit-appearance: media-current-time-display;	151	-webkit-appearance: media-current-time-display;
87	-webkit-user-select: none;	152	-webkit-user-select: none;
88	display: -webkit-box;	153	-webkit-flex: none;
89	height: 20px;	154	display: -webkit-flex;
		155	border: none;
		156	cursor: default;
90		157
91	padding: 4px;	158	height: 30px;
		159	margin: 0 9px 0 0;
		160	padding: 0;
92		161
93	text-align: center;	162	line-height: 30px;
94	font-size: 10px;	163	font-family: Arial, Helvetica, sans-serif;
		164	font-size: 13px;
		165	font-weight: bold;
		166	font-style: normal;
		167	color: white;
95		168
96	color: black;
97	letter-spacing: normal;	169	letter-spacing: normal;
98	word-spacing: normal;	170	word-spacing: normal;
99	line-height: normal;	171	text-align: center
100	text-transform: none;	172	text-transform: none;
101	text-indent: 0;	173	text-indent: 0;
102	text-shadow: none;	174	text-shadow: none;
103	text-decoration: none;	175	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;
111	}	176	}
112		177
113	audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {	178	audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
114	-webkit-appearance: media-slider;	179	-webkit-appearance: media-slider;
115	display: -webkit-box;	180	display: flex;
116	-webkit-box-flex: 1;	181	flex: 1 1 auto;
117	height: 20px;	182	height: 8px;
118	padding: 0px 2px;	183	margin: 0 15px 0 0;
119	background-color: initial;	184	padding: 0;
		185	background-color: black;
		186	min-width: 25px;
120	border: initial;	187	border: initial;
		188	border-radius: 4px;
121	color: inherit;	189	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;
132	}	190	}
133		191
134	audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider {	192	audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider {
135	-webkit-appearance: media-volume-slider;	193	-webkit-appearance: media-volume-slider;
136	display: none;	194	display: flex;
137	background-color: initial;	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;
138	border: initial;	204	border: initial;
139	color: inherit;	205	color: inherit;
140	margin: initial;	206	background-color: black;
		207	border-radius: 4px;
		208	}
		209
		210	input[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. */
		223	input[type="range"]::-webkit-media-slider-container > div {
		224	margin-right: -14px;
		225	}
		226
		227	input[type="range"]::-webkit-media-slider-thumb {
		228	margin-left: -7px;
		229	margin-right: -7px;
		230	background-color: white;
		231	border-radius: 3px;
141	}	232	}
142		233
143	audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button {	234	audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button {
144	-webkit-appearance: media-seek-back-button;	235	-webkit-appearance: media-seek-back-button;
145	display: -webkit-box;	236	display: flex;
146	width: 20px;	237	width: 16px;
147	height: 20px;	238	height: 16px;
148	background-color: initial;	239	background-color: initial;
149	border: initial;	240	border: initial;
150	color: inherit;	241	color: inherit;
Lines 152-172 audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-se a/Source/WebCore/css/mediaControlsNix.css_sec3
152		243
153	audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button {	244	audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button {
154	-webkit-appearance: media-seek-forward-button;	245	-webkit-appearance: media-seek-forward-button;
155	display: -webkit-box;	246	display: flex;
156	width: 20px;	247	width: 16px;
157	height: 20px;	248	height: 16px;
158	background-color: initial;	249	background-color: initial;
159	border: initial;	250	border: initial;
160	color: inherit;	251	color: inherit;
161	}	252	}
162		253
163	audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button {	254	audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button {
164	-webkit-appearance: media-fullscreen-button;	255	-webkit-appearance: media-enter-fullscreen-button;
165	display: -webkit-box;	256	display: flex;
166	width: 20px;	257	flex: none;
167	height: 20px;	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;
168	background-color: initial;	266	background-color: initial;
169	border: initial;
170	color: inherit;	267	color: inherit;
171	}	268	}
172		269
Lines 186-196 audio::-webkit-media-controls-return-to-realtime-button, video::-webkit-media-co a/Source/WebCore/css/mediaControlsNix.css_sec4
186		283
187	audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button {	284	audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button {
188	-webkit-appearance: media-toggle-closed-captions-button;	285	-webkit-appearance: media-toggle-closed-captions-button;
189	display: -webkit-box;	286	display: flex;
190	width: 20px;	287	flex: none;
191	height: 20px;	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;
192	background-color: initial;	296	background-color: initial;
193	border: initial;
194	color: inherit;	297	color: inherit;
195	}	298	}
196		299
Lines 201-203 audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-co a/Source/WebCore/css/mediaControlsNix.css_sec5
201	border: initial;	304	border: initial;
202	color: inherit;	305	color: inherit;
203	}	306	}
		307
		308	audio::-webkit-media-controls-fullscreen-volume-slider, video::-webkit-media-controls-fullscreen-volume-slider {
		309	display: none;
		310	}
		311
		312	audio::-webkit-media-controls-fullscreen-volume-min-button, video::-webkit-media-controls-fullscreen-volume-min-button {
		313	display: none;
		314	}
		315
		316	audio::-webkit-media-controls-fullscreen-volume-max-button, video::-webkit-media-controls-fullscreen-volume-max-button {
		317	display: none;
		318	}
		319
		320	video::-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
		342	video::cue {
		343	display: inline;
		344
		345	background-color: rgba(0, 0, 0, 0.8);
		346	padding: 2px 2px;
		347	}
		348
		349	video::-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
		360	video::-webkit-media-text-track-region-container {
		361	position: relative;
		362
		363	display: flex;
		364	flex-flow: column;
		365	flex-direction: column;
		366	}
		367
		368	video::-webkit-media-text-track-region-container.scrolling {
		369	transition: top 433ms linear;
		370	}
371
372
373	video::-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	}
380	video::cue(:future) {
381	color: gray;
382	}
383
384	video::-webkit-media-text-track-container b {
385	font-weight: bold;
386	}
387
388	video::-webkit-media-text-track-container u {
389	text-decoration: underline;
390	}
391
392	video::-webkit-media-text-track-container i {
393	font-style: italic;
394	}
395

Lines 6-12 a/Source/WebCore/platform/nix/CursorNix.cpp_sec1
- a/Source/WebCore/platform/nix/CursorNix.cpp -55 / +4 lines
6	* Copyright (C) 2008 Kenneth Rohde Christiansen	6	* Copyright (C) 2008 Kenneth Rohde Christiansen
7	* Copyright (C) 2009-2010 ProFUSION embedded systems	7	* Copyright (C) 2009-2010 ProFUSION embedded systems
8	* Copyright (C) 2009-2010 Samsung Electronics	8	* 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).
10	*	10	*
11	* All rights reserved.	11	* All rights reserved.
12	*	12	*
Lines 35-42 a/Source/WebCore/platform/nix/CursorNix.cpp_sec2
35	#include "config.h"	35	#include "config.h"
36	#include "Cursor.h"	36	#include "Cursor.h"
37		37
38	#include "NotImplemented.h"
39
40	namespace WebCore {	38	namespace WebCore {
41		39
42	Cursor::Cursor(const Cursor& other)	40	Cursor::Cursor(const Cursor& other)
Lines 60-120 Cursor& Cursor::operator=(const Cursor& other) a/Source/WebCore/platform/nix/CursorNix.cpp_sec3
60	return *this;	58	return *this;
61	}	59	}
62		60
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
113	void Cursor::ensurePlatformCursor() const	61	void Cursor::ensurePlatformCursor() const
114	{	62	{
115	if (m_platformCursor)	63	if (m_platformCursor)
116	return;	64	return;
117	m_platformCursor = cursorString(m_type);	65	m_platformCursor = m_type;
118	}	66	}
119		67
120	}	68	} // namespace WebCore
		69