Implement "Look Up In Dictionary" context menu item asynchronously. (OS X)

content/browser/renderer_host/text_input_client_mac.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_
 #define CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_block.h"
@@ skipping 61 matching lines @@
   void SetSubstringAndSignal(NSAttributedString* string);
 
   // This async method is invoked from RenderWidgetHostViewCocoa's
   // -quickLookWithEvent:, when the user taps a word using 3 fingers.
   // The reply callback will be invoked from the IO thread, the caller is
   // responsible for bouncing to the main thread if necessary.
   // The callback parameters provide the attributed word under the point and
   // the lower left baseline point of the text.
   void GetStringAtPoint(RenderWidgetHost* rwh,
                         gfx::Point point,
-                        void (^replyHandler)(NSAttributedString*, NSPoint));
+                        void (^reply_handler)(NSAttributedString*, NSPoint));
   // This is called on the IO thread when we get the renderer's reply for

[Alexei Svitkine (slow), 2015/09/21 15:47:55]

Nit: Add an empty line before this for consistency with the below too.

[Shu Chen, 2015/09/22 05:46:08]

Done.

   // GetStringAtPoint.
   void GetStringAtPointReply(NSAttributedString*, NSPoint);

[Alexei Svitkine (slow), 2015/09/21 15:47:55]

Nit: Can you name these params too?

[Shu Chen, 2015/09/22 05:46:08]

Done.

 
+  // This async method is invoked from RenderWidgetHostViewMacDictionaryHelper's
+  // ShowDefinitionForSelection().

[Alexei Svitkine (slow), 2015/09/21 15:47:55]

This comment is referencing code outside content/ - which is a layering
violation. Can you rephrase it as to the purpose (and can allude to it's example
use, but not actual class names, etc).

[Shu Chen, 2015/09/22 05:46:08]

I don't understand. RenderWidgetHostViewMacDictionaryHelper class is within
content/.

But I've rephrased the comment anyway.

+  // The reply callback will be invoked from the IO thread, the caller is

[Alexei Svitkine (slow), 2015/09/21 15:47:56]

Nit: , -> ;

Also make the same change for the comment above.

[Shu Chen, 2015/09/22 05:46:08]

Done.

+  // responsible for bouncing to the main thread if necessary.
+  // The callback parameters provide the attributed word under the point and
+  // the lower left baseline point of the text.
+  void GetStringFromRange(RenderWidgetHost* rwh,
+                          NSRange range,
+                          void (^reply_handler)(NSAttributedString*, NSPoint));
+
+  // This is called on the IO thread when we get the renderer's reply for
+  // GetStringFromRange.
+  void GetStringFromRangeReply(NSAttributedString* string, NSPoint point);
+
  private:
   friend struct base::DefaultSingletonTraits<TextInputClientMac>;
   TextInputClientMac();
   ~TextInputClientMac();
 
   // The critical sections that the Condition guards are in Get*() methods.
   // These methods lock the internal condition for use before the asynchronous
   // message is sent to the renderer to lookup the required information. These
   // are only used on the UI thread.
   void BeforeRequest();
   // Called at the end of a critical section. This will release the lock and
   // condition.
   void AfterRequest();
 
   NSUInteger character_index_;
   NSRect first_rect_;
   base::scoped_nsobject<NSAttributedString> substring_;
 
   base::Lock lock_;
   base::ConditionVariable condition_;
 
-  base::mac::ScopedBlock<void(^)(NSAttributedString*, NSPoint)> replyHandler_;
+  // The callback when received IPC TextInputClientReplyMsg_GotStringAtPoint.
+  base::mac::ScopedBlock<void(^)(NSAttributedString*, NSPoint)>
+      replyForPointHandler_;
+
+  // The callback when received IPC TextInputClientReplyMsg_GotStringForRange.
+  base::mac::ScopedBlock<void(^)(NSAttributedString*, NSPoint)>
+      replyForRangeHandler_;
 
   DISALLOW_COPY_AND_ASSIGN(TextInputClientMac);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_