Changeset 161699 in webkit


Ignore:
Timestamp:
Jan 10, 2014 4:53:54 PM (10 years ago)
Author:
benjamin@webkit.org
Message:

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:
Location:
trunk
Files:
38 edited

Legend:

Unmodified
Added
Removed

  • trunk/CMakeLists.txt

    r161661 r161699  
    101101elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")
    102102    set(WTF_OS_WINDOWS 1)
    103 elseif (CMAKE_SYSTEM_NAME MATCHES "QNX")
    104     set(WTF_OS_QNX 1)
    105     set(WTF_OS_UNIX 1)
    106103else ()
    107104    message(FATAL_ERROR "Unknown OS '${CMAKE_SYSTEM_NAME}'")

  • trunk/ChangeLog

    r161672 r161699  
     12014-01-10  Benjamin Poulain  <bpoulain@apple.com>
     2
     3        Remove the BlackBerry port from trunk
     4        https://bugs.webkit.org/show_bug.cgi?id=126715
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * CMakeLists.txt:
     9        * Source/cmake/OptionsCommon.cmake:
     10
    1112014-01-10  Tamas Gergely  <tgergely.u-szeged@partner.samsung.com>
    212

  • trunk/Source/JavaScriptCore/ChangeLog

    r161691 r161699  
     12014-01-10  Benjamin Poulain  <bpoulain@apple.com>
     2
     3        Remove the BlackBerry port from trunk
     4        https://bugs.webkit.org/show_bug.cgi?id=126715
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * assembler/ARMAssembler.h:
     9        (JSC::ARMAssembler::cacheFlush):
     10        * assembler/ARMv7Assembler.h:
     11        (JSC::ARMv7Assembler::replaceWithJump):
     12        (JSC::ARMv7Assembler::maxJumpReplacementSize):
     13        (JSC::ARMv7Assembler::cacheFlush):
     14        * assembler/MacroAssemblerARMv7.h:
     15        (JSC::MacroAssemblerARMv7::revertJumpReplacementToBranchPtrWithPatch):
     16        * heap/MachineStackMarker.cpp:
     17        (JSC::getPlatformThreadRegisters):
     18        (JSC::otherThreadStackPointer):
     19        (JSC::freePlatformThreadRegisters):
     20        * jit/ExecutableAllocator.h:
     21
    1222014-01-10  Joseph Pecoraro  <pecoraro@apple.com>
    223

  • trunk/Source/JavaScriptCore/assembler/ARMAssembler.h

    r160648 r161699  
    11221122#elif OS(WINCE)
    11231123            CacheRangeFlush(code, size, CACHE_SYNC_ALL);
    1124 #elif OS(QNX) && ENABLE(ASSEMBLER_WX_EXCLUSIVE)
    1125             UNUSED_PARAM(code);
    1126             UNUSED_PARAM(size);
    1127 #elif OS(QNX)
    1128             msync(code, size, MS_INVALIDATE_ICACHE);
    11291124#else
    11301125#error "The cacheFlush support is missing on this platform."

  • trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h

    r160703 r161699  
    13481348    }
    13491349   
    1350 #if OS(LINUX) || OS(QNX)
     1350#if OS(LINUX)
    13511351    static void revertJumpTo_movT3movtcmpT2(void* instructionStart, RegisterID left, RegisterID right, uintptr_t imm)
    13521352    {
    … …  
    22692269        ASSERT(!(bitwise_cast<uintptr_t>(to) & 1));
    22702270
    2271 #if OS(LINUX) || OS(QNX)
     2271#if OS(LINUX)
    22722272        if (canBeJumpT4(reinterpret_cast<uint16_t*>(instructionStart), to)) {
    22732273            uint16_t* ptr = reinterpret_cast<uint16_t*>(instructionStart) + 2;
    … …  
    22882288    static ptrdiff_t maxJumpReplacementSize()
    22892289    {
    2290 #if OS(LINUX) || OS(QNX)
     2290#if OS(LINUX)
    22912291        return 10;
    22922292#else
    … …  
    23782378#elif OS(WINCE)
    23792379        CacheRangeFlush(code, size, CACHE_SYNC_ALL);
    2380 #elif OS(QNX)
    2381 #if !ENABLE(ASSEMBLER_WX_EXCLUSIVE)
    2382         msync(code, size, MS_INVALIDATE_ICACHE);
    2383 #else
    2384         UNUSED_PARAM(code);
    2385         UNUSED_PARAM(size);
    2386 #endif
    23872380#else
    23882381#error "The cacheFlush support is missing on this platform."

  • trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h

    r160680 r161699  
    17851785    static void revertJumpReplacementToBranchPtrWithPatch(CodeLocationLabel instructionStart, RegisterID rd, void* initialValue)
    17861786    {
    1787 #if OS(LINUX) || OS(QNX)
     1787#if OS(LINUX)
    17881788        ARMv7Assembler::revertJumpTo_movT3movtcmpT2(instructionStart.dataLocation(), rd, dataTempRegister, reinterpret_cast<uintptr_t>(initialValue));
    17891789#else

  • trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp

    r157474 r161699  
    5959#endif
    6060
    61 #if OS(QNX)
    62 #include <fcntl.h>
    63 #include <sys/procfs.h>
    64 #include <stdio.h>
    65 #include <errno.h>
    66 #endif
    67 
    6861#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
    6962#include <signal.h>
    … …  
    312305#elif OS(WINDOWS)
    313306typedef CONTEXT PlatformThreadRegisters;
    314 #elif OS(QNX)
    315 typedef struct _debug_thread_info PlatformThreadRegisters;
    316307#elif USE(PTHREADS)
    317308typedef pthread_attr_t PlatformThreadRegisters;
    … …  
    359350    GetThreadContext(platformThread, &regs);
    360351    return sizeof(CONTEXT);
    361 #elif OS(QNX)
    362     memset(&regs, 0, sizeof(regs));
    363     regs.tid = platformThread;
    364     // FIXME: If we find this hurts performance, we can consider caching the fd and keeping it open.
    365     int fd = open("/proc/self/as", O_RDONLY);
    366     if (fd == -1) {
    367         LOG_ERROR("Unable to open /proc/self/as (errno: %d)", errno);
    368         CRASH();
    369     }
    370     int rc = devctl(fd, DCMD_PROC_TIDSTATUS, &regs, sizeof(regs), 0);
    371     if (rc != EOK) {
    372         LOG_ERROR("devctl(DCMD_PROC_TIDSTATUS) failed (error: %d)", rc);
    373         CRASH();
    374     }
    375     close(fd);
    376     return sizeof(struct _debug_thread_info);
    377352#elif USE(PTHREADS)
    378353    pthread_attr_init(&regs);
    … …  
    439414#endif
    440415
    441 #elif OS(QNX)
    442     return reinterpret_cast<void*>((uintptr_t) regs.sp);
    443 
    444416#elif USE(PTHREADS)
    445417    void* stackBase = 0;
    … …  
    456428static void freePlatformThreadRegisters(PlatformThreadRegisters& regs)
    457429{
    458 #if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) && !OS(QNX)
     430#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
    459431    pthread_attr_destroy(&regs);
    460432#else

  • trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h

    r157474 r161699  
    4141#endif
    4242
    43 #if OS(IOS) || OS(QNX)
     43#if OS(IOS)
    4444#include <sys/mman.h>
    4545#endif

  • trunk/Source/WebCore/ChangeLog

    r161698 r161699  
     12014-01-10  Benjamin Poulain  <bpoulain@apple.com>
     2
     3        Remove the BlackBerry port from trunk
     4        https://bugs.webkit.org/show_bug.cgi?id=126715
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * html/canvas/WebGLRenderingContext.cpp:
     9        (WebCore::WebGLRenderingContext::readPixels):
     10        * platform/graphics/ImageBuffer.cpp:
     11        * platform/graphics/ImageBufferData.h:
     12        * platform/graphics/IntPoint.h:
     13        * platform/graphics/IntRect.h:
     14        * platform/graphics/IntSize.h:
     15        * platform/graphics/MediaPlayer.cpp:
     16        * platform/graphics/NativeImagePtr.h:
     17        * platform/graphics/OpenGLESShims.h:
     18        * platform/graphics/Path.cpp:
     19        (WebCore::Path::addPathForRoundedRect):
     20        * platform/graphics/Path.h:
     21        * platform/graphics/PlatformLayer.h:
     22        * platform/graphics/filters/CustomFilterValidatedProgram.cpp:
     23        * platform/graphics/filters/CustomFilterValidatedProgram.h:
     24        * platform/graphics/filters/FilterOperation.h:
     25        * platform/graphics/gpu/DrawingBuffer.cpp:
     26        * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
     27        * platform/graphics/opengl/Extensions3DOpenGLES.cpp:
     28        (WebCore::Extensions3DOpenGLES::getGraphicsResetStatusARB):
     29        * platform/graphics/opengl/Extensions3DOpenGLES.h:
     30        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
     31        (WebCore::GraphicsContext3D::paintRenderingResultsToCanvas):
     32        (WebCore::GraphicsContext3D::prepareTexture):
     33        (WebCore::GraphicsContext3D::bindFramebuffer):
     34        (WebCore::GraphicsContext3D::compileShader):
     35        (WebCore::GraphicsContext3D::copyTexImage2D):
     36        (WebCore::GraphicsContext3D::copyTexSubImage2D):
     37        * platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
     38        (WebCore::GraphicsContext3D::readPixels):
     39        (WebCore::GraphicsContext3D::readPixelsAndConvertToBGRAIfNecessary):
     40        (WebCore::GraphicsContext3D::reshapeFBOs):
     41        * platform/network/NetworkStateNotifier.h:
     42        * platform/network/ResourceHandle.h:
     43        * platform/network/ResourceHandleInternal.h:
     44        * platform/network/ResourceRequestBase.cpp:
     45
    1462014-01-10  Simon Fraser  <simon.fraser@apple.com>
    247

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

    r161688 r161699  
    34943494    }
    34953495
    3496 #if OS(DARWIN) || OS(QNX)
     3496#if OS(DARWIN)
    34973497    if (m_isRobustnessEXTSupported) // we haven't computed padding
    34983498        m_context->computeImageSizeInBytes(format, type, width, height, m_packAlignment, &totalBytesRequired, &padding);
    34993499    // FIXME: remove this section when GL driver bug on Mac AND the GLES driver bug
    3500     // on QC & Imagination QNX is fixed, i.e., when alpha is off, readPixels should
     3500    // on QC is fixed, i.e., when alpha is off, readPixels should
    35013501    // set alpha to 255 instead of 0.
    35023502    if (!m_framebufferBinding && !m_context->getContextAttributes().alpha) {

  • trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp

    r159791 r161699  
    9999}
    100100
    101 #if USE(ACCELERATED_COMPOSITING) && !USE(CAIRO) && !PLATFORM(BLACKBERRY)
     101#if USE(ACCELERATED_COMPOSITING) && !USE(CAIRO)
    102102PlatformLayer* ImageBuffer::platformLayer() const
    103103{

  • trunk/Source/WebCore/platform/graphics/ImageBufferData.h

    r156795 r161699  
    3030#elif USE(WINGDI)
    3131#include "ImageBufferDataWince.h"
    32 #elif PLATFORM(BLACKBERRY)
    33 #include "ImageBufferDataBlackBerry.h"
    3432#endif

  • trunk/Source/WebCore/platform/graphics/IntPoint.h

    r161589 r161699  
    5050#elif PLATFORM(GTK)
    5151typedef struct _GdkPoint GdkPoint;
    52 #elif PLATFORM(BLACKBERRY)
    53 namespace BlackBerry {
    54 namespace Platform {
    55 class IntPoint;
    56 }
    57 }
    5852#elif PLATFORM(EFL)
    5953typedef struct _Evas_Point Evas_Point;
    … …  
    129123    IntPoint(const GdkPoint&);
    130124    operator GdkPoint() const;
    131 #elif PLATFORM(BLACKBERRY)
    132     IntPoint(const BlackBerry::Platform::IntPoint&);
    133     operator BlackBerry::Platform::IntPoint() const;
    134125#elif PLATFORM(EFL)
    135126    explicit IntPoint(const Evas_Point&);

  • trunk/Source/WebCore/platform/graphics/IntRect.h

    r161589 r161699  
    5656#elif PLATFORM(EFL)
    5757typedef struct _Eina_Rectangle Eina_Rectangle;
    58 #elif PLATFORM(BLACKBERRY)
    59 namespace BlackBerry {
    60 namespace Platform {
    61 class IntRect;
    62 }
    63 }
    6458#endif
    6559
    … …  
    205199#endif // !PLATFORM(IOS)
    206200
    207 #if PLATFORM(BLACKBERRY)
    208     IntRect(const BlackBerry::Platform::IntRect&);
    209     operator BlackBerry::Platform::IntRect() const;
    210 #endif
    211 
    212201    void dump(PrintStream& out) const;
    213202

  • trunk/Source/WebCore/platform/graphics/IntSize.h

    r161589 r161699  
    4949#if PLATFORM(WIN)
    5050typedef struct tagSIZE SIZE;
    51 #elif PLATFORM(BLACKBERRY)
    52 namespace BlackBerry {
    53 namespace Platform {
    54 class IntSize;
    55 }
    56 }
    5751#endif
    5852
    … …  
    149143#endif
    150144
    151 #if PLATFORM(BLACKBERRY)
    152     IntSize(const BlackBerry::Platform::IntSize&);
    153     operator BlackBerry::Platform::IntSize() const;
    154 #endif
    155 
    156145    void dump(PrintStream& out) const;
    157146

  • trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

    r161589 r161699  
    7373#if USE(AVFOUNDATION)
    7474#include "MediaPlayerPrivateAVFoundationCF.h"
    75 #endif
    76 #elif PLATFORM(BLACKBERRY)
    77 #include "MediaPlayerPrivateBlackBerry.h"
    78 #define PlatformMediaEngineClassName MediaPlayerPrivate
     75#endif // USE(AVFOUNDATION)
    7976#endif
    8077

  • trunk/Source/WebCore/platform/graphics/NativeImagePtr.h

    r156795 r161699  
    3535#elif USE(WINGDI)
    3636#include "SharedBitmap.h"
    37 #elif PLATFORM(BLACKBERRY)
    38 namespace BlackBerry {
    39 namespace Platform {
    40 namespace Graphics {
    41 class TiledImage;
    42 }
    43 }
    44 }
    4537#endif
    4638
    … …  
    5648#elif USE(WINGDI)
    5749typedef RefPtr<SharedBitmap> NativeImagePtr;
    58 #elif PLATFORM(BLACKBERRY)
    59 typedef BlackBerry::Platform::Graphics::TiledImage* NativeImagePtr;
    6050#endif
    6151

  • trunk/Source/WebCore/platform/graphics/OpenGLESShims.h

    r158351 r161699  
    2727#define OpenGLESShims_h
    2828
    29 #if PLATFORM(BLACKBERRY) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
     29#if PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)
    3030#define glBindFramebufferEXT glBindFramebuffer
    3131#define glFramebufferTexture2DEXT glFramebufferTexture2D
    … …  
    5454#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9
    5555#define FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x9134
    56 #endif // PLATFORM(BLACKBERRY)
     56#endif
    5757
    5858#endif // OpenGLESShims_h

  • trunk/Source/WebCore/platform/graphics/Path.cpp

    r156795 r161699  
    145145{
    146146    if (strategy == PreferNativeRoundedRect) {
    147 #if USE(CG) || PLATFORM(BLACKBERRY)
     147#if USE(CG)
    148148        platformAddPathForRoundedRect(rect, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius);
    149149        return;

  • trunk/Source/WebCore/platform/graphics/Path.h

    r156795 r161699  
    4545}
    4646typedef WebCore::PlatformPath PlatformPath;
    47 #elif PLATFORM(BLACKBERRY)
    48 namespace BlackBerry { namespace Platform { namespace Graphics {
    49     class Path;
    50 } } }
    51 typedef BlackBerry::Platform::Graphics::Path PlatformPath;
    5247#else
    5348typedef void PlatformPath;
    … …  
    147142        void addBeziersForRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius);
    148143
    149 #if USE(CG) || PLATFORM(BLACKBERRY)
     144#if USE(CG)
    150145        void platformAddPathForRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius);
    151 #endif
    152 
    153 #if PLATFORM(BLACKBERRY)
    154         Path(const PlatformPath&);
    155146#endif
    156147

  • trunk/Source/WebCore/platform/graphics/PlatformLayer.h

    r157884 r161699  
    5252typedef TextureMapperPlatformLayer PlatformLayer;
    5353};
    54 #endif
    55 #elif PLATFORM(BLACKBERRY)
    56 namespace WebCore {
    57 class LayerWebKitThread;
    58 typedef LayerWebKitThread PlatformLayer;
    59 }
     54#endif // USE(TEXTURE_MAPPER)
    6055#else
    6156typedef void* PlatformLayer;

  • trunk/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.cpp

    r148518 r161699  
    605605}
    606606
    607 #if !PLATFORM(BLACKBERRY) && !USE(TEXTURE_MAPPER)
     607#if !USE(TEXTURE_MAPPER)
    608608void CustomFilterValidatedProgram::platformInit()
    609609{

  • trunk/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.h

    r148518 r161699  
    3838#include <wtf/RefPtr.h>
    3939#include <wtf/text/WTFString.h>
    40 
    41 // PlatformCompiledProgram defines a type that is compatible with the framework used to implement accelerated compositing on a particular platform.
    42 #if PLATFORM(BLACKBERRY)
    43 namespace WebCore {
    44 class LayerCompiledProgram;
    45 }
    46 typedef WebCore::LayerCompiledProgram PlatformCompiledProgram;
    47 #endif
    4840
    4941namespace WebCore {
    … …  
    9082    }
    9183
    92 #if PLATFORM(BLACKBERRY) || USE(TEXTURE_MAPPER)
     84#if USE(TEXTURE_MAPPER)
    9385    PlatformCompiledProgram* platformCompiledProgram();
    9486#endif
    … …  
    118110
    119111    RefPtr<CustomFilterCompiledProgram> m_compiledProgram;
    120 #if PLATFORM(BLACKBERRY) || USE(TEXTURE_MAPPER)
     112#if USE(TEXTURE_MAPPER)
    121113    PlatformCompiledProgram* m_platformCompiledProgram;
    122114#endif

  • trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h

    r160973 r161699  
    3838#include <wtf/text/WTFString.h>
    3939
    40 #if PLATFORM(BLACKBERRY)
    41 #include <wtf/ThreadSafeRefCounted.h>
    42 #endif
    43 
    4440// Annoyingly, wingdi.h #defines this.
    4541#ifdef PASSTHROUGH
    … …  
    5551#endif
    5652
    57 #if PLATFORM(BLACKBERRY)
    58 class FilterOperation : public ThreadSafeRefCounted<FilterOperation> {
    59 #else
    6053class FilterOperation : public RefCounted<FilterOperation> {
    61 #endif
    6254public:
    6355    enum OperationType {

  • trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp

    r156795 r161699  
    9090// When this limit is set, DrawingBuffer::create() and DrawingBuffer::reset() calls that would
    9191// exceed the global cap will instead clear the buffer.
    92 #if !PLATFORM(BLACKBERRY)
    9392static int s_maximumResourceUsePixels = 0;
    94 #endif
    9593static int s_currentResourceUsePixels = 0;
    9694static const float s_resourceAdjustedRatio = 0.5;

  • trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp

    r161589 r161699  
    3333#include "GraphicsContext3D.h"
    3434
    35 #if PLATFORM(BLACKBERRY)
    36 #include <BlackBerryPlatformLog.h>
    37 #endif
    38 
    3935#if PLATFORM(IOS)
    4036#include <OpenGLES/ES2/glext.h>

  • trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp

    r161645 r161699  
    3434#include <wtf/Vector.h>
    3535
    36 #if PLATFORM(BLACKBERRY)
    37 #include <BlackBerryPlatformLog.h>
    38 #endif
    39 
    4036namespace WebCore {
    4137
    … …  
    177173        int reasonForReset = m_glGetGraphicsResetStatusEXT();
    178174        if (reasonForReset != GL_NO_ERROR) {
    179 #if PLATFORM(BLACKBERRY)
    180             // We cannot yet recreate our compositing thread, so just quit.
    181             BlackBerry::Platform::logAlways(BlackBerry::Platform::LogLevelCritical, "Robust OpenGL context has been reset. Aborting.");
    182             CRASH();
    183 #endif
    184175            ASSERT(m_contextLostCallback);
    185176            if (m_contextLostCallback)

  • trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h

    r160458 r161699  
    3232#include <GLES2/gl2.h>
    3333#include <GLES2/gl2ext.h>
    34 
    35 #if OS(QNX)
    36 // See https://bugs.webkit.org/show_bug.cgi?id=91030.
    37 // Newer Khorons headers do define these with a PROC suffix, but older headers don't.
    38 #define PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC
    39 #define PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMG PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC
    40 #endif
    4134
    4235#ifndef GL_EXT_robustness

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp

    r161605 r161699  
    7373#endif
    7474
    75 #if PLATFORM(BLACKBERRY)
    76 #include <BlackBerryPlatformLog.h>
    77 #endif
    78 
    7975namespace WebCore {
    8076
    … …  
    165161    }
    166162
    167 #if PLATFORM(BLACKBERRY) || USE(CG)
     163#if USE(CG)
    168164    paintToCanvas(pixels.get(), m_currentWidth, m_currentHeight,
    169165                  imageBuffer->internalSize().width(), imageBuffer->internalSize().height(), imageBuffer->context());
    … …  
    204200}
    205201
    206 #if !PLATFORM(BLACKBERRY)
    207202void GraphicsContext3D::prepareTexture()
    208203{
    … …  
    229224    m_layerComposited = true;
    230225}
    231 #endif
    232226
    233227void GraphicsContext3D::readRenderingResults(unsigned char *pixels, int pixelsSize)
    … …  
    400394        fbo = buffer;
    401395    else
    402 #if PLATFORM(BLACKBERRY)
    403         fbo = m_fbo;
    404 #else
    405396        fbo = (m_attrs.antialias ? m_multisampleFBO : m_fbo);
    406 #endif
    407397    if (fbo != m_state.boundFBO) {
    408398        ::glBindFramebufferEXT(target, fbo);
    … …  
    563553        entry.isValid = false;
    564554        LOG(WebGL, "Error: shader translator produced a shader that OpenGL would not compile.");
    565 #if PLATFORM(BLACKBERRY) && !defined(NDEBUG)
    566         BBLOG(BlackBerry::Platform::LogLevelWarn, "The shader validated, but didn't compile.\n");
    567 #endif
    568555    }
    569556
    … …  
    574561{
    575562    makeContextCurrent();
    576 #if !PLATFORM(BLACKBERRY)
    577563    if (m_attrs.antialias && m_state.boundFBO == m_multisampleFBO) {
    578564        resolveMultisamplingIfNecessary(IntRect(x, y, width, height));
    579565        ::glBindFramebufferEXT(GraphicsContext3D::FRAMEBUFFER, m_fbo);
    580566    }
    581 #endif
    582567    ::glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
    583 #if !PLATFORM(BLACKBERRY)
    584568    if (m_attrs.antialias && m_state.boundFBO == m_multisampleFBO)
    585569        ::glBindFramebufferEXT(GraphicsContext3D::FRAMEBUFFER, m_multisampleFBO);
    586 #endif
    587570}
    588571
    … …  
    590573{
    591574    makeContextCurrent();
    592 #if !PLATFORM(BLACKBERRY)
    593575    if (m_attrs.antialias && m_state.boundFBO == m_multisampleFBO) {
    594576        resolveMultisamplingIfNecessary(IntRect(x, y, width, height));
    595577        ::glBindFramebufferEXT(GraphicsContext3D::FRAMEBUFFER, m_fbo);
    596578    }
    597 #endif
    598579    ::glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
    599 #if !PLATFORM(BLACKBERRY)
    600580    if (m_attrs.antialias && m_state.boundFBO == m_multisampleFBO)
    601581        ::glBindFramebufferEXT(GraphicsContext3D::FRAMEBUFFER, m_multisampleFBO);
    602 #endif
    603582}
    604583

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp

    r160991 r161699  
    3636#include "IntRect.h"
    3737#include "IntSize.h"
    38 #if PLATFORM(BLACKBERRY)
    39 #include "LayerWebKitThread.h"
    40 #endif
    4138#include "NotImplemented.h"
    4239
    … …  
    5552    // all previous rendering calls should be done before reading pixels.
    5653    ::glFlush();
    57 #if PLATFORM(BLACKBERRY)
    58     if (m_isImaginationHardware && m_fbo == m_state.boundFBO) {
    59         // FIXME: This workaround should always be used until the
    60         // driver alignment bug is fixed, even when we aren't
    61         // drawing to the canvas.
    62         readPixelsIMG(x, y, width, height, format, type, data);
    63     } else
    64         ::glReadPixels(x, y, width, height, format, type, data);
    65 #else
    6654    if (m_attrs.antialias && m_state.boundFBO == m_multisampleFBO) {
    6755         resolveMultisamplingIfNecessary(IntRect(x, y, width, height));
    … …  
    7462    if (m_attrs.antialias && m_state.boundFBO == m_multisampleFBO)
    7563        ::glBindFramebuffer(GL_FRAMEBUFFER, m_multisampleFBO);
    76 #endif
    7764}
    7865
    7966void GraphicsContext3D::readPixelsAndConvertToBGRAIfNecessary(int x, int y, int width, int height, unsigned char* pixels)
    8067{
    81 #if PLATFORM(BLACKBERRY)
    82     if (m_isImaginationHardware && m_fbo == m_state.boundFBO) {
    83         // FIXME: This workaround should always be used until the
    84         // driver alignment bug is fixed, even when we aren't
    85         // drawing to the canvas.
    86         readPixelsIMG(x, y, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
    87     } else
    88         ::glReadPixels(x, y, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
    89 #else
    9068    ::glReadPixels(x, y, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
    91 #endif
    9269    int totalBytes = width * height * 4;
    9370    if (isGLES2Compliant()) {
    … …  
    9774}
    9875
    99 #if !PLATFORM(BLACKBERRY)
    100 // The BlackBerry port uses a special implementation of reshapeFBOs. See GraphicsContext3DBlackBerry.cpp
    10176bool GraphicsContext3D::reshapeFBOs(const IntSize& size)
    10277{
    … …  
    170145    return mustRestoreFBO;
    171146}
    172 #endif
    173147
    174148void GraphicsContext3D::resolveMultisamplingIfNecessary(const IntRect& rect)

  • trunk/Source/WebCore/platform/network/NetworkStateNotifier.h

    r161589 r161699  
    6868#endif
    6969
    70 #if PLATFORM(BLACKBERRY)
    71     void networkStateChange(bool online);
    72 #endif
    73 
    7470private:
    7571    bool m_isOnLine;
    … …  
    105101};
    106102
    107 #if !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(BLACKBERRY) && !PLATFORM(EFL)
     103#if !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(EFL)
    108104
    109105inline NetworkStateNotifier::NetworkStateNotifier()

  • trunk/Source/WebCore/platform/network/ResourceHandle.h

    r160467 r161699  
    171171#endif
    172172
    173 #if USE(CURL) || USE(SOUP) || PLATFORM(BLACKBERRY)
     173#if USE(CURL) || USE(SOUP)
    174174    ResourceHandleInternal* getInternal() { return d.get(); }
    175175#endif
    … …  
    224224    void setDefersLoading(bool);
    225225
    226 #if PLATFORM(BLACKBERRY)
    227     void pauseLoad(bool); // FIXME: How is this different from setDefersLoading()?
    228 #endif
    229 
    230226    void didChangePriority(ResourceLoadPriority);
    231227

  • trunk/Source/WebCore/platform/network/ResourceHandleInternal.h

    r160352 r161699  
    218218#endif
    219219        AuthenticationChallenge m_currentWebChallenge;
    220 #if PLATFORM(BLACKBERRY)
    221         // We need to store the credentials for host and proxy separately for the platform
    222         // networking layer. One of these will always be equal to m_currentWebChallenge.
    223         AuthenticationChallenge m_hostWebChallenge;
    224         AuthenticationChallenge m_proxyWebChallenge;
    225 #endif
    226 
    227220        ResourceHandle::FailureType m_scheduledFailureType;
    228221        Timer<ResourceHandle> m_failureTimer;

  • trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp

    r161589 r161699  
    524524}
    525525
    526 #if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(BLACKBERRY)
     526#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP)
    527527unsigned initializeMaximumHTTPConnectionCountPerHost()
    528528{

  • trunk/Source/cmake/OptionsCommon.cmake

    r161325 r161699  
    1717    get_filename_component(CODE_GENERATOR_PREPROCESSOR_EXECUTABLE ${CMAKE_CXX_COMPILER} NAME)
    1818    set(CODE_GENERATOR_PREPROCESSOR "${CODE_GENERATOR_PREPROCESSOR_EXECUTABLE} /nologo /EP")
    19     set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}")
    20 elseif (CMAKE_SYSTEM_NAME MATCHES QNX)
    21     set(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -Wp,-P -x c++")
    2219    set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}")
    2320else ()

  • trunk/Tools/ChangeLog

    r161685 r161699  
     12014-01-10  Benjamin Poulain  <bpoulain@apple.com>
     2
     3        Remove the BlackBerry port from trunk
     4        https://bugs.webkit.org/show_bug.cgi?id=126715
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * DumpRenderTree/DumpRenderTree.h:
     9        * DumpRenderTree/PixelDumpSupport.cpp:
     10
    1112014-01-10  Daniel Bates  <dabates@apple.com>
    212

  • trunk/Tools/DumpRenderTree/DumpRenderTree.h

    r148980 r161699  
    4343#elif PLATFORM(EFL)
    4444#include "DumpRenderTreeEfl.h"
    45 #elif PLATFORM(BLACKBERRY)
    46 #include "DumpRenderTreeBlackBerry.h"
    4745#endif
    4846

  • trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp

    r125516 r161699  
    4242#elif USE(CAIRO)
    4343#include "PixelDumpSupportCairo.h"
    44 #elif PLATFORM(BLACKBERRY)
    45 #include "PixelDumpSupportBlackBerry.h"
    4644#endif
    4745
Note: See TracChangeset for help on using the changeset viewer.