Title: [125558] trunk/Source/WebCore
- Revision
- 125558
- Author
- commit-qu...@webkit.org
- Date
- 2012-08-14 06:53:14 -0700 (Tue, 14 Aug 2012)
Log Message
[BlackBerry] Texture cache must adapt to HashMap changes
https://bugs.webkit.org/show_bug.cgi?id=93955
Patch by Arvid Nilsson <anils...@rim.com> on 2012-08-14
Reviewed by Rob Buis.
This was fixed locally, but not upstreamed yet.
Based on an original patch by Konrad Piascik.
* platform/graphics/blackberry/TextureCacheCompositingThread.cpp:
(WebCore::TextureCacheCompositingThread::textureForTiledContents):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (125557 => 125558)
--- trunk/Source/WebCore/ChangeLog 2012-08-14 13:37:50 UTC (rev 125557)
+++ trunk/Source/WebCore/ChangeLog 2012-08-14 13:53:14 UTC (rev 125558)
@@ -1,5 +1,19 @@
2012-08-14 Arvid Nilsson <anils...@rim.com>
+ [BlackBerry] Texture cache must adapt to HashMap changes
+ https://bugs.webkit.org/show_bug.cgi?id=93955
+
+ Reviewed by Rob Buis.
+
+ This was fixed locally, but not upstreamed yet.
+
+ Based on an original patch by Konrad Piascik.
+
+ * platform/graphics/blackberry/TextureCacheCompositingThread.cpp:
+ (WebCore::TextureCacheCompositingThread::textureForTiledContents):
+
+2012-08-14 Arvid Nilsson <anils...@rim.com>
+
[BlackBerry] LayerCompositingThread.h doesn't compile
https://bugs.webkit.org/show_bug.cgi?id=93956
Modified: trunk/Source/WebCore/platform/graphics/blackberry/TextureCacheCompositingThread.cpp (125557 => 125558)
--- trunk/Source/WebCore/platform/graphics/blackberry/TextureCacheCompositingThread.cpp 2012-08-14 13:37:50 UTC (rev 125557)
+++ trunk/Source/WebCore/platform/graphics/blackberry/TextureCacheCompositingThread.cpp 2012-08-14 13:53:14 UTC (rev 125558)
@@ -201,10 +201,10 @@
PassRefPtr<Texture> TextureCacheCompositingThread::textureForTiledContents(const SkBitmap& contents, const IntRect& tileRect, const TileIndex& index, bool isOpaque)
{
- HashMap<ContentsKey, TextureMap>::iterator it = m_cache.add(key(contents), TextureMap()).first;
+ HashMap<ContentsKey, TextureMap>::iterator it = m_cache.add(key(contents), TextureMap()).iterator;
TextureMap& map = (*it).second;
- TextureMap::iterator jt = map.add(index, RefPtr<Texture>()).first;
+ TextureMap::iterator jt = map.add(index, RefPtr<Texture>()).iterator;
RefPtr<Texture> texture = (*jt).second;
if (!texture) {
texture = createTexture();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
