<!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>[167861] 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/167861">167861</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-04-27 13:43:52 -0700 (Sun, 27 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WebKit2] Add support for text autosizing
<rdar://problem/16545245>
https://bugs.webkit.org/show_bug.cgi?id=132237
Reviewed by Tim Horton.
../WebCore:
Move text autosizing width from Frame to Page, as it is a Page level concept.
* WebCore.exp.in:
* page/Frame.cpp:
(WebCore::Frame::textAutosizingWidth): Deleted.
(WebCore::Frame::setTextAutosizingWidth): Deleted.
* page/Frame.h:
* page/FrameView.cpp:
(WebCore::FrameView::layout):
* page/Page.cpp:
(WebCore::Page::Page):
* page/Page.h:
(WebCore::Page::textAutosizingWidth):
(WebCore::Page::setTextAutosizingWidth):
../WebKit/mac:
* WebView/WebFrame.mm:
(-[WebFrame _setTextAutosizingWidth:]):
Forward setting of the text autosizing width to the Page.
../WebKit2:
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::creationParameters):
* UIProcess/WebPageProxy.h:
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::textAutosizingWidth):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
Pass the text autosizing width from the UIProcess to WebProcess.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameh">trunk/Source/WebCore/page/Frame.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParameterscpp">trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParametersh">trunk/Source/WebKit2/Shared/WebPageCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebCore/ChangeLog 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-04-27 Sam Weinig <sam@webkit.org>
+
+ [iOS WebKit2] Add support for text autosizing
+ <rdar://problem/16545245>
+ https://bugs.webkit.org/show_bug.cgi?id=132237
+
+ Reviewed by Tim Horton.
+
+ Move text autosizing width from Frame to Page, as it is a Page level concept.
+
+ * WebCore.exp.in:
+ * page/Frame.cpp:
+ (WebCore::Frame::textAutosizingWidth): Deleted.
+ (WebCore::Frame::setTextAutosizingWidth): Deleted.
+ * page/Frame.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+ * page/Page.h:
+ (WebCore::Page::textAutosizingWidth):
+ (WebCore::Page::setTextAutosizingWidth):
+
</ins><span class="cx"> 2014-04-27 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Updating one bindings test baseline after r167855.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -3113,7 +3113,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> __ZN7WebCore12RenderObject19resetTextAutosizingEv
</span><del>-__ZN7WebCore5Frame22setTextAutosizingWidthEf
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebCore/page/Frame.cpp 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -485,18 +485,6 @@
</span><span class="cx"> return matchLabelsAgainstString(labels, element->getAttribute(idAttr));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(IOS_TEXT_AUTOSIZING)
-float Frame::textAutosizingWidth() const
-{
- return m_textAutosizingWidth;
-}
-
-void Frame::setTextAutosizingWidth(float width)
-{
- m_textAutosizingWidth = width;
-}
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void Frame::scrollOverflowLayer(RenderLayer* layer, const IntRect& visibleRect, const IntRect& exposeRect)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.h (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.h 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebCore/page/Frame.h 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -240,11 +240,6 @@
</span><span class="cx"> String searchForLabelsBeforeElement(const Vector<String>& labels, Element*, size_t* resultDistance, bool* resultIsInCellAbove);
</span><span class="cx"> String matchLabelsAgainstElement(const Vector<String>& labels, Element*);
</span><span class="cx">
</span><del>-#if ENABLE(IOS_TEXT_AUTOSIZING)
- void setTextAutosizingWidth(float);
- float textAutosizingWidth() const;
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // Scroll the selection in an overflow layer on iOS.
</span><span class="cx"> void scrollOverflowLayer(RenderLayer* , const IntRect& visibleRect, const IntRect& exposeRect);
</span><span class="lines">@@ -325,10 +320,6 @@
</span><span class="cx"> VisibleSelection m_rangedSelectionInitialExtent;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IOS_TEXT_AUTOSIZING)
- float m_textAutosizingWidth;
-#endif
-
</del><span class="cx"> float m_pageZoomFactor;
</span><span class="cx"> float m_textZoomFactor;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -1285,7 +1285,7 @@
</span><span class="cx"> root->layout();
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> float minZoomFontSize = frame().settings().minimumZoomFontSize();
</span><del>- float visWidth = frame().page()->mainFrame().textAutosizingWidth();
</del><ins>+ float visWidth = frame().page()->textAutosizingWidth();
</ins><span class="cx"> if (minZoomFontSize && visWidth && !root->view().printing()) {
</span><span class="cx"> root->adjustComputedFontSizesOnBlocks(minZoomFontSize, visWidth);
</span><span class="cx"> bool needsLayout = root->needsLayout();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebCore/page/Page.cpp 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -162,6 +162,9 @@
</span><span class="cx"> , m_zoomedOutPageScaleFactor(0)
</span><span class="cx"> , m_deviceScaleFactor(1)
</span><span class="cx"> , m_topContentInset(0)
</span><ins>+#if ENABLE(IOS_TEXT_AUTOSIZING)
+ , m_textAutosizingWidth(0)
+#endif
</ins><span class="cx"> , m_suppressScrollbarAnimations(false)
</span><span class="cx"> , m_verticalScrollElasticity(ScrollElasticityAllowed)
</span><span class="cx"> , m_horizontalScrollElasticity(ScrollElasticityAllowed)
</span><span class="lines">@@ -783,7 +786,7 @@
</span><span class="cx"> if (FrameView* view = mainFrame().view())
</span><span class="cx"> view->topContentInsetDidChange();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void Page::setShouldSuppressScrollbarAnimations(bool suppressAnimations)
</span><span class="cx"> {
</span><span class="cx"> if (suppressAnimations == m_suppressScrollbarAnimations)
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebCore/page/Page.h 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -282,7 +282,12 @@
</span><span class="cx">
</span><span class="cx"> float topContentInset() const { return m_topContentInset; }
</span><span class="cx"> void setTopContentInset(float);
</span><del>-
</del><ins>+
+#if ENABLE(IOS_TEXT_AUTOSIZING)
+ float textAutosizingWidth() const { return m_textAutosizingWidth; }
+ void setTextAutosizingWidth(float textAutosizingWidth) { m_textAutosizingWidth = textAutosizingWidth; }
+#endif
+
</ins><span class="cx"> bool shouldSuppressScrollbarAnimations() const { return m_suppressScrollbarAnimations; }
</span><span class="cx"> void setShouldSuppressScrollbarAnimations(bool suppressAnimations);
</span><span class="cx"> void lockAllOverlayScrollbarsToHidden(bool lockOverlayScrollbars);
</span><span class="lines">@@ -504,7 +509,11 @@
</span><span class="cx"> float m_deviceScaleFactor;
</span><span class="cx">
</span><span class="cx"> float m_topContentInset;
</span><del>-
</del><ins>+
+#if ENABLE(IOS_TEXT_AUTOSIZING)
+ float m_textAutosizingWidth;
+#endif
+
</ins><span class="cx"> bool m_suppressScrollbarAnimations;
</span><span class="cx">
</span><span class="cx"> unsigned m_verticalScrollElasticity : 2; // ScrollElasticity
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-04-27 Sam Weinig <sam@webkit.org>
+
+ [iOS WebKit2] Add support for text autosizing
+ <rdar://problem/16545245>
+ https://bugs.webkit.org/show_bug.cgi?id=132237
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame _setTextAutosizingWidth:]):
+ Forward setting of the text autosizing width to the Page.
+
</ins><span class="cx"> 2014-04-25 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow a platform-specific size enumeration to be passed into popup-menu display
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -1915,8 +1915,12 @@
</span><span class="cx">
</span><span class="cx"> - (void)_setTextAutosizingWidth:(CGFloat)width
</span><span class="cx"> {
</span><del>- WebCore::Frame *frame = core(self);
- frame->setTextAutosizingWidth(width);
</del><ins>+ WebCore::Frame* frame = core(self);
+ Page* page = frame->page();
+ if (!page)
+ return;
+
+ page->setTextAutosizingWidth(width);
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> - (void)resetTextAutosizingBeforeLayout
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-04-27 Sam Weinig <sam@webkit.org>
+
+ [iOS WebKit2] Add support for text autosizing
+ <rdar://problem/16545245>
+ https://bugs.webkit.org/show_bug.cgi?id=132237
+
+ Reviewed by Tim Horton.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::creationParameters):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::textAutosizingWidth):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ Pass the text autosizing width from the UIProcess to WebProcess.
+
</ins><span class="cx"> 2014-04-27 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit2 View Gestures (Zoom): Pages with 'background-attachment: fixed' don't behave correctly when zoomed
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> encoder << screenSize;
</span><span class="cx"> encoder << availableScreenSize;
</span><ins>+ encoder << textAutosizingWidth;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -154,6 +155,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.availableScreenSize))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(parameters.textAutosizingWidth))
+ return false;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -115,6 +115,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> WebCore::FloatSize screenSize;
</span><span class="cx"> WebCore::FloatSize availableScreenSize;
</span><ins>+ float textAutosizingWidth;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -4247,6 +4247,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> parameters.screenSize = screenSize();
</span><span class="cx"> parameters.availableScreenSize = availableScreenSize();
</span><ins>+ parameters.textAutosizingWidth = textAutosizingWidth();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return parameters;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -1350,8 +1350,8 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> WebCore::FloatSize screenSize();
</span><span class="cx"> WebCore::FloatSize availableScreenSize();
</span><ins>+ float textAutosizingWidth();
</ins><span class="cx">
</span><del>-
</del><span class="cx"> void dynamicViewportUpdateChangedTarget(double newTargetScale, const WebCore::FloatPoint& newScrollPosition);
</span><span class="cx"> void didGetTapHighlightGeometries(uint64_t requestID, const WebCore::Color& color, const Vector<WebCore::FloatQuad>& geometries, const WebCore::IntSize& topLeftRadius, const WebCore::IntSize& topRightRadius, const WebCore::IntSize& bottomLeftRadius, const WebCore::IntSize& bottomRightRadius);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -477,7 +477,12 @@
</span><span class="cx"> {
</span><span class="cx"> return FloatSize(WKGetAvailableScreenSize());
</span><span class="cx"> }
</span><del>-
</del><ins>+
+float WebPageProxy::textAutosizingWidth()
+{
+ return WKGetScreenSize().width;
+}
+
</ins><span class="cx"> void WebPageProxy::dynamicViewportUpdateChangedTarget(double newScale, const WebCore::FloatPoint& newScrollPosition)
</span><span class="cx"> {
</span><span class="cx"> m_pageClient.dynamicViewportUpdateChangedTarget(newScale, newScrollPosition);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (167860 => 167861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-27 20:42:54 UTC (rev 167860)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-27 20:43:52 UTC (rev 167861)
</span><span class="lines">@@ -380,6 +380,9 @@
</span><span class="cx"> m_pageGroup = WebProcess::shared().webPageGroup(parameters.pageGroupData);
</span><span class="cx"> m_page->setGroupName(m_pageGroup->identifier());
</span><span class="cx"> m_page->setDeviceScaleFactor(parameters.deviceScaleFactor);
</span><ins>+#if PLATFORM(IOS)
+ m_page->setTextAutosizingWidth(parameters.textAutosizingWidth);
+#endif
</ins><span class="cx">
</span><span class="cx"> updatePreferences(parameters.store);
</span><span class="cx"> platformInitialize();
</span></span></pre>
</div>
</div>
</body>
</html>