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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2121953002: Do not calculate composition bounds until IME requests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: [WIP] waiting trybots Created 4 years, 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1281 matching lines...) Expand 10 before | Expand all | Expand 10 after
1292 return; 1292 return;
1293 GetRenderWidget()->UpdateSelectionBounds(); 1293 GetRenderWidget()->UpdateSelectionBounds();
1294 } 1294 }
1295 1295
1296 void RenderFrameImpl::PepperCancelComposition( 1296 void RenderFrameImpl::PepperCancelComposition(
1297 PepperPluginInstanceImpl* instance) { 1297 PepperPluginInstanceImpl* instance) {
1298 if (instance != focused_pepper_plugin_) 1298 if (instance != focused_pepper_plugin_)
1299 return; 1299 return;
1300 Send(new InputHostMsg_ImeCancelComposition(render_view_->GetRoutingID())); 1300 Send(new InputHostMsg_ImeCancelComposition(render_view_->GetRoutingID()));
1301 #if defined(OS_MACOSX) || defined(USE_AURA) 1301 #if defined(OS_MACOSX) || defined(USE_AURA)
1302 GetRenderWidget()->UpdateCompositionInfo(true); 1302 const bool kUpdateRange = true;
1303 const bool kNoUpdate = false;
1304 GetRenderWidget()->UpdateCompositionInfo(kUpdateRange, kNoUpdate);
1303 #endif 1305 #endif
1304 } 1306 }
1305 1307
1306 void RenderFrameImpl::PepperSelectionChanged( 1308 void RenderFrameImpl::PepperSelectionChanged(
1307 PepperPluginInstanceImpl* instance) { 1309 PepperPluginInstanceImpl* instance) {
1308 if (instance != focused_pepper_plugin_) 1310 if (instance != focused_pepper_plugin_)
1309 return; 1311 return;
1310 SyncSelectionIfRequired(); 1312 SyncSelectionIfRequired();
1311 } 1313 }
1312 1314
(...skipping 5014 matching lines...) Expand 10 before | Expand all | Expand 10 after
6327 // event target. Potentially a Pepper plugin will receive the event. 6329 // event target. Potentially a Pepper plugin will receive the event.
6328 // In order to tell whether a plugin gets the last mouse event and which it 6330 // In order to tell whether a plugin gets the last mouse event and which it
6329 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6331 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6330 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6332 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6331 // |pepper_last_mouse_event_target_|. 6333 // |pepper_last_mouse_event_target_|.
6332 pepper_last_mouse_event_target_ = nullptr; 6334 pepper_last_mouse_event_target_ = nullptr;
6333 #endif 6335 #endif
6334 } 6336 }
6335 6337
6336 } // namespace content 6338 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698