<!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>[178305] 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/178305">178305</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-01-12 16:25:45 -0800 (Mon, 12 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of unnecessary reimplementations of CGFloor/Ceiling
https://bugs.webkit.org/show_bug.cgi?id=140375
Reviewed by Simon Fraser.
* platform/mac/DragImageMac.mm:
(WebCore::widthWithFont):
(WebCore::drawAtPoint):
(WebCore::webkit_CGCeiling): Deleted.
* platform/mac/WebVideoFullscreenHUDWindowController.mm:
(-[WebVideoFullscreenHUDWindowController windowDidLoad]):
(webkit_CGFloor): Deleted.
Delete unnecessary code, use the real CGFloor/Ceiling instead.
* Misc/WebKitNSStringExtras.mm:
(-[NSString _web_drawAtPoint:font:textColor:allowingFontSmoothing:]):
(webkit_CGCeiling): Deleted.
Delete unnecessary code, use the real CGFloor/Ceiling instead.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacDragImageMacmm">trunk/Source/WebCore/platform/mac/DragImageMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebVideoFullscreenHUDWindowControllermm">trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitNSStringExtrasmm">trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178304 => 178305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-12 23:57:17 UTC (rev 178304)
+++ trunk/Source/WebCore/ChangeLog 2015-01-13 00:25:45 UTC (rev 178305)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-01-12 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Get rid of unnecessary reimplementations of CGFloor/Ceiling
+ https://bugs.webkit.org/show_bug.cgi?id=140375
+
+ Reviewed by Simon Fraser.
+
+ * platform/mac/DragImageMac.mm:
+ (WebCore::widthWithFont):
+ (WebCore::drawAtPoint):
+ (WebCore::webkit_CGCeiling): Deleted.
+ * platform/mac/WebVideoFullscreenHUDWindowController.mm:
+ (-[WebVideoFullscreenHUDWindowController windowDidLoad]):
+ (webkit_CGFloor): Deleted.
+ Delete unnecessary code, use the real CGFloor/Ceiling instead.
+
+2015-01-12 Timothy Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> REGRESSION (r177656): Text in find-in-page yellow bouncy rectangle is not crisp
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140373
</span><span class="cx"> <rdar://problem/19447156>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacDragImageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/DragImageMac.mm (178304 => 178305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/DragImageMac.mm 2015-01-12 23:57:17 UTC (rev 178304)
+++ trunk/Source/WebCore/platform/mac/DragImageMac.mm 2015-01-13 00:25:45 UTC (rev 178305)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> #import "BitmapImage.h"
</span><ins>+#import "CoreGraphicsSPI.h"
</ins><span class="cx"> #import "Font.h"
</span><span class="cx"> #import "FontDescription.h"
</span><span class="cx"> #import "FontSelector.h"
</span><span class="lines">@@ -199,13 +200,6 @@
</span><span class="cx">
</span><span class="cx"> return [string sizeWithAttributes:[NSDictionary dictionaryWithObjectsAndKeys:font, NSFontAttributeName, nil]].width;
</span><span class="cx"> }
</span><del>-
-static inline CGFloat webkit_CGCeiling(CGFloat value)
-{
- if (sizeof(value) == sizeof(float))
- return ceilf(value);
- return static_cast<CGFloat>(ceil(value));
-}
</del><span class="cx">
</span><span class="cx"> static void drawAtPoint(NSString *string, NSPoint point, NSFont *font, NSColor *textColor)
</span><span class="cx"> {
</span><span class="lines">@@ -219,7 +213,7 @@
</span><span class="cx"> // It's probably incorrect for high DPI.
</span><span class="cx"> // If you change this, be sure to test all the text drawn this way in Safari, including
</span><span class="cx"> // the status bar, bookmarks bar, tab bar, and activity window.
</span><del>- point.y = webkit_CGCeiling(point.y);
</del><ins>+ point.y = CGCeiling(point.y);
</ins><span class="cx">
</span><span class="cx"> NSGraphicsContext *nsContext = [NSGraphicsContext currentContext];
</span><span class="cx"> CGContextRef cgContext = static_cast<CGContextRef>([nsContext graphicsPort]);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebVideoFullscreenHUDWindowControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm (178304 => 178305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2015-01-12 23:57:17 UTC (rev 178304)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2015-01-13 00:25:45 UTC (rev 178305)
</span><span class="lines">@@ -30,19 +30,13 @@
</span><span class="cx">
</span><span class="cx"> #import "ExceptionCodePlaceholder.h"
</span><span class="cx"> #import "FloatConversion.h"
</span><ins>+#import <WebCore/CoreGraphicsSPI.h>
</ins><span class="cx"> #import <WebCore/HTMLVideoElement.h>
</span><span class="cx"> #import <WebCoreSystemInterface.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-static inline CGFloat webkit_CGFloor(CGFloat value)
-{
- if (sizeof(value) == sizeof(float))
- return floorf(value);
- return floor(value);
-}
-
</del><span class="cx"> @interface WebVideoFullscreenHUDWindowController (Private) <NSWindowDelegate>
</span><span class="cx">
</span><span class="cx"> - (void)updateTime;
</span><span class="lines">@@ -330,7 +324,7 @@
</span><span class="cx">
</span><span class="cx"> NSView *contentView = [window contentView];
</span><span class="cx">
</span><del>- CGFloat center = webkit_CGFloor((windowWidth - playButtonWidth) / 2);
</del><ins>+ CGFloat center = CGFloor((windowWidth - playButtonWidth) / 2);
</ins><span class="cx"> _playButton = (NSButton *)createControlWithMediaUIControlType(wkMediaUIControlPlayPauseButton, NSMakeRect(center, windowHeight - playButtonTopMargin - playButtonHeight, playButtonWidth, playButtonHeight));
</span><span class="cx"> ASSERT([_playButton isKindOfClass:[NSButton class]]);
</span><span class="cx"> [_playButton setTarget:self];
</span><span class="lines">@@ -353,7 +347,7 @@
</span><span class="cx"> [volumeDownButton release];
</span><span class="cx">
</span><span class="cx"> left += volumeButtonWidth;
</span><del>- _volumeSlider = createControlWithMediaUIControlType(wkMediaUIControlSlider, NSMakeRect(left, volumeControlsBottom + webkit_CGFloor((volumeButtonHeight - volumeSliderHeight) / 2), volumeSliderWidth, volumeSliderHeight));
</del><ins>+ _volumeSlider = createControlWithMediaUIControlType(wkMediaUIControlSlider, NSMakeRect(left, volumeControlsBottom + CGFloor((volumeButtonHeight - volumeSliderHeight) / 2), volumeSliderWidth, volumeSliderHeight));
</ins><span class="cx"> [_volumeSlider setValue:[NSNumber numberWithDouble:[self maxVolume]] forKey:@"maxValue"];
</span><span class="cx"> [_volumeSlider setTarget:self];
</span><span class="cx"> [_volumeSlider setAction:@selector(volumeChanged:)];
</span><span class="lines">@@ -370,7 +364,7 @@
</span><span class="cx">
</span><span class="cx"> [_timeline setTarget:self];
</span><span class="cx"> [_timeline setAction:@selector(timelinePositionChanged:)];
</span><del>- [_timeline setFrame:NSMakeRect(webkit_CGFloor((windowWidth - timelineWidth) / 2), timelineBottomMargin, timelineWidth, timelineHeight)];
</del><ins>+ [_timeline setFrame:NSMakeRect(CGFloor((windowWidth - timelineWidth) / 2), timelineBottomMargin, timelineWidth, timelineHeight)];
</ins><span class="cx"> [contentView addSubview:_timeline];
</span><span class="cx">
</span><span class="cx"> _elapsedTimeText = createTimeTextField(NSMakeRect(timeTextFieldHorizontalMargin, timelineBottomMargin, timeTextFieldWidth, timeTextFieldHeight));
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (178304 => 178305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-01-12 23:57:17 UTC (rev 178304)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-13 00:25:45 UTC (rev 178305)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-12 Timothy Horton <timothy_horton@apple.com>
+
+ Get rid of unnecessary reimplementations of CGFloor/Ceiling
+ https://bugs.webkit.org/show_bug.cgi?id=140375
+
+ Reviewed by Simon Fraser.
+
+ * Misc/WebKitNSStringExtras.mm:
+ (-[NSString _web_drawAtPoint:font:textColor:allowingFontSmoothing:]):
+ (webkit_CGCeiling): Deleted.
+ Delete unnecessary code, use the real CGFloor/Ceiling instead.
+
</ins><span class="cx"> 2015-01-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Make delegates conform to formal delegate protocols
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitNSStringExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm (178304 => 178305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm 2015-01-12 23:57:17 UTC (rev 178304)
+++ trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm 2015-01-13 00:25:45 UTC (rev 178305)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WebKitNSStringExtras.h"
</span><span class="cx">
</span><ins>+#import <WebCore/CoreGraphicsSPI.h>
</ins><span class="cx"> #import <WebCore/Font.h>
</span><span class="cx"> #import <WebCore/GraphicsContext.h>
</span><span class="cx"> #import <WebCore/TextRun.h>
</span><span class="lines">@@ -47,15 +48,6 @@
</span><span class="cx">
</span><span class="cx"> NSString *WebKitLocalCacheDefaultsKey = @"WebKitLocalCache";
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-static inline CGFloat webkit_CGCeiling(CGFloat value)
-{
- if (sizeof(value) == sizeof(float))
- return ceilf(value);
- return ceil(value);
-}
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> @implementation NSString (WebKitExtras)
</span><span class="lines">@@ -89,7 +81,7 @@
</span><span class="cx"> // It's probably incorrect for high DPI.
</span><span class="cx"> // If you change this, be sure to test all the text drawn this way in Safari, including
</span><span class="cx"> // the status bar, bookmarks bar, tab bar, and activity window.
</span><del>- point.y = webkit_CGCeiling(point.y);
</del><ins>+ point.y = CGCeiling(point.y);
</ins><span class="cx">
</span><span class="cx"> NSGraphicsContext *nsContext = [NSGraphicsContext currentContext];
</span><span class="cx"> CGContextRef cgContext = static_cast<CGContextRef>([nsContext graphicsPort]);
</span></span></pre>
</div>
</div>
</body>
</html>