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

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

Issue 1240943002: Mac: Fix Korean input on OSX 10.11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ElCapitan
Patch Set: Rebase Created 5 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
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/IOSurfaceAPI.h> 9 #include <IOSurface/IOSurfaceAPI.h>
10 #include <list> 10 #include <list>
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 113
114 // The selected range, cached from a message sent by the renderer. 114 // The selected range, cached from a message sent by the renderer.
115 NSRange selectedRange_; 115 NSRange selectedRange_;
116 116
117 // Text to be inserted which was generated by handling a key down event. 117 // Text to be inserted which was generated by handling a key down event.
118 base::string16 textToBeInserted_; 118 base::string16 textToBeInserted_;
119 119
120 // Marked text which was generated by handling a key down event. 120 // Marked text which was generated by handling a key down event.
121 base::string16 markedText_; 121 base::string16 markedText_;
122 122
123 // Selected range of |markedText_|.
124 NSRange markedTextSelectedRange_;
125
123 // Underline information of the |markedText_|. 126 // Underline information of the |markedText_|.
124 std::vector<blink::WebCompositionUnderline> underlines_; 127 std::vector<blink::WebCompositionUnderline> underlines_;
125 128
126 // Indicates if doCommandBySelector method receives any edit command when 129 // Indicates if doCommandBySelector method receives any edit command when
127 // handling a key down event. 130 // handling a key down event.
128 BOOL hasEditCommands_; 131 BOOL hasEditCommands_;
129 132
130 // Contains edit commands received by the -doCommandBySelector: method when 133 // Contains edit commands received by the -doCommandBySelector: method when
131 // handling a key down event, not including inserting commands, eg. insertTab, 134 // handling a key down event, not including inserting commands, eg. insertTab,
132 // etc. 135 // etc.
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 585
583 // Factory used to safely scope delayed calls to ShutdownHost(). 586 // Factory used to safely scope delayed calls to ShutdownHost().
584 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; 587 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
585 588
586 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 589 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
587 }; 590 };
588 591
589 } // namespace content 592 } // namespace content
590 593
591 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 594 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698