diff options
| author | Steve Block <steveblock@google.com> | 2010-01-21 11:40:34 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-21 11:40:34 +0000 |
| commit | bd0a8b8ddfa1230848d33782c0e0f04f739dd550 (patch) | |
| tree | a06dbe1c66f5d8a3d7bab5dfe4c0d6889d814796 /WebCore/WebCore.pro | |
| parent | 4e226d42cbe1a5d3bd6b7e92663df661fc14adc3 (diff) | |
| download | external_webkit-bd0a8b8ddfa1230848d33782c0e0f04f739dd550.zip external_webkit-bd0a8b8ddfa1230848d33782c0e0f04f739dd550.tar.gz external_webkit-bd0a8b8ddfa1230848d33782c0e0f04f739dd550.tar.bz2 | |
Cherry-pick WebKit change 53620 to move bridge interfaces Field, Class, Instance and Array from Bridge to BridgeJSC
See http://trac.webkit.org/changeset/53620
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Note that changes to WebCore.xcodeproj were not pulled, as they introduced merge conflicts.
Change-Id: I63f3c4ed101badaea3207d53784de04aee49c2ab
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 \ |