Index: third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h |
diff --git a/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h b/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h |
index 7fd0ba86d731daeb018001db605e6c90f47bb165..cc6597ce1d79467196aef2bee2172dd7c4ce5a29 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h |
+++ b/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h |
@@ -180,8 +180,8 @@ struct WrapperTypeInfo { |
const WrapperTypeInfo* parent_class; |
const unsigned wrapper_type_prototype : 1; // WrapperTypePrototype |
const unsigned wrapper_class_id : 2; // WrapperClassId |
- const unsigned |
- active_script_wrappable_inheritance : 1; // ActiveScriptWrappableInheritance |
+ const unsigned // ActiveScriptWrappableInheritance |
+ active_script_wrappable_inheritance : 1; |
const unsigned lifetime : 1; // Lifetime |
}; |
@@ -199,6 +199,8 @@ inline T* GetInternalField(v8::Local<v8::Object> wrapper) { |
wrapper->GetAlignedPointerFromInternalField(offset)); |
} |
+// The return value can be null if |wrapper| is a global proxy, which points to |
+// nothing while a navigation. |
inline ScriptWrappable* ToScriptWrappable( |
const v8::PersistentBase<v8::Object>& wrapper) { |
return GetInternalField<ScriptWrappable, kV8DOMWrapperObjectIndex>(wrapper); |