diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 12:27:28 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-04-12 17:38:06 +0100 |
| commit | 6fc495ad78b1663298d1395115dc316eeb537036 (patch) | |
| tree | c62f9a1177bec2dbd5c47ca90b91cde129c37441 /Source/WebCore/dom | |
| parent | d7957e4817d6aa730d583fb56e2556bb4e626fb0 (diff) | |
| download | external_webkit-6fc495ad78b1663298d1395115dc316eeb537036.zip external_webkit-6fc495ad78b1663298d1395115dc316eeb537036.tar.gz external_webkit-6fc495ad78b1663298d1395115dc316eeb537036.tar.bz2 | |
Cherry-pick WebKit change r85267 as a prerequisite for r92139
See http://trac.webkit.org/changeset/85267
Bug: 6329073
Change-Id: I7c46eab459647059890732214a9b953adef0a647
Diffstat (limited to 'Source/WebCore/dom')
| -rw-r--r-- | Source/WebCore/dom/Document.cpp | 2 | ||||
| -rw-r--r-- | Source/WebCore/dom/Node.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index 1b5f55b..7fc628c 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -4083,6 +4083,8 @@ void Document::setTransformSource(PassOwnPtr<TransformSource> source) void Document::setDesignMode(InheritedBool value) { m_designMode = value; + for (Frame* frame = m_frame; frame && frame->document(); frame = frame->tree()->traverseNext(m_frame)) + frame->document()->scheduleForcedStyleRecalc(); } Document::InheritedBool Document::getDesignMode() const diff --git a/Source/WebCore/dom/Node.cpp b/Source/WebCore/dom/Node.cpp index 0967ef5..24b2301 100644 --- a/Source/WebCore/dom/Node.cpp +++ b/Source/WebCore/dom/Node.cpp @@ -770,7 +770,7 @@ bool Node::isContentEditable() const bool Node::rendererIsEditable(EditableLevel editableLevel) const { - if (document()->inDesignMode() || (document()->frame() && document()->frame()->page() && document()->frame()->page()->isEditable())) + if (document()->frame() && document()->frame()->page() && document()->frame()->page()->isEditable()) return true; // Ideally we'd call ASSERT(!needsStyleRecalc()) here, but |