From e78cbe89e6f337f2f1fe40315be88f742b547151 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 26 May 2010 10:11:43 +0100 Subject: Merge WebKit at r60074: Initial merge by git Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7 --- WebCore/editing/RemoveFormatCommand.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebCore/editing/RemoveFormatCommand.cpp') diff --git a/WebCore/editing/RemoveFormatCommand.cpp b/WebCore/editing/RemoveFormatCommand.cpp index 9243adc..e456df6 100644 --- a/WebCore/editing/RemoveFormatCommand.cpp +++ b/WebCore/editing/RemoveFormatCommand.cpp @@ -56,7 +56,7 @@ 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 = editingStyleAtPosition(Position(root, 0)); + RefPtr defaultStyle = ApplyStyleCommand::editingStyleAtPosition(Position(root, 0)); // Delete the selected content. // FIXME: We should be able to leave this to insertText, but its delete operation -- cgit v1.1