Commit ee418384 authored by lauro.neto@openbossa.org's avatar lauro.neto@openbossa.org
Browse files

Remove PLATFORM(NIX) from WebCore

https://bugs.webkit.org/show_bug.cgi?id=127299

Reviewed by Anders Carlsson.

* editing/Editor.cpp:
(WebCore::Editor::cut):
(WebCore::Editor::copy):
(WebCore::Editor::copyImage):
* editing/Editor.h:
* html/HTMLCanvasElement.h:
* loader/EmptyClients.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::defaultObjectContentType):
* page/ChromeClient.h:
* page/DragController.cpp:
(WebCore::DragController::startDrag):
* platform/Cursor.h:
* platform/DragData.h:
* platform/DragImage.h:
* platform/FileSystem.h:
* platform/LocalizedStrings.h:
* platform/Widget.h:
* platform/audio/FFTFrame.h:
* platform/audio/HRTFElevation.cpp:
* platform/cairo/WidgetBackingStore.h:
* platform/graphics/ANGLEWebKitBridge.h:
* platform/graphics/FontPlatformData.h:
* platform/graphics/GLContext.cpp:
(WebCore::GLContext::createContextForWindow):
* platform/graphics/GLContext.h:
* platform/graphics/GraphicsContext3D.h:
* platform/graphics/GraphicsContext3DPrivate.cpp:
(WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
* platform/graphics/OpenGLESShims.h:
* platform/graphics/OpenGLShims.cpp:
(WebCore::getProcAddress):
* platform/graphics/OpenGLShims.h:
* platform/graphics/PlatformLayer.h:
* platform/graphics/freetype/FontPlatformDataFreeType.cpp:
* platform/graphics/opengl/Extensions3DOpenGL.cpp:
(WebCore::Extensions3DOpenGL::createVertexArrayOES):
(WebCore::Extensions3DOpenGL::deleteVertexArrayOES):
(WebCore::Extensions3DOpenGL::isVertexArrayOES):
(WebCore::Extensions3DOpenGL::bindVertexArrayOES):
(WebCore::Extensions3DOpenGL::supportsExtension):
* platform/graphics/opengl/Extensions3DOpenGL.h:
* platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
* platform/graphics/opengl/Extensions3DOpenGLES.h:
* platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::reshape):
* platform/graphics/opengl/TemporaryOpenGLSetting.cpp:
* platform/graphics/texmap/TextureMapper.h:
* platform/network/ResourceHandle.h:
* plugins/PluginPackage.cpp:
* plugins/PluginView.cpp:
(WebCore::PluginView::PluginView):
* plugins/PluginView.h:
* plugins/PluginViewNone.cpp:
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseFor):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@162451 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent dbc58ddb
2014-01-21 Lauro Neto <lauro.neto@openbossa.org>
Remove PLATFORM(NIX) from WebCore
https://bugs.webkit.org/show_bug.cgi?id=127299
Reviewed by Anders Carlsson.
* editing/Editor.cpp:
(WebCore::Editor::cut):
(WebCore::Editor::copy):
(WebCore::Editor::copyImage):
* editing/Editor.h:
* html/HTMLCanvasElement.h:
* loader/EmptyClients.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::defaultObjectContentType):
* page/ChromeClient.h:
* page/DragController.cpp:
(WebCore::DragController::startDrag):
* platform/Cursor.h:
* platform/DragData.h:
* platform/DragImage.h:
* platform/FileSystem.h:
* platform/LocalizedStrings.h:
* platform/Widget.h:
* platform/audio/FFTFrame.h:
* platform/audio/HRTFElevation.cpp:
* platform/cairo/WidgetBackingStore.h:
* platform/graphics/ANGLEWebKitBridge.h:
* platform/graphics/FontPlatformData.h:
* platform/graphics/GLContext.cpp:
(WebCore::GLContext::createContextForWindow):
* platform/graphics/GLContext.h:
* platform/graphics/GraphicsContext3D.h:
* platform/graphics/GraphicsContext3DPrivate.cpp:
(WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
* platform/graphics/OpenGLESShims.h:
* platform/graphics/OpenGLShims.cpp:
(WebCore::getProcAddress):
* platform/graphics/OpenGLShims.h:
* platform/graphics/PlatformLayer.h:
* platform/graphics/freetype/FontPlatformDataFreeType.cpp:
* platform/graphics/opengl/Extensions3DOpenGL.cpp:
(WebCore::Extensions3DOpenGL::createVertexArrayOES):
(WebCore::Extensions3DOpenGL::deleteVertexArrayOES):
(WebCore::Extensions3DOpenGL::isVertexArrayOES):
(WebCore::Extensions3DOpenGL::bindVertexArrayOES):
(WebCore::Extensions3DOpenGL::supportsExtension):
* platform/graphics/opengl/Extensions3DOpenGL.h:
* platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
* platform/graphics/opengl/Extensions3DOpenGLES.h:
* platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::reshape):
* platform/graphics/opengl/TemporaryOpenGLSetting.cpp:
* platform/graphics/texmap/TextureMapper.h:
* platform/network/ResourceHandle.h:
* plugins/PluginPackage.cpp:
* plugins/PluginView.cpp:
(WebCore::PluginView::PluginView):
* plugins/PluginView.h:
* plugins/PluginViewNone.cpp:
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseFor):
2014-01-21 Eric Carlson <eric.carlson@apple.com>
 
