diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-11 10:14:40 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-17 13:36:00 -0800 |
| commit | d2e32dd468c28791ca89d1dfa43e8893e80be4c8 (patch) | |
| tree | 5f23fbe79f5d38973b1eb26beafb062084eda9b2 | |
| parent | 556c4742cc0b7ecb0226942b7525852f7c0d6508 (diff) | |
| download | external_webkit-d2e32dd468c28791ca89d1dfa43e8893e80be4c8.zip external_webkit-d2e32dd468c28791ca89d1dfa43e8893e80be4c8.tar.gz external_webkit-d2e32dd468c28791ca89d1dfa43e8893e80be4c8.tar.bz2 | |
Merge Webkit at r71558: Cache.h relocated as MemoryCache.h
http://trac.webkit.org/changeset/71492
http://trac.webkit.org/changeset/71499
Change-Id: Iacd8a22d0c1caece7bec2273f1d4e69dd3e4eb2c
| -rw-r--r-- | WebKit/android/TimeCounter.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/jni/JavaBridge.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/android/TimeCounter.cpp b/WebKit/android/TimeCounter.cpp index 4062bc2..2393f8a 100644 --- a/WebKit/android/TimeCounter.cpp +++ b/WebKit/android/TimeCounter.cpp @@ -28,7 +28,7 @@ #include "config.h" #include "TimeCounter.h" -#include "Cache.h" +#include "MemoryCache.h" #include "KURL.h" #include "Node.h" #include "SystemTime.h" diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp index cb8a8af..ad2bc5d 100644 --- a/WebKit/android/jni/JavaBridge.cpp +++ b/WebKit/android/jni/JavaBridge.cpp @@ -27,7 +27,7 @@ #include "config.h" -#include "Cache.h" +#include "MemoryCache.h" #include "Connection.h" #include "CookieClient.h" #include "FileSystemClient.h" diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 9f818ce..181e256 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -30,7 +30,7 @@ #include "Arena.h" #include "BackForwardList.h" -#include "Cache.h" +#include "MemoryCache.h" #include "Chrome.h" #include "ChromeClientAndroid.h" #include "ChromiumLogging.h" |