<!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>[191137] 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/191137">191137</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-15 14:27:15 -0700 (Thu, 15 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>CTTE menu proxies
https://bugs.webkit.org/show_bug.cgi?id=150187
Reviewed by Tim Horton.
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::showPopupMenu):
(WebKit::WebPageProxy::internalShowContextMenu):
* UIProcess/WebPopupMenuProxy.h:
(WebKit::WebPopupMenuProxy::WebPopupMenuProxy):
* UIProcess/ios/PageClientImplIOS.h:
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::createPopupMenuProxy):
(WebKit::PageClientImpl::createContextMenuProxy): Deleted.
* UIProcess/mac/PageClientImpl.h:
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::createPopupMenuProxy):
(WebKit::PageClientImpl::createContextMenuProxy):
* UIProcess/mac/WebContextMenuProxyMac.h:
(WebKit::WebContextMenuProxyMac::create):
(WebKit::WebContextMenuProxyMac::page):
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::WebContextMenuProxyMac):
(WebKit::WebContextMenuProxyMac::~WebContextMenuProxyMac):
(WebKit::WebContextMenuProxyMac::contextMenuItemSelected):
* UIProcess/mac/WebPopupMenuProxyMac.h:
(WebKit::WebPopupMenuProxyMac::create):
* UIProcess/mac/WebPopupMenuProxyMac.mm:
(WebKit::WebPopupMenuProxyMac::WebPopupMenuProxyMac):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageClienth">trunk/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPopupMenuProxyh">trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSh">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSmm">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplh">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMach">trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191136 => 191137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-15 21:27:15 UTC (rev 191137)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2015-10-15 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ CTTE menu proxies
+ https://bugs.webkit.org/show_bug.cgi?id=150187
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::showPopupMenu):
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ * UIProcess/WebPopupMenuProxy.h:
+ (WebKit::WebPopupMenuProxy::WebPopupMenuProxy):
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::createPopupMenuProxy):
+ (WebKit::PageClientImpl::createContextMenuProxy): Deleted.
+ * UIProcess/mac/PageClientImpl.h:
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::createPopupMenuProxy):
+ (WebKit::PageClientImpl::createContextMenuProxy):
+ * UIProcess/mac/WebContextMenuProxyMac.h:
+ (WebKit::WebContextMenuProxyMac::create):
+ (WebKit::WebContextMenuProxyMac::page):
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::WebContextMenuProxyMac):
+ (WebKit::WebContextMenuProxyMac::~WebContextMenuProxyMac):
+ (WebKit::WebContextMenuProxyMac::contextMenuItemSelected):
+ * UIProcess/mac/WebPopupMenuProxyMac.h:
+ (WebKit::WebPopupMenuProxyMac::create):
+ * UIProcess/mac/WebPopupMenuProxyMac.mm:
+ (WebKit::WebPopupMenuProxyMac::WebPopupMenuProxyMac):
+
+2015-10-15 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Add -[WKFrameInfo _handle]
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150185
</span><span class="cx"> rdar://problem/23132371
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (191136 => 191137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2015-10-15 21:27:15 UTC (rev 191137)
</span><span class="lines">@@ -219,8 +219,8 @@
</span><span class="cx"> virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*) = 0;
- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) = 0;
</del><ins>+ virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) = 0;
+ virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&) = 0;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> virtual RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191136 => 191137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-15 21:27:15 UTC (rev 191137)
</span><span class="lines">@@ -4148,7 +4148,7 @@
</span><span class="cx"> m_activePopupMenu = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_activePopupMenu = m_pageClient.createPopupMenuProxy(this);
</del><ins>+ m_activePopupMenu = m_pageClient.createPopupMenuProxy(*this);
</ins><span class="cx">
</span><span class="cx"> if (!m_activePopupMenu)
</span><span class="cx"> return;
</span><span class="lines">@@ -4202,7 +4202,7 @@
</span><span class="cx"> m_activeContextMenu = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_activeContextMenu = m_pageClient.createContextMenuProxy(this);
</del><ins>+ m_activeContextMenu = m_pageClient.createContextMenuProxy(*this);
</ins><span class="cx"> if (!m_activeContextMenu)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPopupMenuProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h (191136 => 191137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h 2015-10-15 21:27:15 UTC (rev 191137)
</span><span class="lines">@@ -71,8 +71,8 @@
</span><span class="cx"> void invalidate() { m_client = 0; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- explicit WebPopupMenuProxy(Client* client)
- : m_client(client)
</del><ins>+ explicit WebPopupMenuProxy(Client& client)
+ : m_client(&client)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (191136 => 191137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-10-15 21:27:15 UTC (rev 191137)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override;
</span><span class="cx"> #endif
</span><del>- virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*) override;
</del><ins>+ virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
</ins><span class="cx"> virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) override;
</span><span class="cx"> virtual void setTextIndicator(Ref<WebCore::TextIndicator>, WebCore::TextIndicatorWindowLifetime) override;
</span><span class="cx"> virtual void clearTextIndicator(WebCore::TextIndicatorWindowDismissalAnimation) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (191136 => 191137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-10-15 21:27:15 UTC (rev 191137)
</span><span class="lines">@@ -430,15 +430,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy*)
</del><ins>+RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy&)
</ins><span class="cx"> {
</span><del>- notImplemented();
</del><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy*)
</span><span class="cx"> {
</span><del>- notImplemented();
</del><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h (191136 => 191137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-10-15 21:27:15 UTC (rev 191137)
</span><span class="lines">@@ -120,8 +120,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) override;
</span><span class="cx">
</span><del>- virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*) override;
- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) override;
</del><ins>+ virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
+ virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&) override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> virtual RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (191136 => 191137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-10-15 21:27:15 UTC (rev 191137)
</span><span class="lines">@@ -487,12 +487,12 @@
</span><span class="cx"> [m_wkView _doneWithKeyEvent:event.nativeEvent() eventWasHandled:eventWasHandled];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy* page)
</del><ins>+RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy& page)
</ins><span class="cx"> {
</span><span class="cx"> return WebPopupMenuProxyMac::create(m_wkView, page);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy* page)
</del><ins>+RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& page)
</ins><span class="cx"> {
</span><span class="cx"> return WebContextMenuProxyMac::create(m_wkView, page);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (191136 => 191137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-15 21:27:15 UTC (rev 191137)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> class WebContextMenuProxyMac : public WebContextMenuProxy {
</span><span class="cx"> public:
</span><del>- static Ref<WebContextMenuProxyMac> create(WKView* webView, WebPageProxy* page)
</del><ins>+ static Ref<WebContextMenuProxyMac> create(WKView* webView, WebPageProxy& page)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebContextMenuProxyMac(webView, page));
</span><span class="cx"> }
</span><span class="lines">@@ -60,11 +60,11 @@
</span><span class="cx"> void clearServicesMenu();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- WebPageProxy& page() const { return *m_page; }
</del><ins>+ WebPageProxy& page() const { return m_page; }
</ins><span class="cx"> NSWindow *window() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebContextMenuProxyMac(WKView*, WebPageProxy*);
</del><ins>+ WebContextMenuProxyMac(WKView*, WebPageProxy&);
</ins><span class="cx">
</span><span class="cx"> void populate(const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&);
</span><span class="cx">
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> RetainPtr<NSMenu> m_servicesMenu;
</span><span class="cx"> #endif
</span><span class="cx"> WKView* m_webView;
</span><del>- WebPageProxy* m_page;
</del><ins>+ WebPageProxy& m_page;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191136 => 191137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-15 21:27:15 UTC (rev 191137)
</span><span class="lines">@@ -150,17 +150,15 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-WebContextMenuProxyMac::WebContextMenuProxyMac(WKView* webView, WebPageProxy* page)
</del><ins>+WebContextMenuProxyMac::WebContextMenuProxyMac(WKView* webView, WebPageProxy& page)
</ins><span class="cx"> : m_webView(webView)
</span><span class="cx"> , m_page(page)
</span><span class="cx"> {
</span><del>- ASSERT(m_page);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebContextMenuProxyMac::~WebContextMenuProxyMac()
</span><span class="cx"> {
</span><del>- if (m_popup)
- [m_popup setControlView:nil];
</del><ins>+ [m_popup setControlView:nil];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenuProxyMac::contextMenuItemSelected(const WebContextMenuItemData& item)
</span><span class="lines">@@ -169,7 +167,7 @@
</span><span class="cx"> clearServicesMenu();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_page->contextMenuItemSelected(item);
</del><ins>+ m_page.contextMenuItemSelected(item);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void populateNSMenu(NSMenu* menu, const Vector<RetainPtr<NSMenuItem>>& menuItemVector)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h (191136 => 191137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h 2015-10-15 21:27:15 UTC (rev 191137)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> class WebPopupMenuProxyMac : public WebPopupMenuProxy {
</span><span class="cx"> public:
</span><del>- static Ref<WebPopupMenuProxyMac> create(WKView *webView, WebPopupMenuProxy::Client* client)
</del><ins>+ static Ref<WebPopupMenuProxyMac> create(WKView *webView, WebPopupMenuProxy::Client& client)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebPopupMenuProxyMac(webView, client));
</span><span class="cx"> }
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> virtual void cancelTracking() override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebPopupMenuProxyMac(WKView *, WebPopupMenuProxy::Client*);
</del><ins>+ WebPopupMenuProxyMac(WKView *, WebPopupMenuProxy::Client&);
</ins><span class="cx">
</span><span class="cx"> void populate(const Vector<WebPopupItem>&, NSFont *, WebCore::TextDirection);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm (191136 => 191137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2015-10-15 21:27:15 UTC (rev 191137)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-WebPopupMenuProxyMac::WebPopupMenuProxyMac(WKView *webView, WebPopupMenuProxy::Client* client)
</del><ins>+WebPopupMenuProxyMac::WebPopupMenuProxyMac(WKView *webView, WebPopupMenuProxy::Client& client)
</ins><span class="cx"> : WebPopupMenuProxy(client)
</span><span class="cx"> , m_webView(webView)
</span><span class="cx"> , m_wasCanceled(false)
</span></span></pre>
</div>
</div>
</body>
</html>