diff options
| author | Steve Block <steveblock@google.com> | 2010-01-21 10:38:22 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-21 10:38:22 -0800 |
| commit | 031f2784518da97d8493c76709dc87ac2fac8d68 (patch) | |
| tree | 73031e0c18fdf3b61170e92d19dc913ca7d50483 /WebCore/WebCore.pro | |
| parent | 0926ef1b86138ebea85100fdd825f89726482972 (diff) | |
| parent | a6466ffc1f777725ad54838722865978fb23277d (diff) | |
| download | external_webkit-031f2784518da97d8493c76709dc87ac2fac8d68.zip external_webkit-031f2784518da97d8493c76709dc87ac2fac8d68.tar.gz external_webkit-031f2784518da97d8493c76709dc87ac2fac8d68.tar.bz2 | |
Merge changes I1b4ba984,I6cadc4f4,Icf99c709,Id22d59b7,I63f3c4ed
* changes:
Fixes style in V8 jni_runtime.[cpp|h]
Updates V8 version of JavaString to use a private implementation class.
Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix style
Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix style
Cherry-pick WebKit change 53620 to move bridge interfaces Field, Class, Instance and Array from Bridge to BridgeJSC
Diffstat (limited to 'WebCore/WebCore.pro')
| -rw-r--r-- | WebCore/WebCore.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro index b05a972..4dc1294 100644 --- a/WebCore/WebCore.pro +++ b/WebCore/WebCore.pro @@ -775,7 +775,6 @@ SOURCES += \ bindings/js/ScheduledAction.cpp \ bindings/js/SerializedScriptValue.cpp \ bindings/ScriptControllerBase.cpp \ - bridge/Bridge.cpp \ bridge/IdentifierRep.cpp \ bridge/NP_jsobject.cpp \ bridge/npruntime.cpp \ @@ -787,6 +786,7 @@ SOURCES += \ bridge/c/c_instance.cpp \ bridge/c/c_runtime.cpp \ bridge/c/c_utility.cpp \ + bridge/jsc/BridgeJSC.cpp \ css/CSSBorderImageValue.cpp \ css/CSSCanvasValue.cpp \ css/CSSCharsetRule.cpp \ @@ -1464,6 +1464,7 @@ HEADERS += \ bridge/c/c_instance.h \ bridge/c/c_runtime.h \ bridge/c/c_utility.h \ + bridge/jsc/BridgeJSC.h \ bridge/IdentifierRep.h \ bridge/NP_jsobject.h \ bridge/npruntime.h \ |