[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jianli at chromium.org
jianli at chromium.org
Wed Dec 22 14:14:45 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 19f12b78267d24b034e76c53b4b60317f56e3347
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 5 21:38:27 2010 +0000
[V8] Add FileReader to active DOM map
https://bugs.webkit.org/show_bug.cgi?id=47205
Reviewed by Nate Chapin.
We need to have a custom FileReader V8 constructor in order to add object
into active DOM map to prevent it from GC-ed when it is still in-use.
* Android.v8bindings.mk:
* WebCore.gypi:
* bindings/scripts/CodeGeneratorV8.pm:
* bindings/v8/custom/V8FileReaderCustom.cpp: Added.
(WebCore::V8FileReader::constructorCallback):
* fileapi/FileReader.idl:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69148 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index 52078d1..fdee6fb 100644
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -115,6 +115,7 @@ LOCAL_SRC_FILES += \
bindings/v8/custom/V8EventCustom.cpp \
bindings/v8/custom/V8EventSourceConstructor.cpp \
bindings/v8/custom/V8FileListCustom.cpp \
+ bindings/v8/custom/V8FileReaderCustom.cpp \
bindings/v8/custom/V8GeolocationCustom.cpp \
bindings/v8/custom/V8IDBAny.cpp \
bindings/v8/custom/V8IDBKey.cpp \
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f95821f..1130cc3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-05 Jian Li <jianli at chromium.org>
+
+ Reviewed by Nate Chapin.
+
+ [V8] Add FileReader to active DOM map
+ https://bugs.webkit.org/show_bug.cgi?id=47205
+
+ We need to have a custom FileReader V8 constructor in order to add object
+ into active DOM map to prevent it from GC-ed when it is still in-use.
+
+ * Android.v8bindings.mk:
+ * WebCore.gypi:
+ * bindings/scripts/CodeGeneratorV8.pm:
+ * bindings/v8/custom/V8FileReaderCustom.cpp: Added.
+ (WebCore::V8FileReader::constructorCallback):
+ * fileapi/FileReader.idl:
+
2010-10-05 Vincent Scheib <scheib at chromium.org>
Reviewed by Kenneth Russell.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 1289507..ec62ab6 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -733,6 +733,7 @@
'bindings/v8/custom/V8ArrayBufferCustom.cpp',
'bindings/v8/custom/V8Int8ArrayCustom.cpp',
'bindings/v8/custom/V8Int32ArrayCustom.cpp',
+ 'bindings/v8/custom/V8FileReaderCustom.cpp',
'bindings/v8/custom/V8Float32ArrayCustom.cpp',
'bindings/v8/custom/V8Int16ArrayCustom.cpp',
'bindings/v8/custom/V8Uint8ArrayCustom.cpp',
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm
index 3353f0f..4524d2b 100644
--- a/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -2555,6 +2555,7 @@ sub IsActiveDomType
return 1 if $type eq "Worker";
return 1 if $type eq "SharedWorker";
return 1 if $type eq "IDBRequest";
+ return 1 if $type eq "FileReader";
return 0;
}
diff --git a/WebCore/bindings/v8/custom/V8FileReaderCustom.cpp b/WebCore/bindings/v8/custom/V8FileReaderCustom.cpp
new file mode 100755
index 0000000..5f4fb57
--- /dev/null
+++ b/WebCore/bindings/v8/custom/V8FileReaderCustom.cpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "V8FileReader.h"
+
+#include "ScriptExecutionContext.h"
+#include "V8Binding.h"
+
+namespace WebCore {
+
+v8::Handle<v8::Value> V8FileReader::constructorCallback(const v8::Arguments& args)
+{
+ INC_STATS("DOM.FileReader.Constructor");
+
+ if (!args.IsConstructCall())
+ return throwError("DOM object constructor cannot be called as a function.", V8Proxy::TypeError);
+
+ // Expect no parameters.
+ // Allocate a FileReader object as its internal field.
+ ScriptExecutionContext* context = getScriptExecutionContext();
+ if (!context)
+ return throwError("FileReader constructor's associated context is not available", V8Proxy::ReferenceError);
+ RefPtr<FileReader> fileReader = FileReader::create(context);
+ V8DOMWrapper::setDOMWrapper(args.Holder(), &info, fileReader.get());
+
+ // Add object to the wrapper map.
+ fileReader->ref();
+ V8DOMWrapper::setJSWrapperForActiveDOMObject(fileReader.get(), v8::Persistent<v8::Object>::New(args.Holder()));
+ return args.Holder();
+}
+
+} // namespace WebCore
diff --git a/WebCore/fileapi/FileReader.idl b/WebCore/fileapi/FileReader.idl
index b36e9d3..723d242 100644
--- a/WebCore/fileapi/FileReader.idl
+++ b/WebCore/fileapi/FileReader.idl
@@ -34,7 +34,8 @@ module html {
CanBeConstructed,
CallWith=ScriptExecutionContext,
EventTarget,
- NoStaticTables
+ NoStaticTables,
+ V8CustomConstructor
] FileReader {
// ready states
const unsigned short EMPTY = 0;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list