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