<!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>[204886] trunk/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/204886">204886</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-08-23 23:15:01 -0700 (Tue, 23 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add some logging for WKSelectionDrawingInfo
https://bugs.webkit.org/show_bug.cgi?id=161055
Reviewed by Tim Horton.
Source/WebCore:
Add TextStream dumping for SelectionRect.
* platform/ios/SelectionRect.cpp:
(WebCore::operator<<):
* platform/ios/SelectionRect.h:
Source/WebKit2:
Add a Selection logging channel for WK2, and dump WKSelectionDrawingInfo when it changes.
* Platform/Logging.h:
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(WebKit::operator<<):
(-[WKContentView _updateChangedSelection:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformiosSelectionRectcpp">trunk/Source/WebCore/platform/ios/SelectionRect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformiosSelectionRecth">trunk/Source/WebCore/platform/ios/SelectionRect.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformLoggingh">trunk/Source/WebKit2/Platform/Logging.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionh">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204885 => 204886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-24 05:56:08 UTC (rev 204885)
+++ trunk/Source/WebCore/ChangeLog 2016-08-24 06:15:01 UTC (rev 204886)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-23 Simon Fraser <simon.fraser@apple.com>
+
+ Add some logging for WKSelectionDrawingInfo
+ https://bugs.webkit.org/show_bug.cgi?id=161055
+
+ Reviewed by Tim Horton.
+
+ Add TextStream dumping for SelectionRect.
+
+ * platform/ios/SelectionRect.cpp:
+ (WebCore::operator<<):
+ * platform/ios/SelectionRect.h:
+
</ins><span class="cx"> 2016-08-23 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> More consistent header inclusions in the MathML module
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosSelectionRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/SelectionRect.cpp (204885 => 204886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/SelectionRect.cpp 2016-08-24 05:56:08 UTC (rev 204885)
+++ trunk/Source/WebCore/platform/ios/SelectionRect.cpp 2016-08-24 06:15:01 UTC (rev 204886)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SelectionRect.h"
</span><ins>+#include "TextStream.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -87,4 +88,43 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& stream, SelectionRect rect)
+{
+ TextStream::GroupScope group(stream);
+ stream << "selection rect";
+
+ stream.dumpProperty("rect", rect.rect());
+ stream.dumpProperty("direction", isLeftToRightDirection(rect.direction()) ? "ltr" : "rtl");
+
+ stream.dumpProperty("min-x", rect.minX());
+ stream.dumpProperty("max-x", rect.maxX());
+ stream.dumpProperty("max-y", rect.maxY());
+
+ stream.dumpProperty("line number", rect.lineNumber());
+ if (rect.isLineBreak())
+ stream.dumpProperty("is line break", true);
+ if (rect.isFirstOnLine())
+ stream.dumpProperty("is first on line", true);
+ if (rect.isLastOnLine())
+ stream.dumpProperty("is last on line", true);
+
+ if (rect.containsStart())
+ stream.dumpProperty("contains start", true);
+
+ if (rect.containsEnd())
+ stream.dumpProperty("contains end", true);
+
+ if (rect.isHorizontal())
+ stream.dumpProperty("is horizontal", true);
+
+ if (rect.isInFixedPosition())
+ stream.dumpProperty("is in fixed position", true);
+
+ if (rect.isRubyText())
+ stream.dumpProperty("is ruby text", true);
+
+ stream.dumpProperty("page number", rect.pageNumber());
+ return stream;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosSelectionRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/SelectionRect.h (204885 => 204886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/SelectionRect.h 2016-08-24 05:56:08 UTC (rev 204885)
+++ trunk/Source/WebCore/platform/ios/SelectionRect.h 2016-08-24 06:15:01 UTC (rev 204886)
</span><span class="lines">@@ -128,6 +128,8 @@
</span><span class="cx"> int m_pageNumber;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, SelectionRect);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // SelectionRect_h
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (204885 => 204886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-24 05:56:08 UTC (rev 204885)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-24 06:15:01 UTC (rev 204886)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-08-23 Simon Fraser <simon.fraser@apple.com>
+
+ Add some logging for WKSelectionDrawingInfo
+ https://bugs.webkit.org/show_bug.cgi?id=161055
+
+ Reviewed by Tim Horton.
+
+ Add a Selection logging channel for WK2, and dump WKSelectionDrawingInfo when it changes.
+
+ * Platform/Logging.h:
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (WebKit::operator<<):
+ (-[WKContentView _updateChangedSelection:]):
+
</ins><span class="cx"> 2016-08-23 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Another CMake build fix attempt after r204852.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/Logging.h (204885 => 204886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/Logging.h 2016-08-24 05:56:08 UTC (rev 204885)
+++ trunk/Source/WebKit2/Platform/Logging.h 2016-08-24 06:15:01 UTC (rev 204886)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> M(Printing) \
</span><span class="cx"> M(RemoteLayerTree) \
</span><span class="cx"> M(Resize) \
</span><ins>+ M(Selection) \
</ins><span class="cx"> M(SessionState) \
</span><span class="cx"> M(StorageAPI) \
</span><span class="cx"> M(TextInput) \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (204885 => 204886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2016-08-24 05:56:08 UTC (rev 204885)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2016-08-24 06:15:01 UTC (rev 204886)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> class Color;
</span><span class="cx"> class FloatQuad;
</span><span class="cx"> class IntSize;
</span><ins>+class TextStream;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -76,6 +77,7 @@
</span><span class="cx"> typedef void (^UIWKKeyWebEventCompletionHandler)(WebIOSEvent *theEvent, BOOL wasHandled);
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><ins>+
</ins><span class="cx"> struct WKSelectionDrawingInfo {
</span><span class="cx"> enum class SelectionType { None, Plugin, Range };
</span><span class="cx"> WKSelectionDrawingInfo();
</span><span class="lines">@@ -84,6 +86,9 @@
</span><span class="cx"> WebCore::IntRect caretRect;
</span><span class="cx"> Vector<WebCore::SelectionRect> selectionRects;
</span><span class="cx"> };
</span><ins>+
+WebCore::TextStream& operator<<(WebCore::TextStream&, const WKSelectionDrawingInfo&);
+
</ins><span class="cx"> struct WKAutoCorrectionData {
</span><span class="cx"> String fontName;
</span><span class="cx"> CGFloat fontSize;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (204885 => 204886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-08-24 05:56:08 UTC (rev 204885)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-08-24 06:15:01 UTC (rev 204886)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #import "APIUIClient.h"
</span><span class="cx"> #import "EditingRange.h"
</span><ins>+#import "Logging.h"
</ins><span class="cx"> #import "ManagedConfigurationSPI.h"
</span><span class="cx"> #import "NativeWebKeyboardEvent.h"
</span><span class="cx"> #import "NativeWebTouchEvent.h"
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> #import <WebCore/Scrollbar.h>
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <WebCore/TextIndicator.h>
</span><ins>+#import <WebCore/TextStream.h>
</ins><span class="cx"> #import <WebCore/WebCoreNSURLExtras.h>
</span><span class="cx"> #import <WebCore/WebEvent.h>
</span><span class="cx"> #import <WebKit/WebSelectionRect.h> // FIXME: WK2 should not include WebKit headers!
</span><span class="lines">@@ -150,6 +152,26 @@
</span><span class="cx"> return !(a == b);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static WebCore::TextStream& operator<<(WebCore::TextStream& stream, WKSelectionDrawingInfo::SelectionType type)
+{
+ switch (type) {
+ case WKSelectionDrawingInfo::SelectionType::None: stream << "none"; break;
+ case WKSelectionDrawingInfo::SelectionType::Plugin: stream << "plugin"; break;
+ case WKSelectionDrawingInfo::SelectionType::Range: stream << "range"; break;
+ }
+
+ return stream;
+}
+
+WebCore::TextStream& operator<<(WebCore::TextStream& stream, const WKSelectionDrawingInfo& info)
+{
+ TextStream::GroupScope group(stream);
+ stream.dumpProperty("type", info.type);
+ stream.dumpProperty("caret rect", info.caretRect);
+ stream.dumpProperty("selection rects", info.selectionRects);
+ return stream;
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> static const float highlightDelay = 0.12;
</span><span class="lines">@@ -3678,6 +3700,8 @@
</span><span class="cx"> if (!force && selectionDrawingInfo == _lastSelectionDrawingInfo)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG_WITH_STREAM(Selection, stream << "_updateChangedSelection " << selectionDrawingInfo);
+
</ins><span class="cx"> _lastSelectionDrawingInfo = selectionDrawingInfo;
</span><span class="cx">
</span><span class="cx"> // FIXME: We need to figure out what to do if the selection is changed by Javascript.
</span></span></pre>
</div>
</div>
</body>
</html>