Changeset 79914 in webkit

Timestamp:

Feb 28, 2011 1:39:27 PM (13 years ago)

Author:

weinig@apple.com

Message:

WK2 Context Menus - Implement LookUpInDictionary
​https://bugs.webkit.org/show_bug.cgi?id=55405

Reviewed by Brady Eidson.

• Shared/DictionaryPopupInfo.cpp:

(WebKit::DictionaryPopupInfo::encode):
(WebKit::DictionaryPopupInfo::decode):

• Shared/DictionaryPopupInfo.h:

Add type to differentiate between HotKey and ContextMenu triggered
dictionary popups. This is necessary since HotKey triggered ones want
to override the style to always be overlay.

• UIProcess/API/mac/PageClientImpl.mm:

(WebKit::PageClientImpl::didPerformDictionaryLookup):
Only force the overlay style for HotKey triggered dictionary lookups.

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/mac/WebPageMac.mm:

(WebKit::WebPage::performDictionaryLookupAtLocation):
(WebKit::WebPage::performDictionaryLookupForRange):
Factor out shared functionality into performDictionaryLookupForRange.

• WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:

(WebKit::WebContextMenuClient::lookUpInDictionary):
Get selected range and call newly factored out performDictionaryLookupForRange.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/DictionaryPopupInfo.cpp (modified) (2 diffs)
• Shared/DictionaryPopupInfo.h (modified) (1 diff)
• UIProcess/API/mac/PageClientImpl.mm (modified) (1 diff)
• WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm (modified) (2 diffs)
• WebProcess/WebPage/WebPage.h (modified) (2 diffs)
• WebProcess/WebPage/mac/WebPageMac.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-02-28  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Brady Eidson.
+
+        WK2 Context Menus - Implement LookUpInDictionary
+        https://bugs.webkit.org/show_bug.cgi?id=55405
+
+        * Shared/DictionaryPopupInfo.cpp:
+        (WebKit::DictionaryPopupInfo::encode):
+        (WebKit::DictionaryPopupInfo::decode):
+        * Shared/DictionaryPopupInfo.h:
+        Add type to differentiate between HotKey and ContextMenu triggered
+        dictionary popups. This is necessary since HotKey triggered ones want
+        to override the style to always be overlay.
+
+        * UIProcess/API/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::didPerformDictionaryLookup):
+        Only force the overlay style for HotKey triggered dictionary lookups.
+
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        (WebKit::WebPage::performDictionaryLookupAtLocation):
+        (WebKit::WebPage::performDictionaryLookupForRange):
+        Factor out shared functionality into performDictionaryLookupForRange.
+
+        * WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
+        (WebKit::WebContextMenuClient::lookUpInDictionary):
+        Get selected range and call newly factored out performDictionaryLookupForRange.
+
 2011-02-28  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/DictionaryPopupInfo.cpp

@@ -35 +35 @@
     encoder->encode(origin);
     encoder->encode(fontInfo);
+    encoder->encodeEnum(type);
 }
 
@@ -43 +44 @@
     if (!decoder->decode(result.fontInfo))
         return false;
+    if (!decoder->decodeEnum(result.type))
+        return false;
     return true;
 }

trunk/Source/WebKit2/Shared/DictionaryPopupInfo.h

@@ -41 +41 @@
     static bool decode(CoreIPC::ArgumentDecoder*, DictionaryPopupInfo&);
 
+    enum Type {
+        ContextMenu,
+        HotKey
+    };
+
     WebCore::FloatPoint origin;
     FontInfo fontInfo;
+    Type type;
 };
 

trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm

@@ -425 +425 @@
     textBaselineOrigin.y += [font ascender];
     
-    NSDictionary *options = [NSDictionary dictionaryWithObject:NSDefinitionPresentationTypeOverlay forKey:NSDefinitionPresentationTypeKey];
+    // If the dictionary lookup is being triggered by a hot key, force the overlay style.
+    NSDictionary *options = (dictionaryPopupInfo.type == DictionaryPopupInfo::HotKey) ? [NSDictionary dictionaryWithObject:NSDefinitionPresentationTypeOverlay forKey:NSDefinitionPresentationTypeKey] : 0;
     [m_wkView showDefinitionForAttributedString:attributedString.get() range:NSMakeRange(0, [attributedString.get() length]) options:options baselineOriginProvider:^(NSRange adjustedRange) { return (NSPoint)textBaselineOrigin; }];
 }

trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm

@@ -27 +27 @@
 #import "WebContextMenuClient.h"
 
+#import "DictionaryPopupInfo.h"
+#import "WebCoreArgumentCoders.h"
 #import "WebPage.h"
+#import "WebPageProxyMessages.h"
 #import <WebCore/Frame.h>
-#include <WebCore/NotImplemented.h>
+#import <WebCore/FrameView.h>
 #import <WebCore/Page.h>
 #import <wtf/text/WTFString.h>
@@ -37 +40 @@
 namespace WebKit {
 
-void WebContextMenuClient::lookUpInDictionary(Frame*)
+void WebContextMenuClient::lookUpInDictionary(Frame* frame)
 {
-    // FIXME: <rdar://problem/8750610> - Implement
-    notImplemented();
+    RefPtr<Range> selectedRange = frame->selection()->selection().toNormalizedRange();
+    if (!selectedRange)
+        return;
+
+    m_page->performDictionaryLookupForRange(DictionaryPopupInfo::ContextMenu, frame, selectedRange.get());
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -58 +58 @@
 
 #if PLATFORM(MAC)
+#include "DictionaryPopupInfo.h"
 #include <wtf/RetainPtr.h>
 OBJC_CLASS AccessibilityWebPageObject;
@@ -308 +309 @@
 
 #if PLATFORM(MAC)
+    void performDictionaryLookupForRange(DictionaryPopupInfo::Type, WebCore::Frame*, WebCore::Range*);
+
     bool isSpeaking();
     void speak(const String&);

trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

@@ -29 +29 @@
 #import "AccessibilityWebPageObject.h"
 #import "DataReference.h"
-#import "DictionaryPopupInfo.h"
 #import "PluginView.h"
 #import "WebCoreArgumentCoders.h"
@@ -287 +286 @@
         return;
 
-    RenderObject* renderer = finalRange->startContainer()->renderer();
+    performDictionaryLookupForRange(DictionaryPopupInfo::HotKey, frame, finalRange.get());
+}
+
+void WebPage::performDictionaryLookupForRange(DictionaryPopupInfo::Type type, Frame* frame, Range* range)
+{
+    String rangeText = range->text();
+    if (rangeText.stripWhiteSpace().isEmpty())
+        return;
+    
+    RenderObject* renderer = range->startContainer()->renderer();
     RenderStyle* style = renderer->style();
     NSFont *font = style->font().primaryFont()->getNSFont();
     if (!font)
         return;
-
+    
     CFDictionaryRef fontDescriptorAttributes = (CFDictionaryRef)[[font fontDescriptor] fontAttributes];
     if (!fontDescriptorAttributes)
@@ -298 +306 @@
 
     Vector<FloatQuad> quads;
-    finalRange->textQuads(quads);
+    range->textQuads(quads);
     if (quads.isEmpty())
         return;
-
-    IntRect finalRangeRect = frame->view()->contentsToWindow(quads[0].enclosingBoundingBox());
-
+    
+    IntRect rangeRect = frame->view()->contentsToWindow(quads[0].enclosingBoundingBox());
+    
     DictionaryPopupInfo dictionaryPopupInfo;
-    dictionaryPopupInfo.origin = FloatPoint(finalRangeRect.x(), finalRangeRect.y());
+    dictionaryPopupInfo.type = type;
+    dictionaryPopupInfo.origin = FloatPoint(rangeRect.x(), rangeRect.y());
     dictionaryPopupInfo.fontInfo.fontAttributeDictionary = fontDescriptorAttributes;
 
-    send(Messages::WebPageProxy::DidPerformDictionaryLookup(finalRange->text(), dictionaryPopupInfo));
+    send(Messages::WebPageProxy::DidPerformDictionaryLookup(rangeText, dictionaryPopupInfo));
 }