Diff
Modified: trunk/Source/WebCore/ChangeLog (161679 => 161680)
--- trunk/Source/WebCore/ChangeLog 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 22:48:57 UTC (rev 161680)
@@ -1,3 +1,39 @@
+2014-01-10 Benjamin Poulain <[email protected]>
+
+ Remove the BlackBerry port from trunk
+ https://bugs.webkit.org/show_bug.cgi?id=126715
+
+ 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:
+
2014-01-10 Timothy Hatcher <[email protected]>
Clean up and fix some issues with stdout formatting of console messages.
Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp (161679 => 161680)
--- trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2014-01-10 22:48:57 UTC (rev 161680)
@@ -310,9 +310,6 @@
supportedImageMIMETypesForEncoding->add("image/ico");
#elif USE(CAIRO)
supportedImageMIMETypesForEncoding->add("image/png");
-#elif PLATFORM(BLACKBERRY)
- supportedImageMIMETypesForEncoding->add("image/png");
- supportedImageMIMETypesForEncoding->add("image/jpeg");
#endif
}
@@ -686,14 +683,14 @@
return defaultMIMEType;
}
-#if !PLATFORM(BLACKBERRY) && !USE(CURL)
+#if !USE(CURL)
String MIMETypeRegistry::getNormalizedMIMEType(const String& mimeType)
{
return mimeType;
}
#endif
-#if PLATFORM(BLACKBERRY) || USE(CURL)
+#if USE(CURL)
typedef HashMap<String, String> MIMETypeAssociationMap;
static const MIMETypeAssociationMap& mimeTypeAssociationMap()
Modified: trunk/Source/WebCore/platform/PlatformKeyboardEvent.h (161679 => 161680)
--- trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -49,14 +49,6 @@
#include "CompositionResults.h"
#endif
-#if PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class KeyboardEvent;
-}
-}
-#endif
-
#if PLATFORM(EFL)
typedef struct _Evas_Event_Key_Down Evas_Event_Key_Down;
typedef struct _Evas_Event_Key_Up Evas_Event_Key_Up;
@@ -75,9 +67,6 @@
, m_autoRepeat(false)
, m_isKeypad(false)
, m_isSystemKey(false)
-#if PLATFORM(BLACKBERRY)
- , m_unmodifiedCharacter(0)
-#endif
#if PLATFORM(GTK)
, m_gdkEventKey(0)
#endif
@@ -130,10 +119,6 @@
static bool currentCapsLockState();
static void getCurrentModifierState(bool& shiftKey, bool& ctrlKey, bool& altKey, bool& metaKey);
-#if PLATFORM(BLACKBERRY)
- unsigned unmodifiedCharacter() const { return m_unmodifiedCharacter; }
-#endif
-
#if PLATFORM(MAC)
#if !PLATFORM(IOS)
NSEvent* macEvent() const { return m_macEvent.get(); }
@@ -157,10 +142,6 @@
static String singleCharacterString(unsigned);
#endif
-#if PLATFORM(BLACKBERRY)
- PlatformKeyboardEvent(const BlackBerry::Platform::KeyboardEvent&);
-#endif
-
#if PLATFORM(EFL)
explicit PlatformKeyboardEvent(const Evas_Event_Key_Down*);
explicit PlatformKeyboardEvent(const Evas_Event_Key_Up*);
@@ -177,10 +158,6 @@
bool m_isKeypad;
bool m_isSystemKey;
-#if PLATFORM(BLACKBERRY)
- unsigned m_unmodifiedCharacter;
-#endif
-
#if PLATFORM(MAC)
#if !PLATFORM(IOS)
RetainPtr<NSEvent> m_macEvent;
Modified: trunk/Source/WebCore/platform/PlatformMouseEvent.h (161679 => 161680)
--- trunk/Source/WebCore/platform/PlatformMouseEvent.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/PlatformMouseEvent.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -46,10 +46,6 @@
// These button numbers match the ones used in the DOM API, 0 through 2, except for NoButton which isn't specified.
enum MouseButton { NoButton = -1, LeftButton, MiddleButton, RightButton };
-#if PLATFORM(BLACKBERRY)
- enum MouseInputMethod { PointingDevice, TouchScreen };
-#endif
-
class PlatformMouseEvent : public PlatformEvent {
public:
PlatformMouseEvent()
@@ -115,10 +111,6 @@
bool didActivateWebView() const { return m_didActivateWebView; }
#endif
-#if PLATFORM(BLACKBERRY)
- PlatformMouseEvent(const IntPoint& eventPosition, const IntPoint& globalPosition, const PlatformEvent::Type, int clickCount, MouseButton, bool shiftKey, bool ctrlKey, bool altKey, MouseInputMethod = PointingDevice);
- MouseInputMethod inputMethod() const { return m_inputMethod; }
-#endif
protected:
IntPoint m_position;
IntPoint m_globalPosition;
@@ -133,8 +125,6 @@
int m_eventNumber;
#elif PLATFORM(WIN)
bool m_didActivateWebView;
-#elif PLATFORM(BLACKBERRY)
- MouseInputMethod m_inputMethod;
#endif
};
Modified: trunk/Source/WebCore/platform/PlatformTouchEvent.h (161679 => 161680)
--- trunk/Source/WebCore/platform/PlatformTouchEvent.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/PlatformTouchEvent.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -26,14 +26,6 @@
#if ENABLE(TOUCH_EVENTS)
-#if PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class TouchEvent;
-};
-};
-#endif
-
namespace WebCore {
@@ -41,36 +33,13 @@
public:
PlatformTouchEvent()
: PlatformEvent(PlatformEvent::TouchStart)
-#if PLATFORM(BLACKBERRY)
- , m_rotation(0)
- , m_scale(1)
- , m_doubleTap(false)
- , m_touchHold(false)
-#endif
{
}
-#if PLATFORM(BLACKBERRY)
- explicit PlatformTouchEvent(BlackBerry::Platform::TouchEvent*);
-#endif
-
const Vector<PlatformTouchPoint>& touchPoints() const { return m_touchPoints; }
-#if PLATFORM(BLACKBERRY)
- float rotation() const { return m_rotation; }
- float scale() const { return m_scale; }
- bool doubleTap() const { return m_doubleTap; }
- bool touchHold() const { return m_touchHold; }
-#endif
-
protected:
Vector<PlatformTouchPoint> m_touchPoints;
-#if PLATFORM(BLACKBERRY)
- float m_rotation;
- float m_scale;
- bool m_doubleTap;
- bool m_touchHold;
-#endif
};
}
Modified: trunk/Source/WebCore/platform/PlatformTouchPoint.h (161679 => 161680)
--- trunk/Source/WebCore/platform/PlatformTouchPoint.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/PlatformTouchPoint.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -25,14 +25,6 @@
#if ENABLE(TOUCH_EVENTS)
-#if PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class TouchPoint;
-};
-};
-#endif
-
namespace WebCore {
class PlatformTouchEvent;
@@ -58,10 +50,6 @@
{
}
-#if PLATFORM(BLACKBERRY)
- PlatformTouchPoint(const BlackBerry::Platform::TouchPoint&);
-#endif
-
unsigned id() const { return m_id; }
State state() const { return m_state; }
IntPoint screenPos() const { return m_screenPos; }
Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp (161679 => 161680)
--- trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2014-01-10 22:48:57 UTC (rev 161680)
@@ -51,14 +51,12 @@
const double kMinimumTimerInterval = .001;
const double kZoomTicks = 11;
-#if !(PLATFORM(BLACKBERRY))
PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea)
{
if (scrollableArea && scrollableArea->scrollAnimatorEnabled())
return adoptPtr(new ScrollAnimatorNone(scrollableArea));
return adoptPtr(new ScrollAnimator(scrollableArea));
}
-#endif
ScrollAnimatorNone::Parameters::Parameters()
: m_isEnabled(false)
Modified: trunk/Source/WebCore/platform/URL.cpp (161679 => 161680)
--- trunk/Source/WebCore/platform/URL.cpp 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/URL.cpp 2014-01-10 22:48:57 UTC (rev 161680)
@@ -1128,17 +1128,6 @@
&& isLetterMatchIgnoringCase(url[2], 'l')
&& isLetterMatchIgnoringCase(url[3], 'e');
-#if PLATFORM(BLACKBERRY)
- // Parse local: urls the same as file: urls.
- if (!isFile)
- isFile = schemeEnd == 5
- && isLetterMatchIgnoringCase(url[0], 'l')
- && isLetterMatchIgnoringCase(url[1], 'o')
- && isLetterMatchIgnoringCase(url[2], 'c')
- && isLetterMatchIgnoringCase(url[3], 'a')
- && isLetterMatchIgnoringCase(url[4], 'l');
-#endif
-
m_protocolIsInHTTPFamily = isLetterMatchIgnoringCase(url[0], 'h')
&& isLetterMatchIgnoringCase(url[1], 't')
&& isLetterMatchIgnoringCase(url[2], 't')
@@ -1915,11 +1904,6 @@
if (url.protocolIs("file"))
return true;
-#if PLATFORM(BLACKBERRY)
- if (url.protocolIs("local"))
- return true;
-#endif
-
return false;
}
Modified: trunk/Source/WebCore/platform/Widget.h (161679 => 161680)
--- trunk/Source/WebCore/platform/Widget.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/Widget.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -59,7 +59,7 @@
typedef GtkWidget* PlatformWidget;
#endif
-#if PLATFORM(BLACKBERRY) || PLATFORM(NIX)
+#if PLATFORM(NIX)
typedef void* PlatformWidget;
#endif
@@ -72,10 +72,7 @@
typedef Evas_Object* PlatformWidget;
#endif
-#if PLATFORM(BLACKBERRY)
-#include "PageClientBlackBerry.h"
-typedef PageClientBlackBerry* PlatformPageClient;
-#elif PLATFORM(EFL)
+#if PLATFORM(EFL)
class PageClientEfl;
typedef PageClientEfl* PlatformPageClient;
#else
Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h (161679 => 161680)
--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -29,7 +29,7 @@
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
-#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(BLACKBERRY) && !PLATFORM(WIN) && !PLATFORM(NIX)
+#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN) && !PLATFORM(NIX)
#include "ANGLE/ShaderLang.h"
#elif PLATFORM(WIN)
#include "GLSLANG/ShaderLang.h"
Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp (161679 => 161680)
--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2014-01-10 22:48:57 UTC (rev 161680)
@@ -63,9 +63,6 @@
#if PLATFORM(MAC)
, m_displayLink(0)
#endif
-#if PLATFORM(BLACKBERRY)
- , m_animationClient(0)
-#endif
{
}
Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h (161679 => 161680)
--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -34,9 +34,6 @@
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
#include <wtf/Threading.h>
-#if PLATFORM(BLACKBERRY)
-#include <BlackBerryPlatformAnimationFrameRateController.h>
-#endif
#if PLATFORM(MAC)
typedef struct __CVDisplayLink *CVDisplayLinkRef;
@@ -122,15 +119,6 @@
HashSet<DisplayRefreshMonitorClient*> m_clients;
HashSet<DisplayRefreshMonitorClient*>* m_clientsToBeNotified;
-#if PLATFORM(BLACKBERRY)
-public:
- void displayLinkFired();
-private:
- DisplayAnimationClient *m_animationClient;
- void startAnimationClient();
- void stopAnimationClient();
-#endif
-
#if PLATFORM(MAC) && !PLATFORM(IOS)
public:
void displayLinkFired(double nowSeconds, double outputTimeSeconds);
Modified: trunk/Source/WebCore/platform/graphics/FloatPoint.h (161679 => 161680)
--- trunk/Source/WebCore/platform/graphics/FloatPoint.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/graphics/FloatPoint.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -31,14 +31,6 @@
#include "IntPoint.h"
#include <wtf/MathExtras.h>
-#if PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class FloatPoint;
-}
-}
-#endif
-
#if USE(CG)
typedef struct CGPoint CGPoint;
#endif
@@ -146,11 +138,6 @@
#endif
#endif // !PLATFORM(IOS)
-#if PLATFORM(BLACKBERRY)
- FloatPoint(const BlackBerry::Platform::FloatPoint&);
- operator BlackBerry::Platform::FloatPoint() const;
-#endif
-
FloatPoint matrixTransform(const TransformationMatrix&) const;
FloatPoint matrixTransform(const AffineTransform&) const;
Modified: trunk/Source/WebCore/platform/graphics/FloatRect.h (161679 => 161680)
--- trunk/Source/WebCore/platform/graphics/FloatRect.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -46,14 +46,6 @@
#endif
#endif // PLATFORM(MAC) && !PLATFORM(IOS)
-#if PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class FloatRect;
-}
-}
-#endif
-
#if USE(CAIRO)
typedef struct _cairo_rectangle cairo_rectangle_t;
#endif
@@ -174,12 +166,6 @@
void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2);
void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& p3);
-#if PLATFORM(BLACKBERRY)
- FloatRect(const BlackBerry::Platform::FloatRect&);
- operator BlackBerry::Platform::FloatRect() const;
- FloatRect normalized() const;
-#endif
-
#if USE(CG)
FloatRect(const CGRect&);
operator CGRect() const;
Modified: trunk/Source/WebCore/platform/graphics/FloatSize.h (161679 => 161680)
--- trunk/Source/WebCore/platform/graphics/FloatSize.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/graphics/FloatSize.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -31,14 +31,6 @@
#include "IntPoint.h"
#include <wtf/MathExtras.h>
-#if PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class FloatSize;
-}
-}
-#endif
-
#if PLATFORM(IOS)
#include <CoreGraphics/CoreGraphics.h>
#endif
@@ -116,11 +108,6 @@
return FloatSize(m_height, m_width);
}
-#if PLATFORM(BLACKBERRY)
- FloatSize(const BlackBerry::Platform::FloatSize&);
- operator BlackBerry::Platform::FloatSize() const;
-#endif
-
#if USE(CG)
explicit FloatSize(const CGSize&); // don't do this implicitly since it's lossy
operator CGSize() const;
Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (161679 => 161680)
--- trunk/Source/WebCore/platform/graphics/FontCache.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -161,11 +161,7 @@
bool isBold;
bool isItalic;
};
-#if PLATFORM(BLACKBERRY)
- static void getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char* preferredLocale, const FontDescription&, SimpleFontFamily*);
-#else
static void getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char* preferredLocale, SimpleFontFamily*);
-#endif
private:
FontCache();
Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (161679 => 161680)
--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -23,9 +23,7 @@
*/
// FIXME: This is temporary until all ports switch to using this file.
-#if PLATFORM(BLACKBERRY)
-#include "harfbuzz/FontPlatformDataHarfBuzz.h"
-#elif USE(WINGDI)
+#if USE(WINGDI)
#include "wince/FontPlatformData.h"
#elif PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(NIX)
#include "freetype/FontPlatformData.h"
Modified: trunk/Source/WebCore/platform/graphics/GlyphBuffer.h (161679 => 161680)
--- trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -51,8 +51,6 @@
typedef cairo_glyph_t GlyphBufferGlyph;
#elif USE(WINGDI)
typedef wchar_t GlyphBufferGlyph;
-#elif PLATFORM(BLACKBERRY)
-typedef unsigned GlyphBufferGlyph;
#else
typedef Glyph GlyphBufferGlyph;
#endif
Modified: trunk/Source/WebCore/platform/graphics/Gradient.cpp (161679 => 161680)
--- trunk/Source/WebCore/platform/graphics/Gradient.cpp 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/graphics/Gradient.cpp 2014-01-10 22:48:57 UTC (rev 161680)
@@ -170,7 +170,7 @@
invalidateHash();
}
-#if !USE(CAIRO) && !PLATFORM(BLACKBERRY)
+#if !USE(CAIRO)
void Gradient::setPlatformGradientSpaceTransform(const AffineTransform&)
{
}
Modified: trunk/Source/WebCore/platform/graphics/Gradient.h (161679 => 161680)
--- trunk/Source/WebCore/platform/graphics/Gradient.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/graphics/Gradient.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -45,15 +45,6 @@
#elif USE(CAIRO)
typedef struct _cairo_pattern cairo_pattern_t;
typedef cairo_pattern_t* PlatformGradient;
-#elif PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-namespace Graphics {
-class Gradient;
-}
-}
-}
-typedef BlackBerry::Platform::Graphics::Gradient* PlatformGradient;
#else
typedef void* PlatformGradient;
#endif
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (161679 => 161680)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -48,15 +48,6 @@
typedef WebCore::PlatformContextCairo PlatformGraphicsContext;
#elif USE(WINGDI)
typedef struct HDC__ PlatformGraphicsContext;
-#elif PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-namespace Graphics {
-class PlatformGraphicsContext;
-}
-}
-}
-using BlackBerry::Platform::Graphics::PlatformGraphicsContext;
#else
typedef void PlatformGraphicsContext;
#endif
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (161679 => 161680)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-01-10 22:24:00 UTC (rev 161679)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-01-10 22:48:57 UTC (rev 161680)
@@ -26,6 +26,7 @@
#ifndef GraphicsContext3D_h
#define GraphicsContext3D_h
+#include "ANGLEWebKitBridge.h"
#include "GraphicsTypes3D.h"
#include "Image.h"
#include "IntRect.h"
@@ -49,10 +50,6 @@
#undef VERSION
#endif
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
-#include "ANGLEWebKitBridge.h"
-#endif
-
#if PLATFORM(MAC)
#if PLATFORM(IOS)
#include <OpenGLES/ES2/gl.h>
@@ -103,8 +100,6 @@
class IntSize;
#if USE(CAIRO)
class PlatformContextCairo;
-#elif PLATFORM(BLACKBERRY)
-class GraphicsContext;
#endif
typedef WTF::HashMap<CString, uint64_t> ShaderNameHash;
@@ -502,10 +497,8 @@
bool makeContextCurrent();
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
// With multisampling on, blit from multisampleFBO to regular FBO.
void prepareTexture();
-#endif
// Equivalent to ::glTexImage2D(). Allows pixels==0 with no allocation.
void texImage2DDirect(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, const void* pixels);
@@ -793,7 +786,7 @@
#if PLATFORM(GTK) || PLATFORM(EFL) || USE(CAIRO)
void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,
int canvasWidth, int canvasHeight, PlatformContextCairo* context);
-#elif PLATFORM(BLACKBERRY) || USE(CG)
+#elif USE(CG)
void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,
int canvasWidth, int canvasHeight, GraphicsContext*);
#endif
@@ -810,10 +803,6 @@
void endPaint();
#endif
-#if PLATFORM(BLACKBERRY)
- bool paintsIntoCanvasBuffer() const;
-#endif
-
// Support for buffer creation and deletion
Platform3DObject createBuffer();
Platform3DObject createFramebuffer();
@@ -914,8 +903,6 @@
RetainPtr<CGImageRef> m_decodedImage;
RetainPtr<CFDataRef> m_pixelData;
std::unique_ptr<uint8_t[]> m_formalizedRGBA8Data;
-#elif PLATFORM(BLACKBERRY)
- Vector<unsigned> m_imageData;
#endif
Image* m_image;
ImageHtmlDomSource m_imageHtmlDomSource;
@@ -938,7 +925,6 @@
// Destination data will have no gaps between rows.
static bool packPixels(const uint8_t* sourceData, DataFormat sourceDataFormat, unsigned width, unsigned height, unsigned sourceUnpackAlignment, unsigned destinationFormat, unsigned destinationType, AlphaOp, void* destinationData, bool flipY);
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
// Take into account the user's requested context creation attributes,
// in particular stencil and antialias, and determine which could or
// could not be honored based on the capabilities of the OpenGL
@@ -950,17 +936,11 @@
// backbuffer.
void readRenderingResults(unsigned char* pixels, int pixelsSize);
void readPixelsAndConvertToBGRAIfNecessary(int x, int y, int width, int height, unsigned char* pixels);
-#endif
#if PLATFORM(IOS)
bool setRenderbufferStorageFromDrawable(GC3Dsizei width, GC3Dsizei height);
#endif
-#if PLATFORM(BLACKBERRY)
- void logFrameBufferStatus(int line);
- void readPixelsIMG(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, void* data);
-#endif
-
bool reshapeFBOs(const IntSize&);
void resolveMultisamplingIfNecessary(const IntRect& = IntRect());
#if (PLATFORM(EFL) || PLATFORM(NIX)) && USE(GRAPHICS_SURFACE)
@@ -978,14 +958,8 @@
RetainPtr<WebGLLayer> m_webGLLayer;
#elif PLATFORM(WIN) && USE(CA)
RefPtr<PlatformCALayer> m_webGLLayer;
-#elif PLATFORM(BLACKBERRY)
-#if USE(ACCELERATED_COMPOSITING)
- RefPtr<PlatformLayer> m_compositingLayer;
#endif
- void* m_context;
-#endif
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
struct SymbolInfo {
SymbolInfo()
: type(0)
@@ -1072,9 +1046,8 @@
ANGLEWebKitBridge m_compiler;
OwnPtr<ShaderNameHash> nameHashMapForShaders;
-#endif
-#if PLATFORM(BLACKBERRY) || ((PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)) && USE(OPENGL_ES_2))
+#if ((PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)) && USE(OPENGL_ES_2))
friend class Extensions3DOpenGLES;
OwnPtr<Extensions3DOpenGLES> m_extensions;
#else
@@ -1088,15 +1061,11 @@
Vector<Vector<float>> m_vertexArray;
GC3Duint m_texture;
-#if !PLATFORM(BLACKBERRY)
GC3Duint m_compositorTexture;
-#endif
GC3Duint m_fbo;
-#if !PLATFORM(BLACKBERRY)
GC3Duint m_depthBuffer;
GC3Duint m_stencilBuffer;
-#endif
GC3Duint m_depthStencilBuffer;
bool m_layerComposited;
@@ -1124,14 +1093,8 @@
// Errors raised by synthesizeGLError().
ListHashSet<GC3Denum> m_syntheticErrors;
-#if PLATFORM(BLACKBERRY)
- bool m_isImaginationHardware;
-#endif
-
-#if !PLATFORM(BLACKBERRY)
friend class GraphicsContext3DPrivate;
OwnPtr<GraphicsContext3DPrivate> m_private;
-#endif
};
} // namespace WebCore
