| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "core/editing/FrameSelection.h" | 26 #include "core/editing/FrameSelection.h" |
| 27 | 27 |
| 28 #include "bindings/core/v8/ExceptionState.h" | 28 #include "bindings/core/v8/ExceptionState.h" |
| 29 #include "core/HTMLNames.h" | 29 #include "core/HTMLNames.h" |
| 30 #include "core/InputTypeNames.h" | |
| 31 #include "core/css/StylePropertySet.h" | 30 #include "core/css/StylePropertySet.h" |
| 32 #include "core/dom/AXObjectCache.h" | 31 #include "core/dom/AXObjectCache.h" |
| 33 #include "core/dom/CharacterData.h" | 32 #include "core/dom/CharacterData.h" |
| 34 #include "core/dom/Document.h" | 33 #include "core/dom/Document.h" |
| 35 #include "core/dom/Element.h" | 34 #include "core/dom/Element.h" |
| 36 #include "core/dom/ElementTraversal.h" | 35 #include "core/dom/ElementTraversal.h" |
| 37 #include "core/dom/NodeTraversal.h" | 36 #include "core/dom/NodeTraversal.h" |
| 38 #include "core/dom/NodeWithIndex.h" | 37 #include "core/dom/NodeWithIndex.h" |
| 39 #include "core/dom/Text.h" | 38 #include "core/dom/Text.h" |
| 40 #include "core/editing/CaretDisplayItemClient.h" | 39 #include "core/editing/CaretDisplayItemClient.h" |
| (...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 695 .build(), | 694 .build(), |
| 696 options); | 695 options); |
| 697 return true; | 696 return true; |
| 698 } | 697 } |
| 699 | 698 |
| 700 Range* FrameSelection::firstRange() const { | 699 Range* FrameSelection::firstRange() const { |
| 701 return m_selectionEditor->firstRange(); | 700 return m_selectionEditor->firstRange(); |
| 702 } | 701 } |
| 703 | 702 |
| 704 bool FrameSelection::isInPasswordField() const { | 703 bool FrameSelection::isInPasswordField() const { |
| 705 TextControlElement* textControl = enclosingTextControl( | 704 // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets |
| 706 computeVisibleSelectionInDOMTreeDeprecated().start()); | 705 // needs to be audited. See http://crbug.com/590369 for more details. |
| 707 return isHTMLInputElement(textControl) && | 706 document().updateStyleAndLayoutIgnorePendingStylesheets(); |
| 708 toHTMLInputElement(textControl)->type() == InputTypeNames::password; | 707 return blink::isInPasswordField(computeVisibleSelectionInDOMTree().start()); |
| 709 } | 708 } |
| 710 | 709 |
| 711 void FrameSelection::notifyAccessibilityForSelectionChange() { | 710 void FrameSelection::notifyAccessibilityForSelectionChange() { |
| 712 if (selectionInDOMTree().isNone()) | 711 if (selectionInDOMTree().isNone()) |
| 713 return; | 712 return; |
| 714 AXObjectCache* cache = document().existingAXObjectCache(); | 713 AXObjectCache* cache = document().existingAXObjectCache(); |
| 715 if (!cache) | 714 if (!cache) |
| 716 return; | 715 return; |
| 717 const Position& start = selectionInDOMTree().computeStartPosition(); | 716 const Position& start = selectionInDOMTree().computeStartPosition(); |
| 718 cache->selectionChanged(start.computeContainerNode()); | 717 cache->selectionChanged(start.computeContainerNode()); |
| (...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1194 } | 1193 } |
| 1195 | 1194 |
| 1196 void showTree(const blink::FrameSelection* sel) { | 1195 void showTree(const blink::FrameSelection* sel) { |
| 1197 if (sel) | 1196 if (sel) |
| 1198 sel->showTreeForThis(); | 1197 sel->showTreeForThis(); |
| 1199 else | 1198 else |
| 1200 LOG(INFO) << "Cannot showTree for <null> FrameSelection."; | 1199 LOG(INFO) << "Cannot showTree for <null> FrameSelection."; |
| 1201 } | 1200 } |
| 1202 | 1201 |
| 1203 #endif | 1202 #endif |
| OLD | NEW |