Title: [122170] trunk/Source/WebCore
- Revision
- 122170
- Author
- [email protected]
- Date
- 2012-07-09 17:17:24 -0700 (Mon, 09 Jul 2012)
Log Message
[chromium] Remove HashMap workaround for layers with id=0 in CCDamageTracker
https://bugs.webkit.org/show_bug.cgi?id=90825
Reviewed by Adrienne Walker.
Layer ids are no longer allowed to be 0, and the behaviour is guarded
with asserts, so this workaround is not needed any longer.
* platform/graphics/chromium/cc/CCDamageTracker.h:
(CCDamageTracker):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (122169 => 122170)
--- trunk/Source/WebCore/ChangeLog 2012-07-10 00:08:36 UTC (rev 122169)
+++ trunk/Source/WebCore/ChangeLog 2012-07-10 00:17:24 UTC (rev 122170)
@@ -1,3 +1,16 @@
+2012-07-09 Dana Jansens <[email protected]>
+
+ [chromium] Remove HashMap workaround for layers with id=0 in CCDamageTracker
+ https://bugs.webkit.org/show_bug.cgi?id=90825
+
+ Reviewed by Adrienne Walker.
+
+ Layer ids are no longer allowed to be 0, and the behaviour is guarded
+ with asserts, so this workaround is not needed any longer.
+
+ * platform/graphics/chromium/cc/CCDamageTracker.h:
+ (CCDamageTracker):
+
2012-07-09 Vincent Scheib <[email protected]>
Pointer Lock requestPointerLock rejects locking an element not in a document.
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCDamageTracker.cpp (122169 => 122170)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCDamageTracker.cpp 2012-07-10 00:08:36 UTC (rev 122169)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCDamageTracker.cpp 2012-07-10 00:17:24 UTC (rev 122170)
@@ -186,6 +186,7 @@
void CCDamageTracker::saveRectForNextFrame(int layerID, const FloatRect& targetSpaceRect)
{
// This layer should not yet exist in next frame's history.
+ ASSERT(layerID > 0);
ASSERT(m_nextRectHistory->find(layerID) == m_nextRectHistory->end());
m_nextRectHistory->set(layerID, targetSpaceRect);
}
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCDamageTracker.h (122169 => 122170)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCDamageTracker.h 2012-07-10 00:08:36 UTC (rev 122169)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCDamageTracker.h 2012-07-10 00:17:24 UTC (rev 122170)
@@ -70,14 +70,7 @@
// To correctly track exposed regions, two hashtables of rects are maintained.
// The "current" map is used to compute exposed regions of the current frame, while
// the "next" map is used to collect layer rects that are used in the next frame.
- struct RectMapKeyTraits : HashTraits<int> {
- static const bool emptyValueIsZero = false;
- static const bool needsDestruction = false;
- static int emptyValue() { return -1; }
- static void constructDeletedValue(int& slot) { slot = -2; }
- static bool isDeletedValue(int value) { return value == -2; }
- };
- typedef HashMap<int, FloatRect, DefaultHash<int>::Hash, RectMapKeyTraits> RectMap;
+ typedef HashMap<int, FloatRect> RectMap;
OwnPtr<RectMap> m_currentRectHistory;
OwnPtr<RectMap> m_nextRectHistory;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
