Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Side by Side Diff: Source/bindings/core/v8/V8DOMWrapper.cpp

Issue 422233003: bindings: Removes an unnecessary type conversion in V8DOMWrapper. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 23 matching lines...) Expand all
34 #include "bindings/core/v8/V8Binding.h" 34 #include "bindings/core/v8/V8Binding.h"
35 #include "bindings/core/v8/V8HTMLCollection.h" 35 #include "bindings/core/v8/V8HTMLCollection.h"
36 #include "bindings/core/v8/V8HTMLDocument.h" 36 #include "bindings/core/v8/V8HTMLDocument.h"
37 #include "bindings/core/v8/V8ObjectConstructor.h" 37 #include "bindings/core/v8/V8ObjectConstructor.h"
38 #include "bindings/core/v8/V8PerContextData.h" 38 #include "bindings/core/v8/V8PerContextData.h"
39 #include "bindings/core/v8/V8ScriptRunner.h" 39 #include "bindings/core/v8/V8ScriptRunner.h"
40 #include "bindings/core/v8/V8Window.h" 40 #include "bindings/core/v8/V8Window.h"
41 41
42 namespace blink { 42 namespace blink {
43 43
44 static v8::Local<v8::Object> wrapInShadowTemplate(v8::Local<v8::Object> wrapper, Node* impl, v8::Isolate* isolate) 44 static v8::Local<v8::Object> wrapInShadowTemplate(v8::Local<v8::Object> wrapper, void* impl, v8::Isolate* isolate)
45 { 45 {
46 static int shadowTemplateKey; // This address is used for a key to look up t he dom template. 46 static int shadowTemplateKey; // This address is used for a key to look up t he dom template.
47 V8PerIsolateData* data = V8PerIsolateData::from(isolate); 47 V8PerIsolateData* data = V8PerIsolateData::from(isolate);
48 v8::Handle<v8::FunctionTemplate> shadowTemplate = data->existingDOMTemplate( &shadowTemplateKey); 48 v8::Handle<v8::FunctionTemplate> shadowTemplate = data->existingDOMTemplate( &shadowTemplateKey);
49 if (shadowTemplate.IsEmpty()) { 49 if (shadowTemplate.IsEmpty()) {
50 shadowTemplate = v8::FunctionTemplate::New(isolate); 50 shadowTemplate = v8::FunctionTemplate::New(isolate);
51 if (shadowTemplate.IsEmpty()) 51 if (shadowTemplate.IsEmpty())
52 return v8::Local<v8::Object>(); 52 return v8::Local<v8::Object>();
53 shadowTemplate->SetClassName(v8AtomicString(isolate, "HTMLDocument")); 53 shadowTemplate->SetClassName(v8AtomicString(isolate, "HTMLDocument"));
54 shadowTemplate->Inherit(V8HTMLDocument::domTemplate(isolate)); 54 shadowTemplate->Inherit(V8HTMLDocument::domTemplate(isolate));
(...skipping 14 matching lines...) Expand all
69 } 69 }
70 70
71 v8::Local<v8::Object> V8DOMWrapper::createWrapper(v8::Handle<v8::Object> creatio nContext, const WrapperTypeInfo* type, void* impl, v8::Isolate* isolate) 71 v8::Local<v8::Object> V8DOMWrapper::createWrapper(v8::Handle<v8::Object> creatio nContext, const WrapperTypeInfo* type, void* impl, v8::Isolate* isolate)
72 { 72 {
73 V8WrapperInstantiationScope scope(creationContext, isolate); 73 V8WrapperInstantiationScope scope(creationContext, isolate);
74 74
75 V8PerContextData* perContextData = V8PerContextData::from(scope.context()); 75 V8PerContextData* perContextData = V8PerContextData::from(scope.context());
76 v8::Local<v8::Object> wrapper = perContextData ? perContextData->createWrapp erFromCache(type) : V8ObjectConstructor::newInstance(isolate, type->domTemplate( isolate)->GetFunction()); 76 v8::Local<v8::Object> wrapper = perContextData ? perContextData->createWrapp erFromCache(type) : V8ObjectConstructor::newInstance(isolate, type->domTemplate( isolate)->GetFunction());
77 77
78 if (type == &V8HTMLDocument::wrapperTypeInfo && !wrapper.IsEmpty()) 78 if (type == &V8HTMLDocument::wrapperTypeInfo && !wrapper.IsEmpty())
79 wrapper = wrapInShadowTemplate(wrapper, static_cast<Node*>(impl), isolat e); 79 wrapper = wrapInShadowTemplate(wrapper, impl, isolate);
80 80
81 return wrapper; 81 return wrapper;
82 } 82 }
83 83
84 bool V8DOMWrapper::isDOMWrapper(v8::Handle<v8::Value> value) 84 bool V8DOMWrapper::isDOMWrapper(v8::Handle<v8::Value> value)
85 { 85 {
86 if (value.IsEmpty() || !value->IsObject()) 86 if (value.IsEmpty() || !value->IsObject())
87 return false; 87 return false;
88 88
89 if (v8::Handle<v8::Object>::Cast(value)->InternalFieldCount() < v8DefaultWra pperInternalFieldCount) 89 if (v8::Handle<v8::Object>::Cast(value)->InternalFieldCount() < v8DefaultWra pperInternalFieldCount)
90 return false; 90 return false;
91 91
92 v8::Handle<v8::Object> wrapper = v8::Handle<v8::Object>::Cast(value); 92 v8::Handle<v8::Object> wrapper = v8::Handle<v8::Object>::Cast(value);
93 ASSERT(wrapper->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)) ; 93 ASSERT(wrapper->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)) ;
94 ASSERT(wrapper->GetAlignedPointerFromInternalField(v8DOMWrapperTypeIndex)); 94 ASSERT(wrapper->GetAlignedPointerFromInternalField(v8DOMWrapperTypeIndex));
95 95
96 const WrapperTypeInfo* typeInfo = static_cast<const WrapperTypeInfo*>(wrappe r->GetAlignedPointerFromInternalField(v8DOMWrapperTypeIndex)); 96 const WrapperTypeInfo* typeInfo = static_cast<const WrapperTypeInfo*>(wrappe r->GetAlignedPointerFromInternalField(v8DOMWrapperTypeIndex));
97 // FIXME: We should add a more strict way to check if the typeInfo is a type Info of some DOM wrapper. 97 // FIXME: We should add a more strict way to check if the typeInfo is a type Info of some DOM wrapper.
98 // Even if it's a typeInfo of Blink, it's not guaranteed that it's a typeInf o of a DOM wrapper. 98 // Even if it's a typeInfo of Blink, it's not guaranteed that it's a typeInf o of a DOM wrapper.
99 return typeInfo->ginEmbedder == gin::kEmbedderBlink; 99 return typeInfo->ginEmbedder == gin::kEmbedderBlink;
100 } 100 }
101 101
102 } // namespace blink 102 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698