diff options
| author | Steve Block <steveblock@google.com> | 2010-04-28 15:26:38 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:13 +0100 |
| commit | 79768700a853c40c66ff0b0591957958667fdd9e (patch) | |
| tree | 88e6c8a86f3a4ccb554f55313f496eb3170ffdc9 /WebKit/android/nav | |
| parent | 98be84cc0473aaefc551ded18abd6c40bd108a8c (diff) | |
| download | external_webkit-79768700a853c40c66ff0b0591957958667fdd9e.zip external_webkit-79768700a853c40c66ff0b0591957958667fdd9e.tar.gz external_webkit-79768700a853c40c66ff0b0591957958667fdd9e.tar.bz2 | |
Merge webkit.org at r58033 : Update location of CString.h
See http://trac.webkit.org/changeset/56825
Change-Id: I8ba6a9685dcd1d8c4dec3400fba81e19fcbfe74d
Diffstat (limited to 'WebKit/android/nav')
| -rw-r--r-- | WebKit/android/nav/SelectText.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/nav/SelectText.cpp b/WebKit/android/nav/SelectText.cpp index e471307..0fcbe95 100644 --- a/WebKit/android/nav/SelectText.cpp +++ b/WebKit/android/nav/SelectText.cpp @@ -41,7 +41,7 @@ #include "SkUtils.h" #ifdef DEBUG_NAV_UI -#include "CString.h" +#include <wtf/text/CString.h> #endif namespace android { diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index d53b669..b3d42c5 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -33,7 +33,6 @@ #include "CachedFrame.h" #include "CachedNode.h" #include "CachedRoot.h" -#include "CString.h" #include "DrawExtra.h" #include "FindCanvas.h" #include "Frame.h" @@ -68,6 +67,7 @@ #include <JNIHelp.h> #include <jni.h> #include <ui/KeycodeLabels.h> +#include <wtf/text/CString.h> namespace android { |