Index: src/object-observe.js |
diff --git a/src/object-observe.js b/src/object-observe.js |
index 219d7b72d521c3b2b9cbde526c04ce06294dd829..c90c6c7af1d058387ed6482be045009c4587a25a 100644 |
--- a/src/object-observe.js |
+++ b/src/object-observe.js |
@@ -22,14 +22,6 @@ |
var GlobalArray = global.Array; |
var GlobalObject = global.Object; |
var InternalArray = utils.InternalArray; |
- |
-var ObjectFreeze; |
-var ObjectIsFrozen; |
- |
-utils.Import(function(from) { |
- ObjectFreeze = from.ObjectFreeze; |
- ObjectIsFrozen = from.ObjectIsFrozen; |
-}); |
// ------------------------------------------------------------------- |
@@ -388,7 +380,7 @@ |
throw MakeTypeError(kObserveGlobalProxy, "observe"); |
if (!IS_SPEC_FUNCTION(callback)) |
throw MakeTypeError(kObserveNonFunction, "observe"); |
- if (ObjectIsFrozen(callback)) |
+ if ($objectIsFrozen(callback)) |
throw MakeTypeError(kObserveCallbackFrozen); |
var objectObserveFn = %GetObjectContextObjectObserve(object); |
@@ -481,7 +473,7 @@ |
%DefineDataPropertyUnchecked( |
newRecord, prop, changeRecord[prop], READ_ONLY + DONT_DELETE); |
} |
- ObjectFreeze(newRecord); |
+ $objectFreeze(newRecord); |
ObjectInfoEnqueueInternalChangeRecord(objectInfo, newRecord); |
} |
@@ -533,8 +525,8 @@ |
addedCount: addedCount |
}; |
- ObjectFreeze(changeRecord); |
- ObjectFreeze(changeRecord.removed); |
+ $objectFreeze(changeRecord); |
+ $objectFreeze(changeRecord.removed); |
ObjectInfoEnqueueInternalChangeRecord(objectInfo, changeRecord); |
} |
@@ -558,7 +550,7 @@ |
}; |
} |
- ObjectFreeze(changeRecord); |
+ $objectFreeze(changeRecord); |
ObjectInfoEnqueueInternalChangeRecord(objectInfo, changeRecord); |
} |
@@ -615,7 +607,7 @@ |
if (%IsJSGlobalProxy(object)) |
throw MakeTypeError(kObserveGlobalProxy, "getNotifier"); |
- if (ObjectIsFrozen(object)) return null; |
+ if ($objectIsFrozen(object)) return null; |
if (!%ObjectWasCreatedInCurrentOrigin(object)) return null; |
@@ -673,17 +665,17 @@ |
// ------------------------------------------------------------------- |
-utils.InstallFunctions(GlobalObject, DONT_ENUM, [ |
+$installFunctions(GlobalObject, DONT_ENUM, [ |
"deliverChangeRecords", ObjectDeliverChangeRecords, |
"getNotifier", ObjectGetNotifier, |
"observe", ObjectObserve, |
"unobserve", ObjectUnobserve |
]); |
-utils.InstallFunctions(GlobalArray, DONT_ENUM, [ |
+$installFunctions(GlobalArray, DONT_ENUM, [ |
"observe", ArrayObserve, |
"unobserve", ArrayUnobserve |
]); |
-utils.InstallFunctions(notifierPrototype, DONT_ENUM, [ |
+$installFunctions(notifierPrototype, DONT_ENUM, [ |
"notify", ObjectNotifierNotify, |
"performChange", ObjectNotifierPerformChange |
]); |