<!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>[176663] 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/176663">176663</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-12-02 08:57:42 -0800 (Tue, 02 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/176618">r176618</a>. rdar://problem/18992185</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacChangeLog">branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacWebViewWebViewmm">branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</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 (176662 => 176663)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-02 16:57:30 UTC (rev 176662)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-02 16:57:42 UTC (rev 176663)
</span><span class="lines">@@ -1,120 +1,132 @@
</span><del>-2014-12-01 Tim Horton <timothy_horton@apple.com>
</del><ins>+2014-12-02 Dana Burkart <dburkart@apple.com>
</ins><span class="cx">
</span><del>- Implement yellow highlight for WebKit1 data detectors
- https://bugs.webkit.org/show_bug.cgi?id=138956
- <rdar://problem/18992185>
</del><ins>+ Merge r176599. <rdar://problem/18992185>
</ins><span class="cx">
</span><del>- Reviewed by Beth Dakin.
</del><ins>+ 2014-12-01 Tim Horton <timothy_horton@apple.com>
</ins><span class="cx">
</span><del>- * page/TextIndicator.cpp:
- (WebCore::TextIndicator::createWithSelectionInFrame):
- (WebCore::TextIndicator::TextIndicator):
- * page/TextIndicator.h:
- (WebCore::TextIndicator::selectionRectInScreenCoordinates):
- (WebCore::TextIndicator::textBoundingRectInScreenCoordinates):
- (WebCore::TextIndicator::selectionRectInWindowCoordinates): Deleted.
- (WebCore::TextIndicator::textBoundingRectInWindowCoordinates): Deleted.
- Store TextIndicator rects in screen coordinates, since that's what we
- want anyway, and this makes it easier to share this code between the WebKits.
</del><ins>+ Implement yellow highlight for WebKit1 data detectors
+ https://bugs.webkit.org/show_bug.cgi?id=138956
+ <rdar://problem/18992185>
</ins><span class="cx">
</span><del>- * page/mac/TextIndicatorWindow.mm:
- (-[WebTextIndicatorView initWithFrame:textIndicator:margin:]):
- (WebCore::TextIndicatorWindow::setTextIndicator):
- Avoid some rect conversion because the TextIndicator rects are already in screen coordinates.
</del><ins>+ Reviewed by Beth Dakin.
</ins><span class="cx">
</span><del>-2014-11-21 Tim Horton <timothy_horton@apple.com>
</del><ins>+ * page/TextIndicator.cpp:
+ (WebCore::TextIndicator::createWithSelectionInFrame):
+ (WebCore::TextIndicator::TextIndicator):
+ * page/TextIndicator.h:
+ (WebCore::TextIndicator::selectionRectInScreenCoordinates):
+ (WebCore::TextIndicator::textBoundingRectInScreenCoordinates):
+ (WebCore::TextIndicator::selectionRectInWindowCoordinates): Deleted.
+ (WebCore::TextIndicator::textBoundingRectInWindowCoordinates): Deleted.
+ Store TextIndicator rects in screen coordinates, since that's what we
+ want anyway, and this makes it easier to share this code between the WebKits.
</ins><span class="cx">
</span><del>- Move TextIndicator{Window} to WebCore
- https://bugs.webkit.org/show_bug.cgi?id=138954
- <rdar://problem/18992185>
</del><ins>+ * page/mac/TextIndicatorWindow.mm:
+ (-[WebTextIndicatorView initWithFrame:textIndicator:margin:]):
+ (WebCore::TextIndicatorWindow::setTextIndicator):
+ Avoid some rect conversion because the TextIndicator rects are already in screen coordinates.
</ins><span class="cx">
</span><del>- Some adjustments by Csaba Osztrogonác.
- Reviewed by Anders Carlsson.
</del><ins>+2014-12-02 Dana Burkart <dburkart@apple.com>
</ins><span class="cx">
</span><del>- Move TextIndicator and TextIndicatorWindow to WebCore so that both
- WebKits can share the implementation.
</del><ins>+ Merge r176462. <rdar://problem/18992185>
</ins><span class="cx">
</span><del>- * CMakeLists.txt:
- Build TextIndicator.
</del><ins>+ 2014-11-21 Tim Horton <timothy_horton@apple.com>
</ins><span class="cx">
</span><del>- * WebCore.exp.in:
- Export TextIndicator{Window} symbols for the WebKits.
</del><ins>+ Move TextIndicator{Window} to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=138954
+ <rdar://problem/18992185>
</ins><span class="cx">
</span><del>- * WebCore.xcodeproj/project.pbxproj:
- * page/TextIndicator.cpp: Renamed from Source/WebKit2/Shared/TextIndicator.cpp.
- * page/TextIndicator.h: Renamed from Source/WebKit2/Shared/TextIndicator.h.
- Straighforward move of TextIndicator from WebKit2, except:
</del><ins>+ Some adjustments by Csaba Osztrogonác.
+ Reviewed by Anders Carlsson.
</ins><span class="cx">
</span><del>- Move TextIndicator::Data and TextIndicator::PresentationTransition out directly
- into the WebCore namespace to allow for implementation of WebKit2 argument coders.
</del><ins>+ Move TextIndicator and TextIndicatorWindow to WebCore so that both
+ WebKits can share the implementation.
</ins><span class="cx">
</span><del>- Use Image instead of ShareableBitmap internally.
</del><ins>+ * CMakeLists.txt:
+ Build TextIndicator.
</ins><span class="cx">
</span><del>- Move the TextIndicatorData encode/decode to WebCoreArgumentCoders.
-
- * page/mac/TextIndicatorWindow.h: Renamed from Source/WebKit2/UIProcess/mac/TextIndicatorWindow.h.
- * page/mac/TextIndicatorWindow.mm: Renamed from Source/WebKit2/UIProcess/mac/TextIndicatorWindow.mm.
- Straighforward move of TextIndicatorWindow from WebKit2.
</del><ins>+ * WebCore.exp.in:
+ Export TextIndicator{Window} symbols for the WebKits.
</ins><span class="cx">
</span><del>-2014-11-21 Jer Noble <jer.noble@apple.com>
</del><ins>+ * WebCore.xcodeproj/project.pbxproj:
+ * page/TextIndicator.cpp: Renamed from Source/WebKit2/Shared/TextIndicator.cpp.
+ * page/TextIndicator.h: Renamed from Source/WebKit2/Shared/TextIndicator.h.
+ Straighforward move of TextIndicator from WebKit2, except:
</ins><span class="cx">
</span><del>- Support multiple signatures of diagnostic logging.
- https://bugs.webkit.org/show_bug.cgi?id=138690
</del><ins>+ Move TextIndicator::Data and TextIndicator::PresentationTransition out directly
+ into the WebCore namespace to allow for implementation of WebKit2 argument coders.
</ins><span class="cx">
</span><del>- Reviewed by Anders Carlsson.
</del><ins>+ Use Image instead of ShareableBitmap internally.
</ins><span class="cx">
</span><del>- Pull logDiagnosticMessage() out of ChromeClient and make a new client interface,
- DiagnosticLoggingClient, which supports multiple kinds of diagnostic logging,
- namely: simple logging without a parameter, logging with a success parameter, and
- logging with a generic string value parameter.
</del><ins>+ Move the TextIndicatorData encode/decode to WebCoreArgumentCoders.
+
+ * page/mac/TextIndicatorWindow.h: Renamed from Source/WebKit2/UIProcess/mac/TextIndicatorWindow.h.
+ * page/mac/TextIndicatorWindow.mm: Renamed from Source/WebKit2/UIProcess/mac/TextIndicatorWindow.mm.
+ Straighforward move of TextIndicatorWindow from WebKit2.
</ins><span class="cx">
</span><del>- * html/HTMLMediaElement.cpp:
- (WebCore::HTMLMediaElement::parseAttribute): Use DiagnosticLoggingClient.
- * loader/FrameLoader.cpp:
- (WebCore::FrameLoader::checkLoadCompleteForThisFrame): Ditto.
- * loader/SubframeLoader.cpp:
- (WebCore::logPluginRequest): Ditto.
- * page/ChromeClient.h:
- (WebCore::ChromeClient::logDiagnosticMessage): Deleted.
- * page/DiagnosticLoggingClient.h:
- (WebCore::DiagnosticLoggingClient::logDiagnosticMessage): Added.
- (WebCore::DiagnosticLoggingClient::logDiagnosticMessageWithResult): Added.
- (WebCore::DiagnosticLoggingClient::logDiagnosticMessageWithValue): Added.
- (WebCore::DiagnosticLoggingClient::~DiagnosticLoggingClient): Empty destructor.
</del><ins>+2014-12-02 Dana Burkart <dburkart@apple.com>
</ins><span class="cx">
</span><del>- Rename Page::PageClient to PageConfiguration, and pass that configuration from
- Page into MainFrame upon construction.
</del><ins>+ Merge r176499. <rdar://problem/19031034>
</ins><span class="cx">
</span><del>- * inspector/InspectorOverlay.cpp:
- (WebCore::InspectorOverlay::overlayPage): Use PageConfiguration instead of PageClients.
- * loader/EmptyClients.cpp:
- (WebCore::fillWithEmptyClients): Ditto.
- * loader/EmptyClients.h:
- * page/MainFrame.cpp:
- (WebCore::MainFrame::MainFrame): Pass loaderClientForMainFrame through to the
- Frame constructor.
- (WebCore::MainFrame::create): Takes a PageConfiguration.
- * page/MainFrame.h:
- (WebCore::MainFrame::diagnosticLoggingClient): Simple accessor.
- * page/Page.cpp:
- (WebCore::Page::Page):
- (WebCore::Page::PageClients::PageClients): Deleted.
- (WebCore::Page::PageClients::~PageClients): Deleted.
- * page/Page.h:
- * page/PageConfiguration.cpp: Added.
- (WebCore::PageConfiguration::PageConfiguration): Renamed from PageClients().
- (WebCore::PageConfiguration::~PageConfiguration): Renamed from ~PageClients().
- * page/PageConfiguration.h: Added.
- * svg/graphics/SVGImage.cpp:
- (WebCore::SVGImage::dataChanged): Use PageConfiguration instead of PageClients.
</del><ins>+ 2014-11-21 Jer Noble <jer.noble@apple.com>
</ins><span class="cx">
</span><del>- Add new files and symbols to the project.
</del><ins>+ Support multiple signatures of diagnostic logging.
+ https://bugs.webkit.org/show_bug.cgi?id=138690
</ins><span class="cx">
</span><del>- * CMakeLists.txt:
- * WebCore.exp.in:
- * WebCore.vcxproj/WebCore.vcxproj:
- * WebCore.xcodeproj/project.pbxproj:
</del><ins>+ Reviewed by Anders Carlsson.
</ins><span class="cx">
</span><ins>+ Pull logDiagnosticMessage() out of ChromeClient and make a new client interface,
+ DiagnosticLoggingClient, which supports multiple kinds of diagnostic logging,
+ namely: simple logging without a parameter, logging with a success parameter, and
+ logging with a generic string value parameter.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute): Use DiagnosticLoggingClient.
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::checkLoadCompleteForThisFrame): Ditto.
+ * loader/SubframeLoader.cpp:
+ (WebCore::logPluginRequest): Ditto.
+ * page/ChromeClient.h:
+ (WebCore::ChromeClient::logDiagnosticMessage): Deleted.
+ * page/DiagnosticLoggingClient.h:
+ (WebCore::DiagnosticLoggingClient::logDiagnosticMessage): Added.
+ (WebCore::DiagnosticLoggingClient::logDiagnosticMessageWithResult): Added.
+ (WebCore::DiagnosticLoggingClient::logDiagnosticMessageWithValue): Added.
+ (WebCore::DiagnosticLoggingClient::~DiagnosticLoggingClient): Empty destructor.
+
+ Rename Page::PageClient to PageConfiguration, and pass that configuration from
+ Page into MainFrame upon construction.
+
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::InspectorOverlay::overlayPage): Use PageConfiguration instead of PageClients.
+ * loader/EmptyClients.cpp:
+ (WebCore::fillWithEmptyClients): Ditto.
+ * loader/EmptyClients.h:
+ * page/MainFrame.cpp:
+ (WebCore::MainFrame::MainFrame): Pass loaderClientForMainFrame through to the
+ Frame constructor.
+ (WebCore::MainFrame::create): Takes a PageConfiguration.
+ * page/MainFrame.h:
+ (WebCore::MainFrame::diagnosticLoggingClient): Simple accessor.
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+ (WebCore::Page::PageClients::PageClients): Deleted.
+ (WebCore::Page::PageClients::~PageClients): Deleted.
+ * page/Page.h:
+ * page/PageConfiguration.cpp: Added.
+ (WebCore::PageConfiguration::PageConfiguration): Renamed from PageClients().
+ (WebCore::PageConfiguration::~PageConfiguration): Renamed from ~PageClients().
+ * page/PageConfiguration.h: Added.
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::dataChanged): Use PageConfiguration instead of PageClients.
+
+ Add new files and symbols to the project.
+
+ * CMakeLists.txt:
+ * WebCore.exp.in:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-12-02 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r176477. <rdar://problem/19056715>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (176662 => 176663)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-02 16:57:30 UTC (rev 176662)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-02 16:57:42 UTC (rev 176663)
</span><span class="lines">@@ -1,74 +1,98 @@
</span><del>-2014-12-01 Timothy Horton <timothy_horton@apple.com>
</del><ins>+2014-12-02 Dana Burkart <dburkart@apple.com>
</ins><span class="cx">
</span><del>- Fix the iOS build.
</del><ins>+ Merge r176618. <rdar://problem/18992185>
</ins><span class="cx">
</span><del>- * WebView/WebActionMenuController.h:
- * WebView/WebActionMenuController.mm:
- * WebView/WebHTMLView.mm:
- (-[WebHTMLView scrollWheel:scrollWheel:]):
- (-[WebHTMLView mouseDown:mouseDown:]):
- * WebView/WebView.mm:
- * WebView/WebViewData.h:
- * WebView/WebViewData.mm:
- (-[WebViewPrivate dealloc]):
- * WebView/WebViewInternal.h:
</del><ins>+ 2014-12-01 Timothy Horton <timothy_horton@apple.com>
</ins><span class="cx">
</span><del>-2014-12-01 Tim Horton <timothy_horton@apple.com>
</del><ins>+ Try to fix the Mac build.
</ins><span class="cx">
</span><del>- Implement yellow highlight for WebKit1 data detectors
- https://bugs.webkit.org/show_bug.cgi?id=138956
- <rdar://problem/18992185>
</del><ins>+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView _close]):
</ins><span class="cx">
</span><del>- Reviewed by Beth Dakin.
</del><ins>+2014-12-02 Dana Burkart <dburkart@apple.com>
</ins><span class="cx">
</span><del>- * WebView/WebActionMenuController.h:
- * WebView/WebActionMenuController.mm:
- (-[WebActionMenuController webView:willHandleMouseDown:]):
- (-[WebActionMenuController webView:didHandleScrollWheel:]):
- (-[WebActionMenuController prepareForMenu:withEvent:]):
- (-[WebActionMenuController didCloseMenu:withEvent:]):
- (-[WebActionMenuController _defaultMenuItemsForDataDetectedText]):
- (-[WebActionMenuController _showTextIndicator]):
- (-[WebActionMenuController _hideTextIndicator]):
- (-[WebActionMenuController _dismissActionMenuPopovers]):
- Copy the WebKit2 WKActionMenuController TextIndicator implementation
- into WebActionMenuController. The only significant difference is
- that we build the TextIndicator right at menu construction time
- instead of in the Web process.
</del><ins>+ Merge r176608. <rdar://problem/18992185>
</ins><span class="cx">
</span><del>- * WebView/WebHTMLView.mm:
- (-[WebHTMLView scrollWheel:]):
- Let the WebActionMenuController know that we're handling a scroll.
</del><ins>+ 2014-12-01 Timothy Horton <timothy_horton@apple.com>
</ins><span class="cx">
</span><del>- (-[WebHTMLView mouseDown:]):
- Let the WebActionMenuController know that we're handling a mouseDown.
</del><ins>+ Fix the iOS build.
</ins><span class="cx">
</span><del>- * WebView/WebView.mm:
- (-[WebView _setTextIndicator:fadeOut:animationCompletionHandler:]):
- (-[WebView _clearTextIndicator]):
- (-[WebView _actionMenuController]):
- (-[WebView _convertRectFromRootView:]): Deleted.
- * WebView/WebViewData.h:
- * WebView/WebViewData.mm:
- * WebView/WebViewInternal.h:
- Keep a TextIndicatorWindow on WebView, just like WKView does.
- Expose the WebActionMenuController on WebView (internally).
</del><ins>+ * WebView/WebActionMenuController.h:
+ * WebView/WebActionMenuController.mm:
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView scrollWheel:scrollWheel:]):
+ (-[WebHTMLView mouseDown:mouseDown:]):
+ * WebView/WebView.mm:
+ * WebView/WebViewData.h:
+ * WebView/WebViewData.mm:
+ (-[WebViewPrivate dealloc]):
+ * WebView/WebViewInternal.h:
</ins><span class="cx">
</span><del>-2014-11-21 Jer Noble <jer.noble@apple.com>
</del><ins>+2014-12-02 Dana Burkart <dburkart@apple.com>
</ins><span class="cx">
</span><del>- Support multiple signatures of diagnostic logging.
- https://bugs.webkit.org/show_bug.cgi?id=138690
</del><ins>+ Merge r176599. <rdar://problem/18992185>
</ins><span class="cx">
</span><del>- Reviewed by Anders Carlsson.
</del><ins>+ 2014-12-01 Tim Horton <timothy_horton@apple.com>
</ins><span class="cx">
</span><del>- Page::PageClients has been renamed PageConfiguration.
</del><ins>+ Implement yellow highlight for WebKit1 data detectors
+ https://bugs.webkit.org/show_bug.cgi?id=138956
+ <rdar://problem/18992185>
</ins><span class="cx">
</span><del>- * WebView/WebView.mm:
- (-[WebView _commonInitializationWithFrameName:groupName:]):
- (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
</del><ins>+ Reviewed by Beth Dakin.
</ins><span class="cx">
</span><ins>+ * WebView/WebActionMenuController.h:
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController webView:willHandleMouseDown:]):
+ (-[WebActionMenuController webView:didHandleScrollWheel:]):
+ (-[WebActionMenuController prepareForMenu:withEvent:]):
+ (-[WebActionMenuController didCloseMenu:withEvent:]):
+ (-[WebActionMenuController _defaultMenuItemsForDataDetectedText]):
+ (-[WebActionMenuController _showTextIndicator]):
+ (-[WebActionMenuController _hideTextIndicator]):
+ (-[WebActionMenuController _dismissActionMenuPopovers]):
+ Copy the WebKit2 WKActionMenuController TextIndicator implementation
+ into WebActionMenuController. The only significant difference is
+ that we build the TextIndicator right at menu construction time
+ instead of in the Web process.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView scrollWheel:]):
+ Let the WebActionMenuController know that we're handling a scroll.
+
+ (-[WebHTMLView mouseDown:]):
+ Let the WebActionMenuController know that we're handling a mouseDown.
+
+ * WebView/WebView.mm:
+ (-[WebView _setTextIndicator:fadeOut:animationCompletionHandler:]):
+ (-[WebView _clearTextIndicator]):
+ (-[WebView _actionMenuController]):
+ (-[WebView _convertRectFromRootView:]): Deleted.
+ * WebView/WebViewData.h:
+ * WebView/WebViewData.mm:
+ * WebView/WebViewInternal.h:
+ Keep a TextIndicatorWindow on WebView, just like WKView does.
+ Expose the WebActionMenuController on WebView (internally).
+
</ins><span class="cx"> 2014-12-02 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176499. <rdar://problem/19031034>
+
+ 2014-11-21 Jer Noble <jer.noble@apple.com>
+
+ Support multiple signatures of diagnostic logging.
+ https://bugs.webkit.org/show_bug.cgi?id=138690
+
+ Reviewed by Anders Carlsson.
+
+ Page::PageClients has been renamed PageConfiguration.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+
+2014-12-02 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r176477. <rdar://problem/19056715>
</span><span class="cx">
</span><span class="cx"> 2014-11-21 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm (176662 => 176663)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm 2014-12-02 16:57:30 UTC (rev 176662)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm 2014-12-02 16:57:42 UTC (rev 176663)
</span><span class="lines">@@ -880,13 +880,15 @@
</span><span class="cx"> [self addSubview:frameView];
</span><span class="cx"> [frameView release];
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> if ([self respondsToSelector:@selector(setActionMenu:)]) {
</span><span class="cx"> RetainPtr<NSMenu> actionMenu = adoptNS([[NSMenu alloc] init]);
</span><span class="cx"> self.actionMenu = actionMenu.get();
</span><span class="cx"> _private->actionMenuController = [[WebActionMenuController alloc] initWithWebView:self];
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> static bool didOneTimeInitialization = false;
</span><span class="cx"> #endif
</span><span class="cx"> if (!didOneTimeInitialization) {
</span><span class="lines">@@ -1732,6 +1734,8 @@
</span><span class="cx"> [self setUIDelegate:nil];
</span><span class="cx">
</span><span class="cx"> [_private->inspector webViewClosed];
</span><ins>+#endif
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> [_private->actionMenuController webViewClosed];
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -8550,6 +8554,7 @@
</span><span class="cx"> return NSMakeRect(rect.origin.x, [self bounds].size.height - rect.origin.y - rect.size.height, rect.size.width, rect.size.height);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> - (void)prepareForMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="cx"> {
</span><span class="cx"> if (menu != self.actionMenu)
</span><span class="lines">@@ -8592,12 +8597,11 @@
</span><span class="cx"> [self _setTextIndicator:nullptr fadeOut:NO animationCompletionHandler:^ { }];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> - (WebActionMenuController *)_actionMenuController
</span><span class="cx"> {
</span><span class="cx"> return _private->actionMenuController;
</span><span class="cx"> }
</span><del>-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176662 => 176663)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-02 16:57:30 UTC (rev 176662)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-02 16:57:42 UTC (rev 176663)
</span><span class="lines">@@ -1,68 +1,76 @@
</span><del>-2014-12-01 Tim Horton <timothy_horton@apple.com>
</del><ins>+2014-12-02 Dana Burkart <dburkart@apple.com>
</ins><span class="cx">
</span><del>- Implement yellow highlight for WebKit1 data detectors
- https://bugs.webkit.org/show_bug.cgi?id=138956
- <rdar://problem/18992185>
</del><ins>+ Merge r176599. <rdar://problem/18992185>
</ins><span class="cx">
</span><del>- Reviewed by Beth Dakin.
</del><ins>+ 2014-12-01 Tim Horton <timothy_horton@apple.com>
</ins><span class="cx">
</span><del>- * Shared/WebCoreArgumentCoders.cpp:
- (IPC::ArgumentCoder<TextIndicatorData>::encode):
- (IPC::ArgumentCoder<TextIndicatorData>::decode):
- * WebProcess/WebPage/FindController.cpp:
- (WebKit::FindController::updateFindIndicator):
- (WebKit::FindController::drawRect):
- Adjust to the fact that TextIndicator keeps screen-relative rects.
</del><ins>+ Implement yellow highlight for WebKit1 data detectors
+ https://bugs.webkit.org/show_bug.cgi?id=138956
+ <rdar://problem/18992185>
</ins><span class="cx">
</span><del>-2014-11-21 Tim Horton <timothy_horton@apple.com>
</del><ins>+ Reviewed by Beth Dakin.
</ins><span class="cx">
</span><del>- Move TextIndicator{Window} to WebCore
- https://bugs.webkit.org/show_bug.cgi?id=138954
- <rdar://problem/18992185>
</del><ins>+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<TextIndicatorData>::encode):
+ (IPC::ArgumentCoder<TextIndicatorData>::decode):
+ * WebProcess/WebPage/FindController.cpp:
+ (WebKit::FindController::updateFindIndicator):
+ (WebKit::FindController::drawRect):
+ Adjust to the fact that TextIndicator keeps screen-relative rects.
</ins><span class="cx">
</span><del>- Some adjustments by Csaba Osztrogonác.
- Reviewed by Anders Carlsson.
</del><ins>+2014-12-02 Dana Burkart <dburkart@apple.com>
</ins><span class="cx">
</span><del>- * CMakeLists.txt:
- Remove TextIndicator.cpp.
</del><ins>+ Merge r176462. <rdar://problem/18992185>
</ins><span class="cx">
</span><del>- * Scripts/webkit/messages.py:
- (struct_or_class):
- (headers_for_type):
- Tell messages.py that TextIndicatorData is a struct, and comes from TextIndicator.h.
</del><ins>+ 2014-11-21 Tim Horton <timothy_horton@apple.com>
</ins><span class="cx">
</span><del>- * Shared/WebCoreArgumentCoders.h:
- * Shared/WebCoreArgumentCoders.cpp:
- (IPC::ArgumentCoder<TextIndicatorData>::encode):
- (IPC::ArgumentCoder<TextIndicatorData>::decode):
- Add argument coders for TextIndicatorData.
</del><ins>+ Move TextIndicator{Window} to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=138954
+ <rdar://problem/18992185>
</ins><span class="cx">
</span><del>- * Shared/DictionaryPopupInfo.h:
- * Shared/mac/ActionMenuHitTestResult.h:
- * Shared/mac/ActionMenuHitTestResult.mm:
- * UIProcess/API/gtk/PageClientImpl.h:
- * UIProcess/API/gtk/PageClientImpl.cpp:
- * UIProcess/API/mac/WKView.mm:
- * UIProcess/API/mac/WKViewInternal.h:
- * UIProcess/CoordinatedGraphics/WebView.h:
- * UIProcess/CoordinatedGraphics/WebView.cpp:
- * UIProcess/PageClient.h:
- * UIProcess/WebPageProxy.cpp:
- * UIProcess/WebPageProxy.h:
- * UIProcess/WebPageProxy.messages.in:
- * UIProcess/ios/PageClientImplIOS.h:
- * UIProcess/ios/WKContentView.h:
- * UIProcess/mac/PageClientImpl.h:
- * UIProcess/mac/PageClientImpl.mm:
- * UIProcess/mac/WKActionMenuController.mm:
- * WebKit2.xcodeproj/project.pbxproj:
- * WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
- * WebProcess/WebPage/FindController.cpp:
- * WebProcess/WebPage/WebPage.h:
- * WebProcess/WebPage/ios/WebPageIOS.mm:
- * WebProcess/WebPage/mac/WebPageMac.mm:
- Adjust to TextIndicator and TextIndicatorWindow's new home.
</del><ins>+ Some adjustments by Csaba Osztrogonác.
+ Reviewed by Anders Carlsson.
</ins><span class="cx">
</span><ins>+ * CMakeLists.txt:
+ Remove TextIndicator.cpp.
+
+ * Scripts/webkit/messages.py:
+ (struct_or_class):
+ (headers_for_type):
+ Tell messages.py that TextIndicatorData is a struct, and comes from TextIndicator.h.
+
+ * Shared/WebCoreArgumentCoders.h:
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<TextIndicatorData>::encode):
+ (IPC::ArgumentCoder<TextIndicatorData>::decode):
+ Add argument coders for TextIndicatorData.
+
+ * Shared/DictionaryPopupInfo.h:
+ * Shared/mac/ActionMenuHitTestResult.h:
+ * Shared/mac/ActionMenuHitTestResult.mm:
+ * UIProcess/API/gtk/PageClientImpl.h:
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ * UIProcess/API/mac/WKView.mm:
+ * UIProcess/API/mac/WKViewInternal.h:
+ * UIProcess/CoordinatedGraphics/WebView.h:
+ * UIProcess/CoordinatedGraphics/WebView.cpp:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/WKContentView.h:
+ * UIProcess/mac/PageClientImpl.h:
+ * UIProcess/mac/PageClientImpl.mm:
+ * UIProcess/mac/WKActionMenuController.mm:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
+ * WebProcess/WebPage/FindController.cpp:
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ Adjust to TextIndicator and TextIndicatorWindow's new home.
+
</ins><span class="cx"> 2014-12-02 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r176574. <rdar://problem/19052564>
</span></span></pre>
</div>
</div>
</body>
</html>