OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
298 { | 298 { |
299 } | 299 } |
300 | 300 |
301 virtual bool perform(ExceptionState& exceptionState) OVERRIDE | 301 virtual bool perform(ExceptionState& exceptionState) OVERRIDE |
302 { | 302 { |
303 return redo(exceptionState); | 303 return redo(exceptionState); |
304 } | 304 } |
305 | 305 |
306 virtual bool undo(ExceptionState& exceptionState) OVERRIDE | 306 virtual bool undo(ExceptionState& exceptionState) OVERRIDE |
307 { | 307 { |
308 #if ENABLE(OILPAN) | |
309 // FIXME: Oilpan: .get() is unnecessary if m_oldNode is Persistent or Me mber. | |
310 m_parentNode->replaceChild(m_oldNode.get(), m_newNode.get(), exceptionSt ate); | |
311 #else | |
308 m_parentNode->replaceChild(m_oldNode, m_newNode.get(), exceptionState); | 312 m_parentNode->replaceChild(m_oldNode, m_newNode.get(), exceptionState); |
zerny-chromium
2014/06/04 09:28:18
can't this just be .get() in both builds?
tkent
2014/06/05 00:22:27
ok, I add .get() and "FIXME: Oilpan" comment.
| |
313 #endif | |
309 return !exceptionState.hadException(); | 314 return !exceptionState.hadException(); |
310 } | 315 } |
311 | 316 |
312 virtual bool redo(ExceptionState& exceptionState) OVERRIDE | 317 virtual bool redo(ExceptionState& exceptionState) OVERRIDE |
313 { | 318 { |
319 #if ENABLE(OILPAN) | |
320 // FIXME: Oilpan: .get() is unnecessary if m_oldNode is Persistent or Me mber. | |
321 m_parentNode->replaceChild(m_newNode.get(), m_oldNode.get(), exceptionSt ate); | |
322 #else | |
314 m_parentNode->replaceChild(m_newNode, m_oldNode.get(), exceptionState); | 323 m_parentNode->replaceChild(m_newNode, m_oldNode.get(), exceptionState); |
zerny-chromium
2014/06/04 09:28:18
ditto
| |
324 #endif | |
315 return !exceptionState.hadException(); | 325 return !exceptionState.hadException(); |
316 } | 326 } |
317 | 327 |
318 private: | 328 private: |
319 RefPtr<Node> m_parentNode; | 329 RefPtr<Node> m_parentNode; |
320 RefPtr<Node> m_newNode; | 330 RefPtr<Node> m_newNode; |
321 RefPtr<Node> m_oldNode; | 331 RefPtr<Node> m_oldNode; |
322 }; | 332 }; |
323 | 333 |
324 class DOMEditor::SetNodeValueAction FINAL : public InspectorHistory::Action { | 334 class DOMEditor::SetNodeValueAction FINAL : public InspectorHistory::Action { |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
452 bool DOMEditor::replaceWholeText(Text* textNode, const String& text, ErrorString * errorString) | 462 bool DOMEditor::replaceWholeText(Text* textNode, const String& text, ErrorString * errorString) |
453 { | 463 { |
454 TrackExceptionState exceptionState; | 464 TrackExceptionState exceptionState; |
455 bool result = replaceWholeText(textNode, text, exceptionState); | 465 bool result = replaceWholeText(textNode, text, exceptionState); |
456 populateErrorString(exceptionState, errorString); | 466 populateErrorString(exceptionState, errorString); |
457 return result; | 467 return result; |
458 } | 468 } |
459 | 469 |
460 } // namespace WebCore | 470 } // namespace WebCore |
461 | 471 |
OLD | NEW |