[BlackBerry] Upstream BlackBerry build fixes

https://bugs.webkit.org/show_bug.cgi?id=94121

Patch by Joshua Netterfield <jnetterfield@rim.com> on 2012-08-15
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.

Source/WebCore:

* 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):

Source/WebKit/blackberry:

* WebCoreSupport/AboutDataEnableFeatures.in:
* WebCoreSupport/AboutTemplate.html.cpp:
(writeHeader):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@125690 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 87c411a3
2012-08-15 Joshua Netterfield <jnetterfield@rim.com>
[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 <abarth@webkit.org> 2012-08-15 Adam Barth <abarth@webkit.org>
JSDOMWrapper should ASSERT that it has an associated ScriptExecutionContext JSDOMWrapper should ASSERT that it has an associated ScriptExecutionContext
...@@ -116,7 +116,9 @@ bool GraphicsContext3D::computeFormatAndTypeParameters(GC3Denum format, ...@@ -116,7 +116,9 @@ bool GraphicsContext3D::computeFormatAndTypeParameters(GC3Denum format,
*componentsPerPixel = 1; *componentsPerPixel = 1;
*bytesPerComponent = sizeof(GC3Dushort); *bytesPerComponent = sizeof(GC3Dushort);
break; break;
#if !PLATFORM(BLACKBERRY)
case GraphicsContext3D::UNSIGNED_INT_24_8: case GraphicsContext3D::UNSIGNED_INT_24_8:
#endif
case GraphicsContext3D::UNSIGNED_INT: case GraphicsContext3D::UNSIGNED_INT:
*bytesPerComponent = sizeof(GC3Duint); *bytesPerComponent = sizeof(GC3Duint);
break; break;
......
...@@ -74,7 +74,7 @@ typedef QSurface* PlatformGraphicsSurface3D; ...@@ -74,7 +74,7 @@ typedef QSurface* PlatformGraphicsSurface3D;
typedef void* PlatformGraphicsContext3D; typedef void* PlatformGraphicsContext3D;
#endif #endif
#if PLATFORM(CHROMIUM) && USE(SKIA) #if (PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)) && USE(SKIA)
class GrContext; class GrContext;
#endif #endif
...@@ -483,7 +483,7 @@ public: ...@@ -483,7 +483,7 @@ public:
PlatformGraphicsContext3D platformGraphicsContext3D() const { return m_contextObj; } PlatformGraphicsContext3D platformGraphicsContext3D() const { return m_contextObj; }
Platform3DObject platformTexture() const { return m_compositorTexture; } Platform3DObject platformTexture() const { return m_compositorTexture; }
CALayer* platformLayer() const { return reinterpret_cast<CALayer*>(m_webGLLayer.get()); } CALayer* platformLayer() const { return reinterpret_cast<CALayer*>(m_webGLLayer.get()); }
#elif PLATFORM(CHROMIUM) #elif PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)
PlatformGraphicsContext3D platformGraphicsContext3D() const; PlatformGraphicsContext3D platformGraphicsContext3D() const;
Platform3DObject platformTexture() const; Platform3DObject platformTexture() const;
#if USE(SKIA) #if USE(SKIA)
...@@ -519,7 +519,7 @@ public: ...@@ -519,7 +519,7 @@ public:
#endif #endif
bool makeContextCurrent(); 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. // With multisampling on, blit from multisampleFBO to regular FBO.
void prepareTexture(); void prepareTexture();
#endif #endif
...@@ -813,6 +813,10 @@ public: ...@@ -813,6 +813,10 @@ public:
PassRefPtr<ImageData> paintRenderingResultsToImageData(DrawingBuffer*); PassRefPtr<ImageData> paintRenderingResultsToImageData(DrawingBuffer*);
bool paintCompositedResultsToCanvas(ImageBuffer*); bool paintCompositedResultsToCanvas(ImageBuffer*);
#if PLATFORM(BLACKBERRY)
bool paintsIntoCanvasBuffer() const;
#endif
// Support for buffer creation and deletion // Support for buffer creation and deletion
Platform3DObject createBuffer(); Platform3DObject createBuffer();
Platform3DObject createFramebuffer(); Platform3DObject createFramebuffer();
...@@ -915,7 +919,7 @@ public: ...@@ -915,7 +919,7 @@ public:
AlphaOp alphaOp, AlphaOp alphaOp,
void* destinationData); 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, // Take into account the user's requested context creation attributes,
// in particular stencil and antialias, and determine which could or // in particular stencil and antialias, and determine which could or
// could not be honored based on the capabilities of the OpenGL // could not be honored based on the capabilities of the OpenGL
...@@ -954,11 +958,15 @@ public: ...@@ -954,11 +958,15 @@ public:
#endif #endif
#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY)
typedef struct { struct ShaderSourceEntry {
String source; String source;
String log; String log;
bool isValid; bool isValid;
} ShaderSourceEntry; ShaderSourceEntry()
: isValid(0)
{
}
};
HashMap<Platform3DObject, ShaderSourceEntry> m_shaderSourceMap; HashMap<Platform3DObject, ShaderSourceEntry> m_shaderSourceMap;
ANGLEWebKitBridge m_compiler; ANGLEWebKitBridge m_compiler;
......
...@@ -133,7 +133,7 @@ PassRefPtr<LayerFilterRendererAction> LayerFilterRendererAction::create(int prog ...@@ -133,7 +133,7 @@ PassRefPtr<LayerFilterRendererAction> LayerFilterRendererAction::create(int prog
} }
LayerFilterRendererAction::LayerFilterRendererAction(int c_programId) LayerFilterRendererAction::LayerFilterRendererAction(int c_programId)
, m_programId(c_programId) : m_programId(c_programId)
, m_pushSnapshot(false) , m_pushSnapshot(false)
, m_popSnapshot(false) , m_popSnapshot(false)
{ {
......
...@@ -95,7 +95,6 @@ public: ...@@ -95,7 +95,6 @@ public:
static PassRefPtr<LayerFilterRendererAction> create(int programId); static PassRefPtr<LayerFilterRendererAction> 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. // 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. // See the ping-pong note in LayerFilterRenderer::applyActions.
~LayerFilterRendererAction();
bool shouldPushSnapshot() const { return m_pushSnapshot; } bool shouldPushSnapshot() const { return m_pushSnapshot; }
void setPushSnapshot() { m_pushSnapshot = true; } void setPushSnapshot() { m_pushSnapshot = true; }
......
2012-08-15 Joshua Netterfield <jnetterfield@rim.com>
[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 <leoyang@rim.com> 2012-08-15 Leo Yang <leoyang@rim.com>
[BlackBerry] Use nested layout when rotating [BlackBerry] Use nested layout when rotating
......
...@@ -117,7 +117,7 @@ MEDIA_STATISTICS ...@@ -117,7 +117,7 @@ MEDIA_STATISTICS
MEDIA_STREAM MEDIA_STREAM
MEMORY_SAMPLER MEMORY_SAMPLER
META_ALLOCATOR_PROFILE META_ALLOCATOR_PROFILE
METER_ELEMENT METER_TAG
MHTML MHTML
MICRODATA MICRODATA
MUTATION_OBSERVERS MUTATION_OBSERVERS
...@@ -146,7 +146,7 @@ PERFORMANCE_TIMELINE ...@@ -146,7 +146,7 @@ PERFORMANCE_TIMELINE
PLUGIN_PACKAGE_SIMPLE_HASH PLUGIN_PACKAGE_SIMPLE_HASH
PLUGIN_PROCESS PLUGIN_PROCESS
POINTER_LOCK POINTER_LOCK
PROGRESS_ELEMENT PROGRESS_TAG
PURGEABLE_MEMORY PURGEABLE_MEMORY
QUOTA QUOTA
REGEXP_TRACING REGEXP_TRACING
...@@ -184,6 +184,7 @@ SVG_FOREIGN_OBJECT ...@@ -184,6 +184,7 @@ SVG_FOREIGN_OBJECT
TEXT_CARET TEXT_CARET
TEXT_NOTIFICATIONS_ONLY TEXT_NOTIFICATIONS_ONLY
THREADED_SCROLLING THREADED_SCROLLING
THREADED_SCROLLING
THREADING_GENERIC THREADING_GENERIC
THREADING_LIBDISPATCH THREADING_LIBDISPATCH
THREADING_OPENMP THREADING_OPENMP
...@@ -198,7 +199,6 @@ VERBOSE_VALUE_RECOVERIES ...@@ -198,7 +199,6 @@ VERBOSE_VALUE_RECOVERIES
VIBRATION VIBRATION
VIDEO VIDEO
VIDEO_TRACK VIDEO_TRACK
VIDEO|XSLT
VIEWPORT VIEWPORT
VIEWPORT_REFLOW VIEWPORT_REFLOW
WBXML WBXML
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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 "<!DOCTYPE html><html>" return "<!DOCTYPE html><html>"
"<head>" "<head>"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment