Title: [114013] trunk
- Revision
- 114013
- Author
- dslo...@google.com
- Date
- 2012-04-12 12:16:49 -0700 (Thu, 12 Apr 2012)
Log Message
Source/WebCore: REGRESSION (r113233): fast/canvas/webgl/array-message-passing.html crashing on Lion and Snow Leopard bots.
https://bugs.webkit.org/show_bug.cgi?id=83427.
Due to incorrect merge by me when landing r113233, call to find got replaces with call to add in
checking for duplicates in ObjectPool when serializing.
Reviewed by Dean Jackson.
Covered by existing tests.
* bindings/js/SerializedScriptValue.cpp:
(WebCore::CloneSerializer::checkForDuplicate):
LayoutTests: REGRESSION (r113233): fast/canvas/webgl/array-message-passing.html crashing on Lion and Snow Leopard bots.
https://bugs.webkit.org/show_bug.cgi?id=83427.
Bug fixed, unskipping tests.
Reviewed by Dean Jackson.
* platform/mac/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (114012 => 114013)
--- trunk/LayoutTests/ChangeLog 2012-04-12 19:07:07 UTC (rev 114012)
+++ trunk/LayoutTests/ChangeLog 2012-04-12 19:16:49 UTC (rev 114013)
@@ -1,3 +1,13 @@
+2012-04-12 Dmitry Lomov <dslo...@google.com>
+
+ REGRESSION (r113233): fast/canvas/webgl/array-message-passing.html crashing on Lion and Snow Leopard bots.
+ https://bugs.webkit.org/show_bug.cgi?id=83427.
+ Bug fixed, unskipping tests.
+
+ Reviewed by Dean Jackson.
+
+ * platform/mac/Skipped:
+
2012-04-12 David Barton <dbar...@mathscribe.com>
Don't modify shared style objects in RenderMathMLRoot.cpp
Modified: trunk/LayoutTests/platform/mac/Skipped (114012 => 114013)
--- trunk/LayoutTests/platform/mac/Skipped 2012-04-12 19:07:07 UTC (rev 114012)
+++ trunk/LayoutTests/platform/mac/Skipped 2012-04-12 19:16:49 UTC (rev 114013)
@@ -789,9 +789,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=83239
fast/animation/request-animation-frame-during-modal.html
-# https://bugs.webkit.org/show_bug.cgi?id=83427
-fast/canvas/webgl/array-message-passing.html
-
# https://bugs.webkit.org/show_bug.cgi?id=77754
# https://bugs.webkit.org/show_bug.cgi?id=83489
# window.resizeTo() does not seem to work as expected in Mac DRT. The outerWidth changes after a resizeTo()
Modified: trunk/Source/WebCore/ChangeLog (114012 => 114013)
--- trunk/Source/WebCore/ChangeLog 2012-04-12 19:07:07 UTC (rev 114012)
+++ trunk/Source/WebCore/ChangeLog 2012-04-12 19:16:49 UTC (rev 114013)
@@ -1,3 +1,17 @@
+2012-04-12 Dmitry Lomov <dslo...@google.com>
+
+ REGRESSION (r113233): fast/canvas/webgl/array-message-passing.html crashing on Lion and Snow Leopard bots.
+ https://bugs.webkit.org/show_bug.cgi?id=83427.
+ Due to incorrect merge by me when landing r113233, call to find got replaces with call to add in
+ checking for duplicates in ObjectPool when serializing.
+
+ Reviewed by Dean Jackson.
+
+ Covered by existing tests.
+
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::CloneSerializer::checkForDuplicate):
+
2012-04-12 David Barton <dbar...@mathscribe.com>
Don't modify shared style objects in RenderMathMLRoot.cpp
Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (114012 => 114013)
--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2012-04-12 19:07:07 UTC (rev 114012)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2012-04-12 19:16:49 UTC (rev 114013)
@@ -392,13 +392,13 @@
bool checkForDuplicate(JSObject* object)
{
// Record object for graph reconstruction
- ObjectPool::AddResult addResult = m_objectPool.add(object, m_objectPool.size());
+ ObjectPool::const_iterator found = m_objectPool.find(object);
// Handle duplicate references
- if (!addResult.isNewEntry) {
+ if (found != m_objectPool.end()) {
write(ObjectReferenceTag);
- ASSERT(static_cast<int32_t>(addResult.iterator->second) < m_objectPool.size());
- writeObjectIndex(addResult.iterator->second);
+ ASSERT(static_cast<int32_t>(found->second) < m_objectPool.size());
+ writeObjectIndex(found->second);
return true;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
