Changeset 125690 in webkit

Timestamp:

Aug 15, 2012 11:54:33 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

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

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/GraphicsContext3D.cpp (modified) (1 diff)
• WebCore/platform/graphics/GraphicsContext3D.h (modified) (6 diffs)
• WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp (modified) (1 diff)
• WebCore/platform/graphics/blackberry/LayerFilterRenderer.h (modified) (1 diff)
• WebKit/blackberry/ChangeLog (modified) (1 diff)
• WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in (modified) (4 diffs)
• WebKit/blackberry/WebCoreSupport/AboutTemplate.html.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp

@@ -117 +117 @@
         *bytesPerComponent = sizeof(GC3Dushort);
         break;
+#if !PLATFORM(BLACKBERRY)
     case GraphicsContext3D::UNSIGNED_INT_24_8:
+#endif
     case GraphicsContext3D::UNSIGNED_INT:
         *bytesPerComponent = sizeof(GC3Duint);

trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

@@ -75 +75 @@
 #endif
 
-#if PLATFORM(CHROMIUM) && USE(SKIA)
+#if (PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)) && USE(SKIA)
 class GrContext;
 #endif
@@ -484 +484 @@
     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;
@@ -520 +520 @@
     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();
@@ -814 +814 @@
     bool paintCompositedResultsToCanvas(ImageBuffer*);
 
+#if PLATFORM(BLACKBERRY)
+    bool paintsIntoCanvasBuffer() const;
+#endif
+
     // Support for buffer creation and deletion
     Platform3DObject createBuffer();
@@ -916 +920 @@
                     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
@@ -955 +959 @@
 
 #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;
 

trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp

@@ -134 +134 @@
 
 LayerFilterRendererAction::LayerFilterRendererAction(int c_programId)
-    , m_programId(c_programId)
+    : m_programId(c_programId)
     , m_pushSnapshot(false)
     , m_popSnapshot(false)

trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.h

@@ -96 +96 @@
         // 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; }

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in

@@ -118 +118 @@
 MEMORY_SAMPLER
 META_ALLOCATOR_PROFILE
-METER_ELEMENT
+METER_TAG
 MHTML
 MICRODATA
@@ -147 +147 @@
 PLUGIN_PROCESS
 POINTER_LOCK
-PROGRESS_ELEMENT
+PROGRESS_TAG
 PURGEABLE_MEMORY
 QUOTA
@@ -185 +185 @@
 TEXT_NOTIFICATIONS_ONLY
 THREADED_SCROLLING
+THREADED_SCROLLING
 THREADING_GENERIC
 THREADING_LIBDISPATCH
@@ -199 +200 @@
 VIDEO
 VIDEO_TRACK
-VIDEO|XSLT
 VIEWPORT
 VIEWPORT_REFLOW

trunk/Source/WebKit/blackberry/WebCoreSupport/AboutTemplate.html.cpp

@@ -17 +17 @@
  */
 
-static String writeHeader(const String& header)
+static String writeHeader(const String& title)
 {
     return "<!DOCTYPE html><html>"