<!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>[161699] trunk</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/161699">161699</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-10 16:53:54 -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.
.:
* CMakeLists.txt:
* Source/cmake/OptionsCommon.cmake:
Source/JavaScriptCore:
* assembler/ARMAssembler.h:
(JSC::ARMAssembler::cacheFlush):
* assembler/ARMv7Assembler.h:
(JSC::ARMv7Assembler::replaceWithJump):
(JSC::ARMv7Assembler::maxJumpReplacementSize):
(JSC::ARMv7Assembler::cacheFlush):
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::revertJumpReplacementToBranchPtrWithPatch):
* heap/MachineStackMarker.cpp:
(JSC::getPlatformThreadRegisters):
(JSC::otherThreadStackPointer):
(JSC::freePlatformThreadRegisters):
* jit/ExecutableAllocator.h:
Source/WebCore:
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::readPixels):
* platform/graphics/ImageBuffer.cpp:
* platform/graphics/ImageBufferData.h:
* platform/graphics/IntPoint.h:
* platform/graphics/IntRect.h:
* platform/graphics/IntSize.h:
* platform/graphics/MediaPlayer.cpp:
* platform/graphics/NativeImagePtr.h:
* platform/graphics/OpenGLESShims.h:
* platform/graphics/Path.cpp:
(WebCore::Path::addPathForRoundedRect):
* platform/graphics/Path.h:
* platform/graphics/PlatformLayer.h:
* platform/graphics/filters/CustomFilterValidatedProgram.cpp:
* platform/graphics/filters/CustomFilterValidatedProgram.h:
* platform/graphics/filters/FilterOperation.h:
* platform/graphics/gpu/DrawingBuffer.cpp:
* platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
* platform/graphics/opengl/Extensions3DOpenGLES.cpp:
(WebCore::Extensions3DOpenGLES::getGraphicsResetStatusARB):
* platform/graphics/opengl/Extensions3DOpenGLES.h:
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::paintRenderingResultsToCanvas):
(WebCore::GraphicsContext3D::prepareTexture):
(WebCore::GraphicsContext3D::bindFramebuffer):
(WebCore::GraphicsContext3D::compileShader):
(WebCore::GraphicsContext3D::copyTexImage2D):
(WebCore::GraphicsContext3D::copyTexSubImage2D):
* platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
(WebCore::GraphicsContext3D::readPixels):
(WebCore::GraphicsContext3D::readPixelsAndConvertToBGRAIfNecessary):
(WebCore::GraphicsContext3D::reshapeFBOs):
* platform/network/NetworkStateNotifier.h:
* platform/network/ResourceHandle.h:
* platform/network/ResourceHandleInternal.h:
* platform/network/ResourceRequestBase.cpp:
Tools:
* DumpRenderTree/DumpRenderTree.h:
* DumpRenderTree/PixelDumpSupport.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkCMakeListstxt">trunk/CMakeLists.txt</a></li>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMAssemblerh">trunk/Source/JavaScriptCore/assembler/ARMAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMv7Assemblerh">trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMachineStackMarkercpp">trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitExecutableAllocatorh">trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBuffercpp">trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBufferDatah">trunk/Source/WebCore/platform/graphics/ImageBufferData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntPointh">trunk/Source/WebCore/platform/graphics/IntPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntRecth">trunk/Source/WebCore/platform/graphics/IntRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntSizeh">trunk/Source/WebCore/platform/graphics/IntSize.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsNativeImagePtrh">trunk/Source/WebCore/platform/graphics/NativeImagePtr.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsOpenGLESShimsh">trunk/Source/WebCore/platform/graphics/OpenGLESShims.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPathcpp">trunk/Source/WebCore/platform/graphics/Path.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPathh">trunk/Source/WebCore/platform/graphics/Path.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPlatformLayerh">trunk/Source/WebCore/platform/graphics/PlatformLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersCustomFilterValidatedProgramcpp">trunk/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersCustomFilterValidatedProgramh">trunk/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterOperationh">trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgpuDrawingBuffercpp">trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLEScpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLESh">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLEScpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkStateNotifierh">trunk/Source/WebCore/platform/network/NetworkStateNotifier.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleInternalh">trunk/Source/WebCore/platform/network/ResourceHandleInternal.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBasecpp">trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsCommoncmake">trunk/Source/cmake/OptionsCommon.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreeh">trunk/Tools/DumpRenderTree/DumpRenderTree.h</a></li>
<li><a href="#trunkToolsDumpRenderTreePixelDumpSupportcpp">trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/CMakeLists.txt (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/CMakeLists.txt 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/CMakeLists.txt 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -100,9 +100,6 @@
</span><span class="cx"> endif ()
</span><span class="cx"> elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")
</span><span class="cx"> set(WTF_OS_WINDOWS 1)
</span><del>-elseif (CMAKE_SYSTEM_NAME MATCHES "QNX")
- set(WTF_OS_QNX 1)
- set(WTF_OS_UNIX 1)
</del><span class="cx"> else ()
</span><span class="cx"> message(FATAL_ERROR "Unknown OS '${CMAKE_SYSTEM_NAME}'")
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/ChangeLog 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -1,3 +1,13 @@
</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.
+
+ * CMakeLists.txt:
+ * Source/cmake/OptionsCommon.cmake:
+
</ins><span class="cx"> 2014-01-10 Tamas Gergely <tgergely.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][JSC] Enable udis86 disassembler on efl.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -1,3 +1,24 @@
</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.
+
+ * assembler/ARMAssembler.h:
+ (JSC::ARMAssembler::cacheFlush):
+ * assembler/ARMv7Assembler.h:
+ (JSC::ARMv7Assembler::replaceWithJump):
+ (JSC::ARMv7Assembler::maxJumpReplacementSize):
+ (JSC::ARMv7Assembler::cacheFlush):
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::revertJumpReplacementToBranchPtrWithPatch):
+ * heap/MachineStackMarker.cpp:
+ (JSC::getPlatformThreadRegisters):
+ (JSC::otherThreadStackPointer):
+ (JSC::freePlatformThreadRegisters):
+ * jit/ExecutableAllocator.h:
+
</ins><span class="cx"> 2014-01-10 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove unimplemented or static ScriptDebugServer features
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMAssembler.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMAssembler.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/JavaScriptCore/assembler/ARMAssembler.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -1121,11 +1121,6 @@
</span><span class="cx"> linuxPageFlush(current, end);
</span><span class="cx"> #elif OS(WINCE)
</span><span class="cx"> CacheRangeFlush(code, size, CACHE_SYNC_ALL);
</span><del>-#elif OS(QNX) && ENABLE(ASSEMBLER_WX_EXCLUSIVE)
- UNUSED_PARAM(code);
- UNUSED_PARAM(size);
-#elif OS(QNX)
- msync(code, size, MS_INVALIDATE_ICACHE);
</del><span class="cx"> #else
</span><span class="cx"> #error "The cacheFlush support is missing on this platform."
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMv7Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -1347,7 +1347,7 @@
</span><span class="cx"> m_formatter.twoWordOp5i6Imm4Reg4EncodedImm(OP_MOV_imm_T3, imm.m_value.imm4, rd, imm);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if OS(LINUX) || OS(QNX)
</del><ins>+#if OS(LINUX)
</ins><span class="cx"> static void revertJumpTo_movT3movtcmpT2(void* instructionStart, RegisterID left, RegisterID right, uintptr_t imm)
</span><span class="cx"> {
</span><span class="cx"> uint16_t* address = static_cast<uint16_t*>(instructionStart);
</span><span class="lines">@@ -2268,7 +2268,7 @@
</span><span class="cx"> ASSERT(!(bitwise_cast<uintptr_t>(instructionStart) & 1));
</span><span class="cx"> ASSERT(!(bitwise_cast<uintptr_t>(to) & 1));
</span><span class="cx">
</span><del>-#if OS(LINUX) || OS(QNX)
</del><ins>+#if OS(LINUX)
</ins><span class="cx"> if (canBeJumpT4(reinterpret_cast<uint16_t*>(instructionStart), to)) {
</span><span class="cx"> uint16_t* ptr = reinterpret_cast<uint16_t*>(instructionStart) + 2;
</span><span class="cx"> linkJumpT4(ptr, to);
</span><span class="lines">@@ -2287,7 +2287,7 @@
</span><span class="cx">
</span><span class="cx"> static ptrdiff_t maxJumpReplacementSize()
</span><span class="cx"> {
</span><del>-#if OS(LINUX) || OS(QNX)
</del><ins>+#if OS(LINUX)
</ins><span class="cx"> return 10;
</span><span class="cx"> #else
</span><span class="cx"> return 4;
</span><span class="lines">@@ -2377,14 +2377,7 @@
</span><span class="cx"> linuxPageFlush(current, end);
</span><span class="cx"> #elif OS(WINCE)
</span><span class="cx"> CacheRangeFlush(code, size, CACHE_SYNC_ALL);
</span><del>-#elif OS(QNX)
-#if !ENABLE(ASSEMBLER_WX_EXCLUSIVE)
- msync(code, size, MS_INVALIDATE_ICACHE);
</del><span class="cx"> #else
</span><del>- UNUSED_PARAM(code);
- UNUSED_PARAM(size);
-#endif
-#else
</del><span class="cx"> #error "The cacheFlush support is missing on this platform."
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -1784,7 +1784,7 @@
</span><span class="cx">
</span><span class="cx"> static void revertJumpReplacementToBranchPtrWithPatch(CodeLocationLabel instructionStart, RegisterID rd, void* initialValue)
</span><span class="cx"> {
</span><del>-#if OS(LINUX) || OS(QNX)
</del><ins>+#if OS(LINUX)
</ins><span class="cx"> ARMv7Assembler::revertJumpTo_movT3movtcmpT2(instructionStart.dataLocation(), rd, dataTempRegister, reinterpret_cast<uintptr_t>(initialValue));
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(rd);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMachineStackMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -58,13 +58,6 @@
</span><span class="cx"> #include <pthread_np.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(QNX)
-#include <fcntl.h>
-#include <sys/procfs.h>
-#include <stdio.h>
-#include <errno.h>
-#endif
-
</del><span class="cx"> #if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
</span><span class="cx"> #include <signal.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -311,8 +304,6 @@
</span><span class="cx">
</span><span class="cx"> #elif OS(WINDOWS)
</span><span class="cx"> typedef CONTEXT PlatformThreadRegisters;
</span><del>-#elif OS(QNX)
-typedef struct _debug_thread_info PlatformThreadRegisters;
</del><span class="cx"> #elif USE(PTHREADS)
</span><span class="cx"> typedef pthread_attr_t PlatformThreadRegisters;
</span><span class="cx"> #else
</span><span class="lines">@@ -358,22 +349,6 @@
</span><span class="cx"> regs.ContextFlags = CONTEXT_INTEGER | CONTEXT_CONTROL;
</span><span class="cx"> GetThreadContext(platformThread, &regs);
</span><span class="cx"> return sizeof(CONTEXT);
</span><del>-#elif OS(QNX)
- memset(&regs, 0, sizeof(regs));
- regs.tid = platformThread;
- // FIXME: If we find this hurts performance, we can consider caching the fd and keeping it open.
- int fd = open("/proc/self/as", O_RDONLY);
- if (fd == -1) {
- LOG_ERROR("Unable to open /proc/self/as (errno: %d)", errno);
- CRASH();
- }
- int rc = devctl(fd, DCMD_PROC_TIDSTATUS, &regs, sizeof(regs), 0);
- if (rc != EOK) {
- LOG_ERROR("devctl(DCMD_PROC_TIDSTATUS) failed (error: %d)", rc);
- CRASH();
- }
- close(fd);
- return sizeof(struct _debug_thread_info);
</del><span class="cx"> #elif USE(PTHREADS)
</span><span class="cx"> pthread_attr_init(&regs);
</span><span class="cx"> #if HAVE(PTHREAD_NP_H) || OS(NETBSD)
</span><span class="lines">@@ -438,9 +413,6 @@
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#elif OS(QNX)
- return reinterpret_cast<void*>((uintptr_t) regs.sp);
-
</del><span class="cx"> #elif USE(PTHREADS)
</span><span class="cx"> void* stackBase = 0;
</span><span class="cx"> size_t stackSize = 0;
</span><span class="lines">@@ -455,7 +427,7 @@
</span><span class="cx">
</span><span class="cx"> static void freePlatformThreadRegisters(PlatformThreadRegisters& regs)
</span><span class="cx"> {
</span><del>-#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) && !OS(QNX)
</del><ins>+#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
</ins><span class="cx"> pthread_attr_destroy(&regs);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(regs);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitExecutableAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #include <libkern/OSCacheControl.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(IOS) || OS(QNX)
</del><ins>+#if OS(IOS)
</ins><span class="cx"> #include <sys/mman.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -1,3 +1,48 @@
</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.
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::readPixels):
+ * platform/graphics/ImageBuffer.cpp:
+ * platform/graphics/ImageBufferData.h:
+ * platform/graphics/IntPoint.h:
+ * platform/graphics/IntRect.h:
+ * platform/graphics/IntSize.h:
+ * platform/graphics/MediaPlayer.cpp:
+ * platform/graphics/NativeImagePtr.h:
+ * platform/graphics/OpenGLESShims.h:
+ * platform/graphics/Path.cpp:
+ (WebCore::Path::addPathForRoundedRect):
+ * platform/graphics/Path.h:
+ * platform/graphics/PlatformLayer.h:
+ * platform/graphics/filters/CustomFilterValidatedProgram.cpp:
+ * platform/graphics/filters/CustomFilterValidatedProgram.h:
+ * platform/graphics/filters/FilterOperation.h:
+ * platform/graphics/gpu/DrawingBuffer.cpp:
+ * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+ * platform/graphics/opengl/Extensions3DOpenGLES.cpp:
+ (WebCore::Extensions3DOpenGLES::getGraphicsResetStatusARB):
+ * platform/graphics/opengl/Extensions3DOpenGLES.h:
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ (WebCore::GraphicsContext3D::paintRenderingResultsToCanvas):
+ (WebCore::GraphicsContext3D::prepareTexture):
+ (WebCore::GraphicsContext3D::bindFramebuffer):
+ (WebCore::GraphicsContext3D::compileShader):
+ (WebCore::GraphicsContext3D::copyTexImage2D):
+ (WebCore::GraphicsContext3D::copyTexSubImage2D):
+ * platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
+ (WebCore::GraphicsContext3D::readPixels):
+ (WebCore::GraphicsContext3D::readPixelsAndConvertToBGRAIfNecessary):
+ (WebCore::GraphicsContext3D::reshapeFBOs):
+ * platform/network/NetworkStateNotifier.h:
+ * platform/network/ResourceHandle.h:
+ * platform/network/ResourceHandleInternal.h:
+ * platform/network/ResourceRequestBase.cpp:
+
</ins><span class="cx"> 2014-01-10 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix CharsetData.cpp build for iOS
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -3493,11 +3493,11 @@
</span><span class="cx"> m_context->readPixels(x, y, width, height, format, type, data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if OS(DARWIN) || OS(QNX)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> if (m_isRobustnessEXTSupported) // we haven't computed padding
</span><span class="cx"> m_context->computeImageSizeInBytes(format, type, width, height, m_packAlignment, &totalBytesRequired, &padding);
</span><span class="cx"> // FIXME: remove this section when GL driver bug on Mac AND the GLES driver bug
</span><del>- // on QC & Imagination QNX is fixed, i.e., when alpha is off, readPixels should
</del><ins>+ // on QC is fixed, i.e., when alpha is off, readPixels should
</ins><span class="cx"> // set alpha to 255 instead of 0.
</span><span class="cx"> if (!m_framebufferBinding && !m_context->getContextAttributes().alpha) {
</span><span class="cx"> unsigned char* pixels = reinterpret_cast<unsigned char*>(data);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> genericConvertToLuminanceMask();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(ACCELERATED_COMPOSITING) && !USE(CAIRO) && !PLATFORM(BLACKBERRY)
</del><ins>+#if USE(ACCELERATED_COMPOSITING) && !USE(CAIRO)
</ins><span class="cx"> PlatformLayer* ImageBuffer::platformLayer() const
</span><span class="cx"> {
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBufferDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBufferData.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBufferData.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/ImageBufferData.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -29,6 +29,4 @@
</span><span class="cx"> #include "ImageBufferDataCairo.h"
</span><span class="cx"> #elif USE(WINGDI)
</span><span class="cx"> #include "ImageBufferDataWince.h"
</span><del>-#elif PLATFORM(BLACKBERRY)
-#include "ImageBufferDataBlackBerry.h"
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntPoint.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntPoint.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/IntPoint.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -49,12 +49,6 @@
</span><span class="cx"> typedef struct tagPOINTS POINTS;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> typedef struct _GdkPoint GdkPoint;
</span><del>-#elif PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class IntPoint;
-}
-}
</del><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> typedef struct _Evas_Point Evas_Point;
</span><span class="cx"> #endif
</span><span class="lines">@@ -128,9 +122,6 @@
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> IntPoint(const GdkPoint&);
</span><span class="cx"> operator GdkPoint() const;
</span><del>-#elif PLATFORM(BLACKBERRY)
- IntPoint(const BlackBerry::Platform::IntPoint&);
- operator BlackBerry::Platform::IntPoint() const;
</del><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> explicit IntPoint(const Evas_Point&);
</span><span class="cx"> operator Evas_Point() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntRect.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/IntRect.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -55,12 +55,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> typedef struct _Eina_Rectangle Eina_Rectangle;
</span><del>-#elif PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class IntRect;
-}
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(CAIRO)
</span><span class="lines">@@ -204,11 +198,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- IntRect(const BlackBerry::Platform::IntRect&);
- operator BlackBerry::Platform::IntRect() const;
-#endif
-
</del><span class="cx"> void dump(PrintStream& out) const;
</span><span class="cx">
</span><span class="cx"> static IntRect infiniteRect();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntSize.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntSize.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/IntSize.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -48,12 +48,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> typedef struct tagSIZE SIZE;
</span><del>-#elif PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class IntSize;
-}
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -148,11 +142,6 @@
</span><span class="cx"> operator SIZE() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- IntSize(const BlackBerry::Platform::IntSize&);
- operator BlackBerry::Platform::IntSize() const;
-#endif
-
</del><span class="cx"> void dump(PrintStream& out) const;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -72,11 +72,8 @@
</span><span class="cx"> #elif PLATFORM(WIN) && !USE(GSTREAMER)
</span><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx"> #include "MediaPlayerPrivateAVFoundationCF.h"
</span><ins>+#endif // USE(AVFOUNDATION)
</ins><span class="cx"> #endif
</span><del>-#elif PLATFORM(BLACKBERRY)
-#include "MediaPlayerPrivateBlackBerry.h"
-#define PlatformMediaEngineClassName MediaPlayerPrivate
-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsNativeImagePtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/NativeImagePtr.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/NativeImagePtr.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/NativeImagePtr.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -34,14 +34,6 @@
</span><span class="cx"> #include "RefPtrCairo.h"
</span><span class="cx"> #elif USE(WINGDI)
</span><span class="cx"> #include "SharedBitmap.h"
</span><del>-#elif PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-namespace Graphics {
-class TiledImage;
-}
-}
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -55,8 +47,6 @@
</span><span class="cx"> typedef PassRefPtr<cairo_surface_t> PassNativeImagePtr;
</span><span class="cx"> #elif USE(WINGDI)
</span><span class="cx"> typedef RefPtr<SharedBitmap> NativeImagePtr;
</span><del>-#elif PLATFORM(BLACKBERRY)
-typedef BlackBerry::Platform::Graphics::TiledImage* NativeImagePtr;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !USE(CAIRO)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsOpenGLESShimsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/OpenGLESShims.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/OpenGLESShims.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/OpenGLESShims.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef OpenGLESShims_h
</span><span class="cx"> #define OpenGLESShims_h
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
</del><ins>+#if PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
</ins><span class="cx"> #define glBindFramebufferEXT glBindFramebuffer
</span><span class="cx"> #define glFramebufferTexture2DEXT glFramebufferTexture2D
</span><span class="cx"> #define glBindRenderbufferEXT glBindRenderbuffer
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> #define GL_READ_FRAMEBUFFER_EXT 0x8CA8
</span><span class="cx"> #define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9
</span><span class="cx"> #define FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x9134
</span><del>-#endif // PLATFORM(BLACKBERRY)
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #endif // OpenGLESShims_h
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Path.cpp (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Path.cpp 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/Path.cpp 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> void Path::addPathForRoundedRect(const FloatRect& rect, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius, RoundedRectStrategy strategy)
</span><span class="cx"> {
</span><span class="cx"> if (strategy == PreferNativeRoundedRect) {
</span><del>-#if USE(CG) || PLATFORM(BLACKBERRY)
</del><ins>+#if USE(CG)
</ins><span class="cx"> platformAddPathForRoundedRect(rect, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius);
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Path.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Path.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/Path.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -44,11 +44,6 @@
</span><span class="cx"> class PlatformPath;
</span><span class="cx"> }
</span><span class="cx"> typedef WebCore::PlatformPath PlatformPath;
</span><del>-#elif PLATFORM(BLACKBERRY)
-namespace BlackBerry { namespace Platform { namespace Graphics {
- class Path;
-} } }
-typedef BlackBerry::Platform::Graphics::Path PlatformPath;
</del><span class="cx"> #else
</span><span class="cx"> typedef void PlatformPath;
</span><span class="cx"> #endif
</span><span class="lines">@@ -146,14 +141,10 @@
</span><span class="cx"> void addPathForRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius, RoundedRectStrategy = PreferNativeRoundedRect);
</span><span class="cx"> void addBeziersForRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius);
</span><span class="cx">
</span><del>-#if USE(CG) || PLATFORM(BLACKBERRY)
</del><ins>+#if USE(CG)
</ins><span class="cx"> void platformAddPathForRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- Path(const PlatformPath&);
-#endif
-
</del><span class="cx"> private:
</span><span class="cx"> PlatformPathPtr m_path;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPlatformLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PlatformLayer.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PlatformLayer.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/PlatformLayer.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -51,12 +51,7 @@
</span><span class="cx"> class TextureMapperPlatformLayer;
</span><span class="cx"> typedef TextureMapperPlatformLayer PlatformLayer;
</span><span class="cx"> };
</span><del>-#endif
-#elif PLATFORM(BLACKBERRY)
-namespace WebCore {
-class LayerWebKitThread;
-typedef LayerWebKitThread PlatformLayer;
-}
</del><ins>+#endif // USE(TEXTURE_MAPPER)
</ins><span class="cx"> #else
</span><span class="cx"> typedef void* PlatformLayer;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersCustomFilterValidatedProgramcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.cpp (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.cpp 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.cpp 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -604,7 +604,7 @@
</span><span class="cx"> return CustomFilterProgramInfo(m_validatedVertexShader, m_validatedFragmentShader, m_programInfo.programType(), m_programInfo.mixSettings(), m_programInfo.meshType());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(BLACKBERRY) && !USE(TEXTURE_MAPPER)
</del><ins>+#if !USE(TEXTURE_MAPPER)
</ins><span class="cx"> void CustomFilterValidatedProgram::platformInit()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersCustomFilterValidatedProgramh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -38,16 +38,8 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-// PlatformCompiledProgram defines a type that is compatible with the framework used to implement accelerated compositing on a particular platform.
-#if PLATFORM(BLACKBERRY)
</del><span class="cx"> namespace WebCore {
</span><del>-class LayerCompiledProgram;
-}
-typedef WebCore::LayerCompiledProgram PlatformCompiledProgram;
-#endif
</del><span class="cx">
</span><del>-namespace WebCore {
-
</del><span class="cx"> struct ANGLEShaderSymbol;
</span><span class="cx"> class CustomFilterCompiledProgram;
</span><span class="cx"> class CustomFilterGlobalContext;
</span><span class="lines">@@ -89,7 +81,7 @@
</span><span class="cx"> return m_validatedFragmentShader;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY) || USE(TEXTURE_MAPPER)
</del><ins>+#if USE(TEXTURE_MAPPER)
</ins><span class="cx"> PlatformCompiledProgram* platformCompiledProgram();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -117,7 +109,7 @@
</span><span class="cx"> String m_validatedFragmentShader;
</span><span class="cx">
</span><span class="cx"> RefPtr<CustomFilterCompiledProgram> m_compiledProgram;
</span><del>-#if PLATFORM(BLACKBERRY) || USE(TEXTURE_MAPPER)
</del><ins>+#if USE(TEXTURE_MAPPER)
</ins><span class="cx"> PlatformCompiledProgram* m_platformCompiledProgram;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -37,10 +37,6 @@
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-#include <wtf/ThreadSafeRefCounted.h>
-#endif
-
</del><span class="cx"> // Annoyingly, wingdi.h #defines this.
</span><span class="cx"> #ifdef PASSTHROUGH
</span><span class="cx"> #undef PASSTHROUGH
</span><span class="lines">@@ -54,11 +50,7 @@
</span><span class="cx"> class CachedSVGDocumentReference;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-class FilterOperation : public ThreadSafeRefCounted<FilterOperation> {
-#else
</del><span class="cx"> class FilterOperation : public RefCounted<FilterOperation> {
</span><del>-#endif
</del><span class="cx"> public:
</span><span class="cx"> enum OperationType {
</span><span class="cx"> REFERENCE, // url(#somefilter)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgpuDrawingBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -89,9 +89,7 @@
</span><span class="cx"> // Global resource ceiling (expressed in terms of pixels) for DrawingBuffer creation and resize.
</span><span class="cx"> // When this limit is set, DrawingBuffer::create() and DrawingBuffer::reset() calls that would
</span><span class="cx"> // exceed the global cap will instead clear the buffer.
</span><del>-#if !PLATFORM(BLACKBERRY)
</del><span class="cx"> static int s_maximumResourceUsePixels = 0;
</span><del>-#endif
</del><span class="cx"> static int s_currentResourceUsePixels = 0;
</span><span class="cx"> static const float s_resourceAdjustedRatio = 0.5;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -32,10 +32,6 @@
</span><span class="cx"> #include "ANGLEWebKitBridge.h"
</span><span class="cx"> #include "GraphicsContext3D.h"
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-#include <BlackBerryPlatformLog.h>
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include <OpenGLES/ES2/glext.h>
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLEScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -33,10 +33,6 @@
</span><span class="cx"> #include <EGL/egl.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-#include <BlackBerryPlatformLog.h>
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> Extensions3DOpenGLES::Extensions3DOpenGLES(GraphicsContext3D* context)
</span><span class="lines">@@ -176,11 +172,6 @@
</span><span class="cx"> m_context->makeContextCurrent();
</span><span class="cx"> int reasonForReset = m_glGetGraphicsResetStatusEXT();
</span><span class="cx"> if (reasonForReset != GL_NO_ERROR) {
</span><del>-#if PLATFORM(BLACKBERRY)
- // We cannot yet recreate our compositing thread, so just quit.
- BlackBerry::Platform::logAlways(BlackBerry::Platform::LogLevelCritical, "Robust OpenGL context has been reset. Aborting.");
- CRASH();
-#endif
</del><span class="cx"> ASSERT(m_contextLostCallback);
</span><span class="cx"> if (m_contextLostCallback)
</span><span class="cx"> m_contextLostCallback->onContextLost();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLESh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -32,13 +32,6 @@
</span><span class="cx"> #include <GLES2/gl2.h>
</span><span class="cx"> #include <GLES2/gl2ext.h>
</span><span class="cx">
</span><del>-#if OS(QNX)
-// See https://bugs.webkit.org/show_bug.cgi?id=91030.
-// Newer Khorons headers do define these with a PROC suffix, but older headers don't.
-#define PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC
-#define PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMG PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC
-#endif
-
</del><span class="cx"> #ifndef GL_EXT_robustness
</span><span class="cx"> /* reuse GL_NO_ERROR */
</span><span class="cx"> #define GL_GUILTY_CONTEXT_RESET_EXT 0x8253
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -72,10 +72,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-#include <BlackBerryPlatformLog.h>
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static ShaderNameHash* currentNameHashMapForShader;
</span><span class="lines">@@ -164,7 +160,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY) || USE(CG)
</del><ins>+#if USE(CG)
</ins><span class="cx"> paintToCanvas(pixels.get(), m_currentWidth, m_currentHeight,
</span><span class="cx"> imageBuffer->internalSize().width(), imageBuffer->internalSize().height(), imageBuffer->context());
</span><span class="cx"> #else
</span><span class="lines">@@ -203,7 +199,6 @@
</span><span class="cx"> return imageData.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(BLACKBERRY)
</del><span class="cx"> void GraphicsContext3D::prepareTexture()
</span><span class="cx"> {
</span><span class="cx"> if (m_layerComposited)
</span><span class="lines">@@ -228,7 +223,6 @@
</span><span class="cx"> ::glFinish();
</span><span class="cx"> m_layerComposited = true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void GraphicsContext3D::readRenderingResults(unsigned char *pixels, int pixelsSize)
</span><span class="cx"> {
</span><span class="lines">@@ -399,11 +393,7 @@
</span><span class="cx"> if (buffer)
</span><span class="cx"> fbo = buffer;
</span><span class="cx"> else
</span><del>-#if PLATFORM(BLACKBERRY)
- fbo = m_fbo;
-#else
</del><span class="cx"> fbo = (m_attrs.antialias ? m_multisampleFBO : m_fbo);
</span><del>-#endif
</del><span class="cx"> if (fbo != m_state.boundFBO) {
</span><span class="cx"> ::glBindFramebufferEXT(target, fbo);
</span><span class="cx"> m_state.boundFBO = fbo;
</span><span class="lines">@@ -562,9 +552,6 @@
</span><span class="cx"> if (GLCompileSuccess != GL_TRUE) {
</span><span class="cx"> entry.isValid = false;
</span><span class="cx"> LOG(WebGL, "Error: shader translator produced a shader that OpenGL would not compile.");
</span><del>-#if PLATFORM(BLACKBERRY) && !defined(NDEBUG)
- BBLOG(BlackBerry::Platform::LogLevelWarn, "The shader validated, but didn't compile.\n");
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_shaderSymbolCount = nullptr;
</span><span class="lines">@@ -573,33 +560,25 @@
</span><span class="cx"> void GraphicsContext3D::copyTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Dint border)
</span><span class="cx"> {
</span><span class="cx"> makeContextCurrent();
</span><del>-#if !PLATFORM(BLACKBERRY)
</del><span class="cx"> if (m_attrs.antialias && m_state.boundFBO == m_multisampleFBO) {
</span><span class="cx"> resolveMultisamplingIfNecessary(IntRect(x, y, width, height));
</span><span class="cx"> ::glBindFramebufferEXT(GraphicsContext3D::FRAMEBUFFER, m_fbo);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> ::glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
</span><del>-#if !PLATFORM(BLACKBERRY)
</del><span class="cx"> if (m_attrs.antialias && m_state.boundFBO == m_multisampleFBO)
</span><span class="cx"> ::glBindFramebufferEXT(GraphicsContext3D::FRAMEBUFFER, m_multisampleFBO);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::copyTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height)
</span><span class="cx"> {
</span><span class="cx"> makeContextCurrent();
</span><del>-#if !PLATFORM(BLACKBERRY)
</del><span class="cx"> if (m_attrs.antialias && m_state.boundFBO == m_multisampleFBO) {
</span><span class="cx"> resolveMultisamplingIfNecessary(IntRect(x, y, width, height));
</span><span class="cx"> ::glBindFramebufferEXT(GraphicsContext3D::FRAMEBUFFER, m_fbo);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> ::glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
</span><del>-#if !PLATFORM(BLACKBERRY)
</del><span class="cx"> if (m_attrs.antialias && m_state.boundFBO == m_multisampleFBO)
</span><span class="cx"> ::glBindFramebufferEXT(GraphicsContext3D::FRAMEBUFFER, m_multisampleFBO);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::cullFace(GC3Denum mode)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLEScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -35,9 +35,6 @@
</span><span class="cx"> #include "Extensions3DOpenGLES.h"
</span><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include "IntSize.h"
</span><del>-#if PLATFORM(BLACKBERRY)
-#include "LayerWebKitThread.h"
-#endif
</del><span class="cx"> #include "NotImplemented.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -54,15 +51,6 @@
</span><span class="cx"> // FIXME: remove the two glFlush calls when the driver bug is fixed, i.e.,
</span><span class="cx"> // all previous rendering calls should be done before reading pixels.
</span><span class="cx"> ::glFlush();
</span><del>-#if PLATFORM(BLACKBERRY)
- if (m_isImaginationHardware && m_fbo == m_state.boundFBO) {
- // FIXME: This workaround should always be used until the
- // driver alignment bug is fixed, even when we aren't
- // drawing to the canvas.
- readPixelsIMG(x, y, width, height, format, type, data);
- } else
- ::glReadPixels(x, y, width, height, format, type, data);
-#else
</del><span class="cx"> if (m_attrs.antialias && m_state.boundFBO == m_multisampleFBO) {
</span><span class="cx"> resolveMultisamplingIfNecessary(IntRect(x, y, width, height));
</span><span class="cx"> ::glBindFramebuffer(GL_FRAMEBUFFER, m_fbo);
</span><span class="lines">@@ -73,22 +61,11 @@
</span><span class="cx">
</span><span class="cx"> if (m_attrs.antialias && m_state.boundFBO == m_multisampleFBO)
</span><span class="cx"> ::glBindFramebuffer(GL_FRAMEBUFFER, m_multisampleFBO);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::readPixelsAndConvertToBGRAIfNecessary(int x, int y, int width, int height, unsigned char* pixels)
</span><span class="cx"> {
</span><del>-#if PLATFORM(BLACKBERRY)
- if (m_isImaginationHardware && m_fbo == m_state.boundFBO) {
- // FIXME: This workaround should always be used until the
- // driver alignment bug is fixed, even when we aren't
- // drawing to the canvas.
- readPixelsIMG(x, y, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
- } else
- ::glReadPixels(x, y, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
-#else
</del><span class="cx"> ::glReadPixels(x, y, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
</span><del>-#endif
</del><span class="cx"> int totalBytes = width * height * 4;
</span><span class="cx"> if (isGLES2Compliant()) {
</span><span class="cx"> for (int i = 0; i < totalBytes; i += 4)
</span><span class="lines">@@ -96,8 +73,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(BLACKBERRY)
-// The BlackBerry port uses a special implementation of reshapeFBOs. See GraphicsContext3DBlackBerry.cpp
</del><span class="cx"> bool GraphicsContext3D::reshapeFBOs(const IntSize& size)
</span><span class="cx"> {
</span><span class="cx"> const int width = size.width();
</span><span class="lines">@@ -169,7 +144,6 @@
</span><span class="cx">
</span><span class="cx"> return mustRestoreFBO;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void GraphicsContext3D::resolveMultisamplingIfNecessary(const IntRect& rect)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkStateNotifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/NetworkStateNotifier.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/NetworkStateNotifier.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/network/NetworkStateNotifier.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -67,10 +67,6 @@
</span><span class="cx"> void setIsOnLine(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- void networkStateChange(bool online);
-#endif
-
</del><span class="cx"> private:
</span><span class="cx"> bool m_isOnLine;
</span><span class="cx"> Vector<NetworkStateChangeListener> m_listeners;
</span><span class="lines">@@ -104,7 +100,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(BLACKBERRY) && !PLATFORM(EFL)
</del><ins>+#if !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(EFL)
</ins><span class="cx">
</span><span class="cx"> inline NetworkStateNotifier::NetworkStateNotifier()
</span><span class="cx"> : m_isOnLine(true)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> static void CALLBACK internetStatusCallback(HINTERNET, DWORD_PTR, DWORD, LPVOID, DWORD);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(CURL) || USE(SOUP) || PLATFORM(BLACKBERRY)
</del><ins>+#if USE(CURL) || USE(SOUP)
</ins><span class="cx"> ResourceHandleInternal* getInternal() { return d.get(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -223,10 +223,6 @@
</span><span class="cx">
</span><span class="cx"> void setDefersLoading(bool);
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- void pauseLoad(bool); // FIXME: How is this different from setDefersLoading()?
-#endif
-
</del><span class="cx"> void didChangePriority(ResourceLoadPriority);
</span><span class="cx">
</span><span class="cx"> ResourceRequest& firstRequest();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -217,13 +217,6 @@
</span><span class="cx"> NSURLAuthenticationChallenge *m_currentMacChallenge;
</span><span class="cx"> #endif
</span><span class="cx"> AuthenticationChallenge m_currentWebChallenge;
</span><del>-#if PLATFORM(BLACKBERRY)
- // We need to store the credentials for host and proxy separately for the platform
- // networking layer. One of these will always be equal to m_currentWebChallenge.
- AuthenticationChallenge m_hostWebChallenge;
- AuthenticationChallenge m_proxyWebChallenge;
-#endif
-
</del><span class="cx"> ResourceHandle::FailureType m_scheduledFailureType;
</span><span class="cx"> Timer<ResourceHandle> m_failureTimer;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -523,7 +523,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(BLACKBERRY)
</del><ins>+#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP)
</ins><span class="cx"> unsigned initializeMaximumHTTPConnectionCountPerHost()
</span><span class="cx"> {
</span><span class="cx"> // This is used by the loader to control the number of issued parallel load requests.
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsCommoncmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsCommon.cmake (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsCommon.cmake 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Source/cmake/OptionsCommon.cmake 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -17,9 +17,6 @@
</span><span class="cx"> get_filename_component(CODE_GENERATOR_PREPROCESSOR_EXECUTABLE ${CMAKE_CXX_COMPILER} NAME)
</span><span class="cx"> set(CODE_GENERATOR_PREPROCESSOR "${CODE_GENERATOR_PREPROCESSOR_EXECUTABLE} /nologo /EP")
</span><span class="cx"> set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}")
</span><del>-elseif (CMAKE_SYSTEM_NAME MATCHES QNX)
- set(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -Wp,-P -x c++")
- set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}")
</del><span class="cx"> else ()
</span><span class="cx"> set(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++")
</span><span class="cx"> set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CMAKE_CXX_COMPILER} -E -x c++")
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Tools/ChangeLog 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -1,3 +1,13 @@
</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.
+
+ * DumpRenderTree/DumpRenderTree.h:
+ * DumpRenderTree/PixelDumpSupport.cpp:
+
</ins><span class="cx"> 2014-01-10 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Fix project build order
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.h (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.h 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.h 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -42,8 +42,6 @@
</span><span class="cx"> #include "DumpRenderTreeGtk.h"
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> #include "DumpRenderTreeEfl.h"
</span><del>-#elif PLATFORM(BLACKBERRY)
-#include "DumpRenderTreeBlackBerry.h"
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #include <string>
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePixelDumpSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp (161698 => 161699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp 2014-01-11 00:44:31 UTC (rev 161698)
+++ trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp 2014-01-11 00:53:54 UTC (rev 161699)
</span><span class="lines">@@ -41,8 +41,6 @@
</span><span class="cx"> #include "PixelDumpSupportCG.h"
</span><span class="cx"> #elif USE(CAIRO)
</span><span class="cx"> #include "PixelDumpSupportCairo.h"
</span><del>-#elif PLATFORM(BLACKBERRY)
-#include "PixelDumpSupportBlackBerry.h"
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void dumpWebViewAsPixelsAndCompareWithExpected(const std::string& expectedHash)
</span></span></pre>
</div>
</div>
</body>
</html>