WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/editing/EditCommand.cpp

 /*
  * Copyright (C) 2005, 2006, 2007 Apple, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 76 matching lines @@
     if (!m_parent)
         updateLayout();
 
     DeleteButtonController* deleteButtonController = frame->editor()->deleteButtonController();
     deleteButtonController->disable();
     doApply();
     deleteButtonController->enable();
 
     if (!m_parent) {
         updateLayout();
-        frame->editor()->appliedEditing(this);
+        // Only need to call appliedEditing for top-level commands, and TypingCommands do it on their
+        // own (see TypingCommand::typingAddedToOpenCommand).
+        if (!isTypingCommand())
+            frame->editor()->appliedEditing(this);
     }
 }
 
 void EditCommand::unapply()
 {
     ASSERT(m_document);
     ASSERT(m_document->frame());
  
     Frame* frame = m_document->frame();
     
@@ skipping 114 matching lines @@
     m_endingRootEditableElement = parent->m_endingRootEditableElement;
 }
 
 void applyCommand(PassRefPtr<EditCommand> command)
 {
     command->apply();
 }
 
 } // namespace WebCore