Changeset 161680 in webkit


Ignore:
Timestamp:
Jan 10, 2014, 2:48:57 PM (11 years ago)
Author:
benjamin@webkit.org
Message:

Remove the BlackBerry port from trunk
​https://bugs.webkit.org/show_bug.cgi?id=126715

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-01-10
Reviewed by Anders Carlsson.

  • platform/MIMETypeRegistry.cpp:

(WebCore::initializeSupportedImageMIMETypesForEncoding):

  • platform/PlatformKeyboardEvent.h:

(WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):

  • platform/PlatformMouseEvent.h:
  • platform/PlatformTouchEvent.h:

(WebCore::PlatformTouchEvent::PlatformTouchEvent):

  • platform/PlatformTouchPoint.h:
  • platform/ScrollAnimatorNone.cpp:

(WebCore::ScrollAnimator::create):

  • platform/URL.cpp:

(WebCore::URL::parse):
(WebCore::portAllowed):

  • platform/Widget.h:
  • platform/graphics/ANGLEWebKitBridge.h:
  • platform/graphics/DisplayRefreshMonitor.cpp:

(WebCore::DisplayRefreshMonitor::DisplayRefreshMonitor):

  • platform/graphics/DisplayRefreshMonitor.h:
  • platform/graphics/FloatPoint.h:
  • platform/graphics/FloatRect.h:
  • platform/graphics/FloatSize.h:
  • platform/graphics/FontCache.h:
  • platform/graphics/FontPlatformData.h:
  • platform/graphics/GlyphBuffer.h:
  • platform/graphics/Gradient.cpp:
  • platform/graphics/Gradient.h:
  • platform/graphics/GraphicsContext.h:
  • platform/graphics/GraphicsContext3D.h:
