diff options
| author | Steve Block <steveblock@google.com> | 2010-09-29 17:32:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 17:35:08 +0100 |
| commit | 68513a70bcd92384395513322f1b801e7bf9c729 (patch) | |
| tree | 161b50f75a5921d61731bb25e730005994fcec85 /WebCore/editing/ReplaceSelectionCommand.cpp | |
| parent | fd5c6425ce58eb75211be7718d5dee960842a37e (diff) | |
| download | external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.zip external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.gz external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.bz2 | |
Merge WebKit at r67908: Initial merge by Git
Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
Diffstat (limited to 'WebCore/editing/ReplaceSelectionCommand.cpp')
| -rw-r--r-- | WebCore/editing/ReplaceSelectionCommand.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/editing/ReplaceSelectionCommand.cpp b/WebCore/editing/ReplaceSelectionCommand.cpp index 38f3ed2..49bdaca 100644 --- a/WebCore/editing/ReplaceSelectionCommand.cpp +++ b/WebCore/editing/ReplaceSelectionCommand.cpp @@ -898,7 +898,7 @@ void ReplaceSelectionCommand::doApply() // FIXME: Can this wait until after the operation has been performed? There doesn't seem to be // any work performed after this that queries or uses the typing style. if (Frame* frame = document()->frame()) - frame->clearTypingStyle(); + frame->selection()->clearTypingStyle(); bool handledStyleSpans = handleStyleSpansBeforeInsertion(fragment, insertionPos); @@ -1062,7 +1062,7 @@ void ReplaceSelectionCommand::doApply() if (m_smartReplace && currentRoot) { // Disable smart replace for password fields. Node* start = currentRoot->shadowAncestorNode(); - if (start->hasTagName(inputTag) && static_cast<HTMLInputElement*>(start)->inputType() == HTMLInputElement::PASSWORD) + if (start->hasTagName(inputTag) && static_cast<HTMLInputElement*>(start)->isPasswordField()) m_smartReplace = false; } if (m_smartReplace) { |