<!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>[178214] trunk</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/178214">178214</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-09 15:40:25 -0800 (Fri, 09 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Make DumpRenderTree build with public SDK
https://bugs.webkit.org/show_bug.cgi?id=140311
Reviewed by Sam Weinig.
Source/WebKit2:
Add more SPI declarations.
* Platform/spi/ios/UIKitSPI.h:
Tools:
Use CGRound() instead of the obsolete macro function _ROUNDF_ (defined in
header UIKit/UIMath.h), and std::max() instead of the macro function MAX.
Additionally, remove unused header CoreGraphics/CGFontDB.h.
* DumpRenderTree/mac/DumpRenderTree.mm:
(-[ScrollViewResizerDelegate view:didSetFrame:oldFrame:asResultOfZoom:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformspiiosUIKitSPIh">trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178213 => 178214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-01-09 23:36:04 UTC (rev 178213)
+++ trunk/Source/WebKit2/ChangeLog        2015-01-09 23:40:25 UTC (rev 178214)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-09 Daniel Bates <dabates@apple.com>
+
+ [iOS] Make DumpRenderTree build with public SDK
+ https://bugs.webkit.org/show_bug.cgi?id=140311
+
+ Reviewed by Sam Weinig.
+
+ Add more SPI declarations.
+
+ * Platform/spi/ios/UIKitSPI.h:
+
</ins><span class="cx"> 2015-01-09 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove or use TimelineAgent Resource related event types
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (178213 => 178214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h        2015-01-09 23:36:04 UTC (rev 178213)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h        2015-01-09 23:40:25 UTC (rev 178214)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> @interface UIApplication (Details)
</span><span class="cx"> - (UIInterfaceOrientation)interfaceOrientation;
</span><span class="cx"> - (void)_cancelAllTouches;
</span><ins>+- (CGFloat)statusBarHeight;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> typedef NS_ENUM(NSInteger, UIDatePickerPrivateMode) {
</span><span class="lines">@@ -619,9 +620,29 @@
</span><span class="cx"> @interface UIWebTiledView : UIView
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@class WAKWindow;
+
+@interface UIWebTiledView (Details)
+- (void)setWAKWindow:(WAKWindow *)window;
+@end
+
</ins><span class="cx"> @interface UIWebDocumentView : UIWebTiledView
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+typedef enum {
+ UIEveryDocumentMask = 0xFFFFFF,
+} UIDocumentMask;
+
+@interface UIWebDocumentView (Details)
+- (void)setDelegate:(id)delegate;
+- (void)setAutoresizes:(BOOL)flag;
+- (void)setMinimumSize:(CGSize)aSize;
+- (void)setInitialScale:(float)aScale forDocumentTypes:(UIDocumentMask)aDocumentMask;
+- (void)setViewportSize:(CGSize)aSize forDocumentTypes:(UIDocumentMask)aDocumentMask;
+- (void)setMinimumScale:(float)aScale forDocumentTypes:(UIDocumentMask)aDocumentMask;
+- (void)setMaximumScale:(float)aScale forDocumentTypes:(UIDocumentMask)aDocumentMask;
+@end
+
</ins><span class="cx"> @interface UIWebBrowserView : UIWebDocumentView
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -629,7 +650,9 @@
</span><span class="cx">
</span><span class="cx"> @interface UIWebBrowserView (Details)
</span><span class="cx"> - (WebView *)webView;
</span><ins>+- (void)setPaused:(BOOL)paused;
</ins><span class="cx"> - (void)sendScrollEventIfNecessaryWasUserScroll:(BOOL)userScroll;
</span><ins>+@property (nonatomic) BOOL inputViewObeysDOMFocus;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // USE(APPLE_INTERNAL_SDK)
</span><span class="lines">@@ -655,9 +678,13 @@
</span><span class="cx"> extern NSString * const UIWindowWillRotateNotification;
</span><span class="cx">
</span><span class="cx"> extern UIApplication *UIApp;
</span><del>-
</del><ins>+void _UIApplicationLoadWebKit(void);
</ins><span class="cx"> BOOL _UIApplicationUsesLegacyUI(void);
</span><span class="cx">
</span><span class="cx"> void UIImageDataWriteToSavedPhotosAlbum(NSData *imageData, id completionTarget, SEL completionSelector, void *contextInfo);
</span><span class="cx">
</span><ins>+extern const float UIWebViewGrowsAndShrinksToFitHeight;
+extern const float UIWebViewScalesToFitScale;
+extern const float UIWebViewStandardViewportWidth;
+
</ins><span class="cx"> WTF_EXTERN_C_END
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (178213 => 178214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-01-09 23:36:04 UTC (rev 178213)
+++ trunk/Tools/ChangeLog        2015-01-09 23:40:25 UTC (rev 178214)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-09 Daniel Bates <dabates@apple.com>
+
+ [iOS] Make DumpRenderTree build with public SDK
+ https://bugs.webkit.org/show_bug.cgi?id=140311
+
+ Reviewed by Sam Weinig.
+
+ Use CGRound() instead of the obsolete macro function _ROUNDF_ (defined in
+ header UIKit/UIMath.h), and std::max() instead of the macro function MAX.
+ Additionally, remove unused header CoreGraphics/CGFontDB.h.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (-[ScrollViewResizerDelegate view:didSetFrame:oldFrame:asResultOfZoom:]):
+
</ins><span class="cx"> 2015-01-09 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> platform/mac-wk2/tiled-drawing/tiled-drawing-scroll-position-page-cache-restoration.html fails on Retina machines
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (178213 => 178214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm        2015-01-09 23:36:04 UTC (rev 178213)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm        2015-01-09 23:40:25 UTC (rev 178214)
</span><span class="lines">@@ -100,9 +100,8 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import "DumpRenderTreeBrowserView.h"
</span><span class="cx"> #import "UIKitSPI.h"
</span><del>-#import <CoreGraphics/CGFontDB.h>
</del><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><del>-#import <UIKit/UIMath.h>
</del><ins>+#import <WebCore/CoreGraphicsSPI.h>
</ins><span class="cx"> #import <WebKit/WAKWindow.h>
</span><span class="cx"> #import <WebKit/WebCoreThread.h>
</span><span class="cx"> #import <WebKit/WebCoreThreadRun.h>
</span><span class="lines">@@ -136,7 +135,7 @@
</span><span class="cx"> ASSERT(scrollView && [scrollView isKindOfClass:[UIWebScrollView class]]);
</span><span class="cx"> const CGSize scrollViewSize = [scrollView bounds].size;
</span><span class="cx"> CGSize contentSize = newFrame.size;
</span><del>- contentSize.height = _ROUNDF_(MAX(CGRectGetMaxY(newFrame), scrollViewSize.height));
</del><ins>+ contentSize.height = CGRound(max(CGRectGetMaxY(newFrame), scrollViewSize.height));
</ins><span class="cx"> [(UIWebScrollView *)scrollView setContentSize:contentSize];
</span><span class="cx"> }
</span><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>