Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.

1 files changed, 9 insertions, 0 deletions

diff --git a/Source/JavaScriptCore/runtime/Structure.cpp b/Source/JavaScriptCore/runtime/Structure.cpp
index a931def27..e733c7e23 100644
--- a/Source/JavaScriptCore/runtime/Structure.cpp
+++ b/Source/JavaScriptCore/runtime/Structure.cpp
@@ -543,6 +543,15 @@ Structure* Structure::nonPropertyTransition(JSGlobalData& globalData, Structure*
     unsigned attributes = toAttributes(transitionKind);
     IndexingType indexingType = newIndexingType(structure->indexingTypeIncludingHistory(), transitionKind);
     
+    JSGlobalObject* globalObject = structure->globalObject();
+    if (structure == globalObject->arrayStructure()) {
+        Structure* transition = globalObject->arrayStructureWithArrayStorage();
+        if (transition->indexingTypeIncludingHistory() == indexingType) {
+            structure->notifyTransitionFromThisStructure();
+            return transition;
+        }
+    }
+    
     if (Structure* existingTransition = structure->m_transitionTable.get(0, attributes)) {
         ASSERT(existingTransition->m_attributesInPrevious == attributes);
         ASSERT(existingTransition->indexingTypeIncludingHistory() == indexingType);