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

Side by Side Diff: Source/core/dom/PositionIterator.cpp

Issue 192293002: Use new is*Element() helper functions in DOM code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add is*Element(PassRefPtr) helper Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008 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 INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE 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 INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE 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 "config.h" 26 #include "config.h"
27 #include "core/dom/PositionIterator.h" 27 #include "core/dom/PositionIterator.h"
28 28
29 #include "HTMLNames.h"
30 #include "core/editing/htmlediting.h" 29 #include "core/editing/htmlediting.h"
30 #include "core/html/HTMLHtmlElement.h"
31 #include "core/rendering/RenderBlock.h" 31 #include "core/rendering/RenderBlock.h"
32 32
33 namespace WebCore { 33 namespace WebCore {
34 34
35 using namespace HTMLNames; 35 using namespace HTMLNames;
36 36
37 PositionIterator::operator Position() const 37 PositionIterator::operator Position() const
38 { 38 {
39 if (m_nodeAfterPositionInAnchor) { 39 if (m_nodeAfterPositionInAnchor) {
40 ASSERT(m_nodeAfterPositionInAnchor->parentNode() == m_anchorNode); 40 ASSERT(m_nodeAfterPositionInAnchor->parentNode() == m_anchorNode);
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 if (renderer->isBR()) 152 if (renderer->isBR())
153 return !m_offsetInAnchor && !Position::nodeIsUserSelectNone(m_anchorNode ->parentNode()); 153 return !m_offsetInAnchor && !Position::nodeIsUserSelectNone(m_anchorNode ->parentNode());
154 154
155 if (renderer->isText()) 155 if (renderer->isText())
156 return !Position::nodeIsUserSelectNone(m_anchorNode) && Position(*this). inRenderedText(); 156 return !Position::nodeIsUserSelectNone(m_anchorNode) && Position(*this). inRenderedText();
157 157
158 if (isRenderedTableElement(m_anchorNode) || editingIgnoresContent(m_anchorNo de)) 158 if (isRenderedTableElement(m_anchorNode) || editingIgnoresContent(m_anchorNo de))
159 return (atStartOfNode() || atEndOfNode()) && !Position::nodeIsUserSelect None(m_anchorNode->parentNode()); 159 return (atStartOfNode() || atEndOfNode()) && !Position::nodeIsUserSelect None(m_anchorNode->parentNode());
160 160
161 if (!m_anchorNode->hasTagName(htmlTag) && renderer->isRenderBlockFlow()) { 161 if (!isHTMLHtmlElement(*m_anchorNode) && renderer->isRenderBlockFlow()) {
162 if (toRenderBlock(renderer)->logicalHeight() || m_anchorNode->hasTagName (bodyTag)) { 162 if (toRenderBlock(renderer)->logicalHeight() || isHTMLBodyElement(*m_anc horNode)) {
163 if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(renderer )) 163 if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(renderer ))
164 return atStartOfNode() && !Position::nodeIsUserSelectNone(m_anch orNode); 164 return atStartOfNode() && !Position::nodeIsUserSelectNone(m_anch orNode);
165 return m_anchorNode->rendererIsEditable() && !Position::nodeIsUserSe lectNone(m_anchorNode) && Position(*this).atEditingBoundary(); 165 return m_anchorNode->rendererIsEditable() && !Position::nodeIsUserSe lectNone(m_anchorNode) && Position(*this).atEditingBoundary();
166 } 166 }
167 } 167 }
168 168
169 return false; 169 return false;
170 } 170 }
171 171
172 } // namespace WebCore 172 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698