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

Side by Side Diff: Source/core/editing/SplitTextNodeContainingElementCommand.cpp

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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
« no previous file with comments | « Source/core/editing/SpellChecker.cpp ('k') | Source/core/editing/TypingCommand.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2005, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 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
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 { 44 {
45 ASSERT(m_text); 45 ASSERT(m_text);
46 ASSERT(m_offset > 0); 46 ASSERT(m_offset > 0);
47 47
48 splitTextNode(m_text.get(), m_offset); 48 splitTextNode(m_text.get(), m_offset);
49 49
50 Element* parent = m_text->parentElement(); 50 Element* parent = m_text->parentElement();
51 if (!parent || !parent->parentElement() || !parent->parentElement()->hasEdit ableStyle()) 51 if (!parent || !parent->parentElement() || !parent->parentElement()->hasEdit ableStyle())
52 return; 52 return;
53 53
54 LayoutObject* parentRenderer = parent->renderer(); 54 LayoutObject* parentRenderer = parent->layoutObject();
55 if (!parentRenderer || !parentRenderer->isInline()) { 55 if (!parentRenderer || !parentRenderer->isInline()) {
56 wrapContentsInDummySpan(parent); 56 wrapContentsInDummySpan(parent);
57 Node* firstChild = parent->firstChild(); 57 Node* firstChild = parent->firstChild();
58 if (!firstChild || !firstChild->isElementNode()) 58 if (!firstChild || !firstChild->isElementNode())
59 return; 59 return;
60 parent = toElement(firstChild); 60 parent = toElement(firstChild);
61 } 61 }
62 62
63 splitElement(parent, m_text.get()); 63 splitElement(parent, m_text.get());
64 } 64 }
65 65
66 DEFINE_TRACE(SplitTextNodeContainingElementCommand) 66 DEFINE_TRACE(SplitTextNodeContainingElementCommand)
67 { 67 {
68 visitor->trace(m_text); 68 visitor->trace(m_text);
69 CompositeEditCommand::trace(visitor); 69 CompositeEditCommand::trace(visitor);
70 } 70 }
71 71
72 } 72 }
OLDNEW
« no previous file with comments | « Source/core/editing/SpellChecker.cpp ('k') | Source/core/editing/TypingCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698