Title: [177715] trunk/Source/WebKit2
- Revision
- 177715
- Author
- [email protected]
- Date
- 2014-12-23 19:09:04 -0800 (Tue, 23 Dec 2014)
Log Message
Remove telephone number context support from ContextMenuContextData, it is unused
https://bugs.webkit.org/show_bug.cgi?id=139931
Reviewed by Alexey Proskuryakov.
m_isTelephoneNumberContext was only ever set to true in the ContextMenuContextData
constructor that took a TelephoneNumberContextTag, which never got called. Remove it
all.
* Shared/ContextMenuContextData.cpp:
(WebKit::ContextMenuContextData::ContextMenuContextData):
(WebKit::ContextMenuContextData::encode):
(WebKit::ContextMenuContextData::decode):
* Shared/ContextMenuContextData.h:
(WebKit::ContextMenuContextData::ContextMenuContextData):
(WebKit::ContextMenuContextData::isTelephoneNumberContext): Deleted.
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::showContextMenu):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (177714 => 177715)
--- trunk/Source/WebKit2/ChangeLog 2014-12-24 02:51:14 UTC (rev 177714)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-24 03:09:04 UTC (rev 177715)
@@ -1,5 +1,26 @@
2014-12-23 Sam Weinig <[email protected]>
+ Remove telephone number context support from ContextMenuContextData, it is unused
+ https://bugs.webkit.org/show_bug.cgi?id=139931
+
+ Reviewed by Alexey Proskuryakov.
+
+ m_isTelephoneNumberContext was only ever set to true in the ContextMenuContextData
+ constructor that took a TelephoneNumberContextTag, which never got called. Remove it
+ all.
+
+ * Shared/ContextMenuContextData.cpp:
+ (WebKit::ContextMenuContextData::ContextMenuContextData):
+ (WebKit::ContextMenuContextData::encode):
+ (WebKit::ContextMenuContextData::decode):
+ * Shared/ContextMenuContextData.h:
+ (WebKit::ContextMenuContextData::ContextMenuContextData):
+ (WebKit::ContextMenuContextData::isTelephoneNumberContext): Deleted.
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::showContextMenu):
+
+2014-12-23 Sam Weinig <[email protected]>
+
Attempt to fix the Mountain Lion build.
* Shared/ContextMenuContextData.h:
Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp (177714 => 177715)
--- trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp 2014-12-24 02:51:14 UTC (rev 177714)
+++ trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp 2014-12-24 03:09:04 UTC (rev 177715)
@@ -38,24 +38,14 @@
namespace WebKit {
ContextMenuContextData::ContextMenuContextData()
- : m_isTelephoneNumberContext(false)
#if ENABLE(SERVICE_CONTROLS)
- , m_selectionIsEditable(false)
+ : m_selectionIsEditable(false)
#endif
{
}
-ContextMenuContextData::ContextMenuContextData(TelephoneNumberContextTag)
- : m_isTelephoneNumberContext(true)
-#if ENABLE(SERVICE_CONTROLS)
- , m_selectionIsEditable(false)
-#endif
-{
-}
-
ContextMenuContextData::ContextMenuContextData(const ContextMenuContext& context)
: m_webHitTestResultData(WebHitTestResult::Data(context.hitTestResult()))
- , m_isTelephoneNumberContext(false)
#if ENABLE(SERVICE_CONTROLS)
, m_selectionIsEditable(false)
#endif
@@ -75,10 +65,6 @@
{
encoder << m_webHitTestResultData;
-#if ENABLE(TELEPHONE_NUMBER_DETECTION)
- encoder << m_isTelephoneNumberContext;
-#endif
-
#if ENABLE(SERVICE_CONTROLS)
ShareableBitmap::Handle handle;
if (m_controlledImage)
@@ -92,11 +78,6 @@
if (!decoder.decode(contextMenuContextData.m_webHitTestResultData))
return false;
-#if ENABLE(TELEPHONE_NUMBER_DETECTION)
- if (!decoder.decode(contextMenuContextData.m_isTelephoneNumberContext))
- return false;
-#endif
-
#if ENABLE(SERVICE_CONTROLS)
ShareableBitmap::Handle handle;
if (!decoder.decode(handle))
Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.h (177714 => 177715)
--- trunk/Source/WebKit2/Shared/ContextMenuContextData.h 2014-12-24 02:51:14 UTC (rev 177714)
+++ trunk/Source/WebKit2/Shared/ContextMenuContextData.h 2014-12-24 03:09:04 UTC (rev 177715)
@@ -43,20 +43,16 @@
namespace WebKit {
-enum TelephoneNumberContextTag { TelephoneNumberContext };
-
class ContextMenuContextData {
public:
ContextMenuContextData();
- ContextMenuContextData(TelephoneNumberContextTag);
ContextMenuContextData(const WebCore::ContextMenuContext&);
const WebHitTestResult::Data& webHitTestResultData() const { return m_webHitTestResultData; }
#if ENABLE(SERVICE_CONTROLS)
ContextMenuContextData(const Vector<uint8_t>& selectionData, const Vector<String>& selectedTelephoneNumbers, bool isEditable)
- : m_isTelephoneNumberContext(false)
- , m_controlledSelectionData(selectionData)
+ : m_controlledSelectionData(selectionData)
, m_selectedTelephoneNumbers(selectedTelephoneNumbers)
, m_selectionIsEditable(isEditable)
{
@@ -70,14 +66,11 @@
bool needsServicesMenu() const { return m_controlledImage || !m_controlledSelectionData.isEmpty(); }
#endif
- bool isTelephoneNumberContext() const { return m_isTelephoneNumberContext; }
-
void encode(IPC::ArgumentEncoder&) const;
static bool decode(IPC::ArgumentDecoder&, ContextMenuContextData&);
private:
WebHitTestResult::Data m_webHitTestResultData;
- bool m_isTelephoneNumberContext;
#if ENABLE(SERVICE_CONTROLS)
RefPtr<ShareableBitmap> m_controlledImage;
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (177714 => 177715)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-12-24 02:51:14 UTC (rev 177714)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-12-24 03:09:04 UTC (rev 177715)
@@ -471,7 +471,7 @@
// FIXME: That API is better than WKPopupContextMenu. In the future all menus should use either it
// or the [NSMenu popUpContextMenu:withEvent:forView:] API, depending on the menu type.
// Then we could get rid of NSPopUpButtonCell, custom metrics, and WKPopupContextMenu.
- if (context.isTelephoneNumberContext() || context.needsServicesMenu()) {
+ if (context.needsServicesMenu()) {
[menu popUpMenuPositioningItem:nil atLocation:menuLocation inView:m_webView];
hideContextMenu();
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
