Diff
Modified: trunk/Source/WebCore/ChangeLog (161661 => 161662)
--- trunk/Source/WebCore/ChangeLog 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 20:41:20 UTC (rev 161662)
@@ -5,6 +5,60 @@
Reviewed by Anders Carlsson.
+ * dom/TouchEvent.cpp:
+ (WebCore::TouchEvent::TouchEvent):
+ (WebCore::TouchEvent::initTouchEvent):
+ * dom/TouchEvent.h:
+ * dom/ViewportArguments.cpp:
+ * dom/ViewportArguments.h:
+ * history/HistoryItem.h:
+ * loader/PingLoader.cpp:
+ (WebCore::PingLoader::loadImage):
+ (WebCore::PingLoader::sendPing):
+ (WebCore::PingLoader::sendViolationReport):
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::createResourceHandle):
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::load):
+ * loader/icon/IconLoader.cpp:
+ (WebCore::IconLoader::startLoading):
+ * page/NavigatorBase.cpp:
+ * page/Settings.cpp:
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::ScrollingCoordinator::create):
+ * platform/Cursor.cpp:
+ * platform/Cursor.h:
+ (WebCore::Cursor::Cursor):
+ * platform/DragData.h:
+ * platform/DragImage.h:
+ * plugins/PluginDatabase.cpp:
+ (WebCore::PluginDatabase::defaultPluginDirectories):
+ (WebCore::PluginDatabase::isPreferredPluginDirectory):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::paintsIntoWindow):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::shouldRespectImageOrientation):
+ * testing/Internals.cpp:
+ (WebCore::Internals::getCurrentCursorInfo):
+ * workers/DefaultSharedWorkerRepository.cpp:
+ (WebCore::SharedWorkerScriptLoader::load):
+ * workers/Worker.cpp:
+ (WebCore::Worker::create):
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::importScripts):
+ * workers/WorkerScriptLoader.cpp:
+ (WebCore::WorkerScriptLoader::createResourceRequest):
+ * workers/WorkerScriptLoader.h:
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::createRequest):
+
+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.
+
* Modules/navigatorcontentutils/NavigatorContentUtils.cpp:
(WebCore::initProtocolHandlerWhitelist):
* UseJSC.cmake:
Modified: trunk/Source/WebCore/dom/TouchEvent.cpp (161661 => 161662)
--- trunk/Source/WebCore/dom/TouchEvent.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/dom/TouchEvent.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -52,10 +52,6 @@
, m_touches(touches)
, m_targetTouches(targetTouches)
, m_changedTouches(changedTouches)
-#if PLATFORM(BLACKBERRY)
- , m_touchHold(false)
- , m_doubleTap(false)
-#endif
{
}
@@ -82,11 +78,6 @@
m_shiftKey = shiftKey;
m_metaKey = metaKey;
initCoordinates(IntPoint(clientX, clientY));
-#if PLATFORM(BLACKBERRY)
- m_doubleTap = false;
- m_touchHold = false;
-#endif
-
}
EventInterface TouchEvent::eventInterface() const
Modified: trunk/Source/WebCore/dom/TouchEvent.h (161661 => 161662)
--- trunk/Source/WebCore/dom/TouchEvent.h 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/dom/TouchEvent.h 2014-01-10 20:41:20 UTC (rev 161662)
@@ -67,12 +67,6 @@
void setTargetTouches(PassRefPtr<TouchList> targetTouches) { m_targetTouches = targetTouches; }
void setChangedTouches(PassRefPtr<TouchList> changedTouches) { m_changedTouches = changedTouches; }
-#if PLATFORM(BLACKBERRY)
- void setDoubleTap(bool doubleTap) { m_doubleTap = doubleTap; }
- bool isDoubleTap() const { return m_doubleTap; }
- void setTouchHold(bool touchHold) { m_touchHold = touchHold; }
- bool isTouchHold() const { return m_touchHold; }
-#endif
virtual bool isTouchEvent() const OVERRIDE;
virtual EventInterface eventInterface() const;
@@ -88,10 +82,6 @@
RefPtr<TouchList> m_touches;
RefPtr<TouchList> m_targetTouches;
RefPtr<TouchList> m_changedTouches;
-#if PLATFORM(BLACKBERRY)
- bool m_touchHold;
- bool m_doubleTap;
-#endif
};
inline TouchEvent* toTouchEvent(Event* event)
Modified: trunk/Source/WebCore/dom/ViewportArguments.cpp (161661 => 161662)
--- trunk/Source/WebCore/dom/ViewportArguments.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/dom/ViewportArguments.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -43,7 +43,7 @@
namespace WebCore {
-#if PLATFORM(BLACKBERRY) || PLATFORM(GTK)
+#if PLATFORM(GTK)
const float ViewportArguments::deprecatedTargetDPI = 160;
#endif
Modified: trunk/Source/WebCore/dom/ViewportArguments.h (161661 => 161662)
--- trunk/Source/WebCore/dom/ViewportArguments.h 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/dom/ViewportArguments.h 2014-01-10 20:41:20 UTC (rev 161662)
@@ -142,7 +142,7 @@
return !(*this == other);
}
-#if PLATFORM(BLACKBERRY) || PLATFORM(GTK)
+#if PLATFORM(GTK)
// FIXME: We're going to keep this constant around until all embedders
// refactor their code to no longer need it.
static const float deprecatedTargetDPI;
Modified: trunk/Source/WebCore/history/HistoryItem.h (161661 => 161662)
--- trunk/Source/WebCore/history/HistoryItem.h 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/history/HistoryItem.h 2014-01-10 20:41:20 UTC (rev 161662)
@@ -43,10 +43,6 @@
typedef struct objc_object* id;
#endif
-#if PLATFORM(BLACKBERRY)
-#include "HistoryItemViewState.h"
-#endif
-
namespace WebCore {
class CachedPage;
@@ -199,10 +195,6 @@
void setTransientProperty(const String&, id);
#endif
-#if PLATFORM(BLACKBERRY)
- HistoryItemViewState& viewState() { return m_viewState; }
-#endif
-
#ifndef NDEBUG
int showTree() const;
int showTreeWithIndent(unsigned indentLevel) const;
@@ -310,10 +302,6 @@
RetainPtr<id> m_viewState;
OwnPtr<HashMap<String, RetainPtr<id>>> m_transientProperties;
#endif
-
-#if PLATFORM(BLACKBERRY)
- HistoryItemViewState m_viewState;
-#endif
}; //class HistoryItem
} //namespace WebCore
Modified: trunk/Source/WebCore/loader/PingLoader.cpp (161661 => 161662)
--- trunk/Source/WebCore/loader/PingLoader.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/loader/PingLoader.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -57,9 +57,6 @@
}
ResourceRequest request(url);
-#if PLATFORM(BLACKBERRY)
- request.setTargetType(ResourceRequest::TargetIsImage);
-#endif
request.setHTTPHeaderField("Cache-Control", "max-age=0");
String referrer = SecurityPolicy::generateReferrerHeader(frame->document()->referrerPolicy(), request.url(), frame->loader().outgoingReferrer());
if (!referrer.isEmpty())
@@ -73,9 +70,6 @@
void PingLoader::sendPing(Frame* frame, const URL& pingURL, const URL& destinationURL)
{
ResourceRequest request(pingURL);
-#if PLATFORM(BLACKBERRY)
- request.setTargetType(ResourceRequest::TargetIsSubresource);
-#endif
request.setHTTPMethod("POST");
request.setHTTPContentType("text/ping");
request.setHTTPBody(FormData::create("PING"));
@@ -101,9 +95,6 @@
void PingLoader::sendViolationReport(Frame* frame, const URL& reportURL, PassRefPtr<FormData> report)
{
ResourceRequest request(reportURL);
-#if PLATFORM(BLACKBERRY)
- request.setTargetType(ResourceRequest::TargetIsSubresource);
-#endif
request.setHTTPMethod("POST");
request.setHTTPContentType("application/json");
request.setHTTPBody(report);
Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (161661 => 161662)
--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -492,24 +492,6 @@
}
}
-#if PLATFORM(BLACKBERRY)
- ResourceRequest::TargetType target = ResourceRequest::TargetIsUnspecified;
- if (newestCachedResource) {
- const String& mimeType = newestCachedResource->response().mimeType();
- if (!mimeType.isEmpty())
- target = ResourceRequest::targetTypeFromMimeType(mimeType);
- }
- if (target == ResourceRequest::TargetIsUnspecified) {
- String mimeType;
- if (url.protocolIsData())
- mimeType = mimeTypeFromDataURL(url);
- if (!mimeType.isEmpty())
- target = ResourceRequest::targetTypeFromMimeType(mimeType);
- }
-
- request.setTargetType(target);
-#endif
-
RefPtr<ResourceHandle> handle = ResourceHandle::create(m_frame->loader().networkingContext(), request, this, false, true);
#if ENABLE(INSPECTOR)
// Because willSendRequest only gets called during redirects, we initialize
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (161661 => 161662)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -144,48 +144,6 @@
return ResourceLoadPriorityLow;
}
-#if PLATFORM(BLACKBERRY)
-static ResourceRequest::TargetType cachedResourceTypeToTargetType(CachedResource::Type type)
-{
- switch (type) {
- case CachedResource::MainResource:
- return ResourceRequest::TargetIsMainFrame;
- case CachedResource::CSSStyleSheet:
-#if ENABLE(XSLT)
- case CachedResource::XSLStyleSheet:
-#endif
- return ResourceRequest::TargetIsStyleSheet;
- case CachedResource::Script:
- return ResourceRequest::TargetIsScript;
- case CachedResource::FontResource:
- return ResourceRequest::TargetIsFontResource;
- case CachedResource::ImageResource:
- return ResourceRequest::TargetIsImage;
-#if ENABLE(CSS_SHADERS)
- case CachedResource::ShaderResource:
-#endif
- case CachedResource::RawResource:
- return ResourceRequest::TargetIsSubresource;
-#if ENABLE(LINK_PREFETCH)
- case CachedResource::LinkPrefetch:
- return ResourceRequest::TargetIsPrefetch;
- case CachedResource::LinkSubresource:
- return ResourceRequest::TargetIsSubresource;
-#endif
-#if ENABLE(VIDEO_TRACK)
- case CachedResource::TextTrackResource:
- return ResourceRequest::TargetIsTextTrack;
-#endif
-#if ENABLE(SVG)
- case CachedResource::SVGDocumentResource:
- return ResourceRequest::TargetIsImage;
-#endif
- }
- ASSERT_NOT_REACHED();
- return ResourceRequest::TargetIsSubresource;
-}
-#endif
-
static double deadDecodedDataDeletionIntervalForResourceType(CachedResource::Type type)
{
if (type == CachedResource::Script)
@@ -320,11 +278,6 @@
}
#endif
-#if PLATFORM(BLACKBERRY)
- if (m_resourceRequest.targetType() == ResourceRequest::TargetIsUnspecified)
- m_resourceRequest.setTargetType(cachedResourceTypeToTargetType(type()));
-#endif
-
if (!accept().isEmpty())
m_resourceRequest.setHTTPAccept(accept());
Modified: trunk/Source/WebCore/loader/icon/IconLoader.cpp (161661 => 161662)
--- trunk/Source/WebCore/loader/icon/IconLoader.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/loader/icon/IconLoader.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -60,9 +60,6 @@
CachedResourceRequest request(ResourceRequest(m_frame.loader().icon().url()), ResourceLoaderOptions(SendCallbacks, SniffContent, BufferData, DoNotAllowStoredCredentials, DoNotAskClientForAnyCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType));
-#if PLATFORM(BLACKBERRY)
- request.mutableResourceRequest().setTargetType(ResourceRequest::TargetIsFavicon);
-#endif
request.mutableResourceRequest().setPriority(ResourceLoadPriorityLow);
request.setInitiator(cachedResourceRequestInitiators().icon);
Modified: trunk/Source/WebCore/page/NavigatorBase.cpp (161661 => 161662)
--- trunk/Source/WebCore/page/NavigatorBase.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/page/NavigatorBase.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -48,8 +48,6 @@
#define WEBCORE_NAVIGATOR_PLATFORM "MacIntel"
#elif OS(WINDOWS)
#define WEBCORE_NAVIGATOR_PLATFORM "Win32"
-#elif PLATFORM(BLACKBERRY)
-#define WEBCORE_NAVIGATOR_PLATFORM "BlackBerry"
#else
#define WEBCORE_NAVIGATOR_PLATFORM ""
#endif
Modified: trunk/Source/WebCore/page/Settings.cpp (161661 => 161662)
--- trunk/Source/WebCore/page/Settings.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/page/Settings.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -243,7 +243,7 @@
}
#endif
-#if !PLATFORM(MAC) && !PLATFORM(BLACKBERRY)
+#if !PLATFORM(MAC)
void Settings::initializeDefaultFontFamilies()
{
// Other platforms can set up fonts from a client, but on Mac, we want it in WebCore to share code between WebKit1 and WebKit2.
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (161661 => 161662)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -49,10 +49,6 @@
#include "ScrollingCoordinatorCoordinatedGraphics.h"
#endif
-#if PLATFORM(BLACKBERRY)
-#include "ScrollingCoordinatorBlackBerry.h"
-#endif
-
namespace WebCore {
#if !PLATFORM(MAC)
@@ -62,10 +58,6 @@
return adoptRef(new ScrollingCoordinatorCoordinatedGraphics(page));
#endif
-#if PLATFORM(BLACKBERRY)
- return adoptRef(new ScrollingCoordinatorBlackBerry(page));
-#endif
-
return adoptRef(new ScrollingCoordinator(page));
}
#endif
Modified: trunk/Source/WebCore/platform/Cursor.cpp (161661 => 161662)
--- trunk/Source/WebCore/platform/Cursor.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/platform/Cursor.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -145,8 +145,6 @@
return pointerCursor();
}
-#if USE(LAZY_NATIVE_CURSOR)
-
Cursor::Cursor(Image* image, const IntPoint& hotSpot)
: m_type(Custom)
, m_image(image)
@@ -446,6 +444,4 @@
return c;
}
-#endif
-
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/Cursor.h (161661 => 161662)
--- trunk/Source/WebCore/platform/Cursor.h 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/platform/Cursor.h 2014-01-10 20:41:20 UTC (rev 161662)
@@ -40,8 +40,6 @@
#include <wtf/RetainPtr.h>
#elif PLATFORM(GTK)
#include "GRefPtrGtk.h"
-#elif PLATFORM(BLACKBERRY)
-#include <BlackBerryPlatformCursor.h>
#endif
#if PLATFORM(MAC) && !PLATFORM(IOS)
@@ -53,11 +51,6 @@
typedef HICON HCURSOR;
#endif
-// Looks like it's just PLATFORM(BLACKBERRY) still not using this?
-#if PLATFORM(WIN) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(NIX)
-#define WTF_USE_LAZY_NATIVE_CURSOR 1
-#endif
-
namespace WebCore {
class Image;
@@ -81,8 +74,6 @@
typedef const char* PlatformCursor;
#elif PLATFORM(NIX)
typedef unsigned PlatformCursor;
-#elif PLATFORM(BLACKBERRY)
- typedef BlackBerry::Platform::BlackBerryCursor PlatformCursor;
#else
typedef void* PlatformCursor;
#endif
@@ -140,15 +131,11 @@
static const Cursor& fromType(Cursor::Type);
Cursor()
-#if !PLATFORM(IOS) && !PLATFORM(BLACKBERRY)
-#if USE(LAZY_NATIVE_CURSOR)
+#if !PLATFORM(IOS)
// This is an invalid Cursor and should never actually get used.
: m_type(static_cast<Type>(-1))
, m_platformCursor(0)
-#else
- : m_platformCursor(0)
-#endif // USE(LAZY_NATIVE_CURSOR)
-#endif // !PLATFORM(IOS) && !PLATFORM(BLACKBERRY)
+#endif // !PLATFORM(IOS)
{
}
@@ -164,7 +151,6 @@
~Cursor();
Cursor& operator=(const Cursor&);
-#if USE(LAZY_NATIVE_CURSOR)
explicit Cursor(Type);
Type type() const
{
@@ -178,13 +164,8 @@
float imageScaleFactor() const { return m_imageScaleFactor; }
#endif
PlatformCursor platformCursor() const;
-#else
- explicit Cursor(PlatformCursor);
- PlatformCursor impl() const { return m_platformCursor; }
-#endif
private:
-#if USE(LAZY_NATIVE_CURSOR)
void ensurePlatformCursor() const;
Type m_type;
@@ -193,7 +174,6 @@
#if ENABLE(MOUSE_CURSOR_SCALE)
float m_imageScaleFactor;
#endif
-#endif
#if !PLATFORM(MAC)
mutable PlatformCursor m_platformCursor;
Modified: trunk/Source/WebCore/platform/DragData.h (161661 => 161662)
--- trunk/Source/WebCore/platform/DragData.h 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/platform/DragData.h 2014-01-10 20:41:20 UTC (rev 161662)
@@ -55,7 +55,7 @@
class DataObjectGtk;
}
typedef WebCore::DataObjectGtk* DragDataRef;
-#elif PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(NIX) || PLATFORM(IOS)
+#elif PLATFORM(EFL) || PLATFORM(NIX) || PLATFORM(IOS)
typedef void* DragDataRef;
#endif
Modified: trunk/Source/WebCore/platform/DragImage.h (161661 => 161662)
--- trunk/Source/WebCore/platform/DragImage.h 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/platform/DragImage.h 2014-01-10 20:41:20 UTC (rev 161662)
@@ -60,7 +60,7 @@
typedef HBITMAP DragImageRef;
#elif PLATFORM(GTK) || PLATFORM(NIX)
typedef cairo_surface_t* DragImageRef;
-#elif PLATFORM(EFL) || PLATFORM(BLACKBERRY)
+#elif PLATFORM(EFL)
typedef void* DragImageRef;
#endif
Modified: trunk/Source/WebCore/plugins/PluginDatabase.cpp (161661 => 161662)
--- trunk/Source/WebCore/plugins/PluginDatabase.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/plugins/PluginDatabase.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -36,10 +36,6 @@
#include <stdlib.h>
#include <wtf/text/CString.h>
-#if PLATFORM(BLACKBERRY)
-#include <BlackBerryPlatformSettings.h>
-#endif
-
namespace WebCore {
typedef HashMap<String, RefPtr<PluginPackage> > PluginPackageByNameMap;
@@ -389,7 +385,7 @@
Vector<String> paths;
// Add paths specific to each platform
-#if defined(XP_UNIX) && !PLATFORM(BLACKBERRY)
+#if defined(XP_UNIX)
String userPluginPath = homeDirectoryPath();
userPluginPath.append(String("/.mozilla/plugins"));
paths.append(userPluginPath);
@@ -425,8 +421,6 @@
String mozPath(getenv("MOZ_PLUGIN_PATH"));
mozPath.split(UChar(':'), /* allowEmptyEntries */ false, mozPaths);
paths.appendVector(mozPaths);
-#elif PLATFORM(BLACKBERRY)
- paths.append(BlackBerry::Platform::Settings::instance()->applicationPluginDirectory().c_str());
#elif defined(XP_MACOSX)
String userPluginPath = homeDirectoryPath();
userPluginPath.append(String("/Library/Internet Plug-Ins"));
@@ -445,10 +439,8 @@
{
String preferredPath = homeDirectoryPath();
-#if defined(XP_UNIX) && !PLATFORM(BLACKBERRY)
+#if defined(XP_UNIX)
preferredPath.append(String("/.mozilla/plugins"));
-#elif PLATFORM(BLACKBERRY)
- preferredPath = BlackBerry::Platform::Settings::instance()->applicationPluginDirectory().c_str();
#elif defined(XP_MACOSX)
preferredPath.append(String("/Library/Internet Plug-Ins"));
#elif defined(XP_WIN)
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (161661 => 161662)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -2047,7 +2047,7 @@
return false;
if (m_owningLayer.isRootLayer()) {
-#if PLATFORM(BLACKBERRY) || PLATFORM(IOS) || USE(COORDINATED_GRAPHICS)
+#if PLATFORM(IOS) || USE(COORDINATED_GRAPHICS)
if (compositor().inForcedCompositingMode())
return false;
#endif
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (161661 => 161662)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -1725,7 +1725,7 @@
RespectImageOrientationEnum RenderObject::shouldRespectImageOrientation() const
{
-#if USE(CG) || USE(CAIRO) || PLATFORM(BLACKBERRY)
+#if USE(CG) || USE(CAIRO)
// This can only be enabled for ports which honor the orientation flag in their drawing code.
if (document().isImageDocument())
return RespectImageOrientation;
Modified: trunk/Source/WebCore/testing/Internals.cpp (161661 => 161662)
--- trunk/Source/WebCore/testing/Internals.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -1968,7 +1968,7 @@
frameView->setTracksRepaints(false);
}
-#if !PLATFORM(IOS) && USE(LAZY_NATIVE_CURSOR)
+#if !PLATFORM(IOS)
static const char* cursorTypeToString(Cursor::Type cursorType)
{
switch (cursorType) {
@@ -2031,7 +2031,7 @@
return String();
}
-#if !PLATFORM(IOS) && USE(LAZY_NATIVE_CURSOR)
+#if !PLATFORM(IOS)
Cursor cursor = document->frame()->eventHandler().currentMouseCursor();
StringBuilder result;
Modified: trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp (161661 => 161662)
--- trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -311,9 +311,6 @@
// Mark this object as active for the duration of the load.
m_scriptLoader = WorkerScriptLoader::create();
-#if PLATFORM(BLACKBERRY)
- m_scriptLoader->setTargetType(ResourceRequest::TargetIsSharedWorker);
-#endif
m_scriptLoader->loadAsynchronously(m_worker->scriptExecutionContext(), url, DenyCrossOriginRequests, this);
}
Modified: trunk/Source/WebCore/workers/Worker.cpp (161661 => 161662)
--- trunk/Source/WebCore/workers/Worker.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/workers/Worker.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -95,9 +95,6 @@
worker->setPendingActivity(worker.get());
worker->m_scriptLoader = WorkerScriptLoader::create();
-#if PLATFORM(BLACKBERRY)
- worker->m_scriptLoader->setTargetType(ResourceRequest::TargetIsWorker);
-#endif
worker->m_scriptLoader->loadAsynchronously(&context, scriptURL, DenyCrossOriginRequests, worker.get());
return worker.release();
Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (161661 => 161662)
--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -227,9 +227,6 @@
for (Vector<URL>::const_iterator it = completedURLs.begin(); it != end; ++it) {
RefPtr<WorkerScriptLoader> scriptLoader(WorkerScriptLoader::create());
-#if PLATFORM(BLACKBERRY)
- scriptLoader->setTargetType(ResourceRequest::TargetIsScript);
-#endif
scriptLoader->loadSynchronously(scriptExecutionContext(), *it, AllowCrossOriginRequests);
// If the fetching attempt failed, throw a NETWORK_ERR exception and abort all these steps.
Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.cpp (161661 => 161662)
--- trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -103,9 +103,6 @@
{
OwnPtr<ResourceRequest> request = adoptPtr(new ResourceRequest(m_url));
request->setHTTPMethod("GET");
-#if PLATFORM(BLACKBERRY)
- request->setTargetType(m_targetType);
-#endif
return request.release();
}
Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.h (161661 => 161662)
--- trunk/Source/WebCore/workers/WorkerScriptLoader.h 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.h 2014-01-10 20:41:20 UTC (rev 161662)
@@ -71,10 +71,6 @@
virtual void didFail(const ResourceError&) OVERRIDE;
virtual void didFailRedirectCheck() OVERRIDE;
-#if PLATFORM(BLACKBERRY)
- void setTargetType(ResourceRequest::TargetType targetType) { m_targetType = targetType; }
-#endif
-
private:
friend class WTF::RefCounted<WorkerScriptLoader>;
@@ -94,9 +90,6 @@
bool m_failed;
unsigned long m_identifier;
bool m_finishing;
-#if PLATFORM(BLACKBERRY)
- ResourceRequest::TargetType m_targetType;
-#endif
};
} // namespace WebCore
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (161661 => 161662)
--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -780,9 +780,6 @@
ResourceRequest request(m_url);
request.setHTTPMethod(m_method);
-#if PLATFORM(BLACKBERRY)
- request.setTargetType(ResourceRequest::TargetIsXHR);
-#endif
InspectorInstrumentation::willLoadXHR(scriptExecutionContext(), this, m_method, m_url, m_async, m_requestEntityBody ? m_requestEntityBody->deepCopy() : 0, m_requestHeaders, m_includeCredentials);
Modified: trunk/Source/WebKit2/ChangeLog (161661 => 161662)
--- trunk/Source/WebKit2/ChangeLog 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-10 20:41:20 UTC (rev 161662)
@@ -5,6 +5,16 @@
Reviewed by Anders Carlsson.
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::setCursor):
+
+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.
+
* Scripts/generate-forwarding-headers.pl:
2014-01-10 Carlos Garcia Campos <[email protected]>
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (161661 => 161662)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-01-10 20:40:28 UTC (rev 161661)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-01-10 20:41:20 UTC (rev 161662)
@@ -702,9 +702,7 @@
#if !PLATFORM(IOS)
void WebChromeClient::setCursor(const WebCore::Cursor& cursor)
{
-#if USE(LAZY_NATIVE_CURSOR)
m_page->send(Messages::WebPageProxy::SetCursor(cursor));
-#endif
}
void WebChromeClient::setCursorHiddenUntilMouseMoves(bool hiddenUntilMouseMoves)
