OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge WebKit at r78450: Initial merge by git.
[android-x86/external-webkit.git]
/
Source
/
WebCore
/
bindings
/
js
/
JSUint16ArrayCustom.cpp
diff --git
a/Source/WebCore/bindings/js/JSUint16ArrayCustom.cpp
b/Source/WebCore/bindings/js/JSUint16ArrayCustom.cpp
index
9e476f2
..
16f9db2
100644
(file)
--- a/
Source/WebCore/bindings/js/JSUint16ArrayCustom.cpp
+++ b/
Source/WebCore/bindings/js/JSUint16ArrayCustom.cpp
@@
-24,9
+24,6
@@
*/
#include "config.h"
-
-#if ENABLE(3D_CANVAS) || ENABLE(BLOB)
-
#include "JSUint16Array.h"
#include "JSArrayBufferViewHelper.h"
@@
-62,5
+59,3
@@
EncodedJSValue JSC_HOST_CALL JSUint16ArrayConstructor::constructJSUint16Array(Ex
}
} // namespace WebCore
-
-#endif // ENABLE(3D_CANVAS) || ENABLE(BLOB)