Location:
trunk/Source/WebCore
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r161678 r161680  
     12014-01-10  Benjamin Poulain  <bpoulain@apple.com>
     2
     3        Remove the BlackBerry port from trunk
     4        https://bugs.webkit.org/show_bug.cgi?id=126715
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * platform/MIMETypeRegistry.cpp:
     9        (WebCore::initializeSupportedImageMIMETypesForEncoding):
     10        * platform/PlatformKeyboardEvent.h:
     11        (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
     12        * platform/PlatformMouseEvent.h:
     13        * platform/PlatformTouchEvent.h:
     14        (WebCore::PlatformTouchEvent::PlatformTouchEvent):
     15        * platform/PlatformTouchPoint.h:
     16        * platform/ScrollAnimatorNone.cpp:
     17        (WebCore::ScrollAnimator::create):
     18        * platform/URL.cpp:
     19        (WebCore::URL::parse):
     20        (WebCore::portAllowed):
     21        * platform/Widget.h:
     22        * platform/graphics/ANGLEWebKitBridge.h:
     23        * platform/graphics/DisplayRefreshMonitor.cpp:
     24        (WebCore::DisplayRefreshMonitor::DisplayRefreshMonitor):
     25        * platform/graphics/DisplayRefreshMonitor.h:
     26        * platform/graphics/FloatPoint.h:
     27        * platform/graphics/FloatRect.h:
     28        * platform/graphics/FloatSize.h:
     29        * platform/graphics/FontCache.h:
     30        * platform/graphics/FontPlatformData.h:
     31        * platform/graphics/GlyphBuffer.h:
     32        * platform/graphics/Gradient.cpp:
     33        * platform/graphics/Gradient.h:
     34        * platform/graphics/GraphicsContext.h:
     35        * platform/graphics/GraphicsContext3D.h:
     36
    1372014-01-10  Timothy Hatcher  <timothy@apple.com>
    238

  • trunk/Source/WebCore/platform/MIMETypeRegistry.cpp

    r161589 r161680  
    311311#elif USE(CAIRO)
    312312    supportedImageMIMETypesForEncoding->add("image/png");
    313 #elif PLATFORM(BLACKBERRY)
    314     supportedImageMIMETypesForEncoding->add("image/png");
    315     supportedImageMIMETypesForEncoding->add("image/jpeg");
    316313#endif
    317314}
    … …  
    687684}
    688685
    689 #if !PLATFORM(BLACKBERRY) && !USE(CURL)
     686#if !USE(CURL)
    690687String MIMETypeRegistry::getNormalizedMIMEType(const String& mimeType)
    691688{
    … …  
    694691#endif
    695692
    696 #if PLATFORM(BLACKBERRY) || USE(CURL)
     693#if USE(CURL)
    697694typedef HashMap<String, String> MIMETypeAssociationMap;
    698695

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

    r161589 r161680  
    5050#endif
    5151
    52 #if PLATFORM(BLACKBERRY)
    53 namespace BlackBerry {
    54 namespace Platform {
    55 class KeyboardEvent;
    56 }
    57 }
    58 #endif
    59 
    6052#if PLATFORM(EFL)
    6153typedef struct _Evas_Event_Key_Down Evas_Event_Key_Down;
    … …  
    7668            , m_isKeypad(false)
    7769            , m_isSystemKey(false)
    78 #if PLATFORM(BLACKBERRY)
    79             , m_unmodifiedCharacter(0)
    80 #endif
    8170#if PLATFORM(GTK)
    8271            , m_gdkEventKey(0)
    … …  
    131120        static void getCurrentModifierState(bool& shiftKey, bool& ctrlKey, bool& altKey, bool& metaKey);
    132121
    133 #if PLATFORM(BLACKBERRY)
    134         unsigned unmodifiedCharacter() const { return m_unmodifiedCharacter; }
    135 #endif
    136 
    137122#if PLATFORM(MAC)
    138123#if !PLATFORM(IOS)
    … …  
    158143#endif
    159144
    160 #if PLATFORM(BLACKBERRY)
    161         PlatformKeyboardEvent(const BlackBerry::Platform::KeyboardEvent&);
    162 #endif
    163 
    164145#if PLATFORM(EFL)
    165146        explicit PlatformKeyboardEvent(const Evas_Event_Key_Down*);
    … …  
    177158        bool m_isKeypad;
    178159        bool m_isSystemKey;
    179 
    180 #if PLATFORM(BLACKBERRY)
    181         unsigned m_unmodifiedCharacter;
    182 #endif
    183160
    184161#if PLATFORM(MAC)

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

    r161589 r161680  
    4747    enum MouseButton { NoButton = -1, LeftButton, MiddleButton, RightButton };
    4848
    49 #if PLATFORM(BLACKBERRY)
    50     enum MouseInputMethod { PointingDevice, TouchScreen };
    51 #endif
    52    
    5349    class PlatformMouseEvent : public PlatformEvent {
    5450    public:
    … …  
    116112#endif
    117113
    118 #if PLATFORM(BLACKBERRY)
    119         PlatformMouseEvent(const IntPoint& eventPosition, const IntPoint& globalPosition, const PlatformEvent::Type, int clickCount, MouseButton, bool shiftKey, bool ctrlKey, bool altKey, MouseInputMethod = PointingDevice);
    120         MouseInputMethod inputMethod() const { return m_inputMethod; }
    121 #endif
    122114    protected:
    123115        IntPoint m_position;
    … …  
    134126#elif PLATFORM(WIN)
    135127        bool m_didActivateWebView;
    136 #elif PLATFORM(BLACKBERRY)
    137         MouseInputMethod m_inputMethod;
    138128#endif
    139129    };

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

    r156795 r161680  
    2727#if ENABLE(TOUCH_EVENTS)
    2828
    29 #if PLATFORM(BLACKBERRY)
    30 namespace BlackBerry {
    31 namespace Platform {
    32 class TouchEvent;
    33 };
    34 };
    35 #endif
    36 
    3729namespace WebCore {
    3830
    … …  
    4234    PlatformTouchEvent()
    4335        : PlatformEvent(PlatformEvent::TouchStart)
    44 #if PLATFORM(BLACKBERRY)
    45         , m_rotation(0)
    46         , m_scale(1)
    47         , m_doubleTap(false)
    48         , m_touchHold(false)
    49 #endif
    5036    {
    5137    }
    5238
    53 #if PLATFORM(BLACKBERRY)
    54     explicit PlatformTouchEvent(BlackBerry::Platform::TouchEvent*);
    55 #endif
    56 
    5739    const Vector<PlatformTouchPoint>& touchPoints() const { return m_touchPoints; }
    58 
    59 #if PLATFORM(BLACKBERRY)
    60     float rotation() const { return m_rotation; }
    61     float scale() const { return m_scale; }
    62     bool doubleTap() const { return m_doubleTap; }
    63     bool touchHold() const { return m_touchHold; }
    64 #endif
    6540
    6641protected:
    6742    Vector<PlatformTouchPoint> m_touchPoints;
    68 #if PLATFORM(BLACKBERRY)
    69     float m_rotation;
    70     float m_scale;
    71     bool m_doubleTap;
    72     bool m_touchHold;
    73 #endif
    7443};
    7544

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

    r156795 r161680  
    2626#if ENABLE(TOUCH_EVENTS)
    2727
    28 #if PLATFORM(BLACKBERRY)
    29 namespace BlackBerry {
    30 namespace Platform {
    31 class TouchPoint;
    32 };
    33 };
    34 #endif
    35 
    3628namespace WebCore {
    3729
    … …  
    5850    {
    5951    }
    60 
    61 #if PLATFORM(BLACKBERRY)
    62     PlatformTouchPoint(const BlackBerry::Platform::TouchPoint&);
    63 #endif
    6452
    6553    unsigned id() const { return m_id; }

  • trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp

    r157428 r161680  
    5252const double kZoomTicks = 11;
    5353
    54 #if !(PLATFORM(BLACKBERRY))
    5554PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea)
    5655{
    … …  
    5958    return adoptPtr(new ScrollAnimator(scrollableArea));
    6059}
    61 #endif
    6260
    6361ScrollAnimatorNone::Parameters::Parameters()

  • trunk/Source/WebCore/platform/URL.cpp

    r161589 r161680  
    11291129        && isLetterMatchIgnoringCase(url[3], 'e');
    11301130
    1131 #if PLATFORM(BLACKBERRY)
    1132     // Parse local: urls the same as file: urls.
    1133     if (!isFile)
    1134         isFile = schemeEnd == 5
    1135             && isLetterMatchIgnoringCase(url[0], 'l')
    1136             && isLetterMatchIgnoringCase(url[1], 'o')
    1137             && isLetterMatchIgnoringCase(url[2], 'c')
    1138             && isLetterMatchIgnoringCase(url[3], 'a')
    1139             && isLetterMatchIgnoringCase(url[4], 'l');
    1140 #endif
    1141 
    11421131    m_protocolIsInHTTPFamily = isLetterMatchIgnoringCase(url[0], 'h')
    11431132        && isLetterMatchIgnoringCase(url[1], 't')
    … …  
    19161905        return true;
    19171906
    1918 #if PLATFORM(BLACKBERRY)
    1919     if (url.protocolIs("local"))
    1920         return true;
    1921 #endif
    1922 
    19231907    return false;
    19241908}

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

    r161589 r161680  
    6060#endif
    6161
    62 #if PLATFORM(BLACKBERRY) || PLATFORM(NIX)
     62#if PLATFORM(NIX)
    6363typedef void* PlatformWidget;
    6464#endif
    … …  
    7373#endif
    7474
    75 #if PLATFORM(BLACKBERRY)
    76 #include "PageClientBlackBerry.h"
    77 typedef PageClientBlackBerry* PlatformPageClient;
    78 #elif PLATFORM(EFL)
     75#if PLATFORM(EFL)
    7976class PageClientEfl;
    8077typedef PageClientEfl* PlatformPageClient;

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

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

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

    r157299 r161680  
    6464    , m_displayLink(0)
    6565#endif
    66 #if PLATFORM(BLACKBERRY)
    67     , m_animationClient(0)
    68 #endif
    6966{
    7067}

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

    r161589 r161680  
    3535#include <wtf/RefPtr.h>
    3636#include <wtf/Threading.h>
    37 #if PLATFORM(BLACKBERRY)
    38 #include <BlackBerryPlatformAnimationFrameRateController.h>
    39 #endif
    4037
    4138#if PLATFORM(MAC)
    … …  
    123120    HashSet<DisplayRefreshMonitorClient*>* m_clientsToBeNotified;
    124121
    125 #if PLATFORM(BLACKBERRY)
    126 public:
    127     void displayLinkFired();
    128 private:
    129     DisplayAnimationClient *m_animationClient;
    130     void startAnimationClient();
    131     void stopAnimationClient();
    132 #endif
    133 
    134122#if PLATFORM(MAC) && !PLATFORM(IOS)
    135123public:

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

    r161589 r161680  
    3232#include <wtf/MathExtras.h>
    3333
    34 #if PLATFORM(BLACKBERRY)
    35 namespace BlackBerry {
    36 namespace Platform {
    37 class FloatPoint;
    38 }
    39 }
    40 #endif
    41 
    4234#if USE(CG)
    4335typedef struct CGPoint CGPoint;
    … …  
    147139#endif // !PLATFORM(IOS)
    148140
    149 #if PLATFORM(BLACKBERRY)
    150     FloatPoint(const BlackBerry::Platform::FloatPoint&);
    151     operator BlackBerry::Platform::FloatPoint() const;
    152 #endif
    153 
    154141    FloatPoint matrixTransform(const TransformationMatrix&) const;
    155142    FloatPoint matrixTransform(const AffineTransform&) const;

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

    r161589 r161680  
    4747#endif // PLATFORM(MAC) && !PLATFORM(IOS)
    4848
    49 #if PLATFORM(BLACKBERRY)
    50 namespace BlackBerry {
    51 namespace Platform {
    52 class FloatRect;
    53 }
    54 }
    55 #endif
    56 
    5749#if USE(CAIRO)
    5850typedef struct _cairo_rectangle cairo_rectangle_t;
    … …  
    175167    void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& p3);
    176168
    177 #if PLATFORM(BLACKBERRY)
    178     FloatRect(const BlackBerry::Platform::FloatRect&);
    179     operator BlackBerry::Platform::FloatRect() const;
    180     FloatRect normalized() const;
    181 #endif
    182 
    183169#if USE(CG)
    184170    FloatRect(const CGRect&);

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

    r161589 r161680  
    3232#include <wtf/MathExtras.h>
    3333
    34 #if PLATFORM(BLACKBERRY)
    35 namespace BlackBerry {
    36 namespace Platform {
    37 class FloatSize;
    38 }
    39 }
    40 #endif
    41 
    4234#if PLATFORM(IOS)
    4335#include <CoreGraphics/CoreGraphics.h>
    … …  
    117109    }
    118110
    119 #if PLATFORM(BLACKBERRY)
    120     FloatSize(const BlackBerry::Platform::FloatSize&);
    121     operator BlackBerry::Platform::FloatSize() const;
    122 #endif
    123 
    124111#if USE(CG)
    125112    explicit FloatSize(const CGSize&); // don't do this implicitly since it's lossy

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

    r161598 r161680  
    162162        bool isItalic;
    163163    };
    164 #if PLATFORM(BLACKBERRY)
    165     static void getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char* preferredLocale, const FontDescription&, SimpleFontFamily*);
    166 #else
    167164    static void getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char* preferredLocale, SimpleFontFamily*);
    168 #endif
    169165
    170166private:

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

    r161589 r161680  
    2424
    2525// FIXME: This is temporary until all ports switch to using this file.
    26 #if PLATFORM(BLACKBERRY)
    27 #include "harfbuzz/FontPlatformDataHarfBuzz.h"
    28 #elif USE(WINGDI)
     26#if USE(WINGDI)
    2927#include "wince/FontPlatformData.h"
    3028#elif PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(NIX)

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

    r156795 r161680  
    5252#elif USE(WINGDI)
    5353typedef wchar_t GlyphBufferGlyph;
    54 #elif PLATFORM(BLACKBERRY)
    55 typedef unsigned GlyphBufferGlyph;
    5654#else
    5755typedef Glyph GlyphBufferGlyph;

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

    r150088 r161680  
    171171}
    172172
    173 #if !USE(CAIRO) && !PLATFORM(BLACKBERRY)
     173#if !USE(CAIRO)
    174174void Gradient::setPlatformGradientSpaceTransform(const AffineTransform&)
    175175{

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

    r156795 r161680  
    4646typedef struct _cairo_pattern cairo_pattern_t;
    4747typedef cairo_pattern_t* PlatformGradient;
    48 #elif PLATFORM(BLACKBERRY)
    49 namespace BlackBerry {
    50 namespace Platform {
    51 namespace Graphics {
    52 class Gradient;
    53 }
    54 }
    55 }
    56 typedef BlackBerry::Platform::Graphics::Gradient* PlatformGradient;
    5748#else
    5849typedef void* PlatformGradient;

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

    r161589 r161680  
    4949#elif USE(WINGDI)
    5050typedef struct HDC__ PlatformGraphicsContext;
    51 #elif PLATFORM(BLACKBERRY)
    52 namespace BlackBerry {
    53 namespace Platform {
    54 namespace Graphics {
    55 class PlatformGraphicsContext;
    56 }
    57 }
    58 }
    59 using BlackBerry::Platform::Graphics::PlatformGraphicsContext;
    6051#else
    6152typedef void PlatformGraphicsContext;

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

    r161605 r161680  
    2727#define GraphicsContext3D_h
    2828
     29#include "ANGLEWebKitBridge.h"
    2930#include "GraphicsTypes3D.h"
    3031#include "Image.h"
    … …  
    4849// This define is from the X11 headers, but it's used below, so we must undefine it.
    4950#undef VERSION
    50 #endif
    51 
    52 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
    53 #include "ANGLEWebKitBridge.h"
    5451#endif
    5552
    … …  
    104101#if USE(CAIRO)
    105102class PlatformContextCairo;
    106 #elif PLATFORM(BLACKBERRY)
    107 class GraphicsContext;
    108103#endif
    109104
    … …  
    503498    bool makeContextCurrent();
    504499
    505 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
    506500    // With multisampling on, blit from multisampleFBO to regular FBO.
    507501    void prepareTexture();
    508 #endif
    509502
    510503    // Equivalent to ::glTexImage2D(). Allows pixels==0 with no allocation.
    … …  
    794787    void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,
    795788                       int canvasWidth, int canvasHeight, PlatformContextCairo* context);
    796 #elif PLATFORM(BLACKBERRY) || USE(CG)
     789#elif USE(CG)
    797790    void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,
    798791                       int canvasWidth, int canvasHeight, GraphicsContext*);
    … …  
    809802#if PLATFORM(IOS)
    810803    void endPaint();
    811 #endif
    812 
    813 #if PLATFORM(BLACKBERRY)
    814     bool paintsIntoCanvasBuffer() const;
    815804#endif
    816805
    … …  
    915904        RetainPtr<CFDataRef> m_pixelData;
    916905        std::unique_ptr<uint8_t[]> m_formalizedRGBA8Data;
    917 #elif PLATFORM(BLACKBERRY)
    918         Vector<unsigned> m_imageData;
    919906#endif
    920907        Image* m_image;
    … …  
    939926    static bool packPixels(const uint8_t* sourceData, DataFormat sourceDataFormat, unsigned width, unsigned height, unsigned sourceUnpackAlignment, unsigned destinationFormat, unsigned destinationType, AlphaOp, void* destinationData, bool flipY);
    940927
    941 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
    942928    // Take into account the user's requested context creation attributes,
    943929    // in particular stencil and antialias, and determine which could or
    … …  
    951937    void readRenderingResults(unsigned char* pixels, int pixelsSize);
    952938    void readPixelsAndConvertToBGRAIfNecessary(int x, int y, int width, int height, unsigned char* pixels);
    953 #endif
    954939
    955940#if PLATFORM(IOS)
    956941    bool setRenderbufferStorageFromDrawable(GC3Dsizei width, GC3Dsizei height);
    957 #endif
    958 
    959 #if PLATFORM(BLACKBERRY)
    960     void logFrameBufferStatus(int line);
    961     void readPixelsIMG(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, void* data);
    962942#endif
    963943
    … …  
    979959#elif PLATFORM(WIN) && USE(CA)
    980960    RefPtr<PlatformCALayer> m_webGLLayer;
    981 #elif PLATFORM(BLACKBERRY)
    982 #if USE(ACCELERATED_COMPOSITING)
    983     RefPtr<PlatformLayer> m_compositingLayer;
    984 #endif
    985     void* m_context;
    986 #endif
    987 
    988 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
     961#endif
     962
    989963    struct SymbolInfo {
    990964        SymbolInfo()
    … …  
    10731047
    10741048    OwnPtr<ShaderNameHash> nameHashMapForShaders;
    1075 #endif
    1076 
    1077 #if PLATFORM(BLACKBERRY) || ((PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)) && USE(OPENGL_ES_2))
     1049
     1050#if ((PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)) && USE(OPENGL_ES_2))
    10781051    friend class Extensions3DOpenGLES;
    10791052    OwnPtr<Extensions3DOpenGLES> m_extensions;
    … …  
    10891062
    10901063    GC3Duint m_texture;
    1091 #if !PLATFORM(BLACKBERRY)
    10921064    GC3Duint m_compositorTexture;
    1093 #endif
    10941065    GC3Duint m_fbo;
    10951066
    1096 #if !PLATFORM(BLACKBERRY)
    10971067    GC3Duint m_depthBuffer;
    10981068    GC3Duint m_stencilBuffer;
    1099 #endif
    11001069    GC3Duint m_depthStencilBuffer;
    11011070
    … …  
    11251094    ListHashSet<GC3Denum> m_syntheticErrors;
    11261095
    1127 #if PLATFORM(BLACKBERRY)
    1128     bool m_isImaginationHardware;
    1129 #endif
    1130 
    1131 #if !PLATFORM(BLACKBERRY)
    11321096    friend class GraphicsContext3DPrivate;
    11331097    OwnPtr<GraphicsContext3DPrivate> m_private;
    1134 #endif
    11351098};
    11361099
Note: See TracChangeset for help on using the changeset viewer.