OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 2133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2144 return; | 2144 return; |
2145 | 2145 |
2146 Frame* frame = m_page->mainFrame(); | 2146 Frame* frame = m_page->mainFrame(); |
2147 if (!frame) | 2147 if (!frame) |
2148 return; | 2148 return; |
2149 | 2149 |
2150 RefPtr<Frame> focusedFrame = m_page->focusController()->focusedFrame(); | 2150 RefPtr<Frame> focusedFrame = m_page->focusController()->focusedFrame(); |
2151 if (focusedFrame) { | 2151 if (focusedFrame) { |
2152 // Finish an ongoing composition to delete the composition node. | 2152 // Finish an ongoing composition to delete the composition node. |
2153 Editor* editor = focusedFrame->editor(); | 2153 Editor* editor = focusedFrame->editor(); |
2154 if (editor && editor->hasComposition()) | 2154 if (editor && editor->hasComposition()) { |
| 2155 if (m_autofillClient) |
| 2156 m_autofillClient->setIgnoreTextChanges(true); |
| 2157 |
2155 editor->confirmComposition(); | 2158 editor->confirmComposition(); |
| 2159 |
| 2160 if (m_autofillClient) |
| 2161 m_autofillClient->setIgnoreTextChanges(false); |
| 2162 } |
2156 m_imeAcceptEvents = false; | 2163 m_imeAcceptEvents = false; |
2157 } | 2164 } |
2158 } | 2165 } |
2159 } | 2166 } |
2160 | 2167 |
2161 bool WebViewImpl::setComposition( | 2168 bool WebViewImpl::setComposition( |
2162 const WebString& text, | 2169 const WebString& text, |
2163 const WebVector<WebCompositionUnderline>& underlines, | 2170 const WebVector<WebCompositionUnderline>& underlines, |
2164 int selectionStart, | 2171 int selectionStart, |
2165 int selectionEnd) | 2172 int selectionEnd) |
(...skipping 2230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4396 #endif | 4403 #endif |
4397 | 4404 |
4398 bool WebViewImpl::shouldDisableDesktopWorkarounds() | 4405 bool WebViewImpl::shouldDisableDesktopWorkarounds() |
4399 { | 4406 { |
4400 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport
Arguments(); | 4407 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport
Arguments(); |
4401 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments.
userZoom | 4408 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments.
userZoom |
4402 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp
ortArguments::ValueAuto); | 4409 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp
ortArguments::ValueAuto); |
4403 } | 4410 } |
4404 | 4411 |
4405 } // namespace WebKit | 4412 } // namespace WebKit |
OLD | NEW |