Diff
Modified: trunk/Source/WebCore/ChangeLog (125689 => 125690)
--- trunk/Source/WebCore/ChangeLog 2012-08-15 18:44:17 UTC (rev 125689)
+++ trunk/Source/WebCore/ChangeLog 2012-08-15 18:54:33 UTC (rev 125690)
@@ -1,3 +1,25 @@
+2012-08-15 Joshua Netterfield <[email protected]>
+
+ [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 <[email protected]>
JSDOMWrapper should ASSERT that it has an associated ScriptExecutionContext
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp (125689 => 125690)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp 2012-08-15 18:44:17 UTC (rev 125689)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp 2012-08-15 18:54:33 UTC (rev 125690)
@@ -116,7 +116,9 @@
*componentsPerPixel = 1;
*bytesPerComponent = sizeof(GC3Dushort);
break;
+#if !PLATFORM(BLACKBERRY)
case GraphicsContext3D::UNSIGNED_INT_24_8:
+#endif
case GraphicsContext3D::UNSIGNED_INT:
*bytesPerComponent = sizeof(GC3Duint);
break;
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (125689 => 125690)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2012-08-15 18:44:17 UTC (rev 125689)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2012-08-15 18:54:33 UTC (rev 125690)
@@ -74,7 +74,7 @@
typedef void* PlatformGraphicsContext3D;
#endif
-#if PLATFORM(CHROMIUM) && USE(SKIA)
+#if (PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)) && USE(SKIA)
class GrContext;
#endif
@@ -483,7 +483,7 @@
PlatformGraphicsContext3D platformGraphicsContext3D() const { return m_contextObj; }
Platform3DObject platformTexture() const { return m_compositorTexture; }
CALayer* platformLayer() const { return reinterpret_cast<CALayer*>(m_webGLLayer.get()); }
-#elif PLATFORM(CHROMIUM)
+#elif PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)
PlatformGraphicsContext3D platformGraphicsContext3D() const;
Platform3DObject platformTexture() const;
#if USE(SKIA)
@@ -519,7 +519,7 @@
#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 @@
PassRefPtr<ImageData> 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 @@
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 @@
#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<Platform3DObject, ShaderSourceEntry> m_shaderSourceMap;
ANGLEWebKitBridge m_compiler;
Modified: trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp (125689 => 125690)
--- trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp 2012-08-15 18:44:17 UTC (rev 125689)
+++ trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp 2012-08-15 18:54:33 UTC (rev 125690)
@@ -133,7 +133,7 @@
}
LayerFilterRendererAction::LayerFilterRendererAction(int c_programId)
- , m_programId(c_programId)
+ : m_programId(c_programId)
, m_pushSnapshot(false)
, m_popSnapshot(false)
{
Modified: trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.h (125689 => 125690)
--- trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.h 2012-08-15 18:44:17 UTC (rev 125689)
+++ trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.h 2012-08-15 18:54:33 UTC (rev 125690)
@@ -95,7 +95,6 @@
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.
// See the ping-pong note in LayerFilterRenderer::applyActions.
- ~LayerFilterRendererAction();
bool shouldPushSnapshot() const { return m_pushSnapshot; }
void setPushSnapshot() { m_pushSnapshot = true; }
Modified: trunk/Source/WebKit/blackberry/ChangeLog (125689 => 125690)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-08-15 18:44:17 UTC (rev 125689)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-08-15 18:54:33 UTC (rev 125690)
@@ -1,3 +1,19 @@
+2012-08-15 Joshua Netterfield <[email protected]>
+
+ [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 <[email protected]>
[BlackBerry] Use nested layout when rotating
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in (125689 => 125690)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in 2012-08-15 18:44:17 UTC (rev 125689)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in 2012-08-15 18:54:33 UTC (rev 125690)
@@ -117,7 +117,7 @@
MEDIA_STREAM
MEMORY_SAMPLER
META_ALLOCATOR_PROFILE
-METER_ELEMENT
+METER_TAG
MHTML
MICRODATA
MUTATION_OBSERVERS
@@ -146,7 +146,7 @@
PLUGIN_PACKAGE_SIMPLE_HASH
PLUGIN_PROCESS
POINTER_LOCK
-PROGRESS_ELEMENT
+PROGRESS_TAG
PURGEABLE_MEMORY
QUOTA
REGEXP_TRACING
@@ -184,6 +184,7 @@
TEXT_CARET
TEXT_NOTIFICATIONS_ONLY
THREADED_SCROLLING
+THREADED_SCROLLING
THREADING_GENERIC
THREADING_LIBDISPATCH
THREADING_OPENMP
@@ -198,7 +199,6 @@
VIBRATION
VIDEO
VIDEO_TRACK
-VIDEO|XSLT
VIEWPORT
VIEWPORT_REFLOW
WBXML
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/AboutTemplate.html.cpp (125689 => 125690)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/AboutTemplate.html.cpp 2012-08-15 18:44:17 UTC (rev 125689)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/AboutTemplate.html.cpp 2012-08-15 18:54:33 UTC (rev 125690)
@@ -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 "<!DOCTYPE html><html>"
"<head>"
