Changeset 155358 in webkit


Ignore:
Timestamp:
Sep 9, 2013 10:16:37 AM (11 years ago)
Author:
Hugo Parente Lima
Message:

Preparing WebCore to receive Nix Port
​https://bugs.webkit.org/show_bug.cgi?id=118326

Reviewed by Eric Carlson.

Only adding the compilation directives that are Nix specific, in the
existent WebCore files

  • loader/FrameLoader.cpp:

(WebCore::FrameLoader::defaultObjectContentType):

  • platform/Cursor.h:
  • platform/DragData.h:
  • platform/DragImage.h:
  • platform/FileSystem.h:
  • platform/RunLoop.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/GraphicsContext3D.cpp:
  • platform/graphics/GraphicsContext3D.h:
  • platform/graphics/OpenGLESShims.h:
  • platform/graphics/OpenGLShims.cpp:

(WebCore::getProcAddress):

  • platform/graphics/OpenGLShims.h:
  • platform/graphics/PlatformLayer.h:
  • platform/graphics/cairo/GLContext.cpp:

(WebCore::GLContext::createContextForWindow):

  • platform/graphics/cairo/GraphicsContext3DPrivate.cpp:

(WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):

  • 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/texmap/TextureMapper.h:
  • plugins/PluginPackage.cpp:
  • plugins/PluginView.cpp:

(WebCore::PluginView::PluginView):

  • plugins/PluginView.h:
  • plugins/PluginViewNone.cpp:
