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

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160045 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent db06832f
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 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):
2013-12-03 Ralph Thomas <ralpht@gmail.com>
Typo: FixedPositionConstaint -> FixedPositionConstraint
......@@ -4,24 +4,16 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
"${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
......@@ -35,12 +27,9 @@ list(APPEND WebCore_SOURCES
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
......@@ -64,9 +53,6 @@ list(APPEND WebCore_SOURCES
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
......@@ -93,24 +79,8 @@ list(APPEND WebCore_SOURCES
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
......@@ -139,17 +109,9 @@ list(APPEND WebCore_SOURCES
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)
......@@ -186,8 +148,8 @@ if (WTF_USE_EGL)
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
......@@ -226,7 +188,7 @@ list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
list(APPEND WebCore_LIBRARIES
${CAIRO_LIBRARIES}
${FONTCONFIG_LIBRARIES}
${FREETYPE_LIBRARIES}
${FREETYPE2_LIBRARIES}
${GLIB_GIO_LIBRARIES}
${GLIB_GMODULE_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
......@@ -242,15 +204,15 @@ list(APPEND WebCore_LIBRARIES
)
list(APPEND WebCore_INCLUDE_DIRECTORIES
${FONTCONFIG_INCLUDE_DIR}
${CAIRO_INCLUDE_DIRS}
${FREETYPE_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}")
......@@ -284,6 +246,8 @@ if (WTF_USE_CURL)
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
......@@ -291,12 +255,14 @@ if (WTF_USE_CURL)
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
......
This diff is collapsed.
......@@ -435,7 +435,7 @@ String Editor::plainTextFromPasteboard(const PasteboardPlainText& text)
#endif
#if !PLATFORM(MAC) && !PLATFORM(EFL)
#if !PLATFORM(MAC) && !PLATFORM(EFL) && !PLATFORM(NIX)
void Editor::pasteWithPasteboard(Pasteboard* pasteboard, bool allowPlainText)
{
RefPtr<Range> range = selectedRange();
......@@ -1061,7 +1061,7 @@ void Editor::cut()
if (enclosingTextFormControl(m_frame.selection().start()))
Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForClipboard(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
else {
#if PLATFORM(MAC) || PLATFORM(EFL)
#if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
#else
// FIXME: Convert all other platforms to match Mac and delete this.
......@@ -1088,13 +1088,13 @@ void Editor::copy()
canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
} else {
if (HTMLImageElement* imageElement = imageElementFromImageDocument(document())) {
#if (PLATFORM(MAC) && !PLATFORM(IOS)) || PLATFORM(EFL)
#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)
#if (PLATFORM(MAC) && !PLATFORM(IOS)) || PLATFORM(EFL) || PLATFORM(NIX)
writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
#else
// FIXME: Convert all other platforms to match Mac and delete this.
......@@ -1197,7 +1197,7 @@ void Editor::copyImage(const HitTestResult& result)
if (url.isEmpty())
url = result.absoluteImageURL();
#if PLATFORM(MAC) || PLATFORM(EFL)
#if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
writeImageToPasteboard(*Pasteboard::createForCopyAndPaste(), *element, url, result.altDisplayString());
#else
Pasteboard::createForCopyAndPaste()->writeImage(*element, url, result.altDisplayString());
......
......@@ -409,7 +409,7 @@ public:
PassRefPtr<DocumentFragment> webContentFromPasteboard(Pasteboard&, Range& context, bool allowPlainText, bool& chosePlainText);
#endif
#if PLATFORM(MAC) || PLATFORM(EFL)
#if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
void writeSelectionToPasteboard(Pasteboard&);
void writeImageToPasteboard(Pasteboard&, Element& imageElement, const URL&, const String& title);
#endif
......
......@@ -33,7 +33,7 @@
#include "IntSize.h"
#include <wtf/Forward.h>
#if USE(CG)
#if USE(CG) || PLATFORM(NIX)
#define DefaultInterpolationQuality InterpolationLow
#else
#define DefaultInterpolationQuality InterpolationDefault
......
......@@ -77,8 +77,10 @@ namespace WebCore {
typedef NSCursor *PlatformCursor;
#elif PLATFORM(GTK)
typedef GRefPtr<GdkCursor> PlatformCursor;
#elif PLATFORM(EFL) || PLATFORM(NIX)
#elif PLATFORM(EFL)
typedef const char* PlatformCursor;
#elif PLATFORM(NIX)
typedef unsigned PlatformCursor;
#elif PLATFORM(BLACKBERRY)
typedef BlackBerry::Platform::BlackBerryCursor PlatformCursor;
#else
......
......@@ -184,7 +184,6 @@ private:
#endif // USE(WEBAUDIO_IPP)
#if PLATFORM(NIX)
void scalePlanarData(float scale);
OwnPtr<Nix::FFTFrame> m_fftFrame;
#endif // PLATFORM(NIX)
......
......@@ -30,6 +30,7 @@
#include "AudioBus.h"
#include "AudioFileReader.h"
#include "FileSystem.h"
#include <cstdio>
#include <public/MultiChannelPCMData.h>
#include <public/Platform.h>
......@@ -53,8 +54,10 @@ PassRefPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, float samp
{
// FIXME: This assumes the file system uses latin1 or UTF-8 encoding, but this comment also assumes
// that non-ascii file names would appear here.
const CString absoluteFilename(makeString(DATA_DIR, "/webaudio/resources/", name, ".wav").utf8());
CString absoluteFilename(makeString(DATA_DIR, "/webaudio/resources/", name, ".wav").utf8());
struct stat statData;
if (::stat(absoluteFilename.data(), &statData) == -1)
absoluteFilename = makeString(UNINSTALLED_AUDIO_RESOURCES_DIR, "/", name, ".wav").utf8();
if (::stat(absoluteFilename.data(), &statData) == -1)
return nullptr;
......@@ -64,7 +67,7 @@ PassRefPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, float samp
WTF::Vector<char> fileContents;
fileContents.resize(statData.st_size);
size_t bytesRead = fread(&fileContents[0], fileContents.size(), 1, file);
size_t bytesRead = fread(&fileContents[0], 1, fileContents.size(), file);
fclose(file);
if (bytesRead < fileContents.size())
fileContents.resize(bytesRead);
......@@ -88,3 +91,4 @@ PassRefPtr<AudioBus> createBusFromInMemoryAudioFile(const void* data, size_t dat
} // namespace WebCore
#endif // ENABLE(WEB_AUDIO)
......@@ -25,7 +25,7 @@
#include <wtf/Noncopyable.h>
#include <wtf/PassOwnPtr.h>
#if USE(EGL) && !PLATFORM(GTK)
#if USE(EGL) && !PLATFORM(GTK) && !PLATFORM(NIX)
#include "eglplatform.h"
typedef EGLNativeWindowType GLNativeWindowType;
#else
......
......@@ -6,7 +6,7 @@
* Copyright (C) 2008 Kenneth Rohde Christiansen
* Copyright (C) 2009-2010 ProFUSION embedded systems
* Copyright (C) 2009-2010 Samsung Electronics
* Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
* Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
*
* All rights reserved.
*
......@@ -35,8 +35,6 @@
#include "config.h"
#include "Cursor.h"
#include "NotImplemented.h"
namespace WebCore {
Cursor::Cursor(const Cursor& other)
......@@ -60,61 +58,12 @@ Cursor& Cursor::operator=(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 = cursorString(m_type);
m_platformCursor = m_type;
}
}
} // namespace WebCore
/*
* Copyright (C) 2011, Google Inc. All rights reserved.
* 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 are met:
......@@ -47,7 +48,7 @@ void sampleGamepads(GamepadList* into)
RefPtr<Gamepad> gamepad = into->item(i);
if (!gamepad)
gamepad = Gamepad::create();
gamepad->id(nixGamepad.id);
gamepad->id(String::fromUTF8(nixGamepad.id));
gamepad->index(i);
gamepad->timestamp(nixGamepad.timestamp);
gamepad->axes(nixGamepad.axesLength, nixGamepad.axes);
......@@ -58,6 +59,7 @@ void sampleGamepads(GamepadList* into)
}
}
}
} // namespace WebCore
#endif // ENABLE(GAMEPAD)
#endif
/*
* Copyright (C) 2012-2013 Nokia Corporation and/or its subsidiary(-ies).
* 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
......@@ -103,6 +103,22 @@ protected:
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;
......@@ -123,6 +139,6 @@ private:
RenderThemeNix();
};
}
} // namespace WebCore
#endif // RenderThemeNix_h
......@@ -90,7 +90,7 @@ static bool canUseForText(const RenderText& textRenderer, const SimpleFontData&
bool canUseFor(const RenderBlockFlow& flow)
{
#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)
#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(NIX)
// FIXME: Non-mac platforms are hitting ASSERT(run.charactersLength() >= run.length())
// https://bugs.webkit.org/show_bug.cgi?id=123338
return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment