diff options
| author | jnd@google.com <jnd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-18 21:24:29 +0000 |
|---|---|---|
| committer | jnd@google.com <jnd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-18 21:24:29 +0000 |
| commit | 72c94f309664498277eee70eeccc05b44f0f255a (patch) | |
| tree | 65d2fedf4b6907c4971dae0e8526d3c20efe9264 /webkit/glue/webframe_impl.h | |
| parent | ea8c4104164fcb225003bf074d3d4693929e00da (diff) | |
| download | chromium_src-72c94f309664498277eee70eeccc05b44f0f255a.zip chromium_src-72c94f309664498277eee70eeccc05b44f0f255a.tar.gz chromium_src-72c94f309664498277eee70eeccc05b44f0f255a.tar.bz2 | |
The CL is consist of CLs(1624,1580) for bug:1281734 which are reviewed and LG by brett. I just merge them to single one for passing compilation.
The CL is to fix bug http://b/issue?id=1281734. FireFox uses encoding used by the original webpage to decode the source of the webpage, Chrome does not. We need to add a new parameter which carries the override encoding when opening a view-source URL for viewing its source.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframe_impl.h')
| -rw-r--r-- | webkit/glue/webframe_impl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h index c466b16..31de146 100644 --- a/webkit/glue/webframe_impl.h +++ b/webkit/glue/webframe_impl.h @@ -198,7 +198,7 @@ class WebFrameImpl : public WebFrame { plugin_delegate_ = plugin_delegate; } - WebCore::Frame* frame() { + WebCore::Frame* frame() const { return frame_.get(); } @@ -259,6 +259,7 @@ class WebFrameImpl : public WebFrame { bool printing() const { return printing_; } virtual bool HasUnloadListener(); + virtual bool IsReloadAllowingStaleData() const; protected: friend class WebFrameLoaderClient; |