<!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>[182640] 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/182640">182640</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-04-10 13:22:38 -0700 (Fri, 10 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace setFixedLayoutSizeEnabled: with an enum of layout modes
https://bugs.webkit.org/show_bug.cgi?id=143576
Reviewed by Simon Fraser.
* UIProcess/API/C/WKLayoutMode.h: Added.
* UIProcess/API/Cocoa/WKViewPrivate.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _layoutMode]):
(-[WKWebView _setLayoutMode:]):
(-[WKWebView _isFixedLayoutEnabled]): Deleted.
(-[WKWebView _setFixedLayoutEnabled:]): Deleted.
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/API/Cocoa/_WKLayoutMode.h: Added.
* UIProcess/API/mac/WKView.mm:
(-[WKView _layoutMode]):
(-[WKView _setLayoutMode:]):
(-[WKView _isFixedLayoutEnabled]): Deleted.
(-[WKView _setFixedLayoutEnabled:]): Deleted.
* WebKit2.xcodeproj/project.pbxproj:
Add enums for "layout mode". Currently we have two values: "ViewSize",
which is the normal behavior, and "FixedSize", which is fixed layout mode.
More values will come in the future.
* TestWebKitAPI/Tests/WebKit2Cocoa/FixedLayoutSize.mm:
(TEST):
Adopt.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaFixedLayoutSizemm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FixedLayoutSize.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKLayoutModeh">trunk/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKLayoutModeh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182639 => 182640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-10 19:39:57 UTC (rev 182639)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-10 20:22:38 UTC (rev 182640)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-04-10 Tim Horton <timothy_horton@apple.com>
+
+ Replace setFixedLayoutSizeEnabled: with an enum of layout modes
+ https://bugs.webkit.org/show_bug.cgi?id=143576
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/API/C/WKLayoutMode.h: Added.
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _layoutMode]):
+ (-[WKWebView _setLayoutMode:]):
+ (-[WKWebView _isFixedLayoutEnabled]): Deleted.
+ (-[WKWebView _setFixedLayoutEnabled:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/API/Cocoa/_WKLayoutMode.h: Added.
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _layoutMode]):
+ (-[WKView _setLayoutMode:]):
+ (-[WKView _isFixedLayoutEnabled]): Deleted.
+ (-[WKView _setFixedLayoutEnabled:]): Deleted.
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add enums for "layout mode". Currently we have two values: "ViewSize",
+ which is the normal behavior, and "FixedSize", which is fixed layout mode.
+ More values will come in the future.
+
</ins><span class="cx"> 2015-04-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> _WKWebsiteDataStore doesn't track and remove offline application cache entries
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKLayoutModeh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h (0 => 182640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h 2015-04-10 20:22:38 UTC (rev 182640)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+/*
+ * Copyright (C) 2015 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 WKLayoutMode_h
+#define WKLayoutMode_h
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum {
+ kWKLayoutModeViewSize,
+ kWKLayoutModeFixedSize,
+};
+typedef uint32_t WKLayoutMode;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKLayoutMode_h */
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (182639 => 182640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-04-10 19:39:57 UTC (rev 182639)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-04-10 20:22:38 UTC (rev 182640)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #import <WebKit/WKActionMenuTypes.h>
</span><span class="cx"> #import <WebKit/WKBase.h>
</span><span class="cx"> #import <WebKit/WKImmediateActionTypes.h>
</span><ins>+#import <WebKit/WKLayoutMode.h>
</ins><span class="cx"> #import <WebKit/WKView.h>
</span><span class="cx">
</span><span class="cx"> @interface WKView (Private)
</span><span class="lines">@@ -90,7 +91,7 @@
</span><span class="cx"> @property (nonatomic, setter=_setTopContentInset:) CGFloat _topContentInset;
</span><span class="cx"> @property (nonatomic, setter=_setTotalHeightOfBanners:) CGFloat _totalHeightOfBanners;
</span><span class="cx">
</span><del>-@property (nonatomic, getter=_isFixedLayoutEnabled, setter=_setFixedLayoutEnabled:) BOOL _fixedLayoutEnabled;
</del><ins>+@property (nonatomic, setter=_setLayoutMode:) WKLayoutMode _layoutMode;
</ins><span class="cx"> @property (nonatomic, setter=_setFixedLayoutSize:) CGSize _fixedLayoutSize;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setOverrideDeviceScaleFactor:) CGFloat _overrideDeviceScaleFactor WK_AVAILABLE(WK_MAC_TBA, NA);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (182639 => 182640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-04-10 19:39:57 UTC (rev 182639)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-04-10 20:22:38 UTC (rev 182640)
</span><span class="lines">@@ -2242,14 +2242,14 @@
</span><span class="cx"> return _page->isShowingNavigationGestureSnapshot();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)_isFixedLayoutEnabled
</del><ins>+- (_WKLayoutMode)_layoutMode
</ins><span class="cx"> {
</span><del>- return _page->useFixedLayout();
</del><ins>+ return _page->useFixedLayout() ? _WKLayoutModeFixedSize : _WKLayoutModeViewSize;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setFixedLayoutEnabled:(BOOL)fixedLayoutEnabled
</del><ins>+- (void)_setLayoutMode:(_WKLayoutMode)layoutMode
</ins><span class="cx"> {
</span><del>- _page->setUseFixedLayout(fixedLayoutEnabled);
</del><ins>+ _page->setUseFixedLayout(layoutMode == _WKLayoutModeFixedSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (CGSize)_fixedLayoutSize
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (182639 => 182640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-04-10 19:39:57 UTC (rev 182639)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-04-10 20:22:38 UTC (rev 182640)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import <WebKit/_WKFindOptions.h>
</span><ins>+#import <WebKit/_WKLayoutMode.h>
</ins><span class="cx"> #import <WebKit/_WKRenderingProgressEvents.h>
</span><span class="cx">
</span><span class="cx"> typedef NS_ENUM(NSInteger, _WKPaginationMode) {
</span><span class="lines">@@ -91,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_close;
</span><span class="cx">
</span><del>-@property (nonatomic, getter=_isFixedLayoutEnabled, setter=_setFixedLayoutEnabled:) BOOL _fixedLayoutEnabled;
</del><ins>+@property (nonatomic, setter=_setLayoutMode:) _WKLayoutMode _layoutMode;
</ins><span class="cx"> @property (nonatomic, setter=_setFixedLayoutSize:) CGSize _fixedLayoutSize;
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKLayoutModeh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h (0 => 182640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h 2015-04-10 20:22:38 UTC (rev 182640)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+/*
+ * Copyright (C) 2015 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 <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+typedef NS_ENUM(NSUInteger, _WKLayoutMode) {
+ _WKLayoutModeViewSize,
+ _WKLayoutModeFixedSize,
+} WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (182639 => 182640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-04-10 19:39:57 UTC (rev 182639)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-04-10 20:22:38 UTC (rev 182640)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> #import "WKActionMenuItemTypes.h"
</span><span class="cx"> #import "WKFullScreenWindowController.h"
</span><span class="cx"> #import "WKImmediateActionController.h"
</span><ins>+#import "WKLayoutMode.h"
</ins><span class="cx"> #import "WKPrintingView.h"
</span><span class="cx"> #import "WKProcessPoolInternal.h"
</span><span class="cx"> #import "WKStringCF.h"
</span><span class="lines">@@ -4343,14 +4344,14 @@
</span><span class="cx"> return _data->_overrideDeviceScaleFactor;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)_isFixedLayoutEnabled
</del><ins>+- (WKLayoutMode)_layoutMode
</ins><span class="cx"> {
</span><del>- return _data->_page->useFixedLayout();
</del><ins>+ return _data->_page->useFixedLayout() ? kWKLayoutModeFixedSize : kWKLayoutModeViewSize;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setFixedLayoutEnabled:(BOOL)fixedLayoutEnabled
</del><ins>+- (void)_setLayoutMode:(WKLayoutMode)layoutMode
</ins><span class="cx"> {
</span><del>- _data->_page->setUseFixedLayout(fixedLayoutEnabled);
</del><ins>+ _data->_page->setUseFixedLayout(layoutMode == kWKLayoutModeFixedSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (CGSize)_fixedLayoutSize
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (182639 => 182640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-04-10 19:39:57 UTC (rev 182639)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-04-10 20:22:38 UTC (rev 182640)
</span><span class="lines">@@ -625,6 +625,8 @@
</span><span class="cx"> 2D6CD119189058A500E5A4A0 /* ViewSnapshotStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D6CD117189058A500E5A4A0 /* ViewSnapshotStore.h */; };
</span><span class="cx"> 2D6CD11A189058A500E5A4A0 /* ViewSnapshotStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D6CD118189058A500E5A4A0 /* ViewSnapshotStore.mm */; };
</span><span class="cx"> 2D7303791A7C2B7500F8F487 /* WKPageNavigationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D7303781A7C2B7500F8F487 /* WKPageNavigationClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 2D790A9D1AD7050D00AB90B3 /* _WKLayoutMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D790A9C1AD7050D00AB90B3 /* _WKLayoutMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 2D790A9F1AD7164900AB90B3 /* WKLayoutMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D790A9E1AD7164900AB90B3 /* WKLayoutMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 2D7AAFD318C8640600A7ACD4 /* WKWebViewContentProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D7AAFD218C8640600A7ACD4 /* WKWebViewContentProvider.h */; };
</span><span class="cx"> 2D7AAFD618C956AF00A7ACD4 /* WKWebViewConfigurationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D7AAFD518C956AF00A7ACD4 /* WKWebViewConfigurationInternal.h */; };
</span><span class="cx"> 2D7F13101A702FBA009A6FBD /* ProcessType.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D7F130F1A702FBA009A6FBD /* ProcessType.h */; };
</span><span class="lines">@@ -2785,6 +2787,8 @@
</span><span class="cx"> 2D70AB1318A1D51A00026D6E /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
</span><span class="cx"> 2D70AB1418A1D57C00026D6E /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
</span><span class="cx"> 2D7303781A7C2B7500F8F487 /* WKPageNavigationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageNavigationClient.h; sourceTree = "<group>"; };
</span><ins>+ 2D790A9C1AD7050D00AB90B3 /* _WKLayoutMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKLayoutMode.h; sourceTree = "<group>"; };
+ 2D790A9E1AD7164900AB90B3 /* WKLayoutMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKLayoutMode.h; sourceTree = "<group>"; };
</ins><span class="cx"> 2D7AAFD218C8640600A7ACD4 /* WKWebViewContentProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewContentProvider.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D7AAFD518C956AF00A7ACD4 /* WKWebViewConfigurationInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewConfigurationInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D7F130F1A702FBA009A6FBD /* ProcessType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessType.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5346,6 +5350,7 @@
</span><span class="cx"> 2DEAC5CE1AC368BB00A195D8 /* _WKFindOptions.h */,
</span><span class="cx"> 37A64E5418F38E3C00EB30F1 /* _WKFormDelegate.h */,
</span><span class="cx"> 37A64E5618F38F4600EB30F1 /* _WKFormInputSession.h */,
</span><ins>+ 2D790A9C1AD7050D00AB90B3 /* _WKLayoutMode.h */,
</ins><span class="cx"> 1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */,
</span><span class="cx"> 1A43E827188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm */,
</span><span class="cx"> 7C89D2D61A6C6BE6003A5FDE /* _WKProcessPoolConfigurationInternal.h */,
</span><span class="lines">@@ -6382,6 +6387,7 @@
</span><span class="cx"> 1C8E293712761E5B00BC7BD0 /* WKInspector.h */,
</span><span class="cx"> 51A9E1081315CD18009E7031 /* WKKeyValueStorageManager.cpp */,
</span><span class="cx"> 51A9E1091315CD18009E7031 /* WKKeyValueStorageManager.h */,
</span><ins>+ 2D790A9E1AD7164900AB90B3 /* WKLayoutMode.h */,
</ins><span class="cx"> 33D3A3B31339600B00709BE4 /* WKMediaCacheManager.cpp */,
</span><span class="cx"> 33D3A3B41339600B00709BE4 /* WKMediaCacheManager.h */,
</span><span class="cx"> C09AE5E8125257C20025825D /* WKNativeEvent.h */,
</span><span class="lines">@@ -7911,6 +7917,7 @@
</span><span class="cx"> 1A57109F1ABA0027002FABBE /* WKWebsiteDataStoreRef.h in Headers */,
</span><span class="cx"> 1A002D49196B345D00B9AD44 /* SessionStateCoding.h in Headers */,
</span><span class="cx"> 753E3E0E1887398900188496 /* SessionTracker.h in Headers */,
</span><ins>+ 2D790A9F1AD7164900AB90B3 /* WKLayoutMode.h in Headers */,
</ins><span class="cx"> 1A6420E512DCE2FF00CAAE2C /* ShareableBitmap.h in Headers */,
</span><span class="cx"> 51217461164C20E30037A5C1 /* ShareableResource.h in Headers */,
</span><span class="cx"> 1A24BED5120894D100FBB059 /* SharedMemory.h in Headers */,
</span><span class="lines">@@ -8327,6 +8334,7 @@
</span><span class="cx"> BCD597D7112B56DC00EC8C23 /* WKPage.h in Headers */,
</span><span class="cx"> 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */,
</span><span class="cx"> 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */,
</span><ins>+ 2D790A9D1AD7050D00AB90B3 /* _WKLayoutMode.h in Headers */,
</ins><span class="cx"> 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */,
</span><span class="cx"> 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */,
</span><span class="cx"> BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (182639 => 182640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-10 19:39:57 UTC (rev 182639)
+++ trunk/Tools/ChangeLog 2015-04-10 20:22:38 UTC (rev 182640)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-10 Tim Horton <timothy_horton@apple.com>
+
+ Replace setFixedLayoutSizeEnabled: with an enum of layout modes
+ https://bugs.webkit.org/show_bug.cgi?id=143576
+
+ Reviewed by Simon Fraser.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/FixedLayoutSize.mm:
+ (TEST):
+ Adopt.
+
</ins><span class="cx"> 2015-04-09 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Update my email address and expertise.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaFixedLayoutSizemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FixedLayoutSize.mm (182639 => 182640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FixedLayoutSize.mm 2015-04-10 19:39:57 UTC (rev 182639)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FixedLayoutSize.mm 2015-04-10 20:22:38 UTC (rev 182640)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> [webView evaluateJavaScript:@"document.body.clientWidth" completionHandler:^(id result, NSError *error) {
</span><span class="cx"> EXPECT_EQ(100, [result integerValue]);
</span><span class="cx">
</span><del>- [webView _setFixedLayoutEnabled:YES];
</del><ins>+ [webView _setLayoutMode:_WKLayoutModeFixedSize];
</ins><span class="cx"> [webView _setFixedLayoutSize:NSMakeSize(200, 200)];
</span><span class="cx">
</span><span class="cx"> [webView evaluateJavaScript:@"document.body.clientWidth" completionHandler:^(id result, NSError *error) {
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> TestWebKitAPI::Util::run(&fixedLayoutSizeAfterNavigationDone);
</span><span class="cx">
</span><del>- [webView _setFixedLayoutEnabled:NO];
</del><ins>+ [webView _setLayoutMode:_WKLayoutModeViewSize];
</ins><span class="cx"> [webView evaluateJavaScript:@"document.body.clientWidth" completionHandler:^(id result, NSError *error) {
</span><span class="cx"> EXPECT_EQ(100, [result integerValue]);
</span><span class="cx"> fixedLayoutSizeDisabledDone = true;
</span></span></pre>
</div>
</div>
</body>
</html>