summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 00:56:08 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 00:56:08 +0000
commit6ec61ab284475f5e9d03cfdc47b1c406dc32c720 (patch)
treea6fbb6a125afcbc983b93d438432ad19c7f6d9ad /chrome/browser/autocomplete
parent0686afadc3d6567975ff2571e4f26efd08197476 (diff)
downloadchromium_src-6ec61ab284475f5e9d03cfdc47b1c406dc32c720.zip
chromium_src-6ec61ab284475f5e9d03cfdc47b1c406dc32c720.tar.gz
chromium_src-6ec61ab284475f5e9d03cfdc47b1c406dc32c720.tar.bz2
Update internal state on undo to avoid a crash.
Update actions_in_current_group when removing an action so that it doesn't crash afterwards. BUG=61607,62609 TEST=manual (see bug) Do not set text if it didn't change, because it registers a delete/insert undo-able action-couple. Review URL: http://codereview.chromium.org/4683002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
index 8ba3b52..8c627bf 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
@@ -1702,8 +1702,10 @@ void AutocompleteEditViewGtk::SavePrimarySelection(
void AutocompleteEditViewGtk::SetTextAndSelectedRange(const std::wstring& text,
const CharRange& range) {
- std::string utf8 = WideToUTF8(text);
- gtk_text_buffer_set_text(text_buffer_, utf8.data(), utf8.length());
+ if (text != GetText()) {
+ std::string utf8 = WideToUTF8(text);
+ gtk_text_buffer_set_text(text_buffer_, utf8.data(), utf8.length());
+ }
SetSelectedRange(range);
AdjustTextJustification();
}