Changeset 187135 in webkit
- Timestamp:
- Jul 21, 2015 4:31:48 PM (9 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r187131 r187135 1 2015-07-21 Simon Fraser <simon.fraser@apple.com> 2 3 Rename the 'View' log channel to 'Printing' 4 https://bugs.webkit.org/show_bug.cgi?id=147172 5 6 Reviewed by Zalan Bujtas. 7 8 "View" was a terrible name for a log channel that was all about printing. 9 Sort the log channels. 10 11 * Platform/Logging.h: 12 * UIProcess/API/mac/WKView.mm: 13 (-[WKView drawRect:]): 14 (-[WKView printOperationWithPrintInfo:forFrame:]): 15 * UIProcess/mac/WKPrintingView.mm: 16 (-[WKPrintingView _preparePDFDataForPrintingOnSecondaryThread]): 17 (pageDidComputePageRects): 18 (-[WKPrintingView knowsPageRange:]): 19 (-[WKPrintingView drawRect:]): 20 (-[WKPrintingView rectForPage:]): 21 (-[WKPrintingView beginDocument]): 22 (-[WKPrintingView endDocument]): 23 1 24 2015-07-21 Zalan Bujtas <zalan@apple.com> 2 25 -
trunk/Source/WebKit2/Platform/Logging.h
r177294 r187135 40 40 #define WEBKIT2_LOG_CHANNELS(M) \ 41 41 M(ContextMenu) \ 42 M(IDB) \ 42 43 M(IconDatabase) \ 43 44 M(InspectorServer) \ 44 45 M(KeyHandling) \ 45 46 M(Network) \ 47 M(NetworkCache) \ 48 M(NetworkCacheStorage) \ 46 49 M(NetworkScheduling) \ 47 50 M(Plugins) \ 51 M(Printing) \ 48 52 M(RemoteLayerTree) \ 49 53 M(SessionState) \ 50 54 M(StorageAPI) \ 51 55 M(TextInput) \ 52 M(View) \53 M(IDB) \54 M(NetworkCache) \55 M(NetworkCacheStorage) \56 56 57 57 #define DECLARE_LOG_CHANNEL(name) \ -
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
r186662 r187135 2813 2813 - (void)drawRect:(NSRect)rect 2814 2814 { 2815 LOG( View, "drawRect: x:%g, y:%g, width:%g, height:%g", rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);2815 LOG(Printing, "drawRect: x:%g, y:%g, width:%g, height:%g", rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); 2816 2816 _data->_page->endPrinting(); 2817 2817 } … … 4003 4003 - (NSPrintOperation *)printOperationWithPrintInfo:(NSPrintInfo *)printInfo forFrame:(WKFrameRef)frameRef 4004 4004 { 4005 LOG( View, "Creating an NSPrintOperation for frame '%s'", toImpl(frameRef)->url().utf8().data());4005 LOG(Printing, "Creating an NSPrintOperation for frame '%s'", toImpl(frameRef)->url().utf8().data()); 4006 4006 4007 4007 // FIXME: If the frame cannot be printed (e.g. if it contains an encrypted PDF that disallows -
trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm
r182842 r187135 259 259 ASSERT(firstPage > 0); 260 260 ASSERT(firstPage <= lastPage); 261 LOG( View, "WKPrintingView requesting PDF data for pages %u...%u", firstPage, lastPage);261 LOG(Printing, "WKPrintingView requesting PDF data for pages %u...%u", firstPage, lastPage); 262 262 263 263 PrintInfo printInfo([_printOperation printInfo]); … … 318 318 ceil(lastPrintingPageRect.maxX() * view->_totalScaleFactorForPrinting), 319 319 ceil(lastPrintingPageRect.maxY() * view->_totalScaleFactorForPrinting)); 320 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);320 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); 321 321 [view setFrame:newFrameSize]; 322 322 … … 375 375 - (BOOL)knowsPageRange:(NSRangePointer)range 376 376 { 377 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");377 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"); 378 378 ASSERT(_printOperation == [NSPrintOperation currentOperation]); 379 379 … … 523 523 - (void)drawRect:(NSRect)nsRect 524 524 { 525 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" : "");525 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" : ""); 526 526 527 527 ASSERT(_printOperation == [NSPrintOperation currentOperation]); … … 607 607 ASSERT(_printOperation == [NSPrintOperation currentOperation]); 608 608 if (![self _hasPageRects]) { 609 LOG( View, "-[WKPrintingView %p rectForPage:%d] - data is not yet available", self, (int)page);609 LOG(Printing, "-[WKPrintingView %p rectForPage:%d] - data is not yet available", self, (int)page); 610 610 if (!_webFrame->page()) { 611 611 // We may have not told AppKit how many pages there are, so it will try to print until a null rect is returned. … … 626 626 IntRect rect = _printingPageRects[page - 1]; 627 627 rect.scale(_totalScaleFactorForPrinting); 628 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());628 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()); 629 629 return rect; 630 630 } … … 645 645 return; 646 646 647 LOG( View, "-[WKPrintingView %p beginDocument]", self);647 LOG(Printing, "-[WKPrintingView %p beginDocument]", self); 648 648 649 649 [super beginDocument]; … … 660 660 return; 661 661 662 LOG( View, "-[WKPrintingView %p endDocument] - clearing cached data", self);662 LOG(Printing, "-[WKPrintingView %p endDocument] - clearing cached data", self); 663 663 664 664 // Both existing data and pending responses are now obsolete.
Note: See TracChangeset
for help on using the changeset viewer.