<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161680] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161680">161680</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-10 14:48:57 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformMIMETypeRegistrycpp">trunk/Source/WebCore/platform/MIMETypeRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformKeyboardEventh">trunk/Source/WebCore/platform/PlatformKeyboardEvent.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformMouseEventh">trunk/Source/WebCore/platform/PlatformMouseEvent.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformTouchEventh">trunk/Source/WebCore/platform/PlatformTouchEvent.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformTouchPointh">trunk/Source/WebCore/platform/PlatformTouchPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorNonecpp">trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLcpp">trunk/Source/WebCore/platform/URL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformWidgeth">trunk/Source/WebCore/platform/Widget.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsANGLEWebKitBridgeh">trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsDisplayRefreshMonitorcpp">trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsDisplayRefreshMonitorh">trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatPointh">trunk/Source/WebCore/platform/graphics/FloatPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRecth">trunk/Source/WebCore/platform/graphics/FloatRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatSizeh">trunk/Source/WebCore/platform/graphics/FloatSize.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCacheh">trunk/Source/WebCore/platform/graphics/FontCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontPlatformDatah">trunk/Source/WebCore/platform/graphics/FontPlatformData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGlyphBufferh">trunk/Source/WebCore/platform/graphics/GlyphBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGradientcpp">trunk/Source/WebCore/platform/graphics/Gradient.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGradienth">trunk/Source/WebCore/platform/graphics/Gradient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContext3Dh">trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-01-10 Benjamin Poulain <bpoulain@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-01-10 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up and fix some issues with stdout formatting of console messages.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMIMETypeRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -310,9 +310,6 @@
</span><span class="cx"> supportedImageMIMETypesForEncoding->add("image/ico");
</span><span class="cx"> #elif USE(CAIRO)
</span><span class="cx"> supportedImageMIMETypesForEncoding->add("image/png");
</span><del>-#elif PLATFORM(BLACKBERRY)
- supportedImageMIMETypesForEncoding->add("image/png");
- supportedImageMIMETypesForEncoding->add("image/jpeg");
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -686,14 +683,14 @@
</span><span class="cx"> return defaultMIMEType;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(BLACKBERRY) && !USE(CURL)
</del><ins>+#if !USE(CURL)
</ins><span class="cx"> String MIMETypeRegistry::getNormalizedMIMEType(const String& mimeType)
</span><span class="cx"> {
</span><span class="cx"> return mimeType;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY) || USE(CURL)
</del><ins>+#if USE(CURL)
</ins><span class="cx"> typedef HashMap<String, String> MIMETypeAssociationMap;
</span><span class="cx">
</span><span class="cx"> static const MIMETypeAssociationMap& mimeTypeAssociationMap()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformKeyboardEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformKeyboardEvent.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -49,14 +49,6 @@
</span><span class="cx"> #include "CompositionResults.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class KeyboardEvent;
-}
-}
-#endif
-
</del><span class="cx"> #if PLATFORM(EFL)
</span><span class="cx"> typedef struct _Evas_Event_Key_Down Evas_Event_Key_Down;
</span><span class="cx"> typedef struct _Evas_Event_Key_Up Evas_Event_Key_Up;
</span><span class="lines">@@ -75,9 +67,6 @@
</span><span class="cx"> , m_autoRepeat(false)
</span><span class="cx"> , m_isKeypad(false)
</span><span class="cx"> , m_isSystemKey(false)
</span><del>-#if PLATFORM(BLACKBERRY)
- , m_unmodifiedCharacter(0)
-#endif
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> , m_gdkEventKey(0)
</span><span class="cx"> #endif
</span><span class="lines">@@ -130,10 +119,6 @@
</span><span class="cx"> static bool currentCapsLockState();
</span><span class="cx"> static void getCurrentModifierState(bool& shiftKey, bool& ctrlKey, bool& altKey, bool& metaKey);
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- unsigned unmodifiedCharacter() const { return m_unmodifiedCharacter; }
-#endif
-
</del><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> NSEvent* macEvent() const { return m_macEvent.get(); }
</span><span class="lines">@@ -157,10 +142,6 @@
</span><span class="cx"> static String singleCharacterString(unsigned);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- PlatformKeyboardEvent(const BlackBerry::Platform::KeyboardEvent&);
-#endif
-
</del><span class="cx"> #if PLATFORM(EFL)
</span><span class="cx"> explicit PlatformKeyboardEvent(const Evas_Event_Key_Down*);
</span><span class="cx"> explicit PlatformKeyboardEvent(const Evas_Event_Key_Up*);
</span><span class="lines">@@ -177,10 +158,6 @@
</span><span class="cx"> bool m_isKeypad;
</span><span class="cx"> bool m_isSystemKey;
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- unsigned m_unmodifiedCharacter;
-#endif
-
</del><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> RetainPtr<NSEvent> m_macEvent;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformMouseEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformMouseEvent.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -46,10 +46,6 @@
</span><span class="cx"> // These button numbers match the ones used in the DOM API, 0 through 2, except for NoButton which isn't specified.
</span><span class="cx"> enum MouseButton { NoButton = -1, LeftButton, MiddleButton, RightButton };
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- enum MouseInputMethod { PointingDevice, TouchScreen };
-#endif
-
</del><span class="cx"> class PlatformMouseEvent : public PlatformEvent {
</span><span class="cx"> public:
</span><span class="cx"> PlatformMouseEvent()
</span><span class="lines">@@ -115,10 +111,6 @@
</span><span class="cx"> bool didActivateWebView() const { return m_didActivateWebView; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#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
</del><span class="cx"> protected:
</span><span class="cx"> IntPoint m_position;
</span><span class="cx"> IntPoint m_globalPosition;
</span><span class="lines">@@ -133,8 +125,6 @@
</span><span class="cx"> int m_eventNumber;
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> bool m_didActivateWebView;
</span><del>-#elif PLATFORM(BLACKBERRY)
- MouseInputMethod m_inputMethod;
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformTouchEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformTouchEvent.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,14 +26,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class TouchEvent;
-};
-};
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -41,36 +33,13 @@
</span><span class="cx"> public:
</span><span class="cx"> PlatformTouchEvent()
</span><span class="cx"> : PlatformEvent(PlatformEvent::TouchStart)
</span><del>-#if PLATFORM(BLACKBERRY)
- , m_rotation(0)
- , m_scale(1)
- , m_doubleTap(false)
- , m_touchHold(false)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- explicit PlatformTouchEvent(BlackBerry::Platform::TouchEvent*);
-#endif
-
</del><span class="cx"> const Vector<PlatformTouchPoint>& touchPoints() const { return m_touchPoints; }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> protected:
</span><span class="cx"> Vector<PlatformTouchPoint> m_touchPoints;
</span><del>-#if PLATFORM(BLACKBERRY)
- float m_rotation;
- float m_scale;
- bool m_doubleTap;
- bool m_touchHold;
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformTouchPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformTouchPoint.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,14 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class TouchPoint;
-};
-};
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class PlatformTouchEvent;
</span><span class="lines">@@ -58,10 +50,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- PlatformTouchPoint(const BlackBerry::Platform::TouchPoint&);
-#endif
-
</del><span class="cx"> unsigned id() const { return m_id; }
</span><span class="cx"> State state() const { return m_state; }
</span><span class="cx"> IntPoint screenPos() const { return m_screenPos; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorNonecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -51,14 +51,12 @@
</span><span class="cx"> const double kMinimumTimerInterval = .001;
</span><span class="cx"> const double kZoomTicks = 11;
</span><span class="cx">
</span><del>-#if !(PLATFORM(BLACKBERRY))
</del><span class="cx"> PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea)
</span><span class="cx"> {
</span><span class="cx"> if (scrollableArea && scrollableArea->scrollAnimatorEnabled())
</span><span class="cx"> return adoptPtr(new ScrollAnimatorNone(scrollableArea));
</span><span class="cx"> return adoptPtr(new ScrollAnimator(scrollableArea));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> ScrollAnimatorNone::Parameters::Parameters()
</span><span class="cx"> : m_isEnabled(false)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.cpp (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1128,17 +1128,6 @@
</span><span class="cx"> && isLetterMatchIgnoringCase(url[2], 'l')
</span><span class="cx"> && isLetterMatchIgnoringCase(url[3], 'e');
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> m_protocolIsInHTTPFamily = isLetterMatchIgnoringCase(url[0], 'h')
</span><span class="cx"> && isLetterMatchIgnoringCase(url[1], 't')
</span><span class="cx"> && isLetterMatchIgnoringCase(url[2], 't')
</span><span class="lines">@@ -1915,11 +1904,6 @@
</span><span class="cx"> if (url.protocolIs("file"))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- if (url.protocolIs("local"))
- return true;
-#endif
-
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformWidgeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Widget.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> typedef GtkWidget* PlatformWidget;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY) || PLATFORM(NIX)
</del><ins>+#if PLATFORM(NIX)
</ins><span class="cx"> typedef void* PlatformWidget;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -72,10 +72,7 @@
</span><span class="cx"> typedef Evas_Object* PlatformWidget;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-#include "PageClientBlackBerry.h"
-typedef PageClientBlackBerry* PlatformPageClient;
-#elif PLATFORM(EFL)
</del><ins>+#if PLATFORM(EFL)
</ins><span class="cx"> class PageClientEfl;
</span><span class="cx"> typedef PageClientEfl* PlatformPageClient;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsANGLEWebKitBridgeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(BLACKBERRY) && !PLATFORM(WIN) && !PLATFORM(NIX)
</del><ins>+#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN) && !PLATFORM(NIX)
</ins><span class="cx"> #include "ANGLE/ShaderLang.h"
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> #include "GLSLANG/ShaderLang.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsDisplayRefreshMonitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -63,9 +63,6 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> , m_displayLink(0)
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(BLACKBERRY)
- , m_animationClient(0)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsDisplayRefreshMonitorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,9 +34,6 @@
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><del>-#if PLATFORM(BLACKBERRY)
-#include <BlackBerryPlatformAnimationFrameRateController.h>
-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> typedef struct __CVDisplayLink *CVDisplayLinkRef;
</span><span class="lines">@@ -122,15 +119,6 @@
</span><span class="cx"> HashSet<DisplayRefreshMonitorClient*> m_clients;
</span><span class="cx"> HashSet<DisplayRefreshMonitorClient*>* m_clientsToBeNotified;
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-public:
- void displayLinkFired();
-private:
- DisplayAnimationClient *m_animationClient;
- void startAnimationClient();
- void stopAnimationClient();
-#endif
-
</del><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx"> public:
</span><span class="cx"> void displayLinkFired(double nowSeconds, double outputTimeSeconds);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatPoint.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,14 +31,6 @@
</span><span class="cx"> #include "IntPoint.h"
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class FloatPoint;
-}
-}
-#endif
-
</del><span class="cx"> #if USE(CG)
</span><span class="cx"> typedef struct CGPoint CGPoint;
</span><span class="cx"> #endif
</span><span class="lines">@@ -146,11 +138,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- FloatPoint(const BlackBerry::Platform::FloatPoint&);
- operator BlackBerry::Platform::FloatPoint() const;
-#endif
-
</del><span class="cx"> FloatPoint matrixTransform(const TransformationMatrix&) const;
</span><span class="cx"> FloatPoint matrixTransform(const AffineTransform&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRect.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -46,14 +46,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif // PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class FloatRect;
-}
-}
-#endif
-
</del><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> typedef struct _cairo_rectangle cairo_rectangle_t;
</span><span class="cx"> #endif
</span><span class="lines">@@ -174,12 +166,6 @@
</span><span class="cx"> void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2);
</span><span class="cx"> void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& p3);
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- FloatRect(const BlackBerry::Platform::FloatRect&);
- operator BlackBerry::Platform::FloatRect() const;
- FloatRect normalized() const;
-#endif
-
</del><span class="cx"> #if USE(CG)
</span><span class="cx"> FloatRect(const CGRect&);
</span><span class="cx"> operator CGRect() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatSize.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,14 +31,6 @@
</span><span class="cx"> #include "IntPoint.h"
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class FloatSize;
-}
-}
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -116,11 +108,6 @@
</span><span class="cx"> return FloatSize(m_height, m_width);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- FloatSize(const BlackBerry::Platform::FloatSize&);
- operator BlackBerry::Platform::FloatSize() const;
-#endif
-
</del><span class="cx"> #if USE(CG)
</span><span class="cx"> explicit FloatSize(const CGSize&); // don't do this implicitly since it's lossy
</span><span class="cx"> operator CGSize() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -161,11 +161,7 @@
</span><span class="cx"> bool isBold;
</span><span class="cx"> bool isItalic;
</span><span class="cx"> };
</span><del>-#if PLATFORM(BLACKBERRY)
- static void getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char* preferredLocale, const FontDescription&, SimpleFontFamily*);
-#else
</del><span class="cx"> static void getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char* preferredLocale, SimpleFontFamily*);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> FontCache();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontPlatformDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -23,9 +23,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> // FIXME: This is temporary until all ports switch to using this file.
</span><del>-#if PLATFORM(BLACKBERRY)
-#include "harfbuzz/FontPlatformDataHarfBuzz.h"
-#elif USE(WINGDI)
</del><ins>+#if USE(WINGDI)
</ins><span class="cx"> #include "wince/FontPlatformData.h"
</span><span class="cx"> #elif PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(NIX)
</span><span class="cx"> #include "freetype/FontPlatformData.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGlyphBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GlyphBuffer.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -51,8 +51,6 @@
</span><span class="cx"> typedef cairo_glyph_t GlyphBufferGlyph;
</span><span class="cx"> #elif USE(WINGDI)
</span><span class="cx"> typedef wchar_t GlyphBufferGlyph;
</span><del>-#elif PLATFORM(BLACKBERRY)
-typedef unsigned GlyphBufferGlyph;
</del><span class="cx"> #else
</span><span class="cx"> typedef Glyph GlyphBufferGlyph;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGradientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Gradient.cpp (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> invalidateHash();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !USE(CAIRO) && !PLATFORM(BLACKBERRY)
</del><ins>+#if !USE(CAIRO)
</ins><span class="cx"> void Gradient::setPlatformGradientSpaceTransform(const AffineTransform&)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGradienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Gradient.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,15 +45,6 @@
</span><span class="cx"> #elif USE(CAIRO)
</span><span class="cx"> typedef struct _cairo_pattern cairo_pattern_t;
</span><span class="cx"> typedef cairo_pattern_t* PlatformGradient;
</span><del>-#elif PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-namespace Graphics {
-class Gradient;
-}
-}
-}
-typedef BlackBerry::Platform::Graphics::Gradient* PlatformGradient;
</del><span class="cx"> #else
</span><span class="cx"> typedef void* PlatformGradient;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -48,15 +48,6 @@
</span><span class="cx"> typedef WebCore::PlatformContextCairo PlatformGraphicsContext;
</span><span class="cx"> #elif USE(WINGDI)
</span><span class="cx"> typedef struct HDC__ PlatformGraphicsContext;
</span><del>-#elif PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-namespace Graphics {
-class PlatformGraphicsContext;
-}
-}
-}
-using BlackBerry::Platform::Graphics::PlatformGraphicsContext;
</del><span class="cx"> #else
</span><span class="cx"> typedef void PlatformGraphicsContext;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContext3Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (161679 => 161680)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef GraphicsContext3D_h
</span><span class="cx"> #define GraphicsContext3D_h
</span><span class="cx">
</span><ins>+#include "ANGLEWebKitBridge.h"
</ins><span class="cx"> #include "GraphicsTypes3D.h"
</span><span class="cx"> #include "Image.h"
</span><span class="cx"> #include "IntRect.h"
</span><span class="lines">@@ -49,10 +50,6 @@
</span><span class="cx"> #undef VERSION
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
-#include "ANGLEWebKitBridge.h"
-#endif
-
</del><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include <OpenGLES/ES2/gl.h>
</span><span class="lines">@@ -103,8 +100,6 @@
</span><span class="cx"> class IntSize;
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> class PlatformContextCairo;
</span><del>-#elif PLATFORM(BLACKBERRY)
-class GraphicsContext;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> typedef WTF::HashMap<CString, uint64_t> ShaderNameHash;
</span><span class="lines">@@ -502,10 +497,8 @@
</span><span class="cx">
</span><span class="cx"> bool makeContextCurrent();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
</del><span class="cx"> // With multisampling on, blit from multisampleFBO to regular FBO.
</span><span class="cx"> void prepareTexture();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Equivalent to ::glTexImage2D(). Allows pixels==0 with no allocation.
</span><span class="cx"> void texImage2DDirect(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, const void* pixels);
</span><span class="lines">@@ -793,7 +786,7 @@
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL) || USE(CAIRO)
</span><span class="cx"> void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,
</span><span class="cx"> int canvasWidth, int canvasHeight, PlatformContextCairo* context);
</span><del>-#elif PLATFORM(BLACKBERRY) || USE(CG)
</del><ins>+#elif USE(CG)
</ins><span class="cx"> void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,
</span><span class="cx"> int canvasWidth, int canvasHeight, GraphicsContext*);
</span><span class="cx"> #endif
</span><span class="lines">@@ -810,10 +803,6 @@
</span><span class="cx"> void endPaint();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- bool paintsIntoCanvasBuffer() const;
-#endif
-
</del><span class="cx"> // Support for buffer creation and deletion
</span><span class="cx"> Platform3DObject createBuffer();
</span><span class="cx"> Platform3DObject createFramebuffer();
</span><span class="lines">@@ -914,8 +903,6 @@
</span><span class="cx"> RetainPtr<CGImageRef> m_decodedImage;
</span><span class="cx"> RetainPtr<CFDataRef> m_pixelData;
</span><span class="cx"> std::unique_ptr<uint8_t[]> m_formalizedRGBA8Data;
</span><del>-#elif PLATFORM(BLACKBERRY)
- Vector<unsigned> m_imageData;
</del><span class="cx"> #endif
</span><span class="cx"> Image* m_image;
</span><span class="cx"> ImageHtmlDomSource m_imageHtmlDomSource;
</span><span class="lines">@@ -938,7 +925,6 @@
</span><span class="cx"> // Destination data will have no gaps between rows.
</span><span class="cx"> static bool packPixels(const uint8_t* sourceData, DataFormat sourceDataFormat, unsigned width, unsigned height, unsigned sourceUnpackAlignment, unsigned destinationFormat, unsigned destinationType, AlphaOp, void* destinationData, bool flipY);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
</del><span class="cx"> // Take into account the user's requested context creation attributes,
</span><span class="cx"> // in particular stencil and antialias, and determine which could or
</span><span class="cx"> // could not be honored based on the capabilities of the OpenGL
</span><span class="lines">@@ -950,17 +936,11 @@
</span><span class="cx"> // backbuffer.
</span><span class="cx"> void readRenderingResults(unsigned char* pixels, int pixelsSize);
</span><span class="cx"> void readPixelsAndConvertToBGRAIfNecessary(int x, int y, int width, int height, unsigned char* pixels);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool setRenderbufferStorageFromDrawable(GC3Dsizei width, GC3Dsizei height);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- void logFrameBufferStatus(int line);
- void readPixelsIMG(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, void* data);
-#endif
-
</del><span class="cx"> bool reshapeFBOs(const IntSize&);
</span><span class="cx"> void resolveMultisamplingIfNecessary(const IntRect& = IntRect());
</span><span class="cx"> #if (PLATFORM(EFL) || PLATFORM(NIX)) && USE(GRAPHICS_SURFACE)
</span><span class="lines">@@ -978,14 +958,8 @@
</span><span class="cx"> RetainPtr<WebGLLayer> m_webGLLayer;
</span><span class="cx"> #elif PLATFORM(WIN) && USE(CA)
</span><span class="cx"> RefPtr<PlatformCALayer> m_webGLLayer;
</span><del>-#elif PLATFORM(BLACKBERRY)
-#if USE(ACCELERATED_COMPOSITING)
- RefPtr<PlatformLayer> m_compositingLayer;
</del><span class="cx"> #endif
</span><del>- void* m_context;
-#endif
</del><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(NIX)
</del><span class="cx"> struct SymbolInfo {
</span><span class="cx"> SymbolInfo()
</span><span class="cx"> : type(0)
</span><span class="lines">@@ -1072,9 +1046,8 @@
</span><span class="cx"> ANGLEWebKitBridge m_compiler;
</span><span class="cx">
</span><span class="cx"> OwnPtr<ShaderNameHash> nameHashMapForShaders;
</span><del>-#endif
</del><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY) || ((PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)) && USE(OPENGL_ES_2))
</del><ins>+#if ((PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)) && USE(OPENGL_ES_2))
</ins><span class="cx"> friend class Extensions3DOpenGLES;
</span><span class="cx"> OwnPtr<Extensions3DOpenGLES> m_extensions;
</span><span class="cx"> #else
</span><span class="lines">@@ -1088,15 +1061,11 @@
</span><span class="cx"> Vector<Vector<float>> m_vertexArray;
</span><span class="cx">
</span><span class="cx"> GC3Duint m_texture;
</span><del>-#if !PLATFORM(BLACKBERRY)
</del><span class="cx"> GC3Duint m_compositorTexture;
</span><del>-#endif
</del><span class="cx"> GC3Duint m_fbo;
</span><span class="cx">
</span><del>-#if !PLATFORM(BLACKBERRY)
</del><span class="cx"> GC3Duint m_depthBuffer;
</span><span class="cx"> GC3Duint m_stencilBuffer;
</span><del>-#endif
</del><span class="cx"> GC3Duint m_depthStencilBuffer;
</span><span class="cx">
</span><span class="cx"> bool m_layerComposited;
</span><span class="lines">@@ -1124,14 +1093,8 @@
</span><span class="cx"> // Errors raised by synthesizeGLError().
</span><span class="cx"> ListHashSet<GC3Denum> m_syntheticErrors;
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- bool m_isImaginationHardware;
-#endif
-
-#if !PLATFORM(BLACKBERRY)
</del><span class="cx"> friend class GraphicsContext3DPrivate;
</span><span class="cx"> OwnPtr<GraphicsContext3DPrivate> m_private;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>