X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=WebCore%2Fediting%2FRemoveFormatCommand.cpp;h=42833cb1ee1353eb74baa7042b728a2ea09a2a14;hb=28040489d744e0c5d475a88663056c9040ed5320;hp=f8807e24751558560d3685b6c2a062e04e99f38e;hpb=eff9be92c41913c92fb1d3b7983c071f3e718678;p=android-x86%2Fexternal-webkit.git diff --git a/WebCore/editing/RemoveFormatCommand.cpp b/WebCore/editing/RemoveFormatCommand.cpp index f8807e247..42833cb1e 100644 --- a/WebCore/editing/RemoveFormatCommand.cpp +++ b/WebCore/editing/RemoveFormatCommand.cpp @@ -28,18 +28,11 @@ #include "RemoveFormatCommand.h" #include "ApplyStyleCommand.h" -#include "CSSComputedStyleDeclaration.h" -#include "CSSMutableStyleDeclaration.h" -#include "CSSValueKeywords.h" -#include "Editor.h" +#include "EditingStyle.h" +#include "Element.h" #include "Frame.h" -#include "HTMLElement.h" #include "HTMLNames.h" -#include "VisibleSelection.h" #include "SelectionController.h" -#include "TextIterator.h" -#include "TypingCommand.h" -#include "htmlediting.h" namespace WebCore { @@ -92,9 +85,9 @@ void RemoveFormatCommand::doApply() // Get the default style for this editable root, it's the style that we'll give the // content that we're operating on. Node* root = frame->selection()->rootEditableElement(); - RefPtr defaultStyle = ApplyStyleCommand::editingStyleAtPosition(Position(root, 0)); + RefPtr defaultStyle = EditingStyle::create(root); - applyCommandToComposite(ApplyStyleCommand::create(document(), defaultStyle.get(), isElementForRemoveFormatCommand, editingAction())); + applyCommandToComposite(ApplyStyleCommand::create(document(), defaultStyle->style(), isElementForRemoveFormatCommand, editingAction())); } }