diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 6af0de2f9c461aa88fd227d0152882444a19626b..a6d56fd185c3d2315cd2c4f14cdcbe946ad2b121 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,25 @@ +2012-08-15 Joshua Netterfield + + [BlackBerry] Upstream BlackBerry build fixes + https://bugs.webkit.org/show_bug.cgi?id=94121 + + Reviewed by Rob Buis. + + This includes several build fixes due to incorrect upstream patches. + These mistakes were never present downstream. + + No new tests, because no new functionality is added. + + * platform/graphics/GraphicsContext3D.cpp: + (WebCore::GraphicsContext3D::computeFormatAndTypeParameters): + * platform/graphics/GraphicsContext3D.h: + (GraphicsContext3D): + (WebCore::GraphicsContext3D::ShaderSourceEntry::ShaderSourceEntry): + * platform/graphics/blackberry/LayerFilterRenderer.cpp: + (WebCore::LayerFilterRendererAction::LayerFilterRendererAction): + * platform/graphics/blackberry/LayerFilterRenderer.h: + (LayerFilterRendererAction): + 2012-08-15 Adam Barth JSDOMWrapper should ASSERT that it has an associated ScriptExecutionContext diff --git a/Source/WebCore/platform/graphics/GraphicsContext3D.cpp b/Source/WebCore/platform/graphics/GraphicsContext3D.cpp index 38b089268efc09ea884b62269b0a9cca7b17a3d6..bc899472c9b2e92aa09bb68db4b8655352d5e919 100644 --- a/Source/WebCore/platform/graphics/GraphicsContext3D.cpp +++ b/Source/WebCore/platform/graphics/GraphicsContext3D.cpp @@ -116,7 +116,9 @@ bool GraphicsContext3D::computeFormatAndTypeParameters(GC3Denum format, *componentsPerPixel = 1; *bytesPerComponent = sizeof(GC3Dushort); break; +#if !PLATFORM(BLACKBERRY) case GraphicsContext3D::UNSIGNED_INT_24_8: +#endif case GraphicsContext3D::UNSIGNED_INT: *bytesPerComponent = sizeof(GC3Duint); break; diff --git a/Source/WebCore/platform/graphics/GraphicsContext3D.h b/Source/WebCore/platform/graphics/GraphicsContext3D.h index e1373f091d185400abba166f34294ed1503853d5..f5e6f1f2f7d4fa03d43f64313844bbfb063af2d7 100644 --- a/Source/WebCore/platform/graphics/GraphicsContext3D.h +++ b/Source/WebCore/platform/graphics/GraphicsContext3D.h @@ -74,7 +74,7 @@ typedef QSurface* PlatformGraphicsSurface3D; typedef void* PlatformGraphicsContext3D; #endif -#if PLATFORM(CHROMIUM) && USE(SKIA) +#if (PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)) && USE(SKIA) class GrContext; #endif @@ -483,7 +483,7 @@ public: PlatformGraphicsContext3D platformGraphicsContext3D() const { return m_contextObj; } Platform3DObject platformTexture() const { return m_compositorTexture; } CALayer* platformLayer() const { return reinterpret_cast(m_webGLLayer.get()); } -#elif PLATFORM(CHROMIUM) +#elif PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY) PlatformGraphicsContext3D platformGraphicsContext3D() const; Platform3DObject platformTexture() const; #if USE(SKIA) @@ -519,7 +519,7 @@ public: #endif bool makeContextCurrent(); -#if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) +#if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) // With multisampling on, blit from multisampleFBO to regular FBO. void prepareTexture(); #endif @@ -813,6 +813,10 @@ public: PassRefPtr paintRenderingResultsToImageData(DrawingBuffer*); bool paintCompositedResultsToCanvas(ImageBuffer*); +#if PLATFORM(BLACKBERRY) + bool paintsIntoCanvasBuffer() const; +#endif + // Support for buffer creation and deletion Platform3DObject createBuffer(); Platform3DObject createFramebuffer(); @@ -915,7 +919,7 @@ public: AlphaOp alphaOp, void* destinationData); -#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) +#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) // Take into account the user's requested context creation attributes, // in particular stencil and antialias, and determine which could or // could not be honored based on the capabilities of the OpenGL @@ -954,11 +958,15 @@ public: #endif #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) - typedef struct { + struct ShaderSourceEntry { String source; String log; bool isValid; - } ShaderSourceEntry; + ShaderSourceEntry() + : isValid(0) + { + } + }; HashMap m_shaderSourceMap; ANGLEWebKitBridge m_compiler; diff --git a/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp b/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp index 8797c10f36e0921f6441d29aca75169f14163ffe..3da499ffa66206ab7c93219c6881130d5bc56cc5 100644 --- a/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp +++ b/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp @@ -133,7 +133,7 @@ PassRefPtr LayerFilterRendererAction::create(int prog } LayerFilterRendererAction::LayerFilterRendererAction(int c_programId) - , m_programId(c_programId) + : m_programId(c_programId) , m_pushSnapshot(false) , m_popSnapshot(false) { diff --git a/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.h b/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.h index 1c1f06e0319be930dbbaf14cff5efc286d7d8339..7ca93e470aabce2a328b8ab05e84a85637d4bc09 100644 --- a/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.h +++ b/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.h @@ -95,7 +95,6 @@ public: static PassRefPtr create(int programId); // A vector of actions must have an even count, so if you have an odd count, add a passthrough event at the end. // See the ping-pong note in LayerFilterRenderer::applyActions. - ~LayerFilterRendererAction(); bool shouldPushSnapshot() const { return m_pushSnapshot; } void setPushSnapshot() { m_pushSnapshot = true; } diff --git a/Source/WebKit/blackberry/ChangeLog b/Source/WebKit/blackberry/ChangeLog index fcdf0f09e0538a878494e3a533350bcd44ef4dcb..c74a0334ae430bf13baea2cd4c882ab758928351 100644 --- a/Source/WebKit/blackberry/ChangeLog +++ b/Source/WebKit/blackberry/ChangeLog @@ -1,3 +1,19 @@ +2012-08-15 Joshua Netterfield + + [BlackBerry] Upstream BlackBerry build fixes + https://bugs.webkit.org/show_bug.cgi?id=94121 + + Reviewed by Rob Buis. + + This includes several build fixes due to incorrect upstream patches. + These mistakes were never present downstream. + + No new tests, because no new functionality is added. + + * WebCoreSupport/AboutDataEnableFeatures.in: + * WebCoreSupport/AboutTemplate.html.cpp: + (writeHeader): + 2012-08-15 Leo Yang [BlackBerry] Use nested layout when rotating diff --git a/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in b/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in index 9319c0001153f98eca8ae1602dbfa7b1921b792d..15e40e66b2d39e10bc91632b62ec7bbdf74fd12b 100644 --- a/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in +++ b/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in @@ -117,7 +117,7 @@ MEDIA_STATISTICS MEDIA_STREAM MEMORY_SAMPLER META_ALLOCATOR_PROFILE -METER_ELEMENT +METER_TAG MHTML MICRODATA MUTATION_OBSERVERS @@ -146,7 +146,7 @@ PERFORMANCE_TIMELINE PLUGIN_PACKAGE_SIMPLE_HASH PLUGIN_PROCESS POINTER_LOCK -PROGRESS_ELEMENT +PROGRESS_TAG PURGEABLE_MEMORY QUOTA REGEXP_TRACING @@ -184,6 +184,7 @@ SVG_FOREIGN_OBJECT TEXT_CARET TEXT_NOTIFICATIONS_ONLY THREADED_SCROLLING +THREADED_SCROLLING THREADING_GENERIC THREADING_LIBDISPATCH THREADING_OPENMP @@ -198,7 +199,6 @@ VERBOSE_VALUE_RECOVERIES VIBRATION VIDEO VIDEO_TRACK -VIDEO|XSLT VIEWPORT VIEWPORT_REFLOW WBXML diff --git a/Source/WebKit/blackberry/WebCoreSupport/AboutTemplate.html.cpp b/Source/WebKit/blackberry/WebCoreSupport/AboutTemplate.html.cpp index 74984ddd1c2d25c6c12d1725ef67f0a52ff72f42..904e441d7b0707534a0c36c238b9eab919190a7b 100644 --- a/Source/WebKit/blackberry/WebCoreSupport/AboutTemplate.html.cpp +++ b/Source/WebKit/blackberry/WebCoreSupport/AboutTemplate.html.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -static String writeHeader(const String& header) +static String writeHeader(const String& title) { return "" ""