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

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

Issue 23819007: Have Node::document() return a reference instead of a pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 3 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) 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 16 matching lines...) Expand all
27 #include "core/editing/SplitTextNodeContainingElementCommand.h" 27 #include "core/editing/SplitTextNodeContainingElementCommand.h"
28 28
29 #include "core/dom/Element.h" 29 #include "core/dom/Element.h"
30 #include "core/dom/Text.h" 30 #include "core/dom/Text.h"
31 #include "core/rendering/RenderObject.h" 31 #include "core/rendering/RenderObject.h"
32 #include "wtf/Assertions.h" 32 #include "wtf/Assertions.h"
33 33
34 namespace WebCore { 34 namespace WebCore {
35 35
36 SplitTextNodeContainingElementCommand::SplitTextNodeContainingElementCommand(Pas sRefPtr<Text> text, int offset) 36 SplitTextNodeContainingElementCommand::SplitTextNodeContainingElementCommand(Pas sRefPtr<Text> text, int offset)
37 : CompositeEditCommand(text->document()), m_text(text), m_offset(offset) 37 : CompositeEditCommand(&text->document()), m_text(text), m_offset(offset)
38 { 38 {
39 ASSERT(m_text); 39 ASSERT(m_text);
40 ASSERT(m_text->length() > 0); 40 ASSERT(m_text->length() > 0);
41 } 41 }
42 42
43 void SplitTextNodeContainingElementCommand::doApply() 43 void SplitTextNodeContainingElementCommand::doApply()
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()->rendere rIsEditable()) 51 if (!parent || !parent->parentElement() || !parent->parentElement()->rendere rIsEditable())
52 return; 52 return;
53 53
54 RenderObject* parentRenderer = parent->renderer(); 54 RenderObject* parentRenderer = parent->renderer();
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); 63 splitElement(parent, m_text);
64 } 64 }
65 65
66 } 66 }
OLDNEW
« no previous file with comments | « Source/core/editing/SplitTextNodeCommand.cpp ('k') | Source/core/editing/TextCheckingHelper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698