Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(541)

Unified Diff: Source/WebCore/rendering/RenderListMarker.cpp

Issue 9762003: Merge 110323 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/rendering/RenderBoxModelObject.cpp ('k') | Source/WebCore/rendering/RenderObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderListMarker.cpp
===================================================================
--- Source/WebCore/rendering/RenderListMarker.cpp (revision 111422)
+++ Source/WebCore/rendering/RenderListMarker.cpp (working copy)
@@ -1694,11 +1694,12 @@
void RenderListMarker::setSelectionState(SelectionState state)
{
+ // The selection state for our containing block hierarchy is updated by the base class call.
RenderBox::setSelectionState(state);
- if (InlineBox* box = inlineBoxWrapper())
- if (RootInlineBox* root = box->root())
+
+ if (m_inlineBoxWrapper && canUpdateSelectionOnRootLineBoxes())
+ if (RootInlineBox* root = m_inlineBoxWrapper->root())
root->setHasSelectedChildren(state != SelectionNone);
- containingBlock()->setSelectionState(state);
}
LayoutRect RenderListMarker::selectionRectForRepaint(RenderBoxModelObject* repaintContainer, bool clipToVisibleContent)
« no previous file with comments | « Source/WebCore/rendering/RenderBoxModelObject.cpp ('k') | Source/WebCore/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698