Location:
trunk/Source/WebCore
Files:
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r155356 r155358  
     12013-09-09  Hugo Parente Lima  <hugo.lima@openbossa.org>
     2
     3        Preparing WebCore to receive Nix Port
     4        https://bugs.webkit.org/show_bug.cgi?id=118326
     5
     6        Reviewed by Eric Carlson.
     7
     8        Only adding the compilation directives that are Nix specific, in the
     9        existent WebCore files
     10
     11        * loader/FrameLoader.cpp:
     12        (WebCore::FrameLoader::defaultObjectContentType):
     13        * platform/Cursor.h:
     14        * platform/DragData.h:
     15        * platform/DragImage.h:
     16        * platform/FileSystem.h:
     17        * platform/RunLoop.h:
     18        * platform/Widget.h:
     19        * platform/audio/FFTFrame.h:
     20        * platform/audio/HRTFElevation.cpp:
     21        * platform/cairo/WidgetBackingStore.h:
     22        * platform/graphics/ANGLEWebKitBridge.h:
     23        * platform/graphics/FontPlatformData.h:
     24        * platform/graphics/GraphicsContext3D.cpp:
     25        * platform/graphics/GraphicsContext3D.h:
     26        * platform/graphics/OpenGLESShims.h:
     27        * platform/graphics/OpenGLShims.cpp:
     28        (WebCore::getProcAddress):
     29        * platform/graphics/OpenGLShims.h:
     30        * platform/graphics/PlatformLayer.h:
     31        * platform/graphics/cairo/GLContext.cpp:
     32        (WebCore::GLContext::createContextForWindow):
     33        * platform/graphics/cairo/GraphicsContext3DPrivate.cpp:
     34        (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
     35        * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
     36        * platform/graphics/opengl/Extensions3DOpenGL.cpp:
     37        (WebCore::Extensions3DOpenGL::createVertexArrayOES):
     38        (WebCore::Extensions3DOpenGL::deleteVertexArrayOES):
     39        (WebCore::Extensions3DOpenGL::isVertexArrayOES):
     40        (WebCore::Extensions3DOpenGL::bindVertexArrayOES):
     41        (WebCore::Extensions3DOpenGL::supportsExtension):
     42        * platform/graphics/opengl/Extensions3DOpenGL.h:
     43        * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
     44        * platform/graphics/opengl/Extensions3DOpenGLES.h:
     45        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
     46        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
     47        (WebCore::GraphicsContext3D::reshape):
     48        * platform/graphics/texmap/TextureMapper.h:
     49        * plugins/PluginPackage.cpp:
     50        * plugins/PluginView.cpp:
     51        (WebCore::PluginView::PluginView):
     52        * plugins/PluginView.h:
     53        * plugins/PluginViewNone.cpp:
     54
    1552013-09-08  Darin Adler  <darin@apple.com>
    256

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

    r155300 r155358  
    907907        mimeType = mimeTypeFromURL(url);
    908908
    909 #if !PLATFORM(MAC) && !PLATFORM(EFL) // Mac has no PluginDatabase, nor does Chromium or EFL
     909#if !PLATFORM(MAC) && !PLATFORM(EFL) && !PLATFORM(NIX) // Mac has no PluginDatabase, nor does Nix or EFL
    910910    if (mimeType.isEmpty()) {
    911911        String decodedPath = decodeURLEscapeSequences(url.path());
    … …  
    917917        return ObjectContentFrame; // Go ahead and hope that we can display the content.
    918918
    919 #if !PLATFORM(MAC) && !PLATFORM(EFL) // Mac has no PluginDatabase, nor does Chromium or EFL
     919#if !PLATFORM(MAC) && !PLATFORM(EFL) && !PLATFORM(NIX) // Mac has no PluginDatabase, nor does Nix or EFL
    920920    bool plugInSupportsMIMEType = PluginDatabase::installedPlugins()->isMIMETypeRegistered(mimeType);
    921921#else

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

    r149186 r155358  
    5757
    5858// Looks like it's just PLATFORM(BLACKBERRY) still not using this?
    59 #if PLATFORM(WIN) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL)
     59#if PLATFORM(WIN) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(NIX)
    6060#define WTF_USE_LAZY_NATIVE_CURSOR 1
    6161#endif
    … …  
    8080#elif PLATFORM(GTK)
    8181    typedef GRefPtr<GdkCursor> PlatformCursor;
    82 #elif PLATFORM(EFL)
     82#elif PLATFORM(EFL) || PLATFORM(NIX)
    8383    typedef const char* PlatformCursor;
    8484#elif PLATFORM(QT) && !defined(QT_NO_CURSOR)

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

    r154493 r155358  
    6161}
    6262typedef WebCore::DataObjectGtk* DragDataRef;
    63 #elif PLATFORM(EFL) || PLATFORM(BLACKBERRY)
     63#elif PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(NIX)
    6464typedef void* DragDataRef;
    6565#endif

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

    r154088 r155358  
    6262#elif PLATFORM(GTK)
    6363    typedef cairo_surface_t* DragImageRef;
    64 #elif PLATFORM(EFL) || PLATFORM(BLACKBERRY)
     64#elif PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(NIX)
    6565    typedef void* DragImageRef;
    6666#endif

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

    r151111 r155358  
    6262#endif
    6363
    64 #if PLATFORM(GTK)
     64#if USE(GLIB)
    6565typedef struct _GFileIOStream GFileIOStream;
    6666typedef struct _GModule GModule;
    … …  
    7676#if OS(WINDOWS)
    7777typedef HMODULE PlatformModule;
    78 #elif PLATFORM(GTK)
    79 typedef GModule* PlatformModule;
    8078#elif PLATFORM(EFL)
    8179typedef Eina_Module* PlatformModule;
    … …  
    8886typedef void* PlatformModule;
    8987#endif
     88#elif USE(GLIB)
     89typedef GModule* PlatformModule;
    9090#elif USE(CF)
    9191typedef CFBundleRef PlatformModule;
    … …  
    121121typedef QFile* PlatformFileHandle;
    122122const PlatformFileHandle invalidPlatformFileHandle = 0;
    123 #elif PLATFORM(GTK)
     123#elif USE(GLIB) && !PLATFORM(EFL)
    124124typedef GFileIOStream* PlatformFileHandle;
    125125const PlatformFileHandle invalidPlatformFileHandle = 0;
    … …  
    213213#endif
    214214
    215 #if PLATFORM(GTK)
     215#if PLATFORM(GTK) || PLATFORM(NIX)
    216216String filenameToString(const char*);
    217217String filenameForDisplay(const String&);

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

    r149444 r155358  
    3737#include <wtf/Threading.h>
    3838
    39 #if PLATFORM(GTK)
     39#if USE(GLIB)
    4040#include <wtf/gobject/GRefPtr.h>
    4141#endif
    … …  
    100100        int m_ID;
    101101        bool m_isRepeating;
    102 #elif PLATFORM(GTK)
     102#elif PLATFORM(EFL)
     103        static bool timerFired(void* data);
     104        Ecore_Timer* m_timer;
     105        bool m_isRepeating;
     106#elif USE(GLIB)
    103107        static gboolean timerFiredCallback(RunLoop::TimerBase*);
    104108        gboolean isRepeating() const { return m_isRepeating; }
    … …  
    106110        GRefPtr<GSource> m_timerSource;
    107111        gboolean m_isRepeating;
    108 #elif PLATFORM(EFL)
    109         static bool timerFired(void* data);
    110         Ecore_Timer* m_timer;
    111         bool m_isRepeating;
    112112#endif
    113113    };
    … …  
    160160    class TimerObject;
    161161    TimerObject* m_timerObject;
    162 #elif PLATFORM(GTK)
    163 public:
    164     static gboolean queueWork(RunLoop*);
    165     GMainLoop* innermostLoop();
    166     void pushNestedMainLoop(GMainLoop*);
    167     void popNestedMainLoop();
    168 private:
    169     GRefPtr<GMainContext> m_runLoopContext;
    170     Vector<GRefPtr<GMainLoop> > m_runLoopMainLoops;
    171162#elif PLATFORM(EFL)
    172163    bool m_initEfl;
    … …  
    179170
    180171    static void wakeUpEvent(void* data, void*, unsigned int);
     172#elif USE(GLIB)
     173public:
     174    static gboolean queueWork(RunLoop*);
     175    GMainLoop* innermostLoop();
     176    void pushNestedMainLoop(GMainLoop*);
     177    void popNestedMainLoop();
     178private:
     179    GRefPtr<GMainContext> m_runLoopContext;
     180    Vector<GRefPtr<GMainLoop> > m_runLoopMainLoops;
    181181#endif
    182182};

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

    r152757 r155358  
    6666#endif
    6767
    68 #if PLATFORM(BLACKBERRY)
     68#if PLATFORM(BLACKBERRY) || PLATFORM(NIX)
    6969typedef void* PlatformWidget;
    7070#endif

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

    r155262 r155358  
    6868#endif // USE(WEBAUDIO_IPP)
    6969
     70#if PLATFORM(NIX)
     71#include <public/FFTFrame.h>
     72#endif
     73
    7074#include <wtf/Forward.h>
    7175#include <wtf/PassOwnPtr.h>
    … …  
    179183#endif // USE(WEBAUDIO_IPP)
    180184
     185#if PLATFORM(NIX)
     186    void scalePlanarData(float scale);
     187    OwnPtr<Nix::FFTFrame> m_fftFrame;
     188#endif // PLATFORM(NIX)
     189
    181190#if USE(WEBAUDIO_OPENMAX_DL_FFT)
    182191    static OMXFFTSpec_R_F32* contextForSize(unsigned log2FFTSize);

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

    r149778 r155358  
    6262const float ResponseSampleRate = 44100;
    6363
    64 #if PLATFORM(MAC) || USE(WEBAUDIO_GSTREAMER)
     64#if PLATFORM(MAC) || USE(WEBAUDIO_GSTREAMER) || PLATFORM(NIX)
    6565#define USE_CONCATENATED_IMPULSE_RESPONSES
    6666#endif

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

    r155251 r155358  
    4040#elif PLATFORM(EFL)
    4141typedef Evas_Object* PlatformWidget;
     42#elif PLATFORM(NIX)
     43typedef void* PlatformWidget;
    4244#endif
    4345

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

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

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

    r151743 r155358  
    3030#elif USE(WINGDI)
    3131#include "wince/FontPlatformData.h"
    32 #elif PLATFORM(EFL) || PLATFORM(GTK)
     32#elif PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(NIX)
    3333#include "freetype/FontPlatformData.h"
    3434#else

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

    r153492 r155358  
    2020#include "GLContext.h"
    2121
    22 #if USE(OPENGL)
     22#if USE(OPENGL) || (PLATFORM(NIX) && USE(OPENGL_ES_2))
    2323
    2424#if USE(EGL)
    … …  
    160160#endif
    161161
     162#if !PLATFORM(NIX)
    162163#if USE(GLX)
    163164    if (OwnPtr<GLContext> glxContext = GLContextGLX::createContext(windowHandle, sharingContext))
    … …  
    168169        return eglContext.release();
    169170#endif
     171#endif
    170172    return nullptr;
    171173}

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

    r155262 r155358  
    14721472}
    14731473
    1474 #if !PLATFORM(BLACKBERRY) && !PLATFORM(QT) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(MAC) && !PLATFORM(WIN)
     1474#if !PLATFORM(BLACKBERRY) && !PLATFORM(QT) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(NIX)
    14751475PlatformGraphicsContext3D GraphicsContext3D::platformGraphicsContext3D() const
    14761476{

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

    r155262 r155358  
    5050#endif
    5151
    52 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
     52#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
    5353#include "ANGLEWebKitBridge.h"
    5454#endif
    … …  
    6565class QSurface;
    6666QT_END_NAMESPACE
    67 #elif PLATFORM(GTK) || PLATFORM(EFL)
     67#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(NIX)
    6868typedef unsigned int GLuint;
    6969#endif
    … …  
    498498    bool makeContextCurrent();
    499499
    500 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
     500#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
    501501    // With multisampling on, blit from multisampleFBO to regular FBO.
    502502    void prepareTexture();
    … …  
    926926    static bool packPixels(const uint8_t* sourceData, DataFormat sourceDataFormat, unsigned width, unsigned height, unsigned sourceUnpackAlignment, unsigned destinationFormat, unsigned destinationType, AlphaOp, void* destinationData, bool flipY);
    927927
    928 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
     928#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
    929929    // Take into account the user's requested context creation attributes,
    930930    // in particular stencil and antialias, and determine which could or
    … …  
    947947    bool reshapeFBOs(const IntSize&);
    948948    void resolveMultisamplingIfNecessary(const IntRect& = IntRect());
    949 #if (PLATFORM(QT) || PLATFORM(EFL)) && USE(GRAPHICS_SURFACE)
     949#if (PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(NIX)) && USE(GRAPHICS_SURFACE)
    950950    void createGraphicsSurfaces(const IntSize&);
    951951#endif
    … …  
    966966#endif
    967967
    968 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
     968#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
    969969    struct SymbolInfo {
    970970        SymbolInfo()

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

    r153843 r155358  
    2626#include "NotImplemented.h"
    2727#include <wtf/OwnArrayPtr.h>
     28
     29#if PLATFORM(NIX) && USE(EGL)
     30#include "GLContextFromCurrentEGL.h"
     31#endif
    2832
    2933#if USE(CAIRO)
    … …  
    6064        break;
    6165    case GraphicsContext3D::RenderToCurrentGLContext:
     66#if PLATFORM(NIX) && USE(EGL)
     67        m_glContext = GLContextFromCurrentEGL::createFromCurrentGLContext();
     68#endif
    6269        break;
    6370    case GraphicsContext3D::RenderDirectlyToHostWindow:

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

    r151805 r155358  
    2727#define OpenGLESShims_h
    2828
    29 #if PLATFORM(BLACKBERRY) || PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
     29#if PLATFORM(BLACKBERRY) || PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
    3030#define glBindFramebufferEXT glBindFramebuffer
    3131#define glFramebufferTexture2DEXT glFramebufferTexture2D

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

    r152325 r155358  
    2727#endif
    2828
     29#if PLATFORM(NIX) && USE(EGL)
     30#include <EGL/egl.h>
     31#endif
     32
    2933#include <wtf/text/CString.h>
    3034#include <wtf/text/WTFString.h>
    … …  
    4953{
    5054    return GetProcAddress(GetModuleHandleA("libGLESv2"), procName);
     55}
     56#elif PLATFORM(NIX) && USE(EGL)
     57static void* getProcAddress(const char* procName)
     58{
     59    return reinterpret_cast<void*>(eglGetProcAddress(procName));
    5160}
    5261#else
    … …  
    107116}
    108117
    109 #if PLATFORM(QT) && defined(QT_OPENGL_ES_2)
     118#if (PLATFORM(QT) && defined(QT_OPENGL_ES_2)) || (PLATFORM(NIX) && USE(OPENGL_ES_2))
    110119
    111120// With Angle only EGL/GLES2 extensions are available through eglGetProcAddress, not the regular standardized functions.

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

    r151854 r155358  
    2626#include <QOpenGLContext>
    2727#include <QSurface>
     28#elif PLATFORM(NIX) && USE(OPENGL_ES_2)
     29#include <GLES2/gl2.h>
    2830#else
    2931#include <GL/gl.h>

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

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

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

    r141291 r155358  
    3232#include <wtf/text/WTFString.h>
    3333
    34 #if !PLATFORM(EFL)
     34#if !PLATFORM(EFL) && !PLATFORM(NIX)
    3535#include <gdk/gdk.h>
    3636#endif

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

    r151966 r155358  
    3636#include "ANGLE/ShaderLang.h"
    3737#include <OpenGL/gl.h>
    38 #elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT) || PLATFORM(WIN)
     38#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT) || PLATFORM(WIN) || PLATFORM(NIX)
    3939#include "OpenGLShims.h"
    4040#endif
    … …  
    6666    m_context->makeContextCurrent();
    6767    GLuint array = 0;
    68 #if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL)) || PLATFORM(WIN)
     68#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
    6969    if (isVertexArrayObjectSupported())
    7070        glGenVertexArrays(1, &array);
    … …  
    8181
    8282    m_context->makeContextCurrent();
    83 #if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(WIN))
     83#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
    8484    if (isVertexArrayObjectSupported())
    8585        glDeleteVertexArrays(1, &array);
    … …  
    9595
    9696    m_context->makeContextCurrent();
    97 #if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(WIN))
     97#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
    9898    if (isVertexArrayObjectSupported())
    9999        return glIsVertexArray(array);
    … …  
    107107{
    108108    m_context->makeContextCurrent();
    109 #if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(WIN))
     109#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
    110110    if (isVertexArrayObjectSupported())
    111111        glBindVertexArray(array);
    … …  
    161161    // GL_OES_vertex_array_object
    162162    if (name == "GL_OES_vertex_array_object") {
    163 #if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL))
     163#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(NIX))
    164164        return m_availableExtensions.contains("GL_ARB_vertex_array_object");
    165165#else
    … …  
    206206}
    207207
    208 #if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(WIN))
     208#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX))
    209209bool Extensions3DOpenGL::isVertexArrayObjectSupported()
    210210{

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

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

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

    r151966 r155358  
    4343#elif PLATFORM(MAC)
    4444#include <OpenGL/gl.h>
    45 #elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT) || PLATFORM(WIN)
     45#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT) || PLATFORM(WIN) || PLATFORM(NIX)
    4646#include "OpenGLShims.h"
    4747#endif

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

    r144358 r155358  
    7070#endif
    7171
     72#if PLATFORM(NIX) && USE(OPENGL_ES_2) && !GL_IMG_multisampled_render_to_texture
     73// on rPi, PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG is called PFNGLCLIPPLANEXIMG.
     74typedef PFNGLCLIPPLANEXIMG PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG;
     75#endif
     76
    7277namespace WebCore {
    7378

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

    r151966 r155358  
    4343#if PLATFORM(MAC)
    4444#include <OpenGL/gl.h>
    45 #elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT) || PLATFORM(WIN)
     45#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT) || PLATFORM(WIN) || PLATFORM(NIX)
    4646#include "OpenGLShims.h"
    4747#endif

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

    r153728 r155358  
    5858#elif PLATFORM(MAC)
    5959#include <OpenGL/gl.h>
    60 #elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT) || PLATFORM(WIN)
     60#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT) || PLATFORM(WIN) || PLATFORM(NIX)
    6161#include "OpenGLShims.h"
    6262#endif
    … …  
    220220        return;
    221221
    222 #if (PLATFORM(QT) || PLATFORM(EFL)) && USE(GRAPHICS_SURFACE)
     222#if (PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(NIX)) && USE(GRAPHICS_SURFACE)
    223223    ::glFlush(); // Make sure all GL calls have been committed before resizing.
    224224    createGraphicsSurfaces(IntSize(width, height));

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

    r149980 r155358  
    2929#endif
    3030#endif
    31 #if (PLATFORM(GTK) || PLATFORM(EFL)) && USE(OPENGL_ES_2)
     31#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(NIX)) && USE(OPENGL_ES_2)
    3232#define TEXMAP_OPENGL_ES_2
    3333#endif

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

    r144191 r155358  
    178178#endif
    179179
    180 #if defined(XP_UNIX)
     180#if defined(XP_UNIX) && !PLATFORM(NIX)
    181181void PluginPackage::determineQuirks(const String& mimeType)
    182182{

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

    r155321 r155358  
    831831    , m_haveUpdatedPluginWidget(false)
    832832#endif
    833 #if (PLATFORM(QT) && OS(WINDOWS)) || PLATFORM(EFL)
     833#if (PLATFORM(QT) && OS(WINDOWS)) || PLATFORM(EFL) || PLATFORM(NIX)
    834834    , m_window(0)
    835835#endif

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

    r154385 r155358  
    370370#endif
    371371
    372 #if ((PLATFORM(GTK) || PLATFORM(QT)) && OS(WINDOWS)) || PLATFORM(EFL)
     372#if ((PLATFORM(GTK) || PLATFORM(QT)) && OS(WINDOWS)) || PLATFORM(EFL) || PLATFORM(NIX)
    373373        // On Mac OSX and Qt/Windows the plugin does not have its own native widget,
    374374        // but is using the containing window as its reference for positioning/painting.

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

    r147888 r155358  
    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(QT)) || (PLATFORM(QT) && !OS(WINCE))
     135#if PLATFORM(MAC) || PLATFORM(EFL) || (OS(WINCE) && !PLATFORM(QT)) || (PLATFORM(QT) && !OS(WINCE)) || PLATFORM(NIX)
    136136#if ENABLE(NETSCAPE_PLUGIN_API)
    137137void PluginView::keepAlive(NPP)
Note: See TracChangeset for help on using the changeset viewer.