v8-util.h   v8-util.h 
skipping to change at line 210 skipping to change at line 210
/** /**
* Put value into map, like Set(const K&, Local<V>). * Put value into map, like Set(const K&, Local<V>).
*/ */
UniquePersistent<V> Set(const K& key, UniquePersistent<V> value) { UniquePersistent<V> Set(const K& key, UniquePersistent<V> value) {
return SetUnique(key, &value); return SetUnique(key, &value);
} }
/** /**
* Return value for key and remove it from the map. * Return value for key and remove it from the map.
*/ */
V8_INLINE UniquePersistent<V> Remove(const K& key) { UniquePersistent<V> Remove(const K& key) {
return Release(Traits::Remove(&impl_, key)).Pass(); return Release(Traits::Remove(&impl_, key)).Pass();
} }
/** /**
* Traverses the map repeatedly, * Traverses the map repeatedly,
* in case side effects of disposal cause insertions. * in case side effects of disposal cause insertions.
**/ **/
void Clear() { void Clear() {
typedef typename Traits::Iterator It; typedef typename Traits::Iterator It;
HandleScope handle_scope(isolate_); HandleScope handle_scope(isolate_);
skipping to change at line 357 skipping to change at line 357
V8_INLINE static PersistentContainerValue Leak( V8_INLINE static PersistentContainerValue Leak(
UniquePersistent<V>* persistent) { UniquePersistent<V>* persistent) {
return reinterpret_cast<PersistentContainerValue>(persistent->val_); return reinterpret_cast<PersistentContainerValue>(persistent->val_);
} }
/** /**
* Return a container value as UniquePersistent and make sure the weak * Return a container value as UniquePersistent and make sure the weak
* callback is properly disposed of. All remove functionality should go * callback is properly disposed of. All remove functionality should go
* through this. * through this.
*/ */
V8_INLINE static UniquePersistent<V> Release(PersistentContainerValue v) { static UniquePersistent<V> Release(PersistentContainerValue v) {
UniquePersistent<V> p; UniquePersistent<V> p;
p.val_ = FromVal(v); p.val_ = FromVal(v);
if (Traits::kCallbackType != kNotWeak && !p.IsEmpty()) { if (Traits::kCallbackType != kNotWeak && !p.IsEmpty()) {
Traits::DisposeCallbackData( Traits::DisposeCallbackData(
p.template ClearWeak<typename Traits::WeakCallbackDataType>()); p.template ClearWeak<typename Traits::WeakCallbackDataType>());
} }
return p.Pass(); return p.Pass();
} }
Isolate* isolate_; Isolate* isolate_;
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 v8.h   v8.h 
skipping to change at line 806 skipping to change at line 806
rhs.val_ = 0; rhs.val_ = 0;
return *this; return *this;
} }
/** /**
* Cast operator for moves. * Cast operator for moves.
*/ */
V8_INLINE operator RValue() { return RValue(this); } V8_INLINE operator RValue() { return RValue(this); }
/** /**
* Pass allows returning uniques from functions, etc. * Pass allows returning uniques from functions, etc.
*/ */
V8_INLINE UniquePersistent Pass() { return UniquePersistent(RValue(this)) ; } UniquePersistent Pass() { return UniquePersistent(RValue(this)); }
private: private:
UniquePersistent(UniquePersistent&); UniquePersistent(UniquePersistent&);
void operator=(UniquePersistent&); void operator=(UniquePersistent&);
}; };
/** /**
* A stack-allocated class that governs a number of local handles. * A stack-allocated class that governs a number of local handles.
* After a handle scope has been created, all local handles will be * After a handle scope has been created, all local handles will be
* allocated within that handle scope until either the handle scope is * allocated within that handle scope until either the handle scope is
skipping to change at line 5462 skipping to change at line 5462
static const int kStringEncodingMask = 0x4; static const int kStringEncodingMask = 0x4;
static const int kExternalTwoByteRepresentationTag = 0x02; static const int kExternalTwoByteRepresentationTag = 0x02;
static const int kExternalAsciiRepresentationTag = 0x06; static const int kExternalAsciiRepresentationTag = 0x06;
static const int kIsolateEmbedderDataOffset = 0 * kApiPointerSize; static const int kIsolateEmbedderDataOffset = 0 * kApiPointerSize;
static const int kIsolateRootsOffset = 5 * kApiPointerSize; static const int kIsolateRootsOffset = 5 * kApiPointerSize;
static const int kUndefinedValueRootIndex = 5; static const int kUndefinedValueRootIndex = 5;
static const int kNullValueRootIndex = 7; static const int kNullValueRootIndex = 7;
static const int kTrueValueRootIndex = 8; static const int kTrueValueRootIndex = 8;
static const int kFalseValueRootIndex = 9; static const int kFalseValueRootIndex = 9;
static const int kEmptyStringRootIndex = 154; static const int kEmptyStringRootIndex = 152;
static const int kNodeClassIdOffset = 1 * kApiPointerSize; static const int kNodeClassIdOffset = 1 * kApiPointerSize;
static const int kNodeFlagsOffset = 1 * kApiPointerSize + 3; static const int kNodeFlagsOffset = 1 * kApiPointerSize + 3;
static const int kNodeStateMask = 0xf; static const int kNodeStateMask = 0xf;
static const int kNodeStateIsWeakValue = 2; static const int kNodeStateIsWeakValue = 2;
static const int kNodeStateIsPendingValue = 3; static const int kNodeStateIsPendingValue = 3;
static const int kNodeStateIsNearDeathValue = 4; static const int kNodeStateIsNearDeathValue = 4;
static const int kNodeIsIndependentShift = 4; static const int kNodeIsIndependentShift = 4;
static const int kNodeIsPartiallyDependentShift = 5; static const int kNodeIsPartiallyDependentShift = 5;
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/