<!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>[175297] branches/safari-600.3-branch/Source</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/175297">175297</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-10-28 20:34:01 -0700 (Tue, 28 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174524">r174524</a>. <rdar://problem/18640868></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreWebCorexcodeprojprojectpbxproj">branches/safari-600.3-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreeditingEditorcpp">branches/safari-600.3-branch/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreeditingSelectionRectGatherercpp">branches/safari-600.3-branch/Source/WebCore/editing/SelectionRectGatherer.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepageChromeClienth">branches/safari-600.3-branch/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepageEditorClienth">branches/safari-600.3-branch/Source/WebCore/page/EditorClient.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepageMainFramecpp">branches/safari-600.3-branch/Source/WebCore/page/MainFrame.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepageMainFrameh">branches/safari-600.3-branch/Source/WebCore/page/MainFrame.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepagePageOverlaycpp">branches/safari-600.3-branch/Source/WebCore/page/PageOverlay.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepagePageOverlayControllercpp">branches/safari-600.3-branch/Source/WebCore/page/PageOverlayController.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepageSettingsin">branches/safari-600.3-branch/Source/WebCore/page/Settings.in</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformLoggingh">branches/safari-600.3-branch/Source/WebCore/platform/Logging.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PlatformLoggingh">branches/safari-600.3-branch/Source/WebKit2/Platform/Logging.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebKit2xcodeprojprojectpbxproj">branches/safari-600.3-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp">branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessWebCoreSupportWebEditorClienth">branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessWebPageWebPageh">branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebCorepagemacServicesOverlayControllerh">branches/safari-600.3-branch/Source/WebCore/page/mac/ServicesOverlayController.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepagemacServicesOverlayControllermm">branches/safari-600.3-branch/Source/WebCore/page/mac/ServicesOverlayController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -1,5 +1,67 @@
</span><span class="cx"> 2014-10-28 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174524. <rdar://problem/18640868>
+
+ 2014-10-09 Tim Horton <timothy_horton@apple.com>
+
+ Move ServicesOverlayController to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=137416
+ <rdar://problem/18546283>
+
+ Reviewed by Anders Carlsson.
+
+ Move ServicesOverlayController from WebKit2 to WebCore, as it can be used by both Legacy WebKit and WebKit2.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * editing/Editor.cpp:
+ (WebCore::Editor::scanSelectionForTelephoneNumbers):
+ * editing/SelectionRectGatherer.cpp:
+ (WebCore::SelectionRectGatherer::Notifier::~Notifier):
+ Notify ServicesOverlayController of changes via Page instead of EditorClient.
+
+ * page/ChromeClient.h:
+ (WebCore::ChromeClient::handleTelephoneNumberClick):
+ (WebCore::ChromeClient::handleSelectionServiceClick):
+ (WebCore::ChromeClient::hasRelevantSelectionServices):
+ Add ChromeClient functions for services actions.
+
+ * page/EditorClient.h:
+ (WebCore::EditorClient::selectedTelephoneNumberRangesChanged): Deleted.
+ (WebCore::EditorClient::selectionRectsDidChange): Deleted.
+ Remove EditorClient functions for notifying ServicesOverlayController of changes,
+ because it lives in WebCore proper now.
+
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+ * page/Page.h:
+ (WebCore::Page::servicesOverlayController):
+ Keep a ServicesOverlayController on Page.
+
+ * page/PageOverlay.cpp:
+ (WebCore::PageOverlay::mouseEvent):
+ Use windowToContents instead of rootViewToContents; events come in in window coordinates.
+
+ * page/PageOverlayController.cpp:
+ (WebCore::PageOverlayController::updateSettingsForLayer):
+ Get Settings from MainFrame, not Page.
+
+ * page/Settings.in:
+ Add servicesControlsEnabled setting.
+
+ * page/mac/ServicesOverlayController.h: Renamed from Source/WebKit2/WebProcess/WebPage/ServicesOverlayController.h.
+ * page/mac/ServicesOverlayController.mm: Renamed from Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm.
+ Moved from WebKit2. Mostly mechanical changes, plus:
+ - Use windowToContents instead of rootViewToContents; events come in in window coordinates.
+ - Cut off rebuild* if serviceControlsEnabled setting is false
+ - Don't create the overlay if serviceControlsEnabled setting is false
+ - Send click events via ChromeClient.
+ - Tie our lifetime to MainFrame instead of Page, and get lots of things from MainFrame instead.
+
+ * platform/Logging.h:
+ Add Services logging channel (moved from WebKit2).
+
+2014-10-28 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r174231. <rdar://problem/18640833>
</span><span class="cx">
</span><span class="cx"> 2014-10-02 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -1107,6 +1107,8 @@
</span><span class="cx"> 2D8FEBDD143E3EF70072502B /* CSSCrossfadeValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8FEBDB143E3EF70072502B /* CSSCrossfadeValue.h */; };
</span><span class="cx"> 2D9066060BE141D400956998 /* LayoutState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D9066040BE141D400956998 /* LayoutState.cpp */; };
</span><span class="cx"> 2D9066070BE141D400956998 /* LayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9066050BE141D400956998 /* LayoutState.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 2D93AEE319DF5641002A86C3 /* ServicesOverlayController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D93AEE119DF5641002A86C3 /* ServicesOverlayController.h */; };
+ 2D93AEE419DF5641002A86C3 /* ServicesOverlayController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D93AEE219DF5641002A86C3 /* ServicesOverlayController.mm */; };
</ins><span class="cx"> 2D9A246E15B9BD0000D34527 /* DOMSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9A246B15B9BBDD00D34527 /* DOMSecurityPolicy.h */; };
</span><span class="cx"> 2D9A246F15B9BD2F00D34527 /* DOMSecurityPolicy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D9A246A15B9BBDD00D34527 /* DOMSecurityPolicy.cpp */; };
</span><span class="cx"> 2D9A247315B9C2D100D34527 /* DOMDOMSecurityPolicy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D9A247215B9C2C700D34527 /* DOMDOMSecurityPolicy.mm */; };
</span><span class="lines">@@ -8116,6 +8118,8 @@
</span><span class="cx"> 2D9066040BE141D400956998 /* LayoutState.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutState.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2D9066050BE141D400956998 /* LayoutState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LayoutState.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D90660C0665D937006B6F1A /* DataTransferMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DataTransferMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><ins>+ 2D93AEE119DF5641002A86C3 /* ServicesOverlayController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServicesOverlayController.h; sourceTree = "<group>"; };
+ 2D93AEE219DF5641002A86C3 /* ServicesOverlayController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ServicesOverlayController.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 2D9A246A15B9BBDD00D34527 /* DOMSecurityPolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMSecurityPolicy.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2D9A246B15B9BBDD00D34527 /* DOMSecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSecurityPolicy.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D9A247015B9C29500D34527 /* DOMDOMSecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMDOMSecurityPolicy.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -17631,6 +17635,8 @@
</span><span class="cx"> A718788F0B2D04AC00A16ECE /* DragControllerMac.mm */,
</span><span class="cx"> 93C09A7E0B064EEF005ABD4D /* EventHandlerMac.mm */,
</span><span class="cx"> 1C26497B0D7E24EC00BD10F2 /* PageMac.cpp */,
</span><ins>+ 2D93AEE119DF5641002A86C3 /* ServicesOverlayController.h */,
+ 2D93AEE219DF5641002A86C3 /* ServicesOverlayController.mm */,
</ins><span class="cx"> E1C2F2481533A2120083F974 /* SettingsMac.mm */,
</span><span class="cx"> 26255F0218878E110006E1FD /* UserAgentMac.mm */,
</span><span class="cx"> F587854C02DE375901EA4122 /* WebCoreFrameView.h */,
</span><span class="lines">@@ -23561,6 +23567,7 @@
</span><span class="cx"> FD315FFF12B0267600C1A359 /* ChannelMergerNode.h in Headers */,
</span><span class="cx"> FD31600212B0267600C1A359 /* ChannelSplitterNode.h in Headers */,
</span><span class="cx"> 6550B6A0099DF0270090D781 /* CharacterData.h in Headers */,
</span><ins>+ 2D93AEE319DF5641002A86C3 /* ServicesOverlayController.h in Headers */,
</ins><span class="cx"> 97B8FFD116AE7F960038388D /* CharacterReferenceParserInlines.h in Headers */,
</span><span class="cx"> B2C3DA2A0D006C1D00EF6F26 /* CharsetData.h in Headers */,
</span><span class="cx"> F55B3DB21251F12D003EF269 /* CheckboxInputType.h in Headers */,
</span><span class="lines">@@ -28478,6 +28485,7 @@
</span><span class="cx"> E1A5F99B0E7EAA2500AF85EA /* JSMessageChannelCustom.cpp in Sources */,
</span><span class="cx"> 75793EC80D0CE72D007FC0AC /* JSMessageEvent.cpp in Sources */,
</span><span class="cx"> 410B7E721045FAB000D8224F /* JSMessageEventCustom.cpp in Sources */,
</span><ins>+ 2D93AEE419DF5641002A86C3 /* ServicesOverlayController.mm in Sources */,
</ins><span class="cx"> E1ADEDDB0E76BD93004A1A5E /* JSMessagePort.cpp in Sources */,
</span><span class="cx"> E1ADED470E76B8DD004A1A5E /* JSMessagePortCustom.cpp in Sources */,
</span><span class="cx"> A86629D209DA2B48009633A5 /* JSMouseEvent.cpp in Sources */,
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/editing/Editor.cpp (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/editing/Editor.cpp 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebCore/editing/Editor.cpp 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> #include "InsertListCommand.h"
</span><span class="cx"> #include "KeyboardEvent.h"
</span><span class="cx"> #include "KillRing.h"
</span><ins>+#include "MainFrame.h"
</ins><span class="cx"> #include "ModifySelectionListLevel.h"
</span><span class="cx"> #include "NodeList.h"
</span><span class="cx"> #include "NodeTraversal.h"
</span><span class="lines">@@ -102,6 +103,10 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+#include "ServicesOverlayController.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -3368,7 +3373,7 @@
</span><span class="cx">
</span><span class="cx"> FrameSelection& frameSelection = m_frame.selection();
</span><span class="cx"> if (!frameSelection.isRange()) {
</span><del>- client()->selectedTelephoneNumberRangesChanged();
</del><ins>+ m_frame.mainFrame().servicesOverlayController().selectedTelephoneNumberRangesChanged();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> RefPtr<Range> selectedRange = frameSelection.toNormalizedRange();
</span><span class="lines">@@ -3396,7 +3401,7 @@
</span><span class="cx"> RefPtr<Range> extendedRange = extendedSelection.toNormalizedRange();
</span><span class="cx">
</span><span class="cx"> if (!extendedRange) {
</span><del>- client()->selectedTelephoneNumberRangesChanged();
</del><ins>+ m_frame.mainFrame().servicesOverlayController().selectedTelephoneNumberRangesChanged();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3408,7 +3413,7 @@
</span><span class="cx"> m_detectedTelephoneNumberRanges.append(range);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- client()->selectedTelephoneNumberRangesChanged();
</del><ins>+ m_frame.mainFrame().servicesOverlayController().selectedTelephoneNumberRangesChanged();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Editor::scanRangeForTelephoneNumbers(Range& range, const StringView& stringView, Vector<RefPtr<Range>>& markedRanges)
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreeditingSelectionRectGatherercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/editing/SelectionRectGatherer.cpp (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/editing/SelectionRectGatherer.cpp 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebCore/editing/SelectionRectGatherer.cpp 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -26,13 +26,15 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SelectionRectGatherer.h"
</span><span class="cx">
</span><ins>+#if ENABLE(SERVICE_CONTROLS)
+
</ins><span class="cx"> #include "Editor.h"
</span><span class="cx"> #include "EditorClient.h"
</span><span class="cx"> #include "Frame.h"
</span><ins>+#include "MainFrame.h"
</ins><span class="cx"> #include "RenderView.h"
</span><ins>+#include "ServicesOverlayController.h"
</ins><span class="cx">
</span><del>-#if ENABLE(SERVICE_CONTROLS)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> SelectionRectGatherer::SelectionRectGatherer(RenderView& renderView)
</span><span class="lines">@@ -70,8 +72,7 @@
</span><span class="cx">
</span><span class="cx"> SelectionRectGatherer::Notifier::~Notifier()
</span><span class="cx"> {
</span><del>- if (EditorClient* client = m_gatherer.m_renderView.view().frame().editor().client())
- client->selectionRectsDidChange(m_gatherer.m_rects, m_gatherer.m_gapRects, m_gatherer.isTextOnly());
</del><ins>+ m_gatherer.m_renderView.view().frame().mainFrame().servicesOverlayController().selectionRectsDidChange(m_gatherer.m_rects, m_gatherer.m_gapRects, m_gatherer.isTextOnly());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<SelectionRectGatherer::Notifier> SelectionRectGatherer::clearAndCreateNotifier()
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/page/ChromeClient.h (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/ChromeClient.h 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebCore/page/ChromeClient.h 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -433,6 +433,14 @@
</span><span class="cx"> virtual bool unwrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const { return false; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC)
+ virtual void handleTelephoneNumberClick(const String&, const WebCore::IntPoint&) { }
+#endif
+#if ENABLE(SERVICE_CONTROLS)
+ virtual void handleSelectionServiceClick(WebCore::FrameSelection&, const Vector<String>&, const WebCore::IntPoint&) { }
+ virtual bool hasRelevantSelectionServices(bool /* isTextOnly */) const { return false; }
+#endif
+
</ins><span class="cx"> protected:
</span><span class="cx"> virtual ~ChromeClient() { }
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepageEditorClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/page/EditorClient.h (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/EditorClient.h 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebCore/page/EditorClient.h 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -181,11 +181,6 @@
</span><span class="cx"> virtual void willSetInputMethodState() = 0;
</span><span class="cx"> virtual void setInputMethodState(bool enabled) = 0;
</span><span class="cx">
</span><del>-#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
- virtual void selectedTelephoneNumberRangesChanged() { }
- virtual void selectionRectsDidChange(const Vector<LayoutRect>&, const Vector<GapRects>&, bool) { }
-#endif
-
</del><span class="cx"> // Support for global selections, used on platforms like the X Window System that treat
</span><span class="cx"> // selection as a type of clipboard.
</span><span class="cx"> virtual bool supportsGlobalSelection() { return false; }
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepageMainFramecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/page/MainFrame.cpp (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/MainFrame.cpp 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebCore/page/MainFrame.cpp 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -29,11 +29,18 @@
</span><span class="cx">
</span><span class="cx"> #include "PageOverlayController.h"
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+#include "ServicesOverlayController.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> inline MainFrame::MainFrame(Page& page, FrameLoaderClient& client)
</span><span class="cx"> : Frame(page, nullptr, client)
</span><span class="cx"> , m_selfOnlyRefCount(0)
</span><ins>+#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
+ , m_servicesOverlayController(std::make_unique<ServicesOverlayController>(*this))
+#endif
</ins><span class="cx"> , m_pageOverlayController(std::make_unique<PageOverlayController>(*this))
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepageMainFrameh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/page/MainFrame.h (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/MainFrame.h 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebCore/page/MainFrame.h 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class PageOverlayController;
</span><ins>+class ServicesOverlayController;
</ins><span class="cx">
</span><span class="cx"> class MainFrame final : public Frame {
</span><span class="cx"> public:
</span><span class="lines">@@ -42,12 +43,20 @@
</span><span class="cx">
</span><span class="cx"> PageOverlayController& pageOverlayController() { return *m_pageOverlayController; }
</span><span class="cx">
</span><ins>+#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
+ ServicesOverlayController& servicesOverlayController() { return *m_servicesOverlayController; }
+#endif // ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
+
</ins><span class="cx"> private:
</span><span class="cx"> MainFrame(Page&, FrameLoaderClient&);
</span><span class="cx">
</span><span class="cx"> void dropChildren();
</span><span class="cx">
</span><span class="cx"> unsigned m_selfOnlyRefCount;
</span><ins>+
+#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
+ std::unique_ptr<ServicesOverlayController> m_servicesOverlayController;
+#endif
</ins><span class="cx"> std::unique_ptr<PageOverlayController> m_pageOverlayController;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepagePageOverlaycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/page/PageOverlay.cpp (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/PageOverlay.cpp 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebCore/page/PageOverlay.cpp 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> IntPoint mousePositionInOverlayCoordinates(mouseEvent.position());
</span><span class="cx">
</span><span class="cx"> if (m_overlayType == PageOverlay::OverlayType::Document)
</span><del>- mousePositionInOverlayCoordinates = m_page->mainFrame().view()->rootViewToContents(mousePositionInOverlayCoordinates);
</del><ins>+ mousePositionInOverlayCoordinates = m_page->mainFrame().view()->windowToContents(mousePositionInOverlayCoordinates);
</ins><span class="cx">
</span><span class="cx"> // Ignore events outside the bounds.
</span><span class="cx"> if (!bounds().contains(mousePositionInOverlayCoordinates))
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepagePageOverlayControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/page/PageOverlayController.cpp (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/PageOverlayController.cpp 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebCore/page/PageOverlayController.cpp 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx">
</span><span class="cx"> void PageOverlayController::updateSettingsForLayer(GraphicsLayer& layer)
</span><span class="cx"> {
</span><del>- Settings& settings = m_mainFrame.page()->settings();
</del><ins>+ Settings& settings = m_mainFrame.settings();
</ins><span class="cx"> layer.setAcceleratesDrawing(settings.acceleratedDrawingEnabled());
</span><span class="cx"> layer.setShowDebugBorder(settings.showDebugBorders());
</span><span class="cx"> layer.setShowRepaintCounter(settings.showRepaintCounter());
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/page/Settings.in (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/Settings.in 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebCore/page/Settings.in 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -228,3 +228,5 @@
</span><span class="cx"> # Allow SourceBuffers to store up to 304MB each, enough for approximately five minutes
</span><span class="cx"> # of 1080p video and stereo audio.
</span><span class="cx"> maximumSourceBufferSize type=int, initial=318767104, conditional=MEDIA_SOURCE
</span><ins>+
+serviceControlsEnabled initial=false, conditional=SERVICE_CONTROLS
</ins></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepagemacServicesOverlayControllerhfromrev174524trunkSourceWebCorepagemacServicesOverlayControllerh"></a>
<div class="copfile"><h4>Copied: branches/safari-600.3-branch/Source/WebCore/page/mac/ServicesOverlayController.h (from rev 174524, trunk/Source/WebCore/page/mac/ServicesOverlayController.h) (0 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/mac/ServicesOverlayController.h (rev 0)
+++ branches/safari-600.3-branch/Source/WebCore/page/mac/ServicesOverlayController.h 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -0,0 +1,165 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ServicesOverlayController_h
+#define ServicesOverlayController_h
+
+#if (ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)) && PLATFORM(MAC)
+
+#include "GraphicsLayerClient.h"
+#include "PageOverlay.h"
+#include "Range.h"
+#include "Timer.h"
+#include <wtf/RefCounted.h>
+
+typedef struct __DDHighlight DDHighlight, *DDHighlightRef;
+
+namespace WebCore {
+class LayoutRect;
+class MainFrame;
+struct GapRects;
+}
+
+namespace WebCore {
+
+class ServicesOverlayController : private PageOverlay::Client {
+public:
+ explicit ServicesOverlayController(MainFrame&);
+ ~ServicesOverlayController();
+
+ void selectedTelephoneNumberRangesChanged();
+ void selectionRectsDidChange(const Vector<LayoutRect>&, const Vector<GapRects>&, bool isTextOnly);
+
+private:
+ class Highlight : public RefCounted<Highlight>, private GraphicsLayerClient {
+ WTF_MAKE_NONCOPYABLE(Highlight);
+ public:
+ static PassRefPtr<Highlight> createForSelection(ServicesOverlayController&, RetainPtr<DDHighlightRef>, PassRefPtr<Range>);
+ static PassRefPtr<Highlight> createForTelephoneNumber(ServicesOverlayController&, RetainPtr<DDHighlightRef>, PassRefPtr<Range>);
+ ~Highlight();
+
+ void invalidate();
+
+ DDHighlightRef ddHighlight() const { return m_ddHighlight.get(); }
+ Range* range() const { return m_range.get(); }
+ GraphicsLayer* layer() const { return m_graphicsLayer.get(); }
+
+ enum class Type {
+ TelephoneNumber,
+ Selection
+ };
+ Type type() const { return m_type; }
+
+ void fadeIn();
+ void fadeOut();
+
+ void setDDHighlight(DDHighlightRef);
+
+ private:
+ explicit Highlight(ServicesOverlayController&, Type, RetainPtr<DDHighlightRef>, PassRefPtr<Range>);
+
+ // GraphicsLayerClient
+ virtual void notifyFlushRequired(const GraphicsLayer*) override;
+ virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const FloatRect& inClip) override;
+ virtual float deviceScaleFactor() const override;
+
+ void didFinishFadeOutAnimation();
+
+ RetainPtr<DDHighlightRef> m_ddHighlight;
+ RefPtr<Range> m_range;
+ std::unique_ptr<GraphicsLayer> m_graphicsLayer;
+ Type m_type;
+ ServicesOverlayController* m_controller;
+ };
+
+ // PageOverlay::Client
+ virtual void pageOverlayDestroyed(PageOverlay&) override;
+ virtual void willMoveToPage(PageOverlay&, Page*) override;
+ virtual void didMoveToPage(PageOverlay&, Page*) override;
+ virtual void drawRect(PageOverlay&, GraphicsContext&, const IntRect& dirtyRect) override;
+ virtual bool mouseEvent(PageOverlay&, const PlatformMouseEvent&) override;
+ virtual void didScrollFrame(PageOverlay&, Frame&) override;
+
+ void createOverlayIfNeeded();
+ void handleClick(const IntPoint&, Highlight&);
+
+ void drawHighlight(Highlight&, GraphicsContext&);
+
+ void replaceHighlightsOfTypePreservingEquivalentHighlights(HashSet<RefPtr<Highlight>>&, Highlight::Type);
+ void removeAllPotentialHighlightsOfType(Highlight::Type);
+ void buildPhoneNumberHighlights();
+ void buildSelectionHighlight();
+ void didRebuildPotentialHighlights();
+
+ void determineActiveHighlight(bool& mouseIsOverButton);
+ void clearActiveHighlight();
+ Highlight* activeHighlight() const { return m_activeHighlight.get(); }
+
+ Highlight* findTelephoneNumberHighlightContainingSelectionHighlight(Highlight&);
+
+ bool hasRelevantSelectionServices();
+
+ bool mouseIsOverHighlight(Highlight&, bool& mouseIsOverButton) const;
+ std::chrono::milliseconds remainingTimeUntilHighlightShouldBeShown(Highlight*) const;
+ void determineActiveHighlightTimerFired(Timer<ServicesOverlayController>&);
+
+ static bool highlightsAreEquivalent(const Highlight* a, const Highlight* b);
+
+ Vector<RefPtr<Range>> telephoneNumberRangesForFocusedFrame();
+
+ void didCreateHighlight(Highlight*);
+ void willDestroyHighlight(Highlight*);
+ void didFinishFadingOutHighlight(Highlight*);
+
+ MainFrame& mainFrame() const { return m_mainFrame; }
+
+ MainFrame& m_mainFrame;
+ PageOverlay* m_servicesOverlay;
+
+ RefPtr<Highlight> m_activeHighlight;
+ RefPtr<Highlight> m_nextActiveHighlight;
+ HashSet<RefPtr<Highlight>> m_potentialHighlights;
+ HashSet<RefPtr<Highlight>> m_animatingHighlights;
+
+ HashSet<Highlight*> m_highlights;
+
+ // FIXME: These should move onto Highlight.
+ Vector<LayoutRect> m_currentSelectionRects;
+ bool m_isTextOnly;
+
+ std::chrono::steady_clock::time_point m_lastSelectionChangeTime;
+ std::chrono::steady_clock::time_point m_nextActiveHighlightChangeTime;
+ std::chrono::steady_clock::time_point m_lastMouseUpTime;
+
+ RefPtr<Highlight> m_currentMouseDownOnButtonHighlight;
+ IntPoint m_mousePosition;
+
+ Timer<ServicesOverlayController> m_determineActiveHighlightTimer;
+};
+
+} // namespace WebKit
+
+#endif // (ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)) && PLATFORM(MAC)
+#endif // ServicesOverlayController_h
</ins></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepagemacServicesOverlayControllermmfromrev174524trunkSourceWebCorepagemacServicesOverlayControllermm"></a>
<div class="copfile"><h4>Copied: branches/safari-600.3-branch/Source/WebCore/page/mac/ServicesOverlayController.mm (from rev 174524, trunk/Source/WebCore/page/mac/ServicesOverlayController.mm) (0 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/mac/ServicesOverlayController.mm (rev 0)
+++ branches/safari-600.3-branch/Source/WebCore/page/mac/ServicesOverlayController.mm 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -0,0 +1,855 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "ServicesOverlayController.h"
+
+#if (ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)) && PLATFORM(MAC)
+
+#import "Chrome.h"
+#import "ChromeClient.h"
+#import "Document.h"
+#import "Editor.h"
+#import "EventHandler.h"
+#import "FloatQuad.h"
+#import "FocusController.h"
+#import "FrameSelection.h"
+#import "FrameView.h"
+#import "GapRects.h"
+#import "GraphicsContext.h"
+#import "GraphicsLayer.h"
+#import "GraphicsLayerCA.h"
+#import "Logging.h"
+#import "MainFrame.h"
+#import "Page.h"
+#import "PageOverlayController.h"
+#import "PlatformCAAnimationMac.h"
+#import "Settings.h"
+#import "SoftLinking.h"
+#import <QuartzCore/QuartzCore.h>
+
+#if __has_include(<DataDetectors/DDHighlightDrawing.h>)
+#import <DataDetectors/DDHighlightDrawing.h>
+#else
+typedef struct __DDHighlight DDHighlight, *DDHighlightRef;
+#endif
+
+#if __has_include(<DataDetectors/DDHighlightDrawing_Private.h>)
+#import <DataDetectors/DDHighlightDrawing_Private.h>
+#endif
+
+const float highlightFadeAnimationDuration = 0.3;
+
+typedef NSUInteger DDHighlightStyle;
+static const DDHighlightStyle DDHighlightNoOutlineWithArrow = (1 << 16);
+static const DDHighlightStyle DDHighlightOutlineWithArrow = (1 << 16) | 1;
+
+SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(DataDetectors)
+SOFT_LINK(DataDetectors, DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection, DDHighlightRef, (CFAllocatorRef allocator, CGRect* rects, CFIndex count, CGRect globalVisibleRect, DDHighlightStyle style, Boolean withArrow, NSWritingDirection writingDirection, Boolean endsWithEOL, Boolean flipped), (allocator, rects, count, globalVisibleRect, style, withArrow, writingDirection, endsWithEOL, flipped))
+SOFT_LINK(DataDetectors, DDHighlightGetLayerWithContext, CGLayerRef, (DDHighlightRef highlight, CGContextRef context), (highlight, context))
+SOFT_LINK(DataDetectors, DDHighlightGetBoundingRect, CGRect, (DDHighlightRef highlight), (highlight))
+SOFT_LINK(DataDetectors, DDHighlightPointIsOnHighlight, Boolean, (DDHighlightRef highlight, CGPoint point, Boolean* onButton), (highlight, point, onButton))
+
+namespace WebCore {
+
+PassRefPtr<ServicesOverlayController::Highlight> ServicesOverlayController::Highlight::createForSelection(ServicesOverlayController& controller, RetainPtr<DDHighlightRef> ddHighlight, PassRefPtr<Range> range)
+{
+ return adoptRef(new Highlight(controller, Type::Selection, ddHighlight, range));
+}
+
+PassRefPtr<ServicesOverlayController::Highlight> ServicesOverlayController::Highlight::createForTelephoneNumber(ServicesOverlayController& controller, RetainPtr<DDHighlightRef> ddHighlight, PassRefPtr<Range> range)
+{
+ return adoptRef(new Highlight(controller, Type::TelephoneNumber, ddHighlight, range));
+}
+
+ServicesOverlayController::Highlight::Highlight(ServicesOverlayController& controller, Type type, RetainPtr<DDHighlightRef> ddHighlight, PassRefPtr<WebCore::Range> range)
+ : m_range(range)
+ , m_type(type)
+ , m_controller(&controller)
+{
+ ASSERT(ddHighlight);
+ ASSERT(m_range);
+
+ Page* page = controller.mainFrame().page();
+ m_graphicsLayer = GraphicsLayer::create(page ? page->chrome().client().graphicsLayerFactory() : nullptr, *this);
+ m_graphicsLayer->setDrawsContent(true);
+
+ setDDHighlight(ddHighlight.get());
+
+ // Set directly on the PlatformCALayer so that when we leave the 'from' value implicit
+ // in our animations, we get the right initial value regardless of flush timing.
+ toGraphicsLayerCA(layer())->platformCALayer()->setOpacity(0);
+
+ controller.didCreateHighlight(this);
+}
+
+ServicesOverlayController::Highlight::~Highlight()
+{
+ if (m_controller)
+ m_controller->willDestroyHighlight(this);
+}
+
+void ServicesOverlayController::Highlight::setDDHighlight(DDHighlightRef highlight)
+{
+ if (!m_controller)
+ return;
+
+ m_ddHighlight = highlight;
+
+ if (!m_ddHighlight)
+ return;
+
+ CGRect highlightBoundingRect = DDHighlightGetBoundingRect(m_ddHighlight.get());
+ m_graphicsLayer->setPosition(FloatPoint(highlightBoundingRect.origin));
+ m_graphicsLayer->setSize(FloatSize(highlightBoundingRect.size));
+
+ m_graphicsLayer->setNeedsDisplay();
+}
+
+void ServicesOverlayController::Highlight::invalidate()
+{
+ layer()->removeFromParent();
+ m_controller = nullptr;
+}
+
+void ServicesOverlayController::Highlight::notifyFlushRequired(const GraphicsLayer*)
+{
+ if (!m_controller)
+ return;
+
+ Page* page = m_controller->mainFrame().page();
+ if (!page)
+ return;
+
+ page->chrome().client().scheduleCompositingLayerFlush();
+}
+
+void ServicesOverlayController::Highlight::paintContents(const GraphicsLayer*, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const FloatRect&)
+{
+ CGContextRef cgContext = graphicsContext.platformContext();
+
+ CGLayerRef highlightLayer = DDHighlightGetLayerWithContext(ddHighlight(), cgContext);
+ CGRect highlightBoundingRect = DDHighlightGetBoundingRect(ddHighlight());
+ highlightBoundingRect.origin = CGPointZero;
+
+ CGContextDrawLayerInRect(cgContext, highlightBoundingRect, highlightLayer);
+}
+
+float ServicesOverlayController::Highlight::deviceScaleFactor() const
+{
+ if (!m_controller)
+ return 1;
+
+ Page* page = m_controller->mainFrame().page();
+ if (!page)
+ return 1;
+
+ return page->deviceScaleFactor();
+}
+
+void ServicesOverlayController::Highlight::fadeIn()
+{
+ RetainPtr<CABasicAnimation> animation = [CABasicAnimation animationWithKeyPath:@"opacity"];
+ [animation setDuration:highlightFadeAnimationDuration];
+ [animation setFillMode:kCAFillModeForwards];
+ [animation setRemovedOnCompletion:false];
+ [animation setToValue:@1];
+
+ RefPtr<PlatformCAAnimation> platformAnimation = PlatformCAAnimationMac::create(animation.get());
+ toGraphicsLayerCA(layer())->platformCALayer()->addAnimationForKey("FadeHighlightIn", platformAnimation.get());
+}
+
+void ServicesOverlayController::Highlight::fadeOut()
+{
+ RetainPtr<CABasicAnimation> animation = [CABasicAnimation animationWithKeyPath:@"opacity"];
+ [animation setDuration:highlightFadeAnimationDuration];
+ [animation setFillMode:kCAFillModeForwards];
+ [animation setRemovedOnCompletion:false];
+ [animation setToValue:@0];
+
+ RefPtr<Highlight> retainedSelf = this;
+ [CATransaction begin];
+ [CATransaction setCompletionBlock:[retainedSelf] () {
+ retainedSelf->didFinishFadeOutAnimation();
+ }];
+
+ RefPtr<PlatformCAAnimation> platformAnimation = PlatformCAAnimationMac::create(animation.get());
+ toGraphicsLayerCA(layer())->platformCALayer()->addAnimationForKey("FadeHighlightOut", platformAnimation.get());
+ [CATransaction commit];
+}
+
+void ServicesOverlayController::Highlight::didFinishFadeOutAnimation()
+{
+ if (!m_controller)
+ return;
+
+ if (m_controller->activeHighlight() == this)
+ return;
+
+ layer()->removeFromParent();
+}
+
+static IntRect textQuadsToBoundingRectForRange(Range& range)
+{
+ Vector<FloatQuad> textQuads;
+ range.textQuads(textQuads);
+ FloatRect boundingRect;
+ for (auto& quad : textQuads)
+ boundingRect.unite(quad.boundingBox());
+ return enclosingIntRect(boundingRect);
+}
+
+ServicesOverlayController::ServicesOverlayController(MainFrame& mainFrame)
+ : m_mainFrame(mainFrame)
+ , m_servicesOverlay(nullptr)
+ , m_isTextOnly(false)
+ , m_determineActiveHighlightTimer(this, &ServicesOverlayController::determineActiveHighlightTimerFired)
+{
+}
+
+ServicesOverlayController::~ServicesOverlayController()
+{
+ for (auto& highlight : m_highlights)
+ highlight->invalidate();
+}
+
+void ServicesOverlayController::pageOverlayDestroyed(PageOverlay&)
+{
+ // Before the overlay is destroyed, it should have moved out of the Page,
+ // at which point we already cleared our back pointer.
+ ASSERT(!m_servicesOverlay);
+}
+
+void ServicesOverlayController::willMoveToPage(PageOverlay&, Page* page)
+{
+ if (page)
+ return;
+
+ ASSERT(m_servicesOverlay);
+ m_servicesOverlay = nullptr;
+}
+
+void ServicesOverlayController::didMoveToPage(PageOverlay&, Page*)
+{
+}
+
+static const uint8_t AlignmentNone = 0;
+static const uint8_t AlignmentLeft = 1 << 0;
+static const uint8_t AlignmentRight = 1 << 1;
+
+static void expandForGap(Vector<LayoutRect>& rects, uint8_t* alignments, const GapRects& gap)
+{
+ if (!gap.left().isEmpty()) {
+ LayoutUnit leftEdge = gap.left().x();
+ for (unsigned i = 0; i < rects.size(); ++i) {
+ if (alignments[i] & AlignmentLeft)
+ rects[i].shiftXEdgeTo(leftEdge);
+ }
+ }
+
+ if (!gap.right().isEmpty()) {
+ LayoutUnit rightEdge = gap.right().maxX();
+ for (unsigned i = 0; i < rects.size(); ++i) {
+ if (alignments[i] & AlignmentRight)
+ rects[i].shiftMaxXEdgeTo(rightEdge);
+ }
+ }
+}
+
+static inline void stitchRects(Vector<LayoutRect>& rects)
+{
+ if (rects.size() <= 1)
+ return;
+
+ Vector<LayoutRect> newRects;
+
+ // FIXME: Need to support vertical layout.
+ // First stitch together all the rects on the first line of the selection.
+ size_t indexFromStart = 0;
+ LayoutUnit firstTop = rects[indexFromStart].y();
+ LayoutRect& currentRect = rects[indexFromStart];
+ while (indexFromStart < rects.size() && rects[indexFromStart].y() == firstTop)
+ currentRect.unite(rects[indexFromStart++]);
+
+ newRects.append(currentRect);
+ if (indexFromStart == rects.size()) {
+ // All the rects are on one line. There is nothing else to do.
+ rects.swap(newRects);
+ return;
+ }
+
+ // Next stitch together all the rects on the last line of the selection.
+ size_t indexFromEnd = rects.size() - 1;
+ LayoutUnit lastTop = rects[indexFromEnd].y();
+ LayoutRect lastRect = rects[indexFromEnd];
+ while (indexFromEnd >= indexFromStart && rects[indexFromEnd].y() == lastTop)
+ lastRect.unite(rects[indexFromEnd--]);
+
+ // indexFromStart is the index of the first rectangle on the second line.
+ // indexFromEnd is the index of the last rectangle on the second to the last line.
+ // if they are equal, there is one additional rectangle for the line in the middle.
+ if (indexFromEnd == indexFromStart)
+ newRects.append(rects[indexFromStart]);
+
+ if (indexFromEnd <= indexFromStart) {
+ // There are no more rects to stitch. Just append the last line.
+ newRects.append(lastRect);
+ rects.swap(newRects);
+ return;
+ }
+
+ // Stitch together all the rects after the first line until the second to the last included.
+ currentRect = rects[indexFromStart];
+ while (indexFromStart != indexFromEnd)
+ currentRect.unite(rects[++indexFromStart]);
+
+ newRects.append(currentRect);
+ newRects.append(lastRect);
+
+ rects.swap(newRects);
+}
+
+static void compactRectsWithGapRects(Vector<LayoutRect>& rects, const Vector<GapRects>& gapRects)
+{
+ stitchRects(rects);
+
+ // FIXME: The following alignments are correct for LTR text.
+ // We should also account for RTL.
+ uint8_t alignments[3];
+ if (rects.size() == 1) {
+ alignments[0] = AlignmentLeft | AlignmentRight;
+ alignments[1] = AlignmentNone;
+ alignments[2] = AlignmentNone;
+ } else if (rects.size() == 2) {
+ alignments[0] = AlignmentRight;
+ alignments[1] = AlignmentLeft;
+ alignments[2] = AlignmentNone;
+ } else {
+ alignments[0] = AlignmentRight;
+ alignments[1] = AlignmentLeft | AlignmentRight;
+ alignments[2] = AlignmentLeft;
+ }
+
+ // Account for each GapRects by extending the edge of certain LayoutRects to meet the gap.
+ for (auto& gap : gapRects)
+ expandForGap(rects, alignments, gap);
+
+ // If we have 3 rects we might need one final GapRects to align the edges.
+ if (rects.size() == 3) {
+ LayoutRect left;
+ LayoutRect right;
+ for (unsigned i = 0; i < 3; ++i) {
+ if (alignments[i] & AlignmentLeft) {
+ if (left.isEmpty())
+ left = rects[i];
+ else if (rects[i].x() < left.x())
+ left = rects[i];
+ }
+ if (alignments[i] & AlignmentRight) {
+ if (right.isEmpty())
+ right = rects[i];
+ else if ((rects[i].x() + rects[i].width()) > (right.x() + right.width()))
+ right = rects[i];
+ }
+ }
+
+ if (!left.isEmpty() || !right.isEmpty()) {
+ GapRects gap;
+ gap.uniteLeft(left);
+ gap.uniteRight(right);
+ expandForGap(rects, alignments, gap);
+ }
+ }
+}
+
+void ServicesOverlayController::selectionRectsDidChange(const Vector<LayoutRect>& rects, const Vector<GapRects>& gapRects, bool isTextOnly)
+{
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1090
+ m_currentSelectionRects = rects;
+ m_isTextOnly = isTextOnly;
+
+ m_lastSelectionChangeTime = std::chrono::steady_clock::now();
+
+ compactRectsWithGapRects(m_currentSelectionRects, gapRects);
+
+ // DataDetectors needs these reversed in order to place the arrow in the right location.
+ m_currentSelectionRects.reverse();
+
+ LOG(Services, "ServicesOverlayController - Selection rects changed - Now have %lu\n", rects.size());
+
+ buildSelectionHighlight();
+#else
+ UNUSED_PARAM(rects);
+ UNUSED_PARAM(gapRects);
+ UNUSED_PARAM(isTextOnly);
+#endif
+}
+
+void ServicesOverlayController::selectedTelephoneNumberRangesChanged()
+{
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1090
+ LOG(Services, "ServicesOverlayController - Telephone number ranges changed\n");
+ buildPhoneNumberHighlights();
+#endif
+}
+
+bool ServicesOverlayController::mouseIsOverHighlight(Highlight& highlight, bool& mouseIsOverButton) const
+{
+ Boolean onButton;
+ bool hovered = DDHighlightPointIsOnHighlight(highlight.ddHighlight(), (CGPoint)m_mousePosition, &onButton);
+ mouseIsOverButton = onButton;
+ return hovered;
+}
+
+std::chrono::milliseconds ServicesOverlayController::remainingTimeUntilHighlightShouldBeShown(Highlight* highlight) const
+{
+ if (!highlight)
+ return std::chrono::milliseconds::zero();
+
+ auto minimumTimeUntilHighlightShouldBeShown = 200_ms;
+ Page* page = m_mainFrame.page();
+ if (page && page->focusController().focusedOrMainFrame().selection().selection().isContentEditable())
+ minimumTimeUntilHighlightShouldBeShown = 1000_ms;
+
+ bool mousePressed = m_mainFrame.eventHandler().mousePressed();
+
+ // Highlight hysteresis is only for selection services, because telephone number highlights are already much more stable
+ // by virtue of being expanded to include the entire telephone number. However, we will still avoid highlighting
+ // telephone numbers while the mouse is down.
+ if (highlight->type() == Highlight::Type::TelephoneNumber)
+ return mousePressed ? minimumTimeUntilHighlightShouldBeShown : 0_ms;
+
+ auto now = std::chrono::steady_clock::now();
+ auto timeSinceLastSelectionChange = now - m_lastSelectionChangeTime;
+ auto timeSinceHighlightBecameActive = now - m_nextActiveHighlightChangeTime;
+ auto timeSinceLastMouseUp = mousePressed ? 0_ms : now - m_lastMouseUpTime;
+
+ auto remainingDelay = minimumTimeUntilHighlightShouldBeShown - std::min(std::min(timeSinceLastSelectionChange, timeSinceHighlightBecameActive), timeSinceLastMouseUp);
+ return std::chrono::duration_cast<std::chrono::milliseconds>(remainingDelay);
+}
+
+void ServicesOverlayController::determineActiveHighlightTimerFired(Timer<ServicesOverlayController>&)
+{
+ bool mouseIsOverButton;
+ determineActiveHighlight(mouseIsOverButton);
+}
+
+void ServicesOverlayController::drawRect(PageOverlay&, GraphicsContext&, const IntRect&)
+{
+}
+
+void ServicesOverlayController::clearActiveHighlight()
+{
+ if (!m_activeHighlight)
+ return;
+
+ if (m_currentMouseDownOnButtonHighlight == m_activeHighlight)
+ m_currentMouseDownOnButtonHighlight = nullptr;
+ m_activeHighlight = nullptr;
+}
+
+void ServicesOverlayController::removeAllPotentialHighlightsOfType(Highlight::Type type)
+{
+ Vector<RefPtr<Highlight>> highlightsToRemove;
+ for (auto& highlight : m_potentialHighlights) {
+ if (highlight->type() == type)
+ highlightsToRemove.append(highlight);
+ }
+
+ while (!highlightsToRemove.isEmpty())
+ m_potentialHighlights.remove(highlightsToRemove.takeLast());
+}
+
+void ServicesOverlayController::buildPhoneNumberHighlights()
+{
+ if (!DataDetectorsLibrary())
+ return;
+
+ if (!m_mainFrame.settings().serviceControlsEnabled())
+ return;
+
+ HashSet<RefPtr<Highlight>> newPotentialHighlights;
+
+ FrameView& mainFrameView = *m_mainFrame.view();
+
+ for (Frame* frame = &m_mainFrame; frame; frame = frame->tree().traverseNext()) {
+ auto& ranges = frame->editor().detectedTelephoneNumberRanges();
+ for (auto& range : ranges) {
+ // FIXME: This will choke if the range wraps around the edge of the view.
+ // What should we do in that case?
+ IntRect rect = textQuadsToBoundingRectForRange(*range);
+
+ // Convert to the main document's coordinate space.
+ // FIXME: It's a little crazy to call contentsToWindow and then windowToContents in order to get the right coordinate space.
+ // We should consider adding conversion functions to ScrollView for contentsToDocument(). Right now, contentsToRootView() is
+ // not equivalent to what we need when you have a topContentInset or a header banner.
+ FrameView* viewForRange = range->ownerDocument().view();
+ if (!viewForRange)
+ continue;
+ rect.setLocation(mainFrameView.windowToContents(viewForRange->contentsToWindow(rect.location())));
+
+ CGRect cgRect = rect;
+ RetainPtr<DDHighlightRef> ddHighlight = adoptCF(DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection(nullptr, &cgRect, 1, mainFrameView.visibleContentRect(), DDHighlightOutlineWithArrow, YES, NSWritingDirectionNatural, NO, YES));
+
+ newPotentialHighlights.add(Highlight::createForTelephoneNumber(*this, ddHighlight, range));
+ }
+ }
+
+ replaceHighlightsOfTypePreservingEquivalentHighlights(newPotentialHighlights, Highlight::Type::TelephoneNumber);
+
+ didRebuildPotentialHighlights();
+}
+
+void ServicesOverlayController::buildSelectionHighlight()
+{
+ if (!DataDetectorsLibrary())
+ return;
+
+ if (!m_mainFrame.settings().serviceControlsEnabled())
+ return;
+
+ Page* page = m_mainFrame.page();
+ if (!page)
+ return;
+
+ HashSet<RefPtr<Highlight>> newPotentialHighlights;
+
+ Vector<CGRect> cgRects;
+ cgRects.reserveCapacity(m_currentSelectionRects.size());
+
+ RefPtr<Range> selectionRange = page->selection().firstRange();
+ if (selectionRange) {
+ FrameView* mainFrameView = m_mainFrame.view();
+ if (!mainFrameView)
+ return;
+
+ FrameView* viewForRange = selectionRange->ownerDocument().view();
+
+ for (auto& rect : m_currentSelectionRects) {
+ IntRect currentRect = pixelSnappedIntRect(rect);
+ currentRect.setLocation(mainFrameView->windowToContents(viewForRange->contentsToWindow(currentRect.location())));
+ cgRects.append((CGRect)currentRect);
+ }
+
+ if (!cgRects.isEmpty()) {
+ CGRect visibleRect = mainFrameView->visibleContentRect();
+ RetainPtr<DDHighlightRef> ddHighlight = adoptCF(DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection(nullptr, cgRects.begin(), cgRects.size(), visibleRect, DDHighlightNoOutlineWithArrow, YES, NSWritingDirectionNatural, NO, YES));
+
+ newPotentialHighlights.add(Highlight::createForSelection(*this, ddHighlight, selectionRange));
+ }
+ }
+
+ replaceHighlightsOfTypePreservingEquivalentHighlights(newPotentialHighlights, Highlight::Type::Selection);
+
+ didRebuildPotentialHighlights();
+}
+
+void ServicesOverlayController::replaceHighlightsOfTypePreservingEquivalentHighlights(HashSet<RefPtr<Highlight>>& newPotentialHighlights, Highlight::Type type)
+{
+ // If any old Highlights are equivalent (by Range) to a new Highlight, reuse the old
+ // one so that any metadata is retained.
+ HashSet<RefPtr<Highlight>> reusedPotentialHighlights;
+
+ for (auto& oldHighlight : m_potentialHighlights) {
+ if (oldHighlight->type() != type)
+ continue;
+
+ for (auto& newHighlight : newPotentialHighlights) {
+ if (highlightsAreEquivalent(oldHighlight.get(), newHighlight.get())) {
+ oldHighlight->setDDHighlight(newHighlight->ddHighlight());
+
+ reusedPotentialHighlights.add(oldHighlight);
+ newPotentialHighlights.remove(newHighlight);
+
+ break;
+ }
+ }
+ }
+
+ removeAllPotentialHighlightsOfType(type);
+
+ m_potentialHighlights.add(newPotentialHighlights.begin(), newPotentialHighlights.end());
+ m_potentialHighlights.add(reusedPotentialHighlights.begin(), reusedPotentialHighlights.end());
+}
+
+bool ServicesOverlayController::hasRelevantSelectionServices()
+{
+ if (Page* page = m_mainFrame.page())
+ return page->chrome().client().hasRelevantSelectionServices(m_isTextOnly);
+ return false;
+}
+
+void ServicesOverlayController::didRebuildPotentialHighlights()
+{
+ if (m_potentialHighlights.isEmpty()) {
+ if (m_servicesOverlay)
+ m_mainFrame.pageOverlayController().uninstallPageOverlay(m_servicesOverlay, PageOverlay::FadeMode::DoNotFade);
+ return;
+ }
+
+ if (telephoneNumberRangesForFocusedFrame().isEmpty() && !hasRelevantSelectionServices())
+ return;
+
+ createOverlayIfNeeded();
+
+ bool mouseIsOverButton;
+ determineActiveHighlight(mouseIsOverButton);
+}
+
+void ServicesOverlayController::createOverlayIfNeeded()
+{
+ if (m_servicesOverlay)
+ return;
+
+ if (!m_mainFrame.settings().serviceControlsEnabled())
+ return;
+
+ RefPtr<PageOverlay> overlay = PageOverlay::create(*this, PageOverlay::OverlayType::Document);
+ m_servicesOverlay = overlay.get();
+ m_mainFrame.pageOverlayController().installPageOverlay(overlay.release(), PageOverlay::FadeMode::DoNotFade);
+}
+
+Vector<RefPtr<Range>> ServicesOverlayController::telephoneNumberRangesForFocusedFrame()
+{
+ Page* page = m_mainFrame.page();
+ if (!page)
+ return { };
+
+ return page->focusController().focusedOrMainFrame().editor().detectedTelephoneNumberRanges();
+}
+
+bool ServicesOverlayController::highlightsAreEquivalent(const Highlight* a, const Highlight* b)
+{
+ if (a == b)
+ return true;
+
+ if (!a || !b)
+ return false;
+
+ if (a->type() == b->type() && areRangesEqual(a->range(), b->range()))
+ return true;
+
+ return false;
+}
+
+ServicesOverlayController::Highlight* ServicesOverlayController::findTelephoneNumberHighlightContainingSelectionHighlight(Highlight& selectionHighlight)
+{
+ if (selectionHighlight.type() != Highlight::Type::Selection)
+ return nullptr;
+
+ Page* page = m_mainFrame.page();
+ if (!page)
+ return nullptr;
+
+ const VisibleSelection& selection = page->selection();
+ if (!selection.isRange())
+ return nullptr;
+
+ RefPtr<Range> activeSelectionRange = selection.toNormalizedRange();
+ if (!activeSelectionRange)
+ return nullptr;
+
+ for (auto& highlight : m_potentialHighlights) {
+ if (highlight->type() != Highlight::Type::TelephoneNumber)
+ continue;
+
+ if (highlight->range()->contains(*activeSelectionRange))
+ return highlight.get();
+ }
+
+ return nullptr;
+}
+
+void ServicesOverlayController::determineActiveHighlight(bool& mouseIsOverActiveHighlightButton)
+{
+ mouseIsOverActiveHighlightButton = false;
+
+ RefPtr<Highlight> newActiveHighlight;
+
+ for (auto& highlight : m_potentialHighlights) {
+ if (highlight->type() == Highlight::Type::Selection) {
+ // If we've already found a new active highlight, and it's
+ // a telephone number highlight, prefer that over this selection highlight.
+ if (newActiveHighlight && newActiveHighlight->type() == Highlight::Type::TelephoneNumber)
+ continue;
+
+ // If this highlight has no compatible services, it can't be active.
+ if (!hasRelevantSelectionServices())
+ continue;
+ }
+
+ // If this highlight isn't hovered, it can't be active.
+ bool mouseIsOverButton;
+ if (!mouseIsOverHighlight(*highlight, mouseIsOverButton))
+ continue;
+
+ newActiveHighlight = highlight;
+ mouseIsOverActiveHighlightButton = mouseIsOverButton;
+ }
+
+ // If our new active highlight is a selection highlight that is completely contained
+ // by one of the phone number highlights, we'll make the phone number highlight active even if it's not hovered.
+ if (newActiveHighlight && newActiveHighlight->type() == Highlight::Type::Selection) {
+ if (Highlight* containedTelephoneNumberHighlight = findTelephoneNumberHighlightContainingSelectionHighlight(*newActiveHighlight)) {
+ newActiveHighlight = containedTelephoneNumberHighlight;
+
+ // We will always initially choose the telephone number highlight over the selection highlight if the
+ // mouse is over the telephone number highlight's button, so we know that it's not hovered if we got here.
+ mouseIsOverActiveHighlightButton = false;
+ }
+ }
+
+ if (!this->highlightsAreEquivalent(m_activeHighlight.get(), newActiveHighlight.get())) {
+ // When transitioning to a new highlight, we might end up in determineActiveHighlight multiple times
+ // before the new highlight actually becomes active. Keep track of the last next-but-not-yet-active
+ // highlight, and only reset the active highlight hysteresis when that changes.
+ if (m_nextActiveHighlight != newActiveHighlight) {
+ m_nextActiveHighlight = newActiveHighlight;
+ m_nextActiveHighlightChangeTime = std::chrono::steady_clock::now();
+ }
+
+ m_currentMouseDownOnButtonHighlight = nullptr;
+
+ if (m_activeHighlight) {
+ m_activeHighlight->fadeOut();
+ m_activeHighlight = nullptr;
+ }
+
+ auto remainingTimeUntilHighlightShouldBeShown = this->remainingTimeUntilHighlightShouldBeShown(newActiveHighlight.get());
+ if (remainingTimeUntilHighlightShouldBeShown > std::chrono::steady_clock::duration::zero()) {
+ m_determineActiveHighlightTimer.startOneShot(remainingTimeUntilHighlightShouldBeShown);
+ return;
+ }
+
+ m_activeHighlight = m_nextActiveHighlight.release();
+
+ if (m_activeHighlight) {
+ m_servicesOverlay->layer().addChild(m_activeHighlight->layer());
+ m_activeHighlight->fadeIn();
+ }
+ }
+}
+
+bool ServicesOverlayController::mouseEvent(PageOverlay&, const PlatformMouseEvent& event)
+{
+ m_mousePosition = m_mainFrame.view()->windowToContents(event.position());
+
+ bool mouseIsOverActiveHighlightButton = false;
+ determineActiveHighlight(mouseIsOverActiveHighlightButton);
+
+ // Cancel the potential click if any button other than the left button changes state, and ignore the event.
+ if (event.button() != MouseButton::LeftButton) {
+ m_currentMouseDownOnButtonHighlight = nullptr;
+ return false;
+ }
+
+ // If the mouse lifted while still over the highlight button that it went down on, then that is a click.
+ if (event.type() == PlatformEvent::MouseReleased) {
+ RefPtr<Highlight> mouseDownHighlight = m_currentMouseDownOnButtonHighlight;
+ m_currentMouseDownOnButtonHighlight = nullptr;
+
+ m_lastMouseUpTime = std::chrono::steady_clock::now();
+
+ if (mouseIsOverActiveHighlightButton && mouseDownHighlight) {
+ handleClick(m_mousePosition, *mouseDownHighlight);
+ return true;
+ }
+
+ return false;
+ }
+
+ // If the mouse moved outside of the button tracking a potential click, stop tracking the click.
+ if (event.type() == PlatformEvent::MouseMoved) {
+ if (m_currentMouseDownOnButtonHighlight && mouseIsOverActiveHighlightButton)
+ return true;
+
+ m_currentMouseDownOnButtonHighlight = nullptr;
+ return false;
+ }
+
+ // If the mouse went down over the active highlight's button, track this as a potential click.
+ if (event.type() == PlatformEvent::MousePressed) {
+ if (m_activeHighlight && mouseIsOverActiveHighlightButton) {
+ m_currentMouseDownOnButtonHighlight = m_activeHighlight;
+ return true;
+ }
+
+ return false;
+ }
+
+ return false;
+}
+
+void ServicesOverlayController::didScrollFrame(PageOverlay&, Frame& frame)
+{
+ if (frame.isMainFrame())
+ return;
+
+ buildPhoneNumberHighlights();
+ buildSelectionHighlight();
+
+ bool mouseIsOverActiveHighlightButton;
+ determineActiveHighlight(mouseIsOverActiveHighlightButton);
+}
+
+void ServicesOverlayController::handleClick(const IntPoint& clickPoint, Highlight& highlight)
+{
+ FrameView* frameView = m_mainFrame.view();
+ if (!frameView)
+ return;
+
+ Page* page = m_mainFrame.page();
+ if (!page)
+ return;
+
+ IntPoint windowPoint = frameView->contentsToWindow(clickPoint);
+
+ if (highlight.type() == Highlight::Type::Selection) {
+ auto telephoneNumberRanges = telephoneNumberRangesForFocusedFrame();
+ Vector<String> selectedTelephoneNumbers;
+ selectedTelephoneNumbers.reserveCapacity(telephoneNumberRanges.size());
+ for (auto& range : telephoneNumberRanges)
+ selectedTelephoneNumbers.append(range->text());
+
+ page->chrome().client().handleSelectionServiceClick(page->focusController().focusedOrMainFrame().selection(), selectedTelephoneNumbers, windowPoint);
+ } else if (highlight.type() == Highlight::Type::TelephoneNumber)
+ page->chrome().client().handleTelephoneNumberClick(highlight.range()->text(), windowPoint);
+}
+
+void ServicesOverlayController::didCreateHighlight(Highlight* highlight)
+{
+ ASSERT(!m_highlights.contains(highlight));
+ m_highlights.add(highlight);
+}
+
+void ServicesOverlayController::willDestroyHighlight(Highlight* highlight)
+{
+ ASSERT(m_highlights.contains(highlight));
+ m_highlights.remove(highlight);
+}
+
+} // namespace WebKit
+
+#endif // (ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)) && PLATFORM(MAC)
</ins></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformLoggingh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/Logging.h (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/Logging.h 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebCore/platform/Logging.h 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> M(WebAudio) \
</span><span class="cx"> M(WebGL) \
</span><span class="cx"> M(WebReplay) \
</span><ins>+ M(Services) \
</ins><span class="cx">
</span><span class="cx"> #define DECLARE_LOG_CHANNEL(name) \
</span><span class="cx"> extern WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name);
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -1,5 +1,46 @@
</span><span class="cx"> 2014-10-28 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174524. <rdar://problem/18640868>
+
+ 2014-10-09 Tim Horton <timothy_horton@apple.com>
+
+ Move ServicesOverlayController to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=137416
+ <rdar://problem/18546283>
+
+ Reviewed by Anders Carlsson.
+
+ * Platform/Logging.h:
+ Move Services logging channel to WebCore.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::handleTelephoneNumberClick):
+ (WebKit::WebChromeClient::handleSelectionServiceClick):
+ (WebKit::WebChromeClient::hasRelevantSelectionServices):
+ Implement services-related ChromeClient callbacks.
+ Clicks are forwarded to WebPageMac where they do what they used to;
+ hasRelevantSelectionServices is implemented as it was when it lived
+ inside ServicesOverlayController.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+ (WebKit::WebEditorClient::selectedTelephoneNumberRangesChanged): Deleted.
+ (WebKit::WebEditorClient::selectionRectsDidChange): Deleted.
+ * WebProcess/WebCoreSupport/WebEditorClient.h:
+ Remove WebEditorClient overrides for now-removed functions.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::updatePreferences):
+ Forward serviceControlsEnabled setting to WebCore.
+
+ (WebKit::WebPage::servicesOverlayController): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::serviceControlsEnabled): Deleted.
+
+2014-10-28 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r174231. <rdar://problem/18640833>
</span><span class="cx">
</span><span class="cx"> 2014-10-02 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2PlatformLoggingh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/Platform/Logging.h (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/Platform/Logging.h 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebKit2/Platform/Logging.h 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx"> M(TextInput) \
</span><span class="cx"> M(View) \
</span><span class="cx"> M(IDB) \
</span><del>- M(Services) \
</del><span class="cx">
</span><span class="cx"> #define DECLARE_LOG_CHANNEL(name) \
</span><span class="cx"> extern WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name);
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -936,7 +936,6 @@
</span><span class="cx"> 518E8F0B16B2093700E91429 /* DownloadManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518E8F0216B2093700E91429 /* DownloadManager.cpp */; };
</span><span class="cx"> 518E8F0C16B2093700E91429 /* DownloadManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 518E8F0316B2093700E91429 /* DownloadManager.h */; };
</span><span class="cx"> 518E8F0D16B2093700E91429 /* DownloadMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 518E8F0516B2093700E91429 /* DownloadMac.mm */; };
</span><del>- 5192D5761961FD0300CD19AA /* ServicesOverlayController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5192D5751961FD0300CD19AA /* ServicesOverlayController.mm */; };
</del><span class="cx"> 51933DEF1965EB31008AC3EA /* MenuUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 51933DEB1965EB24008AC3EA /* MenuUtilities.h */; };
</span><span class="cx"> 51933DF01965EB31008AC3EA /* MenuUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51933DEC1965EB24008AC3EA /* MenuUtilities.mm */; };
</span><span class="cx"> 51A4D5A916CAC4FF000E615E /* StatisticsRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A4D5A816CAC4FF000E615E /* StatisticsRequest.cpp */; };
</span><span class="lines">@@ -2968,8 +2967,6 @@
</span><span class="cx"> 518E8F0216B2093700E91429 /* DownloadManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DownloadManager.cpp; path = Downloads/DownloadManager.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 518E8F0316B2093700E91429 /* DownloadManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DownloadManager.h; path = Downloads/DownloadManager.h; sourceTree = "<group>"; };
</span><span class="cx"> 518E8F0516B2093700E91429 /* DownloadMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DownloadMac.mm; sourceTree = "<group>"; };
</span><del>- 5192D5711961FA2F00CD19AA /* ServicesOverlayController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ServicesOverlayController.h; sourceTree = "<group>"; };
- 5192D5751961FD0300CD19AA /* ServicesOverlayController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ServicesOverlayController.mm; sourceTree = "<group>"; };
</del><span class="cx"> 51933DEB1965EB24008AC3EA /* MenuUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuUtilities.h; sourceTree = "<group>"; };
</span><span class="cx"> 51933DEC1965EB24008AC3EA /* MenuUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MenuUtilities.mm; sourceTree = "<group>"; };
</span><span class="cx"> 51A4D5A816CAC4FF000E615E /* StatisticsRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StatisticsRequest.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -5747,7 +5744,6 @@
</span><span class="cx"> 7CF47FF917275C57008ACB91 /* PageBanner.h */,
</span><span class="cx"> 2D5C9D0319C81D8F00B3C5C1 /* WebPageOverlay.cpp */,
</span><span class="cx"> 2D5C9D0419C81D8F00B3C5C1 /* WebPageOverlay.h */,
</span><del>- 5192D5711961FA2F00CD19AA /* ServicesOverlayController.h */,
</del><span class="cx"> 2D819B99186275B3001F03D1 /* ViewGestureGeometryCollector.cpp */,
</span><span class="cx"> 2D819B9A186275B3001F03D1 /* ViewGestureGeometryCollector.h */,
</span><span class="cx"> 2D819B9B186275B3001F03D1 /* ViewGestureGeometryCollector.messages.in */,
</span><span class="lines">@@ -6515,7 +6511,6 @@
</span><span class="cx"> 1AB16AE7164B3A8800290D62 /* RemoteLayerTreeContext.mm */,
</span><span class="cx"> 1AB16ADC1648598400290D62 /* RemoteLayerTreeDrawingArea.h */,
</span><span class="cx"> 1AB16ADB1648598400290D62 /* RemoteLayerTreeDrawingArea.mm */,
</span><del>- 5192D5751961FD0300CD19AA /* ServicesOverlayController.mm */,
</del><span class="cx"> 1AAF263714687C39004A1E8A /* TiledCoreAnimationDrawingArea.h */,
</span><span class="cx"> 1AAF263614687C39004A1E8A /* TiledCoreAnimationDrawingArea.mm */,
</span><span class="cx"> 1C8E2DAD1278C5B200BC7BD0 /* WebInspectorMac.mm */,
</span><span class="lines">@@ -8802,7 +8797,6 @@
</span><span class="cx"> 512F589612A8838800629530 /* AuthenticationChallengeProxy.cpp in Sources */,
</span><span class="cx"> 1AE00D4C182D6EB000087DD7 /* WKBrowsingContextHandle.mm in Sources */,
</span><span class="cx"> 512F589812A8838800629530 /* AuthenticationDecisionListener.cpp in Sources */,
</span><del>- 5192D5761961FD0300CD19AA /* ServicesOverlayController.mm in Sources */,
</del><span class="cx"> 518E8EF816B2091C00E91429 /* AuthenticationManager.cpp in Sources */,
</span><span class="cx"> 518E8EFB16B2091C00E91429 /* AuthenticationManager.mac.mm in Sources */,
</span><span class="cx"> 512F58A212A883AD00629530 /* AuthenticationManagerMessageReceiver.cpp in Sources */,
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -1037,5 +1037,24 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC)
+void WebChromeClient::handleTelephoneNumberClick(const String& number, const WebCore::IntPoint& point)
+{
+ m_page->handleTelephoneNumberClick(number, point);
+}
+#endif
</ins><span class="cx">
</span><ins>+#if ENABLE(SERVICE_CONTROLS)
+void WebChromeClient::handleSelectionServiceClick(WebCore::FrameSelection& selection, const Vector<String>& telephoneNumbers, const WebCore::IntPoint& point)
+{
+ m_page->handleSelectionServiceClick(selection, telephoneNumbers, point);
+}
+
+bool WebChromeClient::hasRelevantSelectionServices(bool isTextOnly) const
+{
+ return (isTextOnly && WebProcess::shared().hasSelectionServices()) || WebProcess::shared().hasRichContentServices();
+}
+
+#endif
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -299,6 +299,14 @@
</span><span class="cx"> virtual bool unwrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC)
+ virtual void handleTelephoneNumberClick(const String& number, const WebCore::IntPoint&) override;
+#endif
+#if ENABLE(SERVICE_CONTROLS)
+ virtual void handleSelectionServiceClick(WebCore::FrameSelection&, const Vector<String>& telephoneNumbers, const WebCore::IntPoint&) override;
+ virtual bool hasRelevantSelectionServices(bool isTextOnly) const override;
+#endif
+
</ins><span class="cx"> String m_cachedToolTip;
</span><span class="cx"> mutable RefPtr<WebFrame> m_cachedFrameSetLargestFrame;
</span><span class="cx"> mutable bool m_cachedMainFrameHasHorizontalScrollbar;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "WebEditorClient.h"
</span><span class="cx">
</span><span class="cx"> #include "EditorState.h"
</span><del>-#include "ServicesOverlayController.h"
</del><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebFrame.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="lines">@@ -531,20 +530,4 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
-void WebEditorClient::selectedTelephoneNumberRangesChanged()
-{
-#if PLATFORM(MAC)
- m_page->servicesOverlayController().selectedTelephoneNumberRangesChanged();
-#endif
-}
-void WebEditorClient::selectionRectsDidChange(const Vector<LayoutRect>& rects, const Vector<GapRects>& gapRects, bool isTextOnly)
-{
-#if PLATFORM(MAC)
- if (m_page->serviceControlsEnabled())
- m_page->servicesOverlayController().selectionRectsDidChange(rects, gapRects, isTextOnly);
-#endif
-}
-#endif // ENABLE(SERVICE_CONTROLS) && ENABLE(TELEPHONE_NUMBER_DETECTION)
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -168,11 +168,6 @@
</span><span class="cx">
</span><span class="cx"> virtual bool supportsGlobalSelection() override;
</span><span class="cx">
</span><del>-#if ENABLE(TELEPHONE_NUMBER_DETECTION) || ENABLE(SERVICE_CONTROLS)
- virtual void selectedTelephoneNumberRangesChanged() override;
- virtual void selectionRectsDidChange(const Vector<WebCore::LayoutRect>&, const Vector<WebCore::GapRects>&, bool isTextOnly) override;
-#endif
-
</del><span class="cx"> WebPage* m_page;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> #include "PluginProxy.h"
</span><span class="cx"> #include "PluginView.h"
</span><span class="cx"> #include "PrintInfo.h"
</span><del>-#include "ServicesOverlayController.h"
</del><span class="cx"> #include "SessionState.h"
</span><span class="cx"> #include "SessionStateConversion.h"
</span><span class="cx"> #include "SessionTracker.h"
</span><span class="lines">@@ -260,9 +259,6 @@
</span><span class="cx"> , m_numberOfPrimarySnapshotDetectionAttempts(0)
</span><span class="cx"> , m_determinePrimarySnapshottedPlugInTimer(RunLoop::main(), this, &WebPage::determinePrimarySnapshottedPlugInTimerFired)
</span><span class="cx"> #endif
</span><del>-#if ENABLE(SERVICE_CONTROLS)
- , m_serviceControlsEnabled(false)
-#endif
</del><span class="cx"> , m_layerHostingMode(parameters.layerHostingMode)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> , m_pdfPluginEnabled(false)
</span><span class="lines">@@ -2602,10 +2598,6 @@
</span><span class="cx"> m_pdfPluginEnabled = store.getBoolValueForKey(WebPreferencesKey::pdfPluginEnabledKey());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(SERVICE_CONTROLS)
- m_serviceControlsEnabled = store.getBoolValueForKey(WebPreferencesKey::serviceControlsEnabledKey());
-#endif
-
</del><span class="cx"> // FIXME: This should be generated from macro expansion for all preferences,
</span><span class="cx"> // but we currently don't match the naming of WebCore exactly so we are
</span><span class="cx"> // handrolling the boolean and integer preferences until that is fixed.
</span><span class="lines">@@ -2820,6 +2812,10 @@
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setGamepadsEnabled(store.getBoolValueForKey(WebPreferencesKey::gamepadsEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(SERVICE_CONTROLS)
+ settings.setServiceControlsEnabled(store.getBoolValueForKey(WebPreferencesKey::serviceControlsEnabledKey()));
+#endif
+
</ins><span class="cx"> if (store.getBoolValueForKey(WebPreferencesKey::pageVisibilityBasedProcessSuppressionEnabledKey()))
</span><span class="cx"> m_processSuppressionDisabledByWebPreference.stop();
</span><span class="cx"> else
</span><span class="lines">@@ -4762,17 +4758,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
-#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
-ServicesOverlayController& WebPage::servicesOverlayController()
-{
- if (!m_servicesOverlayController)
- m_servicesOverlayController = std::make_unique<ServicesOverlayController>(*this);
</del><span class="cx">
</span><del>- return *m_servicesOverlayController;
-}
-#endif
-
</del><span class="cx"> void WebPage::didChangeScrollOffsetForFrame(Frame* frame)
</span><span class="cx"> {
</span><span class="cx"> if (!frame->isMainFrame())
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (175296 => 175297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-10-29 02:26:28 UTC (rev 175296)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-10-29 03:34:01 UTC (rev 175297)
</span><span class="lines">@@ -143,7 +143,6 @@
</span><span class="cx"> class NotificationPermissionRequestManager;
</span><span class="cx"> class PageBanner;
</span><span class="cx"> class PluginView;
</span><del>-class ServicesOverlayController;
</del><span class="cx"> class VisibleContentRectUpdateInfo;
</span><span class="cx"> class WebColorChooser;
</span><span class="cx"> class WebContextMenu;
</span><span class="lines">@@ -824,11 +823,9 @@
</span><span class="cx"> // While this is not ideal, it does not have to be applied to every platform at the moment.
</span><span class="cx"> static bool synchronousMessagesShouldSpinRunLoop();
</span><span class="cx">
</span><del>-#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
- ServicesOverlayController& servicesOverlayController();
</del><ins>+#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
</ins><span class="cx"> void handleTelephoneNumberClick(const String& number, const WebCore::IntPoint&);
</span><span class="cx"> void handleSelectionServiceClick(WebCore::FrameSelection&, const Vector<String>& telephoneNumbers, const WebCore::IntPoint&);
</span><del>- bool serviceControlsEnabled() const { return m_serviceControlsEnabled; }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void didChangeScrollOffsetForFrame(WebCore::Frame*);
</span><span class="lines">@@ -1090,10 +1087,6 @@
</span><span class="cx"> RunLoop::Timer<WebPage> m_determinePrimarySnapshottedPlugInTimer;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
- bool m_serviceControlsEnabled;
-#endif
-
</del><span class="cx"> // The layer hosting mode.
</span><span class="cx"> LayerHostingMode m_layerHostingMode;
</span><span class="cx">
</span><span class="lines">@@ -1267,10 +1260,6 @@
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> WebCore::WebGLLoadPolicy m_systemWebGLPolicy;
</span><span class="cx"> #endif
</span><del>-
-#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
- std::unique_ptr<ServicesOverlayController> m_servicesOverlayController;
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>