Changeset 162451 in webkit


Ignore:
Timestamp:
Jan 21, 2014 10:46:51 AM (10 years ago)
Author:
lauro.neto@openbossa.org
Message:

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

Location:
trunk/Source/WebCore
Files:
42 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r162450 r162451  
     12014-01-21  Lauro Neto  <lauro.neto@openbossa.org>
     2
     3        Remove PLATFORM(NIX) from WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=127299
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * editing/Editor.cpp:
     9        (WebCore::Editor::cut):
     10        (WebCore::Editor::copy):
     11        (WebCore::Editor::copyImage):
     12        * editing/Editor.h:
     13        * html/HTMLCanvasElement.h:
     14        * loader/EmptyClients.h:
     15        * loader/FrameLoader.cpp:
     16        (WebCore::FrameLoader::defaultObjectContentType):
     17        * page/ChromeClient.h:
     18        * page/DragController.cpp:
     19        (WebCore::DragController::startDrag):
     20        * platform/Cursor.h:
     21        * platform/DragData.h:
     22        * platform/DragImage.h:
     23        * platform/FileSystem.h:
     24        * platform/LocalizedStrings.h:
     25        * platform/Widget.h:
     26        * platform/audio/FFTFrame.h:
     27        * platform/audio/HRTFElevation.cpp:
     28        * platform/cairo/WidgetBackingStore.h:
     29        * platform/graphics/ANGLEWebKitBridge.h:
     30        * platform/graphics/FontPlatformData.h:
     31        * platform/graphics/GLContext.cpp:
     32        (WebCore::GLContext::createContextForWindow):
     33        * platform/graphics/GLContext.h:
     34        * platform/graphics/GraphicsContext3D.h:
     35        * platform/graphics/GraphicsContext3DPrivate.cpp:
     36        (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
     37        * platform/graphics/OpenGLESShims.h:
     38        * platform/graphics/OpenGLShims.cpp:
     39        (WebCore::getProcAddress):
     40        * platform/graphics/OpenGLShims.h:
     41        * platform/graphics/PlatformLayer.h:
     42        * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
     43        * platform/graphics/opengl/Extensions3DOpenGL.cpp:
     44        (WebCore::Extensions3DOpenGL::createVertexArrayOES):
     45        (WebCore::Extensions3DOpenGL::deleteVertexArrayOES):
     46        (WebCore::Extensions3DOpenGL::isVertexArrayOES):
     47        (WebCore::Extensions3DOpenGL::bindVertexArrayOES):
     48        (WebCore::Extensions3DOpenGL::supportsExtension):
     49        * platform/graphics/opengl/Extensions3DOpenGL.h:
     50        * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
     51        * platform/graphics/opengl/Extensions3DOpenGLES.h:
     52        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
     53        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
     54        (WebCore::GraphicsContext3D::reshape):
     55        * platform/graphics/opengl/TemporaryOpenGLSetting.cpp:
     56        * platform/graphics/texmap/TextureMapper.h:
     57        * platform/network/ResourceHandle.h:
     58        * plugins/PluginPackage.cpp:
     59        * plugins/PluginView.cpp:
     60        (WebCore::PluginView::PluginView):
     61        * plugins/PluginView.h:
     62        * plugins/PluginViewNone.cpp:
     63        * rendering/SimpleLineLayout.cpp:
     64        (WebCore::SimpleLineLayout::canUseFor):
     65
    1662014-01-21  Eric Carlson  <eric.carlson@apple.com>
    267

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

    r161851 r162451  
    564564#endif
    565565
    566 #if !PLATFORM(MAC) && !PLATFORM(EFL) && !PLATFORM(NIX)
     566#if !PLATFORM(MAC) && !PLATFORM(EFL)
    567567void Editor::pasteWithPasteboard(Pasteboard* pasteboard, bool allowPlainText)
    568568{
    … …  
    12841284            Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForClipboard(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
    12851285        else {
    1286 #if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
     1286#if PLATFORM(MAC) || PLATFORM(EFL)
    12871287            writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
    12881288#else
    … …  
    13111311    } else {
    13121312        if (HTMLImageElement* imageElement = imageElementFromImageDocument(document())) {
    1313 #if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
     1313#if PLATFORM(MAC) || PLATFORM(EFL)
    13141314            writeImageToPasteboard(*Pasteboard::createForCopyAndPaste(), *imageElement, document().url(), document().title());
    13151315#else
    … …  
    13171317#endif
    13181318        } else {
    1319 #if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
     1319#if PLATFORM(MAC) || PLATFORM(EFL)
    13201320            writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
    13211321#else
    … …  
    14211421        url = result.absoluteImageURL();
    14221422
    1423 #if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
     1423#if PLATFORM(MAC) || PLATFORM(EFL)
    14241424    writeImageToPasteboard(*Pasteboard::createForCopyAndPaste(), *element, url, result.altDisplayString());
    14251425#else

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

    r161638 r162451  
    435435#endif
    436436
    437 #if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
     437#if PLATFORM(MAC) || PLATFORM(EFL)
    438438    void writeSelectionToPasteboard(Pasteboard&);
    439439    void writeImageToPasteboard(Pasteboard&, Element& imageElement, const URL&, const String& title);

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

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

  • trunk/Source/WebCore/loader/EmptyClients.h

    r162227 r162451  
    196196#endif
    197197
    198 #if PLATFORM(NIX)
    199     virtual FloatRect screenRect() const override { return FloatRect(); }
    200 #endif
    201 
    202198#if PLATFORM(IOS)
    203199#if ENABLE(TOUCH_EVENTS)

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r162264 r162451  
    955955        mimeType = mimeTypeFromURL(url);
    956956
    957 #if !PLATFORM(MAC) && !PLATFORM(EFL) && !PLATFORM(NIX) // Mac has no PluginDatabase, nor does Nix or EFL
     957#if !PLATFORM(MAC) && !PLATFORM(EFL) // Mac has no PluginDatabase, nor does EFL
    958958    if (mimeType.isEmpty()) {
    959959        String decodedPath = decodeURLEscapeSequences(url.path());
    … …  
    965965        return ObjectContentFrame; // Go ahead and hope that we can display the content.
    966966
    967 #if !PLATFORM(MAC) && !PLATFORM(EFL) && !PLATFORM(NIX) // Mac has no PluginDatabase, nor does Nix or EFL
     967#if !PLATFORM(MAC) && !PLATFORM(EFL) // Mac has no PluginDatabase, nor does EFL
    968968    bool plugInSupportsMIMEType = PluginDatabase::installedPlugins()->isMIMETypeRegistered(mimeType);
    969969#else

  • trunk/Source/WebCore/page/ChromeClient.h

    r162099 r162451  
    367367#endif
    368368
    369 #if PLATFORM(NIX)
    370     virtual FloatRect screenRect() const = 0;
    371 #endif
    372 
    373369#if ENABLE(TOUCH_EVENTS)
    374370    virtual void needTouchEvents(bool) = 0;

  • trunk/Source/WebCore/page/DragController.cpp

    r161577 r162451  
    769769                clipboard.pasteboard().writePlainText(src.editor().selectedTextForClipboard(), Pasteboard::CannotSmartReplace);
    770770            else {
    771 #if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(NIX)
     771#if PLATFORM(MAC) || PLATFORM(EFL)
    772772                src.editor().writeSelectionToPasteboard(clipboard.pasteboard());
    773773#else

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

    r161662 r162451  
    7373#elif PLATFORM(EFL)
    7474    typedef const char* PlatformCursor;
    75 #elif PLATFORM(NIX)
    76     typedef unsigned PlatformCursor;
    7775#else
    7876    typedef void* PlatformCursor;

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

    r161944 r162451  
    5555}
    5656typedef WebCore::DataObjectGtk* DragDataRef;
    57 #elif PLATFORM(EFL) || PLATFORM(NIX) || PLATFORM(IOS)
     57#elif PLATFORM(EFL) || PLATFORM(IOS)
    5858typedef void* DragDataRef;
    5959#endif

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

    r161729 r162451  
    4242#elif PLATFORM(WIN)
    4343typedef struct HBITMAP__* HBITMAP;
    44 #elif PLATFORM(GTK) || PLATFORM(NIX)
     44#elif PLATFORM(GTK)
    4545typedef struct _cairo_surface cairo_surface_t;
    4646#endif
    … …  
    6464#elif PLATFORM(WIN)
    6565typedef HBITMAP DragImageRef;
    66 #elif PLATFORM(GTK) || PLATFORM(NIX)
     66#elif PLATFORM(GTK)
    6767typedef cairo_surface_t* DragImageRef;
    6868#elif PLATFORM(EFL)

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

    r161589 r162451  
    192192#endif
    193193
    194 #if PLATFORM(GTK) || PLATFORM(NIX)
     194#if PLATFORM(GTK)
    195195String filenameToString(const char*);
    196196String filenameForDisplay(const String&);

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

    r161589 r162451  
    5555    String contextMenuItemTagDownloadImageToDisk();
    5656    String contextMenuItemTagCopyImageToClipboard();
    57 #if PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(NIX)
     57#if PLATFORM(GTK) || PLATFORM(EFL)
    5858    String contextMenuItemTagCopyImageUrlToClipboard();
    5959#endif
    … …  
    8181    String contextMenuItemTagUnicodeInsertZWNJMark();
    8282#endif
    83 #if PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(NIX)
     83#if PLATFORM(GTK) || PLATFORM(EFL)
    8484    String contextMenuItemTagSelectAll();
    8585#endif

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

    r161680 r162451  
    6060#endif
    6161
    62 #if PLATFORM(NIX)
    63 typedef void* PlatformWidget;
    64 #endif
    65 
    6662#if PLATFORM(EFL)
    6763#if USE(EO)

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

    r162368 r162451  
    6767#include <ipps.h>
    6868#endif // USE(WEBAUDIO_IPP)
    69 
    70 #if PLATFORM(NIX)
    71 #include <public/FFTFrame.h>
    72 #endif
    7369
    7470#include <memory>
    … …  
    183179#endif // USE(WEBAUDIO_IPP)
    184180
    185 #if PLATFORM(NIX)
    186     OwnPtr<Nix::FFTFrame> m_fftFrame;
    187 #endif // PLATFORM(NIX)
    188 
    189181#if USE(WEBAUDIO_OPENMAX_DL_FFT)
    190182    static OMXFFTSpec_R_F32* contextForSize(unsigned log2FFTSize);

  • trunk/Source/WebCore/platform/audio/HRTFElevation.cpp

    r162368 r162451  
    5959const float ResponseSampleRate = 44100;
    6060
    61 #if PLATFORM(MAC) || USE(WEBAUDIO_GSTREAMER) || PLATFORM(NIX)
     61#if PLATFORM(MAC) || USE(WEBAUDIO_GSTREAMER)
    6262#define USE_CONCATENATED_IMPULSE_RESPONSES
    6363#endif

  • trunk/Source/WebCore/platform/cairo/WidgetBackingStore.h

    r155358 r162451  
    4040#elif PLATFORM(EFL)
    4141typedef Evas_Object* PlatformWidget;
    42 #elif PLATFORM(NIX)
    43 typedef void* PlatformWidget;
    4442#endif
    4543

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

    r161680 r162451  
    3030#include <wtf/text/WTFString.h>
    3131
    32 #if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN) && !PLATFORM(NIX)
     32#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN)
    3333#include "ANGLE/ShaderLang.h"
    3434#elif PLATFORM(WIN)

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

    r161680 r162451  
    2626#if USE(WINGDI)
    2727#include "wince/FontPlatformData.h"
    28 #elif PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(NIX)
     28#elif PLATFORM(EFL) || PLATFORM(GTK)
    2929#include "freetype/FontPlatformData.h"
    3030#else

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

    r160997 r162451  
    2020#include "GLContext.h"
    2121
    22 #if USE(OPENGL) || (PLATFORM(NIX) && USE(OPENGL_ES_2))
     22#if USE(OPENGL)
    2323
    2424#if USE(EGL)
    … …  
    155155#endif
    156156
    157 #if !PLATFORM(NIX)
    158157#if USE(GLX)
    159158    if (OwnPtr<GLContext> glxContext = GLContextGLX::createContext(windowHandle, sharingContext))
    … …  
    164163        return eglContext.release();
    165164#endif
    166 #endif
    167165    return nullptr;
    168166}

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

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

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

    r161889 r162451  
    6161OBJC_CLASS CALayer;
    6262OBJC_CLASS WebGLLayer;
    63 #elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(NIX)
     63#elif PLATFORM(GTK) || PLATFORM(EFL)
    6464typedef unsigned int GLuint;
    6565#endif
    … …  
    988988    bool reshapeFBOs(const IntSize&);
    989989    void resolveMultisamplingIfNecessary(const IntRect& = IntRect());
    990 #if (PLATFORM(EFL) || PLATFORM(NIX)) && USE(GRAPHICS_SURFACE)
     990#if PLATFORM(EFL) && USE(GRAPHICS_SURFACE)
    991991    void createGraphicsSurfaces(const IntSize&);
    992992#endif
    … …  
    10931093    OwnPtr<ShaderNameHash> nameHashMapForShaders;
    10941094
    1095 #if ((PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)) && USE(OPENGL_ES_2))
     1095#if ((PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)) && USE(OPENGL_ES_2))
    10961096    friend class Extensions3DOpenGLES;
    10971097    OwnPtr<Extensions3DOpenGLES> m_extensions;

  • trunk/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp

    r156336 r162451  
    2626#include "NotImplemented.h"
    2727#include <wtf/StdLibExtras.h>
    28 
    29 #if PLATFORM(NIX) && USE(EGL)
    30 #include "GLContextFromCurrentEGL.h"
    31 #endif
    3228
    3329#if USE(CAIRO)
    … …  
    6460        break;
    6561    case GraphicsContext3D::RenderToCurrentGLContext:
    66 #if PLATFORM(NIX) && USE(EGL)
    67         m_glContext = GLContextFromCurrentEGL::createFromCurrentGLContext();
    68 #endif
    6962        break;
    7063    case GraphicsContext3D::RenderDirectlyToHostWindow:

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

    r161699 r162451  
    2727#define OpenGLESShims_h
    2828
    29 #if PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
     29#if PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
    3030#define glBindFramebufferEXT glBindFramebuffer
    3131#define glFramebufferTexture2DEXT glFramebufferTexture2D

  • trunk/Source/WebCore/platform/graphics/OpenGLShims.cpp

    r156795 r162451  
    2727#endif
    2828
    29 #if PLATFORM(NIX) && USE(EGL)
    30 #include <EGL/egl.h>
    31 #endif
    32 
    3329#include <wtf/text/CString.h>
    3430#include <wtf/text/WTFString.h>
    … …  
    4642{
    4743    return GetProcAddress(GetModuleHandleA("libGLESv2"), procName);
    48 }
    49 #elif PLATFORM(NIX) && USE(EGL)
    50 static void* getProcAddress(const char* procName)
    51 {
    52     return reinterpret_cast<void*>(eglGetProcAddress(procName));
    5344}
    5445#else
    … …  
    109100}
    110101
    111 #if PLATFORM(NIX) && USE(OPENGL_ES_2)
    112 
    113 // With Angle only EGL/GLES2 extensions are available through eglGetProcAddress, not the regular standardized functions.
    114 #define ASSIGN_FUNCTION_TABLE_ENTRY(FunctionName, success) \
    115     openGLFunctionTable()->FunctionName = reinterpret_cast<FunctionName##Type>(::FunctionName)
    116 
    117 #else
    118 
    119102#define ASSIGN_FUNCTION_TABLE_ENTRY(FunctionName, success) \
    120103    openGLFunctionTable()->FunctionName = reinterpret_cast<FunctionName##Type>(lookupOpenGLFunctionAddress(#FunctionName, &success))
    121 
    122 #endif
    123104
    124105#define ASSIGN_FUNCTION_TABLE_ENTRY_EXT(FunctionName) \

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

    r156795 r162451  
    2121#define OpenGLShims_h
    2222
    23 #if PLATFORM(NIX) && USE(OPENGL_ES_2)
    24 #include <GLES2/gl2.h>
    25 #else
    2623#include <GL/gl.h>
    2724#include <GL/glext.h>
    28 #endif
    2925
    3026#if defined(GL_ES_VERSION_2_0)

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

    r161699 r162451  
    4646};
    4747#endif
    48 #elif PLATFORM(EFL) || PLATFORM(NIX)
     48#elif PLATFORM(EFL)
    4949#if USE(TEXTURE_MAPPER)
    5050namespace WebCore {

  • trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp

    r159939 r162451  
    3434#include <wtf/text/WTFString.h>
    3535
    36 #if !PLATFORM(EFL) && !PLATFORM(NIX)
     36#if !PLATFORM(EFL)
    3737#include <gdk/gdk.h>
    3838#endif

  • trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp

    r161688 r162451  
    3939#include "ANGLE/ShaderLang.h"
    4040#include <OpenGL/gl.h>
    41 #elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
     41#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
    4242#include "OpenGLShims.h"
    4343#endif
    … …  
    8787    m_context->makeContextCurrent();
    8888    GLuint array = 0;
    89 #if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
     89#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
    9090    if (isVertexArrayObjectSupported())
    9191        glGenVertexArrays(1, &array);
    … …  
    102102
    103103    m_context->makeContextCurrent();
    104 #if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
     104#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
    105105    if (isVertexArrayObjectSupported())
    106106        glDeleteVertexArrays(1, &array);
    … …  
    116116
    117117    m_context->makeContextCurrent();
    118 #if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
     118#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
    119119    if (isVertexArrayObjectSupported())
    120120        return glIsVertexArray(array);
    … …  
    132132
    133133    m_context->makeContextCurrent();
    134 #if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
     134#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
    135135    if (isVertexArrayObjectSupported())
    136136        glBindVertexArray(array);
    … …  
    186186    // GL_OES_vertex_array_object
    187187    if (name == "GL_OES_vertex_array_object") {
    188 #if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(NIX))
     188#if (PLATFORM(GTK) || PLATFORM(EFL))
    189189        return m_availableExtensions.contains("GL_ARB_vertex_array_object");
    190190#else
    … …  
    237237}
    238238
    239 #if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
     239#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
    240240bool Extensions3DOpenGL::isVertexArrayObjectSupported()
    241241{

  • trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h

    r156795 r162451  
    6161    virtual bool supportsExtension(const WTF::String&);
    6262    virtual String getExtensions();
    63 #if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
     63#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
    6464private:
    6565    bool isVertexArrayObjectSupported();

  • trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp

    r161699 r162451  
    4242#elif PLATFORM(MAC)
    4343#include <OpenGL/gl.h>
    44 #elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
     44#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
    4545#include "OpenGLShims.h"
    4646#endif

  • trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h

    r161699 r162451  
    5656typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GC3Dsizei bufSize, float *params);
    5757typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GC3Dsizei bufSize, GLint *params);
    58 #endif
    59 
    60 #if PLATFORM(NIX) && USE(OPENGL_ES_2) && !GL_IMG_multisampled_render_to_texture
    61 // on rPi, PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG is called PFNGLCLIPPLANEXIMG.
    62 typedef PFNGLCLIPPLANEXIMG PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG;
    6358#endif
    6459

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp

    r162105 r162451  
    5252#elif PLATFORM(MAC)
    5353#include <OpenGL/gl.h>
    54 #elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
     54#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
    5555#include "OpenGLShims.h"
    5656#endif

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp

    r162105 r162451  
    6969#elif PLATFORM(MAC)
    7070#include <OpenGL/gl.h>
    71 #elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
     71#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
    7272#include "OpenGLShims.h"
    7373#endif
    … …  
    272272    markContextChanged();
    273273
    274 #if (PLATFORM(EFL) || PLATFORM(NIX)) && USE(GRAPHICS_SURFACE)
     274#if PLATFORM(EFL) && USE(GRAPHICS_SURFACE)
    275275    ::glFlush(); // Make sure all GL calls have been committed before resizing.
    276276    createGraphicsSurfaces(IntSize(width, height));

  • trunk/Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.cpp

    r161693 r162451  
    3737#elif PLATFORM(MAC)
    3838#include <OpenGL/gl.h>
    39 #elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
     39#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
    4040#include "OpenGLShims.h"
    4141#endif

  • trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h

    r156795 r162451  
    2323#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
    2424
    25 #if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(NIX)) && USE(OPENGL_ES_2)
     25#if (PLATFORM(GTK) || PLATFORM(EFL)) && USE(OPENGL_ES_2)
    2626#define TEXMAP_OPENGL_ES_2
    2727#endif

  • trunk/Source/WebCore/platform/network/ResourceHandle.h

    r162139 r162451  
    151151#endif // USE(CFNETWORK)
    152152
    153 #if (PLATFORM(WIN) || PLATFORM(NIX)) && USE(CURL)
     153#if PLATFORM(WIN) && USE(CURL)
    154154    static void setHostAllowsAnyHTTPSCertificate(const String&);
    155155#endif

  • trunk/Source/WebCore/plugins/PluginPackage.cpp

    r156813 r162451  
    177177#endif
    178178
    179 #if defined(XP_UNIX) && !PLATFORM(NIX)
     179#if defined(XP_UNIX)
    180180void PluginPackage::determineQuirks(const String& mimeType)
    181181{

  • trunk/Source/WebCore/plugins/PluginView.cpp

    r160457 r162451  
    834834    , m_haveUpdatedPluginWidget(false)
    835835#endif
    836 #if PLATFORM(EFL) || PLATFORM(NIX)
     836#if PLATFORM(EFL)
    837837    , m_window(0)
    838838#endif

  • trunk/Source/WebCore/plugins/PluginView.h

    r162139 r162451  
    355355#endif
    356356
    357 #if (PLATFORM(GTK) && OS(WINDOWS)) || PLATFORM(EFL) || PLATFORM(NIX)
     357#if (PLATFORM(GTK) && OS(WINDOWS)) || PLATFORM(EFL)
    358358        // On Mac OSX and Qt/Windows the plugin does not have its own native widget,
    359359        // but is using the containing window as its reference for positioning/painting.

  • trunk/Source/WebCore/plugins/PluginViewNone.cpp

    r156813 r162451  
    133133// added, please make sure they have the proper platform #ifs so that changes
    134134// do not break ports who compile both this file and PluginView.cpp.   
    135 #if PLATFORM(MAC) || PLATFORM(EFL) || OS(WINCE) || PLATFORM(NIX)
     135#if PLATFORM(MAC) || PLATFORM(EFL) || OS(WINCE)
    136136#if ENABLE(NETSCAPE_PLUGIN_API)
    137137void PluginView::keepAlive(NPP)

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

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