summaryrefslogtreecommitdiff
path: root/Source/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.cpp')
-rw-r--r--Source/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.cpp b/Source/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.cpp
index 723a0b5b4..c06d77a7e 100644
--- a/Source/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.cpp
+++ b/Source/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.cpp
@@ -31,15 +31,15 @@
#include "config.h"
#include "V8HTMLImageElementConstructor.h"
-#include "HTMLImageElement.h"
+#include "BindingState.h"
#include "Document.h"
#include "Frame.h"
+#include "HTMLImageElement.h"
#include "HTMLNames.h"
#include "V8Binding.h"
#include "V8Document.h"
#include "V8HTMLImageElement.h"
#include "V8Proxy.h"
-
#include <wtf/RefPtr.h>
namespace WebCore {
@@ -56,7 +56,7 @@ static v8::Handle<v8::Value> v8HTMLImageElementConstructorCallback(const v8::Arg
if (ConstructorMode::current() == ConstructorMode::WrapExistingObject)
return args.Holder();
- Frame* frame = V8Proxy::retrieveFrameForCurrentContext();
+ Frame* frame = currentFrame(BindingState::instance());
if (!frame)
return V8Proxy::throwError(V8Proxy::ReferenceError, "Image constructor associated frame is unavailable", args.GetIsolate());
@@ -85,9 +85,10 @@ static v8::Handle<v8::Value> v8HTMLImageElementConstructorCallback(const v8::Arg
}
RefPtr<HTMLImageElement> image = HTMLImageElement::createForJSConstructor(document, optionalWidth, optionalHeight);
- V8DOMWrapper::setDOMWrapper(args.Holder(), &V8HTMLImageElementConstructor::info, image.get());
- V8DOMWrapper::setJSWrapperForDOMNode(image.release(), v8::Persistent<v8::Object>::New(args.Holder()));
- return args.Holder();
+ v8::Handle<v8::Object> wrapper = args.Holder();
+ V8DOMWrapper::setDOMWrapper(wrapper, &V8HTMLImageElementConstructor::info, image.get());
+ V8DOMWrapper::setJSWrapperForDOMNode(image.release(), wrapper);
+ return wrapper;
}
v8::Persistent<v8::FunctionTemplate> V8HTMLImageElementConstructor::GetTemplate()