<!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>[187135] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187135">187135</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-07-21 16:31:48 -0700 (Tue, 21 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename the 'View' log channel to 'Printing'
https://bugs.webkit.org/show_bug.cgi?id=147172
Reviewed by Zalan Bujtas.
"View" was a terrible name for a log channel that was all about printing.
Sort the log channels.
* Platform/Logging.h:
* UIProcess/API/mac/WKView.mm:
(-[WKView drawRect:]):
(-[WKView printOperationWithPrintInfo:forFrame:]):
* UIProcess/mac/WKPrintingView.mm:
(-[WKPrintingView _preparePDFDataForPrintingOnSecondaryThread]):
(pageDidComputePageRects):
(-[WKPrintingView knowsPageRange:]):
(-[WKPrintingView drawRect:]):
(-[WKPrintingView rectForPage:]):
(-[WKPrintingView beginDocument]):
(-[WKPrintingView endDocument]):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKPrintingViewmm">trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187134 => 187135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-07-21 23:31:44 UTC (rev 187134)
+++ trunk/Source/WebKit2/ChangeLog        2015-07-21 23:31:48 UTC (rev 187135)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-07-21 Simon Fraser <simon.fraser@apple.com>
+
+ Rename the 'View' log channel to 'Printing'
+ https://bugs.webkit.org/show_bug.cgi?id=147172
+
+ Reviewed by Zalan Bujtas.
+
+ "View" was a terrible name for a log channel that was all about printing.
+ Sort the log channels.
+
+ * Platform/Logging.h:
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView drawRect:]):
+ (-[WKView printOperationWithPrintInfo:forFrame:]):
+ * UIProcess/mac/WKPrintingView.mm:
+ (-[WKPrintingView _preparePDFDataForPrintingOnSecondaryThread]):
+ (pageDidComputePageRects):
+ (-[WKPrintingView knowsPageRange:]):
+ (-[WKPrintingView drawRect:]):
+ (-[WKPrintingView rectForPage:]):
+ (-[WKPrintingView beginDocument]):
+ (-[WKPrintingView endDocument]):
+
</ins><span class="cx"> 2015-07-21 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Menu drop down such as on nike.com does not stay
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/Logging.h (187134 => 187135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/Logging.h        2015-07-21 23:31:44 UTC (rev 187134)
+++ trunk/Source/WebKit2/Platform/Logging.h        2015-07-21 23:31:48 UTC (rev 187135)
</span><span class="lines">@@ -39,20 +39,20 @@
</span><span class="cx">
</span><span class="cx"> #define WEBKIT2_LOG_CHANNELS(M) \
</span><span class="cx"> M(ContextMenu) \
</span><ins>+ M(IDB) \
</ins><span class="cx"> M(IconDatabase) \
</span><span class="cx"> M(InspectorServer) \
</span><span class="cx"> M(KeyHandling) \
</span><span class="cx"> M(Network) \
</span><ins>+ M(NetworkCache) \
+ M(NetworkCacheStorage) \
</ins><span class="cx"> M(NetworkScheduling) \
</span><span class="cx"> M(Plugins) \
</span><ins>+ M(Printing) \
</ins><span class="cx"> M(RemoteLayerTree) \
</span><span class="cx"> M(SessionState) \
</span><span class="cx"> M(StorageAPI) \
</span><span class="cx"> M(TextInput) \
</span><del>- M(View) \
- M(IDB) \
- M(NetworkCache) \
- M(NetworkCacheStorage) \
</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="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (187134 => 187135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm        2015-07-21 23:31:44 UTC (rev 187134)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm        2015-07-21 23:31:48 UTC (rev 187135)
</span><span class="lines">@@ -2812,7 +2812,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)drawRect:(NSRect)rect
</span><span class="cx"> {
</span><del>- LOG(View, "drawRect: x:%g, y:%g, width:%g, height:%g", rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
</del><ins>+ LOG(Printing, "drawRect: x:%g, y:%g, width:%g, height:%g", rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
</ins><span class="cx"> _data->_page->endPrinting();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4002,7 +4002,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSPrintOperation *)printOperationWithPrintInfo:(NSPrintInfo *)printInfo forFrame:(WKFrameRef)frameRef
</span><span class="cx"> {
</span><del>- LOG(View, "Creating an NSPrintOperation for frame '%s'", toImpl(frameRef)->url().utf8().data());
</del><ins>+ LOG(Printing, "Creating an NSPrintOperation for frame '%s'", toImpl(frameRef)->url().utf8().data());
</ins><span class="cx">
</span><span class="cx"> // FIXME: If the frame cannot be printed (e.g. if it contains an encrypted PDF that disallows
</span><span class="cx"> // printing), this function should return nil.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKPrintingViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm (187134 => 187135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm        2015-07-21 23:31:44 UTC (rev 187134)
+++ trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm        2015-07-21 23:31:48 UTC (rev 187135)
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(firstPage > 0);
</span><span class="cx"> ASSERT(firstPage <= lastPage);
</span><del>- LOG(View, "WKPrintingView requesting PDF data for pages %u...%u", firstPage, lastPage);
</del><ins>+ LOG(Printing, "WKPrintingView requesting PDF data for pages %u...%u", firstPage, lastPage);
</ins><span class="cx">
</span><span class="cx"> PrintInfo printInfo([_printOperation printInfo]);
</span><span class="cx"> // Return to printing mode if we're already back to screen (e.g. due to window resizing).
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> NSRect newFrameSize = NSMakeRect(0, 0,
</span><span class="cx"> ceil(lastPrintingPageRect.maxX() * view->_totalScaleFactorForPrinting),
</span><span class="cx"> ceil(lastPrintingPageRect.maxY() * view->_totalScaleFactorForPrinting));
</span><del>- LOG(View, "WKPrintingView setting frame size to x:%g y:%g width:%g height:%g", newFrameSize.origin.x, newFrameSize.origin.y, newFrameSize.size.width, newFrameSize.size.height);
</del><ins>+ LOG(Printing, "WKPrintingView setting frame size to x:%g y:%g width:%g height:%g", newFrameSize.origin.x, newFrameSize.origin.y, newFrameSize.size.width, newFrameSize.size.height);
</ins><span class="cx"> [view setFrame:newFrameSize];
</span><span class="cx">
</span><span class="cx"> if ([view _isPrintingPreview]) {
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)knowsPageRange:(NSRangePointer)range
</span><span class="cx"> {
</span><del>- LOG(View, "-[WKPrintingView %p knowsPageRange:], %s, %s", self, [self _hasPageRects] ? "print data is available" : "print data is not available yet", RunLoop::isMain() ? "on main thread" : "on secondary thread");
</del><ins>+ LOG(Printing, "-[WKPrintingView %p knowsPageRange:], %s, %s", self, [self _hasPageRects] ? "print data is available" : "print data is not available yet", RunLoop::isMain() ? "on main thread" : "on secondary thread");
</ins><span class="cx"> ASSERT(_printOperation == [NSPrintOperation currentOperation]);
</span><span class="cx">
</span><span class="cx"> // Assuming that once we switch to printing from a secondary thread, we don't go back.
</span><span class="lines">@@ -522,7 +522,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)drawRect:(NSRect)nsRect
</span><span class="cx"> {
</span><del>- LOG(View, "WKPrintingView %p printing rect x:%g, y:%g, width:%g, height:%g%s", self, nsRect.origin.x, nsRect.origin.y, nsRect.size.width, nsRect.size.height, [self _isPrintingPreview] ? " for preview" : "");
</del><ins>+ LOG(Printing, "WKPrintingView %p printing rect x:%g, y:%g, width:%g, height:%g%s", self, nsRect.origin.x, nsRect.origin.y, nsRect.size.width, nsRect.size.height, [self _isPrintingPreview] ? " for preview" : "");
</ins><span class="cx">
</span><span class="cx"> ASSERT(_printOperation == [NSPrintOperation currentOperation]);
</span><span class="cx">
</span><span class="lines">@@ -606,7 +606,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(_printOperation == [NSPrintOperation currentOperation]);
</span><span class="cx"> if (![self _hasPageRects]) {
</span><del>- LOG(View, "-[WKPrintingView %p rectForPage:%d] - data is not yet available", self, (int)page);
</del><ins>+ LOG(Printing, "-[WKPrintingView %p rectForPage:%d] - data is not yet available", self, (int)page);
</ins><span class="cx"> if (!_webFrame->page()) {
</span><span class="cx"> // We may have not told AppKit how many pages there are, so it will try to print until a null rect is returned.
</span><span class="cx"> return NSMakeRect(0, 0, 0, 0);
</span><span class="lines">@@ -625,7 +625,7 @@
</span><span class="cx">
</span><span class="cx"> IntRect rect = _printingPageRects[page - 1];
</span><span class="cx"> rect.scale(_totalScaleFactorForPrinting);
</span><del>- LOG(View, "-[WKPrintingView %p rectForPage:%d] -> x %d, y %d, width %d, height %d", self, (int)page, rect.x(), rect.y(), rect.width(), rect.height());
</del><ins>+ LOG(Printing, "-[WKPrintingView %p rectForPage:%d] -> x %d, y %d, width %d, height %d", self, (int)page, rect.x(), rect.y(), rect.width(), rect.height());
</ins><span class="cx"> return rect;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -644,7 +644,7 @@
</span><span class="cx"> if (isForcingPreviewUpdate)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- LOG(View, "-[WKPrintingView %p beginDocument]", self);
</del><ins>+ LOG(Printing, "-[WKPrintingView %p beginDocument]", self);
</ins><span class="cx">
</span><span class="cx"> [super beginDocument];
</span><span class="cx">
</span><span class="lines">@@ -659,7 +659,7 @@
</span><span class="cx"> if (isForcingPreviewUpdate)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- LOG(View, "-[WKPrintingView %p endDocument] - clearing cached data", self);
</del><ins>+ LOG(Printing, "-[WKPrintingView %p endDocument] - clearing cached data", self);
</ins><span class="cx">
</span><span class="cx"> // Both existing data and pending responses are now obsolete.
</span><span class="cx"> _printingPageRects.clear();
</span></span></pre>
</div>
</div>
</body>
</html>