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

Side by Side Diff: Source/WebCore/editing/InsertIntoTextNodeCommand.cpp

Issue 12703031: Revert 146726 "AXObjectCache gets recreated during document tear..." (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1453/
Patch Set: Created 7 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
« no previous file with comments | « Source/WebCore/editing/Editor.cpp ('k') | Source/WebCore/editing/InsertNodeBeforeCommand.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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 return; 56 return;
57 57
58 if (passwordEchoEnabled) { 58 if (passwordEchoEnabled) {
59 RenderText* renderText = toRenderText(m_node->renderer()); 59 RenderText* renderText = toRenderText(m_node->renderer());
60 if (renderText && renderText->isSecure()) 60 if (renderText && renderText->isSecure())
61 renderText->momentarilyRevealLastTypedCharacter(m_offset + m_text.le ngth() - 1); 61 renderText->momentarilyRevealLastTypedCharacter(m_offset + m_text.le ngth() - 1);
62 } 62 }
63 63
64 m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION); 64 m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION);
65 65
66 if (AXObjectCache* cache = document()->existingAXObjectCache()) 66 if (AXObjectCache::accessibilityEnabled())
67 cache->nodeTextChangeNotification(m_node.get(), AXObjectCache::AXTextIns erted, m_offset, m_text); 67 document()->axObjectCache()->nodeTextChangeNotification(m_node.get(), AX ObjectCache::AXTextInserted, m_offset, m_text);
68 } 68 }
69 69
70 void InsertIntoTextNodeCommand::doUnapply() 70 void InsertIntoTextNodeCommand::doUnapply()
71 { 71 {
72 if (!m_node->rendererIsEditable()) 72 if (!m_node->rendererIsEditable())
73 return; 73 return;
74 74
75 // Need to notify this before actually deleting the text 75 // Need to notify this before actually deleting the text
76 if (AXObjectCache* cache = document()->existingAXObjectCache()) 76 if (AXObjectCache::accessibilityEnabled())
77 cache->nodeTextChangeNotification(m_node.get(), AXObjectCache::AXTextDel eted, m_offset, m_text); 77 document()->axObjectCache()->nodeTextChangeNotification(m_node.get(), AX ObjectCache::AXTextDeleted, m_offset, m_text);
78 78
79 m_node->deleteData(m_offset, m_text.length(), IGNORE_EXCEPTION); 79 m_node->deleteData(m_offset, m_text.length(), IGNORE_EXCEPTION);
80 } 80 }
81 81
82 #ifndef NDEBUG 82 #ifndef NDEBUG
83 void InsertIntoTextNodeCommand::getNodesInCommand(HashSet<Node*>& nodes) 83 void InsertIntoTextNodeCommand::getNodesInCommand(HashSet<Node*>& nodes)
84 { 84 {
85 addNodeAndDescendants(m_node.get(), nodes); 85 addNodeAndDescendants(m_node.get(), nodes);
86 } 86 }
87 #endif 87 #endif
88 88
89 } // namespace WebCore 89 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/editing/Editor.cpp ('k') | Source/WebCore/editing/InsertNodeBeforeCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698