Changeset 149019 in webkit

Timestamp:

Apr 24, 2013 1:09:55 AM (11 years ago)

Author:

anilsson@rim.com

Message:

[BlackBerry] Remove the setContentsToColor flavor of LayerTiler::TextureJob
​https://bugs.webkit.org/show_bug.cgi?id=115092

Reviewed by Carlos Garcia Campos.

With the Skia backend, we had an optimization to detect solid color
layers. The Skia code has been purged, but these bits remained. With
BlackBerry::Platform::Graphics::PlatformGraphicsContext, only the solid
color will be drawn anyway, so we don't need to detect such layers at
the WebCore level. Fixed by removing the setContentsToColor flavor of
LayerTiler::TextureJob.

BlackBerry::WebKit::WebOverlay still uses
TextureCacheCompositingThread::textureForColor() so that one can stay
for now.

This was dead code so no new tests.

• platform/graphics/blackberry/LayerTile.cpp:
• platform/graphics/blackberry/LayerTile.h:

(LayerTile):

• platform/graphics/blackberry/LayerTiler.cpp:

(WebCore::LayerTiler::processTextureJob):
(WebCore::LayerTiler::performTileJob):

• platform/graphics/blackberry/LayerTiler.h:

(WebCore::LayerTiler::TextureJob::setContents):
(TextureJob):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/blackberry/LayerTile.cpp (modified) (1 diff)
• platform/graphics/blackberry/LayerTile.h (modified) (2 diffs)
• platform/graphics/blackberry/LayerTiler.cpp (modified) (2 diffs)
• platform/graphics/blackberry/LayerTiler.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-24  Arvid Nilsson  <anilsson@rim.com>
+
+        [BlackBerry] Remove the setContentsToColor flavor of LayerTiler::TextureJob
+        https://bugs.webkit.org/show_bug.cgi?id=115092
+
+        Reviewed by Carlos Garcia Campos.
+
+        With the Skia backend, we had an optimization to detect solid color
+        layers. The Skia code has been purged, but these bits remained. With
+        BlackBerry::Platform::Graphics::PlatformGraphicsContext, only the solid
+        color will be drawn anyway, so we don't need to detect such layers at
+        the WebCore level. Fixed by removing the setContentsToColor flavor of
+        LayerTiler::TextureJob.
+
+        BlackBerry::WebKit::WebOverlay still uses
+        TextureCacheCompositingThread::textureForColor() so that one can stay
+        for now.
+
+        This was dead code so no new tests.
+
+        * platform/graphics/blackberry/LayerTile.cpp:
+        * platform/graphics/blackberry/LayerTile.h:
+        (LayerTile):
+        * platform/graphics/blackberry/LayerTiler.cpp:
+        (WebCore::LayerTiler::processTextureJob):
+        (WebCore::LayerTiler::performTileJob):
+        * platform/graphics/blackberry/LayerTiler.h:
+        (WebCore::LayerTiler::TextureJob::setContents):
+        (TextureJob):
+
 2013-04-24  Zan Dobersek  <zdobersek@igalia.com>
 

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

@@ -43 +43 @@
 {
     setTexture(textureCacheCompositingThread()->textureForContents(contents));
-}
-
-void LayerTile::setContentsToColor(const Color& color)
-{
-    setTexture(textureCacheCompositingThread()->textureForColor(color));
 }
 

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

@@ -28 +28 @@
 namespace WebCore {
 
-class Color;
 class IntRect;
 class TileIndex;
@@ -48 +47 @@
 
     void setContents(BlackBerry::Platform::Graphics::Buffer*);
-    void setContentsToColor(const Color&);
     void updateContents(BlackBerry::Platform::Graphics::Buffer*);
     void discardContents();

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

@@ -383 +383 @@
     }
 
-    if (job.m_type == TextureJob::SetContentsToColor) {
-        addTileJob(job.m_index, job, tileJobsMap);
-        return;
-    }
-
     addTileJob(indexOfTile(job.m_dirtyRect.minXMinYCorner()), job, tileJobsMap);
 }
@@ -414 +409 @@
 {
     switch (job.m_type) {
-    case TextureJob::SetContentsToColor:
-        tile->setContentsToColor(job.m_color);
-        return;
     case TextureJob::SetContents:
         tile->setContents(job.m_contents);

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

@@ -22 +22 @@
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "Color.h"
 #include "FloatRect.h"
 #include "IntRect.h"
@@ -76 +75 @@
 private:
     struct TextureJob {
-        enum Type { Unknown, SetContents, SetContentsToColor, UpdateContents, DiscardContents, ResizeContents, DirtyContents };
+        enum Type { Unknown, SetContents, UpdateContents, DiscardContents, ResizeContents, DirtyContents };
 
         TextureJob()
@@ -109 +108 @@
         }
 
-        TextureJob(Type type, const Color& color, const TileIndex& index)
-            : m_type(type)
-            , m_contents(0)
-            , m_color(color)
-            , m_index(index)
-        {
-            ASSERT(type == SetContentsToColor);
-        }
-
         static TextureJob setContents(BlackBerry::Platform::Graphics::Buffer* contents, const IntRect& contentsRect)
         {
             return TextureJob(SetContents, contents, contentsRect);
         }
-        static TextureJob setContentsToColor(const Color& color, const TileIndex& index) { return TextureJob(SetContentsToColor, color, index); }
         static TextureJob updateContents(BlackBerry::Platform::Graphics::Buffer* contents, const IntRect& dirtyRect) { return TextureJob(UpdateContents, contents, dirtyRect); }
         static TextureJob discardContents(const IntRect& dirtyRect) { return TextureJob(DiscardContents, dirtyRect); }
@@ -133 +122 @@
         BlackBerry::Platform::Graphics::Buffer* m_contents;
         IntRect m_dirtyRect;
-        Color m_color;
         TileIndex m_index;
     };