Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1046)

Side by Side Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 1644993002: Initialize UserGestureIndicator for IME commitText. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Final patch for landing Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2376 matching lines...) Expand 10 before | Expand all | Expand 10 after
2387 return confirmComposition(DoNotKeepSelection); 2387 return confirmComposition(DoNotKeepSelection);
2388 } 2388 }
2389 2389
2390 bool WebViewImpl::confirmComposition(ConfirmCompositionBehavior selectionBehavio r) 2390 bool WebViewImpl::confirmComposition(ConfirmCompositionBehavior selectionBehavio r)
2391 { 2391 {
2392 return confirmComposition(WebString(), selectionBehavior); 2392 return confirmComposition(WebString(), selectionBehavior);
2393 } 2393 }
2394 2394
2395 bool WebViewImpl::confirmComposition(const WebString& text) 2395 bool WebViewImpl::confirmComposition(const WebString& text)
2396 { 2396 {
2397 UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
2397 return confirmComposition(text, DoNotKeepSelection); 2398 return confirmComposition(text, DoNotKeepSelection);
2398 } 2399 }
2399 2400
2400 bool WebViewImpl::confirmComposition(const WebString& text, ConfirmCompositionBe havior selectionBehavior) 2401 bool WebViewImpl::confirmComposition(const WebString& text, ConfirmCompositionBe havior selectionBehavior)
2401 { 2402 {
2402 LocalFrame* focused = toLocalFrame(focusedCoreFrame()); 2403 LocalFrame* focused = toLocalFrame(focusedCoreFrame());
2403 if (!focused || !m_imeAcceptEvents) 2404 if (!focused || !m_imeAcceptEvents)
2404 return false; 2405 return false;
2405 2406
2406 if (WebPlugin* plugin = focusedPluginIfInputMethodSupported(focused)) 2407 if (WebPlugin* plugin = focusedPluginIfInputMethodSupported(focused))
(...skipping 2223 matching lines...) Expand 10 before | Expand all | Expand 10 after
4630 { 4631 {
4631 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa ctor rather than 4632 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa ctor rather than
4632 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. 4633 // page's scale factor, which can be 1 in use-zoom-for-dsf mode.
4633 if (!page()) 4634 if (!page())
4634 return 1; 4635 return 1;
4635 4636
4636 return page()->deviceScaleFactor(); 4637 return page()->deviceScaleFactor();
4637 } 4638 }
4638 4639
4639 } // namespace blink 4640 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698