<!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>[166691] trunk/Source/WebKit</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/166691">166691</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-02 19:38:24 -0700 (Wed, 02 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Remove the legacy string drawing code
https://bugs.webkit.org/show_bug.cgi?id=131088
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-04-02
Reviewed by Sam Weinig.
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj:
Source/WebKit/ios:
* Misc/WebNSStringDrawing.h: Removed.
* Misc/WebNSStringDrawing.mm: Removed.
* Misc/WebUIKitSupport.h:
Source/WebKit/mac:
* Configurations/WebKit.xcconfig:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosMiscWebUIKitSupporth">trunk/Source/WebKit/ios/Misc/WebUIKitSupport.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsWebKitxcconfig">trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitiosMiscWebNSStringDrawingh">trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.h</a></li>
<li><a href="#trunkSourceWebKitiosMiscWebNSStringDrawingmm">trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (166690 => 166691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-04-03 01:38:53 UTC (rev 166690)
+++ trunk/Source/WebKit/ChangeLog 2014-04-03 02:38:24 UTC (rev 166691)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-04-02 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS] Remove the legacy string drawing code
+ https://bugs.webkit.org/show_bug.cgi?id=131088
+
+ Reviewed by Sam Weinig.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-04-02 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix for full Debug rebuild.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (166690 => 166691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-04-03 01:38:53 UTC (rev 166690)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-04-03 02:38:24 UTC (rev 166691)
</span><span class="lines">@@ -344,8 +344,6 @@
</span><span class="cx"> A10C1D3518202FC50036883A /* WebGeolocationCoreLocationProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = A10C1D2618202FC50036883A /* WebGeolocationCoreLocationProvider.mm */; };
</span><span class="cx"> A10C1D3618202FC50036883A /* WebGeolocationProviderIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = A10C1D2718202FC50036883A /* WebGeolocationProviderIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A10C1D3718202FC50036883A /* WebGeolocationProviderIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = A10C1D2818202FC50036883A /* WebGeolocationProviderIOS.mm */; };
</span><del>- A10C1D3818202FC50036883A /* WebNSStringDrawing.h in Headers */ = {isa = PBXBuildFile; fileRef = A10C1D2918202FC50036883A /* WebNSStringDrawing.h */; settings = {ATTRIBUTES = (Private, ); }; };
- A10C1D3918202FC50036883A /* WebNSStringDrawing.mm in Sources */ = {isa = PBXBuildFile; fileRef = A10C1D2A18202FC50036883A /* WebNSStringDrawing.mm */; };
</del><span class="cx"> A10C1D3A18202FC50036883A /* WebNSStringExtrasIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = A10C1D2B18202FC50036883A /* WebNSStringExtrasIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A10C1D3B18202FC50036883A /* WebNSStringExtrasIOS.m in Sources */ = {isa = PBXBuildFile; fileRef = A10C1D2C18202FC50036883A /* WebNSStringExtrasIOS.m */; };
</span><span class="cx"> A10C1D3C18202FC50036883A /* WebNSStringExtrasIPhone.h in Headers */ = {isa = PBXBuildFile; fileRef = A10C1D2D18202FC50036883A /* WebNSStringExtrasIPhone.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -745,8 +743,6 @@
</span><span class="cx"> A10C1D2618202FC50036883A /* WebGeolocationCoreLocationProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebGeolocationCoreLocationProvider.mm; path = ios/Misc/WebGeolocationCoreLocationProvider.mm; sourceTree = SOURCE_ROOT; };
</span><span class="cx"> A10C1D2718202FC50036883A /* WebGeolocationProviderIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGeolocationProviderIOS.h; path = ios/Misc/WebGeolocationProviderIOS.h; sourceTree = SOURCE_ROOT; };
</span><span class="cx"> A10C1D2818202FC50036883A /* WebGeolocationProviderIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebGeolocationProviderIOS.mm; path = ios/Misc/WebGeolocationProviderIOS.mm; sourceTree = SOURCE_ROOT; };
</span><del>- A10C1D2918202FC50036883A /* WebNSStringDrawing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebNSStringDrawing.h; path = ios/Misc/WebNSStringDrawing.h; sourceTree = SOURCE_ROOT; };
- A10C1D2A18202FC50036883A /* WebNSStringDrawing.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebNSStringDrawing.mm; path = ios/Misc/WebNSStringDrawing.mm; sourceTree = SOURCE_ROOT; };
</del><span class="cx"> A10C1D2B18202FC50036883A /* WebNSStringExtrasIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebNSStringExtrasIOS.h; path = ios/Misc/WebNSStringExtrasIOS.h; sourceTree = SOURCE_ROOT; };
</span><span class="cx"> A10C1D2C18202FC50036883A /* WebNSStringExtrasIOS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebNSStringExtrasIOS.m; path = ios/Misc/WebNSStringExtrasIOS.m; sourceTree = SOURCE_ROOT; };
</span><span class="cx"> A10C1D2D18202FC50036883A /* WebNSStringExtrasIPhone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebNSStringExtrasIPhone.h; path = ios/Misc/WebNSStringExtrasIPhone.h; sourceTree = SOURCE_ROOT; };
</span><span class="lines">@@ -1446,8 +1442,6 @@
</span><span class="cx"> A10C1D2618202FC50036883A /* WebGeolocationCoreLocationProvider.mm */,
</span><span class="cx"> A10C1D2718202FC50036883A /* WebGeolocationProviderIOS.h */,
</span><span class="cx"> A10C1D2818202FC50036883A /* WebGeolocationProviderIOS.mm */,
</span><del>- A10C1D2918202FC50036883A /* WebNSStringDrawing.h */,
- A10C1D2A18202FC50036883A /* WebNSStringDrawing.mm */,
</del><span class="cx"> A10C1D2B18202FC50036883A /* WebNSStringExtrasIOS.h */,
</span><span class="cx"> A10C1D2C18202FC50036883A /* WebNSStringExtrasIOS.m */,
</span><span class="cx"> A10C1D2D18202FC50036883A /* WebNSStringExtrasIPhone.h */,
</span><span class="lines">@@ -1837,7 +1831,6 @@
</span><span class="cx"> 9398106D0824BF01008DF038 /* WebKitErrorsPrivate.h in Headers */,
</span><span class="cx"> CD8BFCE815531224005AFB25 /* WebKitFullScreenListener.h in Headers */,
</span><span class="cx"> 9398101D0824BF01008DF038 /* WebKitLogging.h in Headers */,
</span><del>- A10C1D3818202FC50036883A /* WebNSStringDrawing.h in Headers */,
</del><span class="cx"> 9398101E0824BF01008DF038 /* WebKitNSStringExtras.h in Headers */,
</span><span class="cx"> 1AAF58940EDCCF15008D883D /* WebKitPluginAgent.defs in Headers */,
</span><span class="cx"> 1AAF58950EDCCF15008D883D /* WebKitPluginAgentReply.defs in Headers */,
</span><span class="lines">@@ -2372,7 +2365,6 @@
</span><span class="cx"> 939811150824BF01008DF038 /* WebNSDataExtras.m in Sources */,
</span><span class="cx"> 65488DA2084FBCCB00831AD0 /* WebNSDictionaryExtras.m in Sources */,
</span><span class="cx"> 939811160824BF01008DF038 /* WebNSEventExtras.m in Sources */,
</span><del>- A10C1D3918202FC50036883A /* WebNSStringDrawing.mm in Sources */,
</del><span class="cx"> 65EEDE58084FFC9E0002DB25 /* WebNSFileManagerExtras.mm in Sources */,
</span><span class="cx"> 939810C70824BF01008DF038 /* WebNSImageExtras.m in Sources */,
</span><span class="cx"> A10C1D4318202FEF0036883A /* WebSQLiteDatabaseTrackerClient.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (166690 => 166691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2014-04-03 01:38:53 UTC (rev 166690)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-04-03 02:38:24 UTC (rev 166691)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-04-02 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS] Remove the legacy string drawing code
+ https://bugs.webkit.org/show_bug.cgi?id=131088
+
+ Reviewed by Sam Weinig.
+
+ * Misc/WebNSStringDrawing.h: Removed.
+ * Misc/WebNSStringDrawing.mm: Removed.
+ * Misc/WebUIKitSupport.h:
+
</ins><span class="cx"> 2014-04-02 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix after r166684.
</span></span></pre></div>
<a id="trunkSourceWebKitiosMiscWebNSStringDrawingh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.h (166690 => 166691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.h 2014-04-03 01:38:53 UTC (rev 166690)
+++ trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.h 2014-04-03 02:38:24 UTC (rev 166691)
</span><span class="lines">@@ -1,119 +0,0 @@
</span><del>-/*
- * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebNSStringDrawing_h
-#define WebNSStringDrawing_h
-
-// FIXME: Delete this header after testing to be sure it doesn't break any apps or frameworks.
-
-#if TARGET_OS_IPHONE
-
-#import <CoreGraphics/CoreGraphics.h>
-#import <Foundation/Foundation.h>
-#import <GraphicsServices/GraphicsServices.h>
-
-typedef enum {
- // The order of the enum items is important, and it is used for >= comparisions
- WebEllipsisStyleNone = 0, // Old style, no truncation. Doesn't respect the "width" passed to it. Left in for compatability.
- WebEllipsisStyleHead = 1,
- WebEllipsisStyleTail = 2,
- WebEllipsisStyleCenter = 3,
- WebEllipsisStyleClip = 4, // Doesn't really clip, but instad truncates at the last character.
- WebEllipsisStyleWordWrap = 5, // Truncates based on the width/height passed to it.
- WebEllipsisStyleCharacterWrap = 6, // For "drawAtPoint", it is just like WebEllipsisStyleClip, since it doesn't really clip, but truncates at the last character
-} WebEllipsisStyle;
-
-typedef enum {
- WebTextAlignmentLeft = 0,
- WebTextAlignmentCenter = 1,
- WebTextAlignmentRight = 2,
-} WebTextAlignment;
-
-@protocol WebTextRenderingAttributes
-
-@property(nonatomic, readonly) GSFontRef font; // font the text should be rendered with (defaults to nil)
-@property(nonatomic, readonly) CGFloat lineSpacing; // set to specify the line spacing (defaults to 0.0 which indicates the default line spacing)
-
-@property(nonatomic, readonly) WebEllipsisStyle ellipsisStyle; // text will be wrapped and truncated according to the line break mode (defaults to UILineBreakModeWordWrap)
-@property(nonatomic, readonly) CGFloat letterSpacing; // number of extra pixels to be added or subtracted between each pair of characters (defalts to 0)
-@property(nonatomic, readonly) WebTextAlignment alignment; // specifies the horizontal alignment that should be used when rendering the text (defaults to UITextAlignmentLeft)
-@property(nonatomic, readonly) BOOL includeEmoji; // if yes, the text can include Emoji characters.
-@property(nonatomic, readwrite) CGRect truncationRect; // the truncation rect argument, if non-nil, will be used instead of an ellipsis character for truncation sizing. if no truncation occurs, the truncationRect will be changed to CGRectNull. If truncation occurs, the rect will be updated with its placement.
-
-@property(nonatomic, readonly) NSString **renderString; // An out-parameter for the actual rendered string. Defaults to nil.
-@property(nonatomic, readonly) BOOL drawUnderline; // if yes, the text will be painted with underline.
-
-@end
-
-@interface NSString (WebStringDrawing)
-
-+ (void)_web_setWordRoundingEnabled:(BOOL)flag;
-+ (BOOL)_web_wordRoundingEnabled;
-
-+ (void)_web_setWordRoundingAllowed:(BOOL)flag;
-+ (BOOL)_web_wordRoundingAllowed;
-
-+ (void)_web_setAscentRoundingEnabled:(BOOL)flag;
-+ (BOOL)_web_ascentRoundingEnabled;
-
-- (CGSize)_web_drawAtPoint:(CGPoint)point withFont:(GSFontRef)font;
-
-- (CGSize)_web_sizeWithFont:(GSFontRef)font;
-
-// Size after applying ellipsis style and clipping to width.
-- (CGSize)_web_sizeWithFont:(GSFontRef)font forWidth:(float)width ellipsis:(WebEllipsisStyle)ellipsisStyle;
-- (CGSize)_web_sizeWithFont:(GSFontRef)font forWidth:(float)width ellipsis:(WebEllipsisStyle)ellipsisStyle letterSpacing:(float)letterSpacing;
-- (CGSize)_web_sizeWithFont:(GSFontRef)font forWidth:(float)width ellipsis:(WebEllipsisStyle)ellipsisStyle letterSpacing:(float)letterSpacing resultRange:(NSRange *)resultRangeOut;
-
-// Draw text to fit width. Clip or apply ellipsis according to style.
-- (CGSize)_web_drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle;
-- (CGSize)_web_drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle letterSpacing:(float)letterSpacing;
-- (CGSize)_web_drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle letterSpacing:(float)letterSpacing includeEmoji:(BOOL)includeEmoji;
-
-// Wrap and clip to rect.
-- (CGSize)_web_drawInRect:(CGRect)rect withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle alignment:(WebTextAlignment)alignment;
-- (CGSize)_web_drawInRect:(CGRect)rect withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle alignment:(WebTextAlignment)alignment lineSpacing:(int)lineSpacing;
-- (CGSize)_web_drawInRect:(CGRect)rect withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle alignment:(WebTextAlignment)alignment lineSpacing:(int)lineSpacing includeEmoji:(BOOL)includeEmoj truncationRect:(CGRect *)truncationRect;
-- (CGSize)_web_sizeInRect:(CGRect)rect withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle;
-- (CGSize)_web_sizeInRect:(CGRect)rect withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle lineSpacing:(int)lineSpacing;
-
-// Clip or apply ellipsis according to style. Return the string which results.
-- (NSString *)_web_stringForWidth:(float)width withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle letterSpacing:(float)letterSpacing includeEmoji:(BOOL)includeEmoji;
-
-// These methods should eventually replace all string drawing/sizing methods above
-
-// Sizing/drawing a single line of text
-- (CGSize)_web_sizeForWidth:(CGFloat)width withAttributes:(id <WebTextRenderingAttributes>)attributes;
-- (CGSize)_web_drawAtPoint:(CGPoint)point forWidth:(CGFloat)width withAttributes:(id <WebTextRenderingAttributes>)attributes;
-
-// Sizing/drawing multiline text
-- (CGSize)_web_sizeInRect:(CGRect)rect withAttributes:(id <WebTextRenderingAttributes>)attributes;
-- (CGSize)_web_drawInRect:(CGRect)rect withAttributes:(id <WebTextRenderingAttributes>)attributes;
-
-@end
-
-#endif // TARGET_OS_IPHONE
-
-#endif // WebNSStringDrawing_h
</del></span></pre></div>
<a id="trunkSourceWebKitiosMiscWebNSStringDrawingmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.mm (166690 => 166691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.mm 2014-04-03 01:38:53 UTC (rev 166690)
+++ trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.mm 2014-04-03 02:38:24 UTC (rev 166691)
</span><span class="lines">@@ -1,162 +0,0 @@
</span><del>-/*
- * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "WebNSStringDrawing.h"
-
-// FIXME: Delete this file after testing to be sure it doesn't break any apps or frameworks.
-
-#if PLATFORM(IOS)
-
-@implementation NSString (WebStringDrawing)
-
-+ (void)_web_setWordRoundingEnabled:(BOOL)flag
-{
-}
-
-+ (BOOL)_web_wordRoundingEnabled
-{
- return NO;
-}
-
-+ (void)_web_setWordRoundingAllowed:(BOOL)flag
-{
-}
-
-+ (BOOL)_web_wordRoundingAllowed
-{
- return YES;
-}
-
-+ (void)_web_setAscentRoundingEnabled:(BOOL)flag
-{
-}
-
-+ (BOOL)_web_ascentRoundingEnabled
-{
- return NO;
-}
-
-- (CGSize)_web_drawAtPoint:(CGPoint)point withFont:(GSFontRef)font
-{
- return CGSizeZero;
-}
-
-- (CGSize)_web_sizeWithFont:(GSFontRef)font
-{
- return CGSizeZero;
-}
-
-- (CGSize)_web_sizeWithFont:(GSFontRef)font forWidth:(float)width ellipsis:(WebEllipsisStyle)ellipsisStyle
-{
- return CGSizeZero;
-}
-
-- (CGSize)_web_sizeWithFont:(GSFontRef)font forWidth:(float)width ellipsis:(WebEllipsisStyle)ellipsisStyle letterSpacing:(float)letterSpacing
-{
- return CGSizeZero;
-}
-
-- (CGSize)_web_sizeWithFont:(GSFontRef)font forWidth:(float)width ellipsis:(WebEllipsisStyle)ellipsisStyle letterSpacing:(float)letterSpacing resultRange:(NSRange *)resultRangeOut
-{
- return CGSizeZero;
-}
-
-- (CGSize)_web_drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle
-{
- return CGSizeZero;
-}
-
-- (CGSize)_web_drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle letterSpacing:(float)letterSpacing
-{
- return CGSizeZero;
-}
-
-- (CGSize)_web_drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle letterSpacing:(float)letterSpacing includeEmoji:(BOOL)includeEmoji
-{
- return CGSizeZero;
-}
-
-- (CGSize)_web_drawInRect:(CGRect)rect withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle alignment:(WebTextAlignment)alignment lineSpacing:(int)lineSpacing includeEmoji:(BOOL)includeEmoji truncationRect:(CGRect *)truncationRect measureOnly:(BOOL)measureOnly
-{
- if (truncationRect)
- *truncationRect = CGRectZero;
- return CGSizeZero;
-}
-
-- (CGSize)_web_drawInRect:(CGRect)rect withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle alignment:(WebTextAlignment)alignment lineSpacing:(int)lineSpacing includeEmoji:(BOOL)includeEmoji truncationRect:(CGRect *)truncationRect
-{
- if (truncationRect)
- *truncationRect = CGRectZero;
- return CGSizeZero;
-}
-
-- (CGSize)_web_drawInRect:(CGRect)rect withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle alignment:(WebTextAlignment)alignment lineSpacing:(int)lineSpacing
-{
- return CGSizeZero;
-}
-
-- (CGSize)_web_drawInRect:(CGRect)rect withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle alignment:(WebTextAlignment)alignment
-{
- return CGSizeZero;
-}
-
-- (CGSize)_web_sizeInRect:(CGRect)rect withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle lineSpacing:(int)lineSpacing
-{
- return CGSizeZero;
-}
-
-- (CGSize)_web_sizeInRect:(CGRect)rect withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle
-{
- return CGSizeZero;
-}
-
-- (NSString *)_web_stringForWidth:(float)width withFont:(GSFontRef)font ellipsis:(WebEllipsisStyle)ellipsisStyle letterSpacing:(float)letterSpacing includeEmoji:(BOOL)includeEmoji
-{
- return @"";
-}
-
-- (CGSize)_web_sizeForWidth:(CGFloat)width withAttributes:(id <WebTextRenderingAttributes>)attributes
-{
- return CGSizeZero;
-}
-
-- (CGSize)_web_drawAtPoint:(CGPoint)point forWidth:(CGFloat)width withAttributes:(id <WebTextRenderingAttributes>)attributes
-{
- return CGSizeZero;
-}
-
-- (CGSize)_web_sizeInRect:(CGRect)rect withAttributes:(id <WebTextRenderingAttributes>)attributes
-{
- return CGSizeZero;
-}
-
-- (CGSize)_web_drawInRect:(CGRect)rect withAttributes:(id <WebTextRenderingAttributes>)attributes
-{
- return CGSizeZero;
-}
-
-@end
-
-#endif // PLATFORM(IOS)
</del></span></pre></div>
<a id="trunkSourceWebKitiosMiscWebUIKitSupporth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/Misc/WebUIKitSupport.h (166690 => 166691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/Misc/WebUIKitSupport.h 2014-04-03 01:38:53 UTC (rev 166690)
+++ trunk/Source/WebKit/ios/Misc/WebUIKitSupport.h 2014-04-03 02:38:24 UTC (rev 166691)
</span><span class="lines">@@ -53,8 +53,6 @@
</span><span class="cx"> // This method gives WebKit the notifications to listen to so it knows about app Suspend/Resume
</span><span class="cx"> void WebKitSetBackgroundAndForegroundNotificationNames(NSString *, NSString *);
</span><span class="cx">
</span><del>-// This method does the minimum amount of work for WebNSStringDrawing to work
-// correctly.
</del><span class="cx"> void WebKitInitialize(void);
</span><span class="cx"> void WebKitSetIsClassic(BOOL);
</span><span class="cx"> float WebKitGetMinimumZoomFontSize(void);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (166690 => 166691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-04-03 01:38:53 UTC (rev 166690)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-04-03 02:38:24 UTC (rev 166691)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-04-02 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS] Remove the legacy string drawing code
+ https://bugs.webkit.org/show_bug.cgi?id=131088
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/WebKit.xcconfig:
+
</ins><span class="cx"> 2014-04-02 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> <https://webkit.org/b/131135> Introduce LockHistory and LockBackForwardList enums to use in place of bools.
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsWebKitxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (166690 => 166691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-04-03 01:38:53 UTC (rev 166690)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-04-03 02:38:24 UTC (rev 166691)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebRenderNode.mm WebStringTruncator.* WebTextCompletionController.*;
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</span><del>-EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringDrawing.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
</ins><span class="cx">
</span><span class="cx"> EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
</span><span class="cx"> EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
</span></span></pre>
</div>
</div>
</body>
</html>