Merge 141540

Source/WebKit/chromium/src/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2412 matching lines @@
         return true;
 
     size_t location;
     size_t length;
     caretOrSelectionRange(&location, &length);
     editor->setIgnoreCompositionSelectionChange(true);
     editor->setSelectionOffsets(compositionStart, compositionEnd);
     String text = editor->selectedText();
     focused->document()->execCommand("delete", true);
     editor->setComposition(text, CompositionUnderlineVectorBuilder(underlines), 0, 0);
+    // Need to set setIgnoreCompositionSelectionChange(true) again because setComposition resets it to false.
+    editor->setIgnoreCompositionSelectionChange(true);
     editor->setSelectionOffsets(location, location + length);
     editor->setIgnoreCompositionSelectionChange(false);
 
     return true;
 }
 
 void WebViewImpl::extendSelectionAndDelete(int before, int after)
 {
     const Frame* focused = focusedWebCoreFrame();
     if (!focused)
@@ skipping 1860 matching lines @@
 #endif
 
 bool WebViewImpl::shouldDisableDesktopWorkarounds()
 {
     ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewportArguments();
     return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments.userZoom
         || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != ViewportArguments::ValueAuto);
 }
 
 } // namespace WebKit