<!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>[185328] trunk/Source/WebKit/mac</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/185328">185328</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-08 13:40:57 -0700 (Mon, 08 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove more unused Objective-C methods
https://bugs.webkit.org/show_bug.cgi?id=145761
Reviewed by Geoffrey Garen.
* Misc/WebNSImageExtras.h:
* Misc/WebNSImageExtras.m:
(-[NSImage _web_saveAndOpen]): Deleted.
* Misc/WebNSViewExtras.h:
* Misc/WebNSViewExtras.m:
(-[NSView _web_DragImageForElement:rect:event:pasteboard:source:offset:]): Deleted.
(-[NSView _web_convertRect:toView:]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSImageExtrash">trunk/Source/WebKit/mac/Misc/WebNSImageExtras.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSImageExtrasm">trunk/Source/WebKit/mac/Misc/WebNSImageExtras.m</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSViewExtrash">trunk/Source/WebKit/mac/Misc/WebNSViewExtras.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSViewExtrasm">trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (185327 => 185328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-06-08 20:26:02 UTC (rev 185327)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-08 20:40:57 UTC (rev 185328)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-06-08 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove more unused Objective-C methods
+ https://bugs.webkit.org/show_bug.cgi?id=145761
+
+ Reviewed by Geoffrey Garen.
+
+ * Misc/WebNSImageExtras.h:
+ * Misc/WebNSImageExtras.m:
+ (-[NSImage _web_saveAndOpen]): Deleted.
+ * Misc/WebNSViewExtras.h:
+ * Misc/WebNSViewExtras.m:
+ (-[NSView _web_DragImageForElement:rect:event:pasteboard:source:offset:]): Deleted.
+ (-[NSView _web_convertRect:toView:]): Deleted.
+
+2015-06-08 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Try to fix the Mavericks build.
</span><span class="cx">
</span><span class="cx"> * WebView/WebPDFView.mm:
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSImageExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSImageExtras.h (185327 => 185328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSImageExtras.h 2015-06-08 20:26:02 UTC (rev 185327)
+++ trunk/Source/WebKit/mac/Misc/WebNSImageExtras.h 2015-06-08 20:40:57 UTC (rev 185328)
</span><span class="lines">@@ -36,9 +36,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)_web_dissolveToFraction:(float)delta;
</span><span class="cx">
</span><del>-// Debug method. Saves an image and opens it in the preferred TIFF viewing application.
-- (void)_web_saveAndOpen;
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSImageExtrasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSImageExtras.m (185327 => 185328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSImageExtras.m 2015-06-08 20:26:02 UTC (rev 185327)
+++ trunk/Source/WebKit/mac/Misc/WebNSImageExtras.m 2015-06-08 20:40:57 UTC (rev 185328)
</span><span class="lines">@@ -93,18 +93,6 @@
</span><span class="cx"> [dissolvedImage release];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_web_saveAndOpen
-{
- char path[] = "/tmp/XXXXXX.tiff";
- int fd = mkstemps(path, 5);
- if (fd != -1) {
- NSData *data = [self TIFFRepresentation];
- write(fd, [data bytes], [data length]);
- close(fd);
- [[NSWorkspace sharedWorkspace] openFile:[NSString stringWithUTF8String:path]];
- }
-}
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSViewExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSViewExtras.h (185327 => 185328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSViewExtras.h 2015-06-08 20:26:02 UTC (rev 185327)
+++ trunk/Source/WebKit/mac/Misc/WebNSViewExtras.h 2015-06-08 20:40:57 UTC (rev 185328)
</span><span class="lines">@@ -68,19 +68,10 @@
</span><span class="cx"> // Returns NSDragOperationNone otherwise.
</span><span class="cx"> - (NSDragOperation)_web_dragOperationForDraggingInfo:(id <NSDraggingInfo>)sender;
</span><span class="cx">
</span><del>-// Resizes and applies alpha to image and drags it.
-- (void)_web_DragImageForElement:(DOMElement *)element
- rect:(NSRect)rect
- event:(NSEvent *)event
- pasteboard:(NSPasteboard *)pasteboard
- source:(id)source
- offset:(NSPoint *)dragImageOffset;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> - (BOOL)_web_firstResponderIsSelfOrDescendantView;
</span><span class="cx">
</span><del>-- (NSRect)_web_convertRect:(NSRect)aRect toView:(NSView *)aView;
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSViewExtrasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m (185327 => 185328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m 2015-06-08 20:26:02 UTC (rev 185327)
+++ trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m 2015-06-08 20:40:57 UTC (rev 185328)
</span><span class="lines">@@ -159,61 +159,6 @@
</span><span class="cx"> return NSDragOperationNone;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_web_DragImageForElement:(DOMElement *)element
- rect:(NSRect)rect
- event:(NSEvent *)event
- pasteboard:(NSPasteboard *)pasteboard
- source:(id)source
- offset:(NSPoint *)dragImageOffset
-{
- NSPoint mouseDownPoint = [self convertPoint:[event locationInWindow] fromView:nil];
- NSImage *dragImage;
- NSPoint origin;
-
- NSImage *image = [element image];
- if (image != nil && [image size].height * [image size].width <= WebMaxOriginalImageArea) {
- NSSize originalSize = rect.size;
- origin = rect.origin;
-
- dragImage = [[image copy] autorelease];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [dragImage setScalesWhenResized:YES];
-#pragma clang diagnostic pop
- [dragImage setSize:originalSize];
-
- [dragImage _web_scaleToMaxSize:WebMaxDragImageSize];
- NSSize newSize = [dragImage size];
-
- [dragImage _web_dissolveToFraction:WebDragImageAlpha];
-
- // Properly orient the drag image and orient it differently if it's smaller than the original
- origin.x = mouseDownPoint.x - (((mouseDownPoint.x - origin.x) / originalSize.width) * newSize.width);
- origin.y = origin.y + originalSize.height;
- origin.y = mouseDownPoint.y - (((mouseDownPoint.y - origin.y) / originalSize.height) * newSize.height);
- } else {
- // FIXME: This has been broken for a while.
- // There's no way to get the MIME type for the image from a DOM element.
- // The old code used [image MIMEType];
- NSString *extension = @"";
- dragImage = [[NSWorkspace sharedWorkspace] iconForFileType:extension];
- NSSize offset = NSMakeSize([dragImage size].width - WebDragIconRightInset, -WebDragIconBottomInset);
- origin = NSMakePoint(mouseDownPoint.x - offset.width, mouseDownPoint.y - offset.height);
- }
-
- // This is the offset from the lower left corner of the image to the mouse location. Because we
- // are a flipped view the calculation of Y is inverted.
- if (dragImageOffset) {
- dragImageOffset->x = mouseDownPoint.x - origin.x;
- dragImageOffset->y = origin.y - mouseDownPoint.y;
- }
-
- // Per kwebster, offset arg is ignored
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [self dragImage:dragImage at:origin offset:NSZeroSize event:event pasteboard:pasteboard source:source slideBack:YES];
-#pragma clang diagnostic pop
-}
</del><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> - (BOOL)_web_firstResponderIsSelfOrDescendantView
</span><span class="lines">@@ -224,40 +169,6 @@
</span><span class="cx"> ([responder isKindOfClass:[NSView class]] && [(NSView *)responder isDescendantOf:self])));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSRect)_web_convertRect:(NSRect)aRect toView:(NSView *)aView
-{
- // Converting to this view's window; let -convertRect:toView: handle it
- if (aView == nil)
- return [self convertRect:aRect toView:nil];
-
- // This view must be in a window. Do whatever weird thing -convertRect:toView: does in this situation.
- NSWindow *thisWindow = [self window];
- if (!thisWindow)
- return [self convertRect:aRect toView:aView];
-
- // The other view must be in a window, too.
- NSWindow *otherWindow = [aView window];
- if (!otherWindow)
- return [self convertRect:aRect toView:aView];
-
- // Convert to this window's coordinates
- NSRect convertedRect = [self convertRect:aRect toView:nil];
-
- // Convert to screen coordinates
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- convertedRect.origin = [thisWindow convertBaseToScreen:convertedRect.origin];
-
- // Convert to other window's coordinates
- convertedRect.origin = [otherWindow convertScreenToBase:convertedRect.origin];
-#pragma clang diagnostic pop
-
- // Convert to other view's coordinates
- convertedRect = [aView convertRect:convertedRect fromView:nil];
-
- return convertedRect;
-}
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>