diff options
| author | Steve Block <steveblock@google.com> | 2010-04-28 18:33:52 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:13 +0100 |
| commit | 705137e4853511cb7ba5e05ea74aab69a4fea13b (patch) | |
| tree | 3be90b2384e254b7278bfcbbb2c3b8ef0d22e2d3 /WebKit/android/WebCoreSupport | |
| parent | 3c25249500ca8f7f4650b123b179948d46b9aa81 (diff) | |
| download | external_webkit-705137e4853511cb7ba5e05ea74aab69a4fea13b.zip external_webkit-705137e4853511cb7ba5e05ea74aab69a4fea13b.tar.gz external_webkit-705137e4853511cb7ba5e05ea74aab69a4fea13b.tar.bz2 | |
Merge webkit.org at r58033 : FrameLoader::setEncoding() has moved
See http://trac.webkit.org/changeset/57927
Change-Id: I3ee9f44de1cbe22ab4a795791763ff9facfd298d
Diffstat (limited to 'WebKit/android/WebCoreSupport')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index cf4691b..e513e91 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -695,7 +695,7 @@ void FrameLoaderClientAndroid::committedLoad(DocumentLoader* loader, const char* bool userChosen = !encoding.isNull(); if (encoding.isNull()) encoding = loader->response().textEncodingName(); - loader->frameLoader()->setEncoding(encoding, userChosen); + loader->frameLoader()->writer()->setEncoding(encoding, userChosen); Document *doc = m_frame->document(); if (doc) loader->frameLoader()->addData(data, length); |