diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-21 11:46:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 11:46:21 -0700 |
| commit | c194fa2ce4ff53dae520be0ee6759a6f9f367db0 (patch) | |
| tree | e99f626aedb6ce69f2966fef6f83be9c0941639b /WebCore/rendering/InlineFlowBox.cpp | |
| parent | 219c89f043c10eba31fc94db69a8136bbc115d1d (diff) | |
| parent | ee4c9585fe53aff7a0aa833b9a5d3e861e16578e (diff) | |
| download | external_webkit-c194fa2ce4ff53dae520be0ee6759a6f9f367db0.zip external_webkit-c194fa2ce4ff53dae520be0ee6759a6f9f367db0.tar.gz external_webkit-c194fa2ce4ff53dae520be0ee6759a6f9f367db0.tar.bz2 | |
am ee4c9585: Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
Merge commit 'ee4c9585fe53aff7a0aa833b9a5d3e861e16578e' into gingerbread-plus-aosp
* commit 'ee4c9585fe53aff7a0aa833b9a5d3e861e16578e':
Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
Diffstat (limited to 'WebCore/rendering/InlineFlowBox.cpp')
| -rw-r--r-- | WebCore/rendering/InlineFlowBox.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/WebCore/rendering/InlineFlowBox.cpp b/WebCore/rendering/InlineFlowBox.cpp index abfdf5c..f193a4c 100644 --- a/WebCore/rendering/InlineFlowBox.cpp +++ b/WebCore/rendering/InlineFlowBox.cpp @@ -81,8 +81,6 @@ void InlineFlowBox::addToLine(InlineBox* child) child->setFirstLineStyleBit(m_firstLine); if (child->isText()) m_hasTextChildren = true; - if (child->renderer()->selectionState() != RenderObject::SelectionNone) - root()->setHasSelectedChildren(true); checkConsistency(); } |