<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[177715] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/177715">177715</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-12-23 19:09:04 -0800 (Tue, 23 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedContextMenuContextDatacpp">trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedContextMenuContextDatah">trunk/Source/WebKit2/Shared/ContextMenuContextData.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177714 => 177715)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-12-23 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><ins>+ 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 <sam@webkit.org>
+
</ins><span class="cx"> Attempt to fix the Mountain Lion build.
</span><span class="cx">
</span><span class="cx"> * Shared/ContextMenuContextData.h:
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedContextMenuContextDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp (177714 => 177715)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -38,24 +38,14 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> ContextMenuContextData::ContextMenuContextData()
</span><del>- : m_isTelephoneNumberContext(false)
</del><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- , m_selectionIsEditable(false)
</del><ins>+ : m_selectionIsEditable(false)
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ContextMenuContextData::ContextMenuContextData(TelephoneNumberContextTag)
- : m_isTelephoneNumberContext(true)
-#if ENABLE(SERVICE_CONTROLS)
- , m_selectionIsEditable(false)
-#endif
-{
-}
-
</del><span class="cx"> ContextMenuContextData::ContextMenuContextData(const ContextMenuContext& context)
</span><span class="cx"> : m_webHitTestResultData(WebHitTestResult::Data(context.hitTestResult()))
</span><del>- , m_isTelephoneNumberContext(false)
</del><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> , m_selectionIsEditable(false)
</span><span class="cx"> #endif
</span><span class="lines">@@ -75,10 +65,6 @@
</span><span class="cx"> {
</span><span class="cx"> encoder << m_webHitTestResultData;
</span><span class="cx">
</span><del>-#if ENABLE(TELEPHONE_NUMBER_DETECTION)
- encoder << m_isTelephoneNumberContext;
-#endif
-
</del><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> if (m_controlledImage)
</span><span class="lines">@@ -92,11 +78,6 @@
</span><span class="cx"> if (!decoder.decode(contextMenuContextData.m_webHitTestResultData))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if ENABLE(TELEPHONE_NUMBER_DETECTION)
- if (!decoder.decode(contextMenuContextData.m_isTelephoneNumberContext))
- return false;
-#endif
-
</del><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> if (!decoder.decode(handle))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedContextMenuContextDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.h (177714 => 177715)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -43,20 +43,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-enum TelephoneNumberContextTag { TelephoneNumberContext };
-
</del><span class="cx"> class ContextMenuContextData {
</span><span class="cx"> public:
</span><span class="cx"> ContextMenuContextData();
</span><del>- ContextMenuContextData(TelephoneNumberContextTag);
</del><span class="cx"> ContextMenuContextData(const WebCore::ContextMenuContext&);
</span><span class="cx">
</span><span class="cx"> const WebHitTestResult::Data& webHitTestResultData() const { return m_webHitTestResultData; }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> ContextMenuContextData(const Vector<uint8_t>& selectionData, const Vector<String>& selectedTelephoneNumbers, bool isEditable)
</span><del>- : m_isTelephoneNumberContext(false)
- , m_controlledSelectionData(selectionData)
</del><ins>+ : m_controlledSelectionData(selectionData)
</ins><span class="cx"> , m_selectedTelephoneNumbers(selectedTelephoneNumbers)
</span><span class="cx"> , m_selectionIsEditable(isEditable)
</span><span class="cx"> {
</span><span class="lines">@@ -70,14 +66,11 @@
</span><span class="cx"> bool needsServicesMenu() const { return m_controlledImage || !m_controlledSelectionData.isEmpty(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool isTelephoneNumberContext() const { return m_isTelephoneNumberContext; }
-
</del><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, ContextMenuContextData&);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebHitTestResult::Data m_webHitTestResultData;
</span><del>- bool m_isTelephoneNumberContext;
</del><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> RefPtr<ShareableBitmap> m_controlledImage;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (177714 => 177715)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx"> // FIXME: That API is better than WKPopupContextMenu. In the future all menus should use either it
</span><span class="cx"> // or the [NSMenu popUpContextMenu:withEvent:forView:] API, depending on the menu type.
</span><span class="cx"> // Then we could get rid of NSPopUpButtonCell, custom metrics, and WKPopupContextMenu.
</span><del>- if (context.isTelephoneNumberContext() || context.needsServicesMenu()) {
</del><ins>+ if (context.needsServicesMenu()) {
</ins><span class="cx"> [menu popUpMenuPositioningItem:nil atLocation:menuLocation inView:m_webView];
</span><span class="cx"> hideContextMenu();
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>