diff options
| author | Steve Block <steveblock@google.com> | 2010-02-16 16:40:51 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-18 14:18:39 +0000 |
| commit | e1856da6b02fd4ba281b9a8f2ddc84a4016d355b (patch) | |
| tree | 2a9d65d2bcdbfd4d6349623a6ee8aec2ceabf35e /WebCore/bindings | |
| parent | bd101811338d779f435b01aa071e97a7c0a23736 (diff) | |
| download | external_webkit-e1856da6b02fd4ba281b9a8f2ddc84a4016d355b.zip external_webkit-e1856da6b02fd4ba281b9a8f2ddc84a4016d355b.tar.gz external_webkit-e1856da6b02fd4ba281b9a8f2ddc84a4016d355b.tar.bz2 | |
Cherry-pick WebKit change 54957 to use V8 DerivedSourcesAllInOne.cpp
This updates Android to match Chromium
See http://trac.webkit.org/changeset/54957
Change-Id: I41c082460f00e1c0ec32bf180205ca40fd2f190a
Diffstat (limited to 'WebCore/bindings')
| -rw-r--r-- | WebCore/bindings/v8/DerivedSourcesAllInOne.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp index b626499..07d1187 100644 --- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp +++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp @@ -70,6 +70,9 @@ #include "bindings/V8Clipboard.cpp" #include "bindings/V8Comment.cpp" #include "bindings/V8CompositionEvent.cpp" +// ANDROID +// Temporary modification - will not be upstreamed +#include "bindings/V8Connection.cpp" #include "bindings/V8Console.cpp" #include "bindings/V8Coordinates.cpp" #include "bindings/V8Counter.cpp" @@ -225,6 +228,16 @@ #include "bindings/V8TreeWalker.cpp" #include "bindings/V8UIEvent.cpp" #include "bindings/V8ValidityState.cpp" +// ANDROID +// Do not upstream. +// The Android build requires V8VoidCallback.h, but not V8VoidCallback.cpp. The +// same is true of Chromium. Now that we use DerivedSourcesAllInOne.cpp, the +// generation of header files (in Android.derived.v8bindings.mk) is separate +// from building the corresponding source files (this file). This will allow us +// to remove V8VoidCallback.cpp from the Android build (once we have removed +// DOM_OBJECT_VOIDCALLBACK_TYPES, which currently exists only to satisfy +// V8VoidCallback.cpp) +#include "bindings/V8VoidCallback.cpp" #include "bindings/V8WebKitAnimationEvent.cpp" #include "bindings/V8WebKitCSSKeyframeRule.cpp" #include "bindings/V8WebKitCSSKeyframesRule.cpp" |