queryCommandState should consider the nested list

third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Igalia S.L.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 18 matching lines @@
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/CSSPropertyNames.h"
 #include "core/CSSValueKeywords.h"
 #include "core/HTMLNames.h"
 #include "core/clipboard/Pasteboard.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/StylePropertySet.h"
 #include "core/dom/DocumentFragment.h"
+#include "core/dom/TagCollection.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/SelectionModifier.h"
 #include "core/editing/commands/CreateLinkCommand.h"
 #include "core/editing/commands/EditorCommandNames.h"
 #include "core/editing/commands/FormatBlockCommand.h"
 #include "core/editing/commands/IndentOutdentCommand.h"
 #include "core/editing/commands/InsertListCommand.h"
 #include "core/editing/commands/ReplaceSelectionCommand.h"
 #include "core/editing/commands/TypingCommand.h"
@@ skipping 302 matching lines @@
     const EphemeralRange newRange = selection.toNormalizedEphemeralRange();
     if (newRange.isNull())
         return false;
     if (newRange.isCollapsed())
         return false;
     TextAffinity affinity = frame.selection().affinity();
     frame.selection().setSelectedRange(newRange, affinity, SelectionDirectionalMode::NonDirectional, FrameSelection::CloseTyping);
     return true;
 }
 
+static bool hasChildTags(Element& element, const QualifiedName& tagName)
+{
+    return !element.getElementsByTagName(tagName.localName())->isEmpty();
+}
+
 static TriState selectionListState(const FrameSelection& selection, const QualifiedName& tagName)
 {
     if (selection.isCaret()) {
         if (enclosingElementWithTag(selection.selection().start(), tagName))
             return TrueTriState;
     } else if (selection.isRange()) {
         Element* startElement = enclosingElementWithTag(selection.selection().start(), tagName);
         Element* endElement = enclosingElementWithTag(selection.selection().end(), tagName);
-        if (startElement && endElement && startElement == endElement)
+
+        if (startElement && endElement && startElement == endElement) {
+            // If the selected list has the different type of list as child, return |FalseTriState|.
+            // See http://crbug.com/385374
+            if (hasChildTags(*startElement, tagName.matches(ulTag) ? olTag : ulTag))
+                return FalseTriState;
             return TrueTriState;
+        }
     }
 
     return FalseTriState;
 }
 
 static TriState stateStyle(LocalFrame& frame, CSSPropertyID propertyID, const char* desiredValue)
 {
     if (frame.editor().behavior().shouldToggleStyleBasedOnStartOfSelection())
         return frame.editor().selectionStartHasStyle(propertyID, desiredValue) ? TrueTriState : FalseTriState;
     return frame.editor().selectionHasStyle(propertyID, desiredValue);
@@ skipping 1577 matching lines @@
     case WebEditingCommandType::DeleteWordBackward:
         return RangesFromCurrentSelectionOrExtendCaret(*m_frame, DirectionBackward, WordGranularity);
     case WebEditingCommandType::DeleteWordForward:
         return RangesFromCurrentSelectionOrExtendCaret(*m_frame, DirectionForward, WordGranularity);
     default:
         return nullptr;
     }
 }
 
 } // namespace blink