From 2fc2651226baac27029e38c9d6ef883fa32084db Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 18 May 2011 13:36:51 +0100 Subject: Merge WebKit at r78450: Initial merge by git. Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1 --- Source/JavaScriptCore/runtime/Operations.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/JavaScriptCore/runtime/Operations.h') diff --git a/Source/JavaScriptCore/runtime/Operations.h b/Source/JavaScriptCore/runtime/Operations.h index 1252345..6e84123 100644 --- a/Source/JavaScriptCore/runtime/Operations.h +++ b/Source/JavaScriptCore/runtime/Operations.h @@ -429,7 +429,7 @@ namespace JSC { // Since we're accessing a prototype in a loop, it's a good bet that it // should not be treated as a dictionary. if (cell->structure()->isDictionary()) { - asObject(cell)->flattenDictionaryObject(); + asObject(cell)->flattenDictionaryObject(callFrame->globalData()); if (slotBase == cell) slotOffset = cell->structure()->get(propertyName); } @@ -454,7 +454,7 @@ namespace JSC { // Since we're accessing a prototype in a loop, it's a good bet that it // should not be treated as a dictionary. if (base->structure()->isDictionary()) - asObject(base)->flattenDictionaryObject(); + asObject(base)->flattenDictionaryObject(callFrame->globalData()); ++count; } @@ -471,7 +471,7 @@ namespace JSC { PropertySlot slot; JSObject* base; while (true) { - base = *iter; + base = iter->get(); if (next == end) return isStrictPut ? JSValue() : base; if (base->getPropertySlot(callFrame, property, slot)) -- cgit v1.1