Title: [172364] trunk/Source/WebKit2
- Revision
- 172364
- Author
- [email protected]
- Date
- 2014-08-08 16:15:55 -0700 (Fri, 08 Aug 2014)
Log Message
Clients that request the selection services menu after WebKit2 will get one with different metrics than otherwise
https://bugs.webkit.org/show_bug.cgi?id=135765
<rdar://problem/17962180>
Reviewed by Brady Eidson.
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::setupServicesMenu):
The menu is cached between clients, but we make adjustments to it.
We should copy it before adjusting.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (172363 => 172364)
--- trunk/Source/WebKit2/ChangeLog 2014-08-08 23:14:07 UTC (rev 172363)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-08 23:15:55 UTC (rev 172364)
@@ -1,5 +1,18 @@
2014-08-08 Timothy Horton <[email protected]>
+ Clients that request the selection services menu after WebKit2 will get one with different metrics than otherwise
+ https://bugs.webkit.org/show_bug.cgi?id=135765
+ <rdar://problem/17962180>
+
+ Reviewed by Brady Eidson.
+
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::setupServicesMenu):
+ The menu is cached between clients, but we make adjustments to it.
+ We should copy it before adjusting.
+
+2014-08-08 Timothy Horton <[email protected]>
+
Services overlay dropdown is often in the wrong place with zoomed pages or horizontal scrolling
https://bugs.webkit.org/show_bug.cgi?id=135755
<rdar://problem/17907752>
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (172363 => 172364)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-08-08 23:14:07 UTC (rev 172363)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-08-08 23:15:55 UTC (rev 172364)
@@ -370,7 +370,6 @@
void WebContextMenuProxyMac::setupServicesMenu(const ContextMenuContextData& context)
{
- RetainPtr<NSSharingServicePicker> picker;
bool includeEditorServices = context.controlledDataIsEditable();
bool hasControlledImage = !context.controlledImageHandle().isNull();
NSArray *items = nil;
@@ -392,13 +391,13 @@
return;
}
- picker = adoptNS([[NSSharingServicePicker alloc] initWithItems:items]);
+ RetainPtr<NSSharingServicePicker> picker = adoptNS([[NSSharingServicePicker alloc] initWithItems:items]);
[picker setStyle:hasControlledImage ? NSSharingServicePickerStyleRollover : NSSharingServicePickerStyleTextSelection];
[picker setDelegate:[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate]];
[[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setPicker:picker.get()];
[[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setIncludeEditorServices:includeEditorServices];
- m_servicesMenu = [picker menu];
+ m_servicesMenu = adoptNS([[picker menu] copy]);
if (!hasControlledImage)
[m_servicesMenu setShowsStateColumn:YES];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
