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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.h

Issue 2228633005: Cancel composition on RenderWidgetHostCocoaView after a child frame's RWHV receives the correspondi… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added a unit test Created 4 years, 4 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <IOSurface/IOSurface.h> 9 #include <IOSurface/IOSurface.h>
10 #include <stddef.h> 10 #include <stddef.h>
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 void StopSpeaking() override; 277 void StopSpeaking() override;
278 void SetBackgroundColor(SkColor color) override; 278 void SetBackgroundColor(SkColor color) override;
279 279
280 // Implementation of RenderWidgetHostViewBase. 280 // Implementation of RenderWidgetHostViewBase.
281 void InitAsPopup(RenderWidgetHostView* parent_host_view, 281 void InitAsPopup(RenderWidgetHostView* parent_host_view,
282 const gfx::Rect& pos) override; 282 const gfx::Rect& pos) override;
283 void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override; 283 void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override;
284 void Focus() override; 284 void Focus() override;
285 void UpdateCursor(const WebCursor& cursor) override; 285 void UpdateCursor(const WebCursor& cursor) override;
286 void SetIsLoading(bool is_loading) override; 286 void SetIsLoading(bool is_loading) override;
287 void ImeCancelComposition() override;
288 void ImeCompositionRangeChanged( 287 void ImeCompositionRangeChanged(
289 const gfx::Range& range, 288 const gfx::Range& range,
290 const std::vector<gfx::Rect>& character_bounds) override; 289 const std::vector<gfx::Rect>& character_bounds) override;
291 void RenderProcessGone(base::TerminationStatus status, 290 void RenderProcessGone(base::TerminationStatus status,
292 int error_code) override; 291 int error_code) override;
293 void Destroy() override; 292 void Destroy() override;
294 void SetTooltipText(const base::string16& tooltip_text) override; 293 void SetTooltipText(const base::string16& tooltip_text) override;
295 void SelectionChanged(const base::string16& text, 294 void SelectionChanged(const base::string16& text,
296 size_t offset, 295 size_t offset,
297 const gfx::Range& range) override; 296 const gfx::Range& range) override;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 const gfx::Point& point, 348 const gfx::Point& point,
350 const cc::SurfaceId& original_surface) override; 349 const cc::SurfaceId& original_surface) override;
351 gfx::Point TransformPointToCoordSpaceForView( 350 gfx::Point TransformPointToCoordSpaceForView(
352 const gfx::Point& point, 351 const gfx::Point& point,
353 RenderWidgetHostViewBase* target_view) override; 352 RenderWidgetHostViewBase* target_view) override;
354 353
355 // TextInputManager::Observer implementation. 354 // TextInputManager::Observer implementation.
356 void OnUpdateTextInputStateCalled(TextInputManager* text_input_manager, 355 void OnUpdateTextInputStateCalled(TextInputManager* text_input_manager,
357 RenderWidgetHostViewBase* updated_view, 356 RenderWidgetHostViewBase* updated_view,
358 bool did_update_state) override; 357 bool did_update_state) override;
358 void OnImeCancelComposition(TextInputManager* text_input_manager,
359 RenderWidgetHostViewBase* updated_view) override;
360
359 // IPC::Sender implementation. 361 // IPC::Sender implementation.
360 bool Send(IPC::Message* message) override; 362 bool Send(IPC::Message* message) override;
361 363
362 // display::DisplayObserver implementation. 364 // display::DisplayObserver implementation.
363 void OnDisplayAdded(const display::Display& new_display) override; 365 void OnDisplayAdded(const display::Display& new_display) override;
364 void OnDisplayRemoved(const display::Display& old_display) override; 366 void OnDisplayRemoved(const display::Display& old_display) override;
365 void OnDisplayMetricsChanged(const display::Display& display, 367 void OnDisplayMetricsChanged(const display::Display& display,
366 uint32_t metrics) override; 368 uint32_t metrics) override;
367 369
368 // Forwards the mouse event to the renderer. 370 // Forwards the mouse event to the renderer.
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 548
547 // Factory used to safely scope delayed calls to ShutdownHost(). 549 // Factory used to safely scope delayed calls to ShutdownHost().
548 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; 550 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
549 551
550 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 552 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
551 }; 553 };
552 554
553 } // namespace content 555 } // namespace content
554 556
555 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 557 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698