Add &lrm; &rlm; and &nbsp; to WebVTT parser
......@@ -563,7 +563,7 @@ String Editor::plainTextFromPasteboard(const PasteboardPlainText& text)
#endif
#if !PLATFORM(MAC) && !PLATFORM(EFL) && !PLATFORM(NIX)
#if !PLATFORM(MAC) && !PLATFORM(EFL)
void Editor::pasteWithPasteboard(Pasteboard* pasteboard, bool allowPlainText)
{
RefPtr<Range> range = selectedRange();
......@@ -1283,7 +1283,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) || PLATFORM(NIX)
#if PLATFORM(MAC) || PLATFORM(EFL)
writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
#else
// FIXME: Convert all other platforms to match Mac and delete this.
......@@ -1310,13 +1310,13 @@ void Editor::copy()
canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
} else {
if (HTMLImageElement* imageElement = imageElementFromImageDocument(document())) {
#if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
#if PLATFORM(MAC) || PLATFORM(EFL)
writeImageToPasteboard(*Pasteboard::createForCopyAndPaste(), *imageElement, document().url(), document().title());
#else
Pasteboard::createForCopyAndPaste()->writeImage(*imageElement, document().url(), document().title());
#endif
} else {
#if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
#if PLATFORM(MAC) || PLATFORM(EFL)
writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
#else
// FIXME: Convert all other platforms to match Mac and delete this.
......@@ -1420,7 +1420,7 @@ void Editor::copyImage(const HitTestResult& result)
if (url.isEmpty())
url = result.absoluteImageURL();
#if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
#if PLATFORM(MAC) || PLATFORM(EFL)
writeImageToPasteboard(*Pasteboard::createForCopyAndPaste(), *element, url, result.altDisplayString());
#else
Pasteboard::createForCopyAndPaste()->writeImage(*element, url, result.altDisplayString());
......
......@@ -434,7 +434,7 @@ public:
#endif // !PLATFORM(IOS)
#endif
#if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
#if PLATFORM(MAC) || PLATFORM(EFL)
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) || PLATFORM(NIX)
#if USE(CG)
#define DefaultInterpolationQuality InterpolationLow
#else
#define DefaultInterpolationQuality InterpolationDefault
......
......@@ -195,10 +195,6 @@ public:
virtual void AXFinishFrameLoad() override { }
#endif
#if PLATFORM(NIX)
virtual FloatRect screenRect() const override { return FloatRect(); }
#endif
#if PLATFORM(IOS)
#if ENABLE(TOUCH_EVENTS)
virtual void didPreventDefaultForEvent() override { }
......
......@@ -954,7 +954,7 @@ ObjectContentType FrameLoader::defaultObjectContentType(const URL& url, const St
if (mimeType.isEmpty())
mimeType = mimeTypeFromURL(url);
#if !PLATFORM(MAC) && !PLATFORM(EFL) && !PLATFORM(NIX) // Mac has no PluginDatabase, nor does Nix or EFL
#if !PLATFORM(MAC) && !PLATFORM(EFL) // Mac has no PluginDatabase, nor does EFL
if (mimeType.isEmpty()) {
String decodedPath = decodeURLEscapeSequences(url.path());
mimeType = PluginDatabase::installedPlugins()->MIMETypeForExtension(decodedPath.substring(decodedPath.reverseFind('.') + 1));
......@@ -964,7 +964,7 @@ ObjectContentType FrameLoader::defaultObjectContentType(const URL& url, const St
if (mimeType.isEmpty())
return ObjectContentFrame; // Go ahead and hope that we can display the content.
#if !PLATFORM(MAC) && !PLATFORM(EFL) && !PLATFORM(NIX) // Mac has no PluginDatabase, nor does Nix or EFL
#if !PLATFORM(MAC) && !PLATFORM(EFL) // Mac has no PluginDatabase, nor does EFL
bool plugInSupportsMIMEType = PluginDatabase::installedPlugins()->isMIMETypeRegistered(mimeType);
#else
bool plugInSupportsMIMEType = false;
......
......@@ -366,10 +366,6 @@ public:
virtual void AXFinishFrameLoad() = 0;
#endif
#if PLATFORM(NIX)
virtual FloatRect screenRect() const = 0;
#endif
#if ENABLE(TOUCH_EVENTS)
virtual void needTouchEvents(bool) = 0;
#endif
......
......@@ -768,7 +768,7 @@ bool DragController::startDrag(Frame& src, const DragState& state, DragOperation
if (enclosingTextFormControl(src.selection().start()))
clipboard.pasteboard().writePlainText(src.editor().selectedTextForClipboard(), Pasteboard::CannotSmartReplace);
else {
#if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
#if PLATFORM(MAC) || PLATFORM(EFL)
src.editor().writeSelectionToPasteboard(clipboard.pasteboard());
#else
// FIXME: Convert all other platforms to match Mac and delete this.
......
......@@ -72,8 +72,6 @@ namespace WebCore {
typedef GRefPtr<GdkCursor> PlatformCursor;
#elif PLATFORM(EFL)
typedef const char* PlatformCursor;
#elif PLATFORM(NIX)
typedef unsigned PlatformCursor;
#else
typedef void* PlatformCursor;
#endif
......
......@@ -54,7 +54,7 @@ namespace WebCore {
class DataObjectGtk;
}
typedef WebCore::DataObjectGtk* DragDataRef;
#elif PLATFORM(EFL) || PLATFORM(NIX) || PLATFORM(IOS)
#elif PLATFORM(EFL) || PLATFORM(IOS)
typedef void* DragDataRef;
#endif
......
......@@ -41,7 +41,7 @@ typedef struct CGImage *CGImageRef;
OBJC_CLASS NSImage;
#elif PLATFORM(WIN)
typedef struct HBITMAP__* HBITMAP;
#elif PLATFORM(GTK) || PLATFORM(NIX)
#elif PLATFORM(GTK)
typedef struct _cairo_surface cairo_surface_t;
#endif
......@@ -63,7 +63,7 @@ typedef RetainPtr<CGImageRef> DragImageRef;
typedef RetainPtr<NSImage> DragImageRef;
#elif PLATFORM(WIN)
typedef HBITMAP DragImageRef;
#elif PLATFORM(GTK) || PLATFORM(NIX)
#elif PLATFORM(GTK)
typedef cairo_surface_t* DragImageRef;
#elif PLATFORM(EFL)
typedef void* DragImageRef;
......
......@@ -191,7 +191,7 @@ String encodeForFileName(const String&);
RetainPtr<CFURLRef> pathAsURL(const String&);
#endif
#if PLATFORM(GTK) || PLATFORM(NIX)
#if PLATFORM(GTK)
String filenameToString(const char*);
String filenameForDisplay(const String&);
CString applicationDirectoryPath();
......
......@@ -54,7 +54,7 @@ namespace WebCore {
String contextMenuItemTagOpenImageInNewWindow();
String contextMenuItemTagDownloadImageToDisk();
String contextMenuItemTagCopyImageToClipboard();
#if PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(NIX)
#if PLATFORM(GTK) || PLATFORM(EFL)
String contextMenuItemTagCopyImageUrlToClipboard();
#endif
String contextMenuItemTagOpenFrameInNewWindow();
......@@ -80,7 +80,7 @@ namespace WebCore {
String contextMenuItemTagUnicodeInsertZWJMark();
String contextMenuItemTagUnicodeInsertZWNJMark();
#endif
#if PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(NIX)
#if PLATFORM(GTK) || PLATFORM(EFL)
String contextMenuItemTagSelectAll();
#endif
String contextMenuItemTagNoGuessesFound();
......
......@@ -59,10 +59,6 @@ typedef struct _GtkContainer GtkContainer;
typedef GtkWidget* PlatformWidget;
#endif
#if PLATFORM(NIX)
typedef void* PlatformWidget;
#endif
#if PLATFORM(EFL)
#if USE(EO)
typedef struct _Eo_Opaque Evas_Object;
......
......@@ -67,10 +67,6 @@ struct RDFTContext;
#include <ipps.h>
#endif // USE(WEBAUDIO_IPP)
#if PLATFORM(NIX)
#include <public/FFTFrame.h>
#endif
#include <memory>
#include <wtf/Forward.h>
#include <wtf/Threading.h>
......@@ -182,10 +178,6 @@ private:
AudioFloatArray m_imagData;
#endif // USE(WEBAUDIO_IPP)
#if PLATFORM(NIX)
OwnPtr<Nix::FFTFrame> m_fftFrame;
#endif // PLATFORM(NIX)
#if USE(WEBAUDIO_OPENMAX_DL_FFT)
static OMXFFTSpec_R_F32* contextForSize(unsigned log2FFTSize);
......
......@@ -58,7 +58,7 @@ const size_t ResponseFrameSize = 256;
// The impulse responses may be resampled to a different sample-rate (depending on the audio hardware) when they are loaded.
const float ResponseSampleRate = 44100;
#if PLATFORM(MAC) || USE(WEBAUDIO_GSTREAMER) || PLATFORM(NIX)
#if PLATFORM(MAC) || USE(WEBAUDIO_GSTREAMER)
#define USE_CONCATENATED_IMPULSE_RESPONSES
#endif
......
......@@ -39,8 +39,6 @@ namespace WebCore {
typedef GtkWidget* PlatformWidget;
#elif PLATFORM(EFL)
typedef Evas_Object* PlatformWidget;
#elif PLATFORM(NIX)
typedef void* PlatformWidget;
#endif
class WidgetBackingStore {
......
......@@ -29,7 +29,7 @@
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN) && !PLATFORM(NIX)
#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN)
#include "ANGLE/ShaderLang.h"
#elif PLATFORM(WIN)
#include "GLSLANG/ShaderLang.h"
......
......@@ -25,7 +25,7 @@
// FIXME: This is temporary until all ports switch to using this file.
#if USE(WINGDI)
#include "wince/FontPlatformData.h"
#elif PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(NIX)
#elif PLATFORM(EFL) || PLATFORM(GTK)
#include "freetype/FontPlatformData.h"
#else
......
......@@ -19,7 +19,7 @@
#include "config.h"
#include "GLContext.h"
#if USE(OPENGL) || (PLATFORM(NIX) && USE(OPENGL_ES_2))
#if USE(OPENGL)
#if USE(EGL)
#include "GLContextEGL.h"
......@@ -154,7 +154,6 @@ PassOwnPtr<GLContext> GLContext::createContextForWindow(GLNativeWindowType windo
}
#endif
#if !PLATFORM(NIX)
#if USE(GLX)
if (OwnPtr<GLContext> glxContext = GLContextGLX::createContext(windowHandle, sharingContext))
return glxContext.release();
......@@ -162,7 +161,6 @@ PassOwnPtr<GLContext> GLContext::createContextForWindow(GLNativeWindowType windo
#if USE(EGL)
if (OwnPtr<GLContext> eglContext = GLContextEGL::createContext(windowHandle, sharingContext))
return eglContext.release();
#endif
#endif
return nullptr;
}
......
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