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;
}
......
......@@ -25,7 +25,7 @@
#include <wtf/Noncopyable.h>
#include <wtf/PassOwnPtr.h>
#if USE(EGL) && !PLATFORM(GTK) && !PLATFORM(NIX)
#if USE(EGL) && !PLATFORM(GTK)
#include "eglplatform.h"
typedef EGLNativeWindowType GLNativeWindowType;
#else
......
......@@ -60,7 +60,7 @@
#include <wtf/RetainPtr.h>
OBJC_CLASS CALayer;
OBJC_CLASS WebGLLayer;
#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(NIX)
#elif PLATFORM(GTK) || PLATFORM(EFL)
typedef unsigned int GLuint;
#endif
......@@ -987,7 +987,7 @@ private:
bool reshapeFBOs(const IntSize&);
void resolveMultisamplingIfNecessary(const IntRect& = IntRect());
#if (PLATFORM(EFL) || PLATFORM(NIX)) && USE(GRAPHICS_SURFACE)
#if PLATFORM(EFL) && USE(GRAPHICS_SURFACE)
void createGraphicsSurfaces(const IntSize&);
#endif
......@@ -1092,7 +1092,7 @@ private:
OwnPtr<ShaderNameHash> nameHashMapForShaders;
#if ((PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)) && USE(OPENGL_ES_2))
#if ((PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)) && USE(OPENGL_ES_2))
friend class Extensions3DOpenGLES;
OwnPtr<Extensions3DOpenGLES> m_extensions;
#else
......
......@@ -26,10 +26,6 @@
#include "NotImplemented.h"
#include <wtf/StdLibExtras.h>
#if PLATFORM(NIX) && USE(EGL)
#include "GLContextFromCurrentEGL.h"
#endif
#if USE(CAIRO)
#include "PlatformContextCairo.h"
#endif
......@@ -63,9 +59,6 @@ GraphicsContext3DPrivate::GraphicsContext3DPrivate(GraphicsContext3D* context, G
m_glContext = GLContext::createOffscreenContext(GLContext::sharingContext());
break;
case GraphicsContext3D::RenderToCurrentGLContext:
#if PLATFORM(NIX) && USE(EGL)
m_glContext = GLContextFromCurrentEGL::createFromCurrentGLContext();
#endif
break;
case GraphicsContext3D::RenderDirectlyToHostWindow:
ASSERT_NOT_REACHED();
......
......@@ -26,7 +26,7 @@
#ifndef OpenGLESShims_h
#define OpenGLESShims_h
#if PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
#if PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
#define glBindFramebufferEXT glBindFramebuffer
#define glFramebufferTexture2DEXT glFramebufferTexture2D
#define glBindRenderbufferEXT glBindRenderbuffer
......
......@@ -26,10 +26,6 @@
#include <dlfcn.h>
#endif
#if PLATFORM(NIX) && USE(EGL)
#include <EGL/egl.h>
#endif
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
......@@ -46,11 +42,6 @@ static void* getProcAddress(const char* procName)
{
return GetProcAddress(GetModuleHandleA("libGLESv2"), procName);
}
#elif PLATFORM(NIX) && USE(EGL)
static void* getProcAddress(const char* procName)
{
return reinterpret_cast<void*>(eglGetProcAddress(procName));
}
#else
typedef void* (*glGetProcAddressType) (const char* procName);
static void* getProcAddress(const char* procName)
......@@ -108,19 +99,9 @@ static void* lookupOpenGLFunctionAddress(const char* functionName, bool* success
return target;
}
#if PLATFORM(NIX) && USE(OPENGL_ES_2)
// With Angle only EGL/GLES2 extensions are available through eglGetProcAddress, not the regular standardized functions.
#define ASSIGN_FUNCTION_TABLE_ENTRY(FunctionName, success) \
openGLFunctionTable()->FunctionName = reinterpret_cast<FunctionName##Type>(::FunctionName)
#else
#define ASSIGN_FUNCTION_TABLE_ENTRY(FunctionName, success) \
openGLFunctionTable()->FunctionName = reinterpret_cast<FunctionName##Type>(lookupOpenGLFunctionAddress(#FunctionName, &success))
#endif
#define ASSIGN_FUNCTION_TABLE_ENTRY_EXT(FunctionName) \
openGLFunctionTable()->FunctionName = reinterpret_cast<FunctionName##Type>(lookupOpenGLFunctionAddress(#FunctionName))
......
......@@ -20,12 +20,8 @@
#ifndef OpenGLShims_h
#define OpenGLShims_h
#if PLATFORM(NIX) && USE(OPENGL_ES_2)
#include <GLES2/gl2.h>
#else
#include <GL/gl.h>
#include <GL/glext.h>
#endif
#if defined(GL_ES_VERSION_2_0)
// Some openGL ES systems miss this typedef.
......
......@@ -45,7 +45,7 @@ class TextureMapperPlatformLayer;
typedef TextureMapperPlatformLayer PlatformLayer;
};
#endif
#elif PLATFORM(EFL) || PLATFORM(NIX)
#elif PLATFORM(EFL)
#if USE(TEXTURE_MAPPER)
namespace WebCore {
class TextureMapperPlatformLayer;
......
......@@ -33,7 +33,7 @@
#include FT_TRUETYPE_TABLES_H
#include <wtf/text/WTFString.h>
#if !PLATFORM(EFL) && !PLATFORM(NIX)
#if !PLATFORM(EFL)
#include <gdk/gdk.h>
#endif
......
......@@ -38,7 +38,7 @@
#elif PLATFORM(MAC)
#include "ANGLE/ShaderLang.h"
#include <OpenGL/gl.h>
#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
#include "OpenGLShims.h"
#endif
......@@ -86,7 +86,7 @@ Platform3DObject Extensions3DOpenGL::createVertexArrayOES()
{
m_context->makeContextCurrent();
GLuint array = 0;
#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
if (isVertexArrayObjectSupported())
glGenVertexArrays(1, &array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
......@@ -101,7 +101,7 @@ void Extensions3DOpenGL::deleteVertexArrayOES(Platform3DObject array)
return;
m_context->makeContextCurrent();
#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
if (isVertexArrayObjectSupported())
glDeleteVertexArrays(1, &array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
......@@ -115,7 +115,7 @@ GC3Dboolean Extensions3DOpenGL::isVertexArrayOES(Platform3DObject array)
return GL_FALSE;
m_context->makeContextCurrent();
#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
if (isVertexArrayObjectSupported())
return glIsVertexArray(array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
......@@ -131,7 +131,7 @@ void Extensions3DOpenGL::bindVertexArrayOES(Platform3DObject array)
#endif
m_context->makeContextCurrent();
#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
if (isVertexArrayObjectSupported())
glBindVertexArray(array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
......@@ -185,7 +185,7 @@ bool Extensions3DOpenGL::supportsExtension(const String& name)
// GL_OES_vertex_array_object
if (name == "GL_OES_vertex_array_object") {
#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(NIX))
#if (PLATFORM(GTK) || PLATFORM(EFL))
return m_availableExtensions.contains("GL_ARB_vertex_array_object");
#else
return m_availableExtensions.contains("GL_APPLE_vertex_array_object");
......@@ -236,7 +236,7 @@ String Extensions3DOpenGL::getExtensions()
return String(reinterpret_cast<const char*>(::glGetString(GL_EXTENSIONS)));
}
#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
bool Extensions3DOpenGL::isVertexArrayObjectSupported()
{
static const bool supportsVertexArrayObject = supports("GL_OES_vertex_array_object");
......
......@@ -60,7 +60,7 @@ protected:
virtual bool supportsExtension(const WTF::String&);
virtual String getExtensions();
#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
private:
bool isVertexArrayObjectSupported();
#endif
......
......@@ -41,7 +41,7 @@
#include <GLES2/gl2ext.h>
#elif PLATFORM(MAC)
#include <OpenGL/gl.h>
#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
#include "OpenGLShims.h"
#endif
#endif
......
......@@ -57,11 +57,6 @@ typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint loc
typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GC3Dsizei bufSize, GLint *params);
#endif
#if PLATFORM(NIX) && USE(OPENGL_ES_2) && !GL_IMG_multisampled_render_to_texture
// on rPi, PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG is called PFNGLCLIPPLANEXIMG.
typedef PFNGLCLIPPLANEXIMG PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG;
#endif
namespace WebCore {
class Extensions3DOpenGLES : public Extensions3DOpenGLCommon {
......
......@@ -51,7 +51,7 @@
#define GL_RGB32F_ARB 0x8815
#elif PLATFORM(MAC)
#include <OpenGL/gl.h>
#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
#include "OpenGLShims.h"
#endif
......
......@@ -68,7 +68,7 @@
#include "OpenGLESShims.h"
#elif PLATFORM(MAC)
#include <OpenGL/gl.h>
#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
#include "OpenGLShims.h"
#endif
#endif
......@@ -271,7 +271,7 @@ void GraphicsContext3D::reshape(int width, int height)
markContextChanged();
#if (PLATFORM(EFL) || PLATFORM(NIX)) && USE(GRAPHICS_SURFACE)
#if PLATFORM(EFL) && USE(GRAPHICS_SURFACE)
::glFlush(); // Make sure all GL calls have been committed before resizing.
createGraphicsSurfaces(IntSize(width, height));
#endif
......
......@@ -36,7 +36,7 @@
#include <OpenGLES/ES2/gl.h>
#elif PLATFORM(MAC)
#include <OpenGL/gl.h>
#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
#include "OpenGLShims.h"
#endif
......
......@@ -22,7 +22,7 @@
#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(NIX)) && USE(OPENGL_ES_2)
#if (PLATFORM(GTK) || PLATFORM(EFL)) && USE(OPENGL_ES_2)
#define TEXMAP_OPENGL_ES_2
#endif
......
......@@ -150,7 +150,7 @@ public:
#endif // USE(CFNETWORK)
#if (PLATFORM(WIN) || PLATFORM(NIX)) && USE(CURL)
#if PLATFORM(WIN) && USE(CURL)
static void setHostAllowsAnyHTTPSCertificate(const String&);
#endif
#if PLATFORM(WIN) && USE(CURL) && USE(CF)
......
......@@ -176,7 +176,7 @@ PassRefPtr<PluginPackage> PluginPackage::createPackageFromCache(const String& pa
}
#endif
#if defined(XP_UNIX) && !PLATFORM(NIX)
#if defined(XP_UNIX)
void PluginPackage::determineQuirks(const String& mimeType)
{
if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType)) {
......
......@@ -833,7 +833,7 @@ PluginView::PluginView(Frame* parentFrame, const IntSize& size, PluginPackage* p
, m_wmPrintHDC(0)
, m_haveUpdatedPluginWidget(false)
#endif
#if PLATFORM(EFL) || PLATFORM(NIX)
#if PLATFORM(EFL)
, m_window(0)
#endif
#if defined(XP_MACOSX)
......
......@@ -354,7 +354,7 @@ namespace WebCore {
bool m_haveUpdatedPluginWidget;
#endif
#if (PLATFORM(GTK) && OS(WINDOWS)) || PLATFORM(EFL) || PLATFORM(NIX)
#if (PLATFORM(GTK) && OS(WINDOWS)) || PLATFORM(EFL)
// On Mac OSX and Qt/Windows the plugin does not have its own native widget,
// but is using the containing window as its reference for positioning/painting.
PlatformPluginWidget m_window;
......
......@@ -132,7 +132,7 @@ void PluginView::handleFocusOutEvent()
// ports using PluginView, but until then, if new functions like this are
// added, please make sure they have the proper platform #ifs so that changes
// do not break ports who compile both this file and PluginView.cpp.
#if PLATFORM(MAC) || PLATFORM(EFL) || OS(WINCE) || PLATFORM(NIX)
#if PLATFORM(MAC) || PLATFORM(EFL) || OS(WINCE)
#if ENABLE(NETSCAPE_PLUGIN_API)
void PluginView::keepAlive(NPP)
{
......
......@@ -90,7 +90,7 @@ static bool canUseForText(const RenderText& textRenderer, const SimpleFontData&
bool canUseFor(const RenderBlockFlow& flow)
{
#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(NIX)
#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)
// 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