diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit/wx/WebFrame.cpp | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit/wx/WebFrame.cpp')
| -rw-r--r-- | Source/WebKit/wx/WebFrame.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Source/WebKit/wx/WebFrame.cpp b/Source/WebKit/wx/WebFrame.cpp index 1d5f03a..e32d300 100644 --- a/Source/WebKit/wx/WebFrame.cpp +++ b/Source/WebKit/wx/WebFrame.cpp @@ -77,7 +77,6 @@ wxWebFrame::wxWebFrame(wxWebView* container, wxWebFrame* parent, WebViewFrameData* data) : m_textMagnifier(1.0), - m_isEditable(false), m_isInitialized(false), m_beingDestroyed(false) { @@ -403,10 +402,16 @@ void wxWebFrame::ResetTextSize() void wxWebFrame::MakeEditable(bool enable) { - m_isEditable = enable; + if (enable != IsEditable() && m_impl->frame && m_impl->frame->document()) + m_impl->frame->document()->setDesignMode(enable ? WebCore::Document::on : WebCore::Document::off); } - +bool wxWebFrame::IsEditable() const +{ + if (m_impl->frame && m_impl->frame->document()) + return m_impl->frame->document()->inDesignMode(); + return false; +} bool wxWebFrame::CanCopy() { |