Changeset 149019 in webkit
- Timestamp:
- Apr 24, 2013 1:09:55 AM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r149018 r149019 1 2013-04-24 Arvid Nilsson <anilsson@rim.com> 2 3 [BlackBerry] Remove the setContentsToColor flavor of LayerTiler::TextureJob 4 https://bugs.webkit.org/show_bug.cgi?id=115092 5 6 Reviewed by Carlos Garcia Campos. 7 8 With the Skia backend, we had an optimization to detect solid color 9 layers. The Skia code has been purged, but these bits remained. With 10 BlackBerry::Platform::Graphics::PlatformGraphicsContext, only the solid 11 color will be drawn anyway, so we don't need to detect such layers at 12 the WebCore level. Fixed by removing the setContentsToColor flavor of 13 LayerTiler::TextureJob. 14 15 BlackBerry::WebKit::WebOverlay still uses 16 TextureCacheCompositingThread::textureForColor() so that one can stay 17 for now. 18 19 This was dead code so no new tests. 20 21 * platform/graphics/blackberry/LayerTile.cpp: 22 * platform/graphics/blackberry/LayerTile.h: 23 (LayerTile): 24 * platform/graphics/blackberry/LayerTiler.cpp: 25 (WebCore::LayerTiler::processTextureJob): 26 (WebCore::LayerTiler::performTileJob): 27 * platform/graphics/blackberry/LayerTiler.h: 28 (WebCore::LayerTiler::TextureJob::setContents): 29 (TextureJob): 30 1 31 2013-04-24 Zan Dobersek <zdobersek@igalia.com> 2 32 -
trunk/Source/WebCore/platform/graphics/blackberry/LayerTile.cpp
r148192 r149019 43 43 { 44 44 setTexture(textureCacheCompositingThread()->textureForContents(contents)); 45 }46 47 void LayerTile::setContentsToColor(const Color& color)48 {49 setTexture(textureCacheCompositingThread()->textureForColor(color));50 45 } 51 46 -
trunk/Source/WebCore/platform/graphics/blackberry/LayerTile.h
r148192 r149019 28 28 namespace WebCore { 29 29 30 class Color;31 30 class IntRect; 32 31 class TileIndex; … … 48 47 49 48 void setContents(BlackBerry::Platform::Graphics::Buffer*); 50 void setContentsToColor(const Color&);51 49 void updateContents(BlackBerry::Platform::Graphics::Buffer*); 52 50 void discardContents(); -
trunk/Source/WebCore/platform/graphics/blackberry/LayerTiler.cpp
r148881 r149019 383 383 } 384 384 385 if (job.m_type == TextureJob::SetContentsToColor) {386 addTileJob(job.m_index, job, tileJobsMap);387 return;388 }389 390 385 addTileJob(indexOfTile(job.m_dirtyRect.minXMinYCorner()), job, tileJobsMap); 391 386 } … … 414 409 { 415 410 switch (job.m_type) { 416 case TextureJob::SetContentsToColor:417 tile->setContentsToColor(job.m_color);418 return;419 411 case TextureJob::SetContents: 420 412 tile->setContents(job.m_contents); -
trunk/Source/WebCore/platform/graphics/blackberry/LayerTiler.h
r148192 r149019 22 22 #if USE(ACCELERATED_COMPOSITING) 23 23 24 #include "Color.h"25 24 #include "FloatRect.h" 26 25 #include "IntRect.h" … … 76 75 private: 77 76 struct TextureJob { 78 enum Type { Unknown, SetContents, SetContentsToColor,UpdateContents, DiscardContents, ResizeContents, DirtyContents };77 enum Type { Unknown, SetContents, UpdateContents, DiscardContents, ResizeContents, DirtyContents }; 79 78 80 79 TextureJob() … … 109 108 } 110 109 111 TextureJob(Type type, const Color& color, const TileIndex& index)112 : m_type(type)113 , m_contents(0)114 , m_color(color)115 , m_index(index)116 {117 ASSERT(type == SetContentsToColor);118 }119 120 110 static TextureJob setContents(BlackBerry::Platform::Graphics::Buffer* contents, const IntRect& contentsRect) 121 111 { 122 112 return TextureJob(SetContents, contents, contentsRect); 123 113 } 124 static TextureJob setContentsToColor(const Color& color, const TileIndex& index) { return TextureJob(SetContentsToColor, color, index); }125 114 static TextureJob updateContents(BlackBerry::Platform::Graphics::Buffer* contents, const IntRect& dirtyRect) { return TextureJob(UpdateContents, contents, dirtyRect); } 126 115 static TextureJob discardContents(const IntRect& dirtyRect) { return TextureJob(DiscardContents, dirtyRect); } … … 133 122 BlackBerry::Platform::Graphics::Buffer* m_contents; 134 123 IntRect m_dirtyRect; 135 Color m_color;136 124 TileIndex m_index; 137 125 };
Note: See TracChangeset
for help on using the changeset viewer.