[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 15:16:45 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9a887236b37d1e3ab1b5e18c88b2caeb03bfd508
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 29 18:36:36 2010 +0000
Unreviewed. Fix chromium build break.
* bindings/v8/custom/V8FileReaderCustom.cpp:
(WebCore::V8FileReader::resultAccessorGetter):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70906 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 405a610..4354d8e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
2010-10-29 Jian Li <jianli at chromium.org>
+ Unreviewed. Fix chromium build break.
+
+ * bindings/v8/custom/V8FileReaderCustom.cpp:
+ (WebCore::V8FileReader::resultAccessorGetter):
+
+2010-10-29 Jian Li <jianli at chromium.org>
+
Reviewed by David Levin.
Support readAsArrayBuffer in FileReader and FileReaderSync
diff --git a/WebCore/bindings/v8/custom/V8FileReaderCustom.cpp b/WebCore/bindings/v8/custom/V8FileReaderCustom.cpp
index de4691f..fb0d53c 100755
--- a/WebCore/bindings/v8/custom/V8FileReaderCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8FileReaderCustom.cpp
@@ -66,7 +66,7 @@ v8::Handle<v8::Value> V8FileReader::resultAccessorGetter(v8::Local<v8::String> n
INC_STATS("DOM.FileReader.result._get");
v8::Handle<v8::Object> holder = info.Holder();
FileReader* imp = V8FileReader::toNative(holder);
- if (imp->readType() == FileReader::ReadFileAsArrayBuffer)
+ if (imp->readType() == FileReaderLoader::ReadAsArrayBuffer)
return toV8(imp->arrayBufferResult());
return v8StringOrNull(imp->stringResult());
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list