Implement Mac Pop-up Dictionary for OOPIF.

third_party/WebKit/Source/web/mac/WebSubstringUtil.mm

 /*
  * Copyright (C) 2005, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 35 matching lines @@
 #include "core/html/HTMLElement.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/LayoutObject.h"
 #include "core/style/ComputedStyle.h"
 #include "platform/fonts/Font.h"
 #include "platform/mac/ColorMac.h"
 #include "public/platform/WebRect.h"
 #include "public/web/WebHitTestResult.h"
 #include "public/web/WebRange.h"
 #include "public/web/WebView.h"
+#include "public/web/WebWidget.h"
+#include "web/WebFrameWidgetBase.h"
+#include "web/WebFrameWidgetImpl.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 
 using namespace blink;
 
 static NSAttributedString* attributedSubstringFromRange(const EphemeralRange& range)
 {
     NSMutableAttributedString* string = [[NSMutableAttributedString alloc] init];
     NSMutableDictionary* attrs = [NSMutableDictionary dictionary];
     size_t length = range.endPosition().computeOffsetInContainerNode() - range.startPosition().computeOffsetInContainerNode();
@@ skipping 63 matching lines @@
     if ([string length]) {
         NSDictionary* attributes = [string attributesAtIndex:0 effectiveRange:NULL];
         if (NSFont* font = [attributes objectForKey:NSFontAttributeName])
             stringPoint.move(0, ceil(-[font descender]));
     }
     return stringPoint;
 }
 
 namespace blink {
 
-NSAttributedString* WebSubstringUtil::attributedWordAtPoint(WebView* view, WebPoint point, WebPoint& baselinePoint)
+NSAttributedString* WebSubstringUtil::attributedWordAtPoint(WebView* view, WebWidget* widget, WebPoint point, WebPoint& baselinePoint)
 {
-    HitTestResult result = static_cast<WebViewImpl*>(view)->coreHitTestResultAt(point);
+    WebViewImpl* viewImpl = static_cast<WebViewImpl*>(view);
+
+    // Either this call is for a main frame's WebView or a local roots WebFrameWidgetImpl.
+    if (!viewImpl->mainFrameImpl() && !widget)
+        return nil;
+
+    // Either we are in the main frame, where |widget| is a WebViewImpl equal to |view|, or, |widget| is a WebFrameWidget.
+    HitTestResult result = widget->isWebView() ? viewImpl->coreHitTestResultAt(point) : static_cast<WebFrameWidgetImpl*>(widget)->coreHitTestResultAt(point);

[kenrb, 2016/09/12 17:28:13]

It looks like you dereference widget without first guaranteeing that it isn't
null (you checked that mainFrameImpl() OR widget is null, which isn't
sufficient).

Please check this with lfg@, who has been working on the WebView/WebWidget split
and might have advice on how to structure this.

[EhsanK, 2016/09/13 18:52:15]

I believe neither |view| nor (specifically) |widget| are nullptr when we reach
this point. This call comes from RenderWidget which already owns a WebWidget.
The reason we have a view and widget here is that I cannot cast WebWidget to
WebViewImpl. However, with Lucas's patch coming up I think I will declare the
method coreHitTestResultAt  in WebFrameWidgetBase and implement in both
WebFrameWidgetImpl and WebViewFrameWidget (which would simply call the m_webView
one). With that this ugliness will be removed.

+
     if (!result.innerNode())
         return nil;
     LocalFrame* frame = result.innerNode()->document().frame();
     EphemeralRange range = frame->rangeForPoint(result.roundedPointInInnerNodeFrame());
     if (range.isNull())
         return nil;
 
     // Expand to word under point.
     VisibleSelection selection(range);
     selection.expandUsingGranularity(WordGranularity);
@@ skipping 23 matching lines @@
     if (ephemeralRange.isNull())
         return nil;
 
     NSAttributedString* result = attributedSubstringFromRange(ephemeralRange);
     if (baselinePoint)
         *baselinePoint = getBaselinePoint(frame->view(), ephemeralRange, result);
     return result;
 }
 
 } // namespace blink