summaryrefslogtreecommitdiffstats
path: root/WebCore/WebCoreSources.bkl
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-01-19 13:01:06 +0000
committerSteve Block <steveblock@google.com>2010-01-19 15:04:38 +0000
commit1325a8463a7f9bc2ec969c7728aba33e3de91a17 (patch)
treeb292f004a258e20f87f6e6e347449d567ca23904 /WebCore/WebCoreSources.bkl
parentbe164dbcfc9adfae8ae7c559ebdff00580f8086d (diff)
downloadexternal_webkit-1325a8463a7f9bc2ec969c7728aba33e3de91a17.zip
external_webkit-1325a8463a7f9bc2ec969c7728aba33e3de91a17.tar.gz
external_webkit-1325a8463a7f9bc2ec969c7728aba33e3de91a17.tar.bz2
Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to WebCore/bridge/Bridge
See http://trac.webkit.org/changeset/53464 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Note that this change required an update to ScriptControllerAndroid.cpp and a manual fix in PluginView.cpp to add a temporary ANDROID guard. Change-Id: Ib2fe7793f7b3212e3b41324ff7dc5bb15c0e14b4
Diffstat (limited to 'WebCore/WebCoreSources.bkl')
-rw-r--r--WebCore/WebCoreSources.bkl2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/WebCoreSources.bkl b/WebCore/WebCoreSources.bkl
index cd94ae6..3201bfa 100644
--- a/WebCore/WebCoreSources.bkl
+++ b/WebCore/WebCoreSources.bkl
@@ -165,6 +165,7 @@ This file contains the list of files needed to build WebCore.
</set>
<set append="1" var="WEBCORE_SOURCES_BRIDGE">
+ bridge/Bridge.cpp
bridge/IdentifierRep.cpp
bridge/NP_jsobject.cpp
bridge/c/c_class.cpp
@@ -172,7 +173,6 @@ This file contains the list of files needed to build WebCore.
bridge/c/c_runtime.cpp
bridge/c/c_utility.cpp
bridge/npruntime.cpp
- bridge/runtime.cpp
bridge/runtime_array.cpp
bridge/runtime_method.cpp
bridge/runtime_object.cpp