<!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>[160423] branches/safari-537.74-branch</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/160423">160423</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2013-12-11 04:12:06 -0800 (Wed, 11 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/159460">r159460</a>. <rdar://problem/15517467></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53774branchLayoutTestsChangeLog">branches/safari-537.74-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53774branchSourceWebCoreChangeLog">branches/safari-537.74-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53774branchSourceWebCorepageSettingsin">branches/safari-537.74-branch/Source/WebCore/page/Settings.in</a></li>
<li><a href="#branchessafari53774branchSourceWebCorerenderingRenderBlockLineLayoutcpp">branches/safari-537.74-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
<li><a href="#branchessafari53774branchSourceWebKitmacChangeLog">branches/safari-537.74-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari53774branchSourceWebKitmacWebViewWebPreferenceKeysPrivateh">branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#branchessafari53774branchSourceWebKitmacWebViewWebPreferencesmm">branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#branchessafari53774branchSourceWebKitmacWebViewWebPreferencesPrivateh">branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#branchessafari53774branchSourceWebKitmacWebViewWebViewmm">branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari53774branchSourceWebKit2ChangeLog">branches/safari-537.74-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari53774branchSourceWebKit2SharedWebPreferencesStoreh">branches/safari-537.74-branch/Source/WebKit2/Shared/WebPreferencesStore.h</a></li>
<li><a href="#branchessafari53774branchSourceWebKit2UIProcessAPICWKPreferencescpp">branches/safari-537.74-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#branchessafari53774branchSourceWebKit2UIProcessAPICWKPreferencesPrivateh">branches/safari-537.74-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h</a></li>
<li><a href="#branchessafari53774branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-537.74-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53774branchLayoutTestsfastblocklegacytextalignpositionquirkexpectedhtml">branches/safari-537.74-branch/LayoutTests/fast/block/legacy-text-align-position-quirk-expected.html</a></li>
<li><a href="#branchessafari53774branchLayoutTestsfastblocklegacytextalignpositionquirkhtml">branches/safari-537.74-branch/LayoutTests/fast/block/legacy-text-align-position-quirk.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53774branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/LayoutTests/ChangeLog (160422 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/LayoutTests/ChangeLog 2013-12-11 12:00:40 UTC (rev 160422)
+++ branches/safari-537.74-branch/LayoutTests/ChangeLog 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2013-12-11 Lucas Forschler <lforschler@apple.com>
+
+ Merge r159460
+
+ 2013-11-18 David Hyatt <hyatt@apple.com>
+
+ Add a quirk to not respect center text-align when positioning
+
+ <rdar://problem/15427571>
+ https://bugs.webkit.org/show_bug.cgi?id=124522
+
+ Reviewed by Simon Fraser.
+
+ Added fast/block/legacy-text-align-position-quirk.html
+
+ * fast/block/legacy-text-align-position-quirk-expected.html: Added.
+ * fast/block/legacy-text-align-position-quirk.html: Added.
+
</ins><span class="cx"> 2013-11-20 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r159481
</span></span></pre></div>
<a id="branchessafari53774branchLayoutTestsfastblocklegacytextalignpositionquirkexpectedhtmlfromrev159460trunkLayoutTestsfastblocklegacytextalignpositionquirkexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.74-branch/LayoutTests/fast/block/legacy-text-align-position-quirk-expected.html (from rev 159460, trunk/LayoutTests/fast/block/legacy-text-align-position-quirk-expected.html) (0 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/LayoutTests/fast/block/legacy-text-align-position-quirk-expected.html (rev 0)
+++ branches/safari-537.74-branch/LayoutTests/fast/block/legacy-text-align-position-quirk-expected.html 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<html>
+<head>
+ <style>
+ #block {
+ margin: 0px;
+ padding: 0px;
+ position: absolute;
+ width: 200px;
+ background: blue;
+ height: 20px;
+ display: inline-block;
+ }
+ </style>
+</head>
+<body style="width: 800px;">
+ <p> The two blue bars should be aligned with each other. </p>
+ <div>
+ <span style="position: absolute; top: 44px;">
+ <div id="block"></div>
+ </span>
+ </div>
+ <div id="block" style="position: absolute; top: 80px;"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari53774branchLayoutTestsfastblocklegacytextalignpositionquirkhtmlfromrev159460trunkLayoutTestsfastblocklegacytextalignpositionquirkhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.74-branch/LayoutTests/fast/block/legacy-text-align-position-quirk.html (from rev 159460, trunk/LayoutTests/fast/block/legacy-text-align-position-quirk.html) (0 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/LayoutTests/fast/block/legacy-text-align-position-quirk.html (rev 0)
+++ branches/safari-537.74-branch/LayoutTests/fast/block/legacy-text-align-position-quirk.html 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<html>
+<head>
+ <style>
+ #block {
+ margin: 0px;
+ padding: 0px;
+ position: absolute;
+ width: 200px;
+ background: blue;
+ height: 20px;
+ display: inline-block;
+ }
+ </style>
+ <script>
+ if (internals)
+ internals.settings.setUseLegacyTextAlignPositionedElementBehavior(true)
+ </script>
+</head>
+<body style="width: 800px;">
+ <p> The two blue bars should be aligned with each other. </p>
+ <div style="text-align: center" >
+ <span style="position: absolute; top: 44px;">
+ <div id="block"></div>
+ </span>
+ </div>
+ <div id="block" style="position: absolute; top: 80px;"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari53774branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebCore/ChangeLog (160422 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebCore/ChangeLog 2013-12-11 12:00:40 UTC (rev 160422)
+++ branches/safari-537.74-branch/Source/WebCore/ChangeLog 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2013-12-11 Lucas Forschler <lforschler@apple.com>
+
+ Merge r159460
+
+ 2013-11-18 David Hyatt <hyatt@apple.com>
+
+ Add a quirk to not respect center text-align when positioning
+
+ <rdar://problem/15427571>
+ https://bugs.webkit.org/show_bug.cgi?id=124522
+
+ Reviewed by Simon Fraser.
+
+ Added fast/block/legacy-text-align-position-quirk.html
+
+ * page/Settings.in:
+ Add the quirk setting.
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlock::startAlignedOffsetForLine):
+ Don't pay attention to center text-align when the quirk is set.
+
</ins><span class="cx"> 2013-12-10 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge 154333
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebCore/page/Settings.in (160422 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebCore/page/Settings.in 2013-12-11 12:00:40 UTC (rev 160422)
+++ branches/safari-537.74-branch/Source/WebCore/page/Settings.in 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx"> acceleratedFiltersEnabled initial=false
</span><span class="cx"> regionBasedColumnsEnabled initial=false
</span><span class="cx"> cssGridLayoutEnabled initial=false
</span><ins>+useLegacyTextAlignPositionedElementBehavior initial=false
</ins><span class="cx">
</span><span class="cx"> # FIXME: This should really be disabled by default as it makes platforms that don't support the feature download files
</span><span class="cx"> # they can't use by. Leaving enabled for now to not change existing behavior.
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp (160422 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-12-11 12:00:40 UTC (rev 160422)
+++ branches/safari-537.74-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -3663,7 +3663,11 @@
</span><span class="cx"> {
</span><span class="cx"> ETextAlign textAlign = style()->textAlign();
</span><span class="cx">
</span><del>- if (textAlign == TASTART) // FIXME: Handle TAEND here
</del><ins>+ // <rdar://problem/15427571>
+ // https://bugs.webkit.org/show_bug.cgi?id=124522
+ // This quirk is for legacy content that doesn't work properly with the center positioning scheme
+ // being honored (e.g., epubs).
+ if (textAlign == TASTART || document()->settings()->useLegacyTextAlignPositionedElementBehavior()) // FIXME: Handle TAEND here
</ins><span class="cx"> return startOffsetForLine(position, firstLine);
</span><span class="cx">
</span><span class="cx"> // updateLogicalWidthForAlignment() handles the direction of the block so no need to consider it here
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit/mac/ChangeLog (160422 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit/mac/ChangeLog 2013-12-11 12:00:40 UTC (rev 160422)
+++ branches/safari-537.74-branch/Source/WebKit/mac/ChangeLog 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2013-12-11 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r159460
+
+ 2013-11-18 David Hyatt <hyatt@apple.com>
+
+ Add a quirk to not respect center text-align when positioning
+
+ <rdar://problem/15427571>
+ https://bugs.webkit.org/show_bug.cgi?id=124522
+
+ Reviewed by Simon Fraser.
+
+ Added fast/block/legacy-text-align-position-quirk.html
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences useLegacyTextAlignPositionedElementBehavior]):
+ (-[WebPreferences setUseLegacyTextAlignPositionedElementBehavior:]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
+2013-12-11 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r157279
</span><span class="cx">
</span><span class="cx"> 2013-10-10 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (160422 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2013-12-11 12:00:40 UTC (rev 160422)
+++ branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -133,6 +133,7 @@
</span><span class="cx"> #define WebKitHiddenPageDOMTimerThrottlingEnabledPreferenceKey @"WebKitHiddenPageDOMTimerThrottlingEnabled"
</span><span class="cx"> #define WebKitHiddenPageCSSAnimationSuspensionEnabledPreferenceKey @"WebKitHiddenPageCSSAnimationSuspensionEnabled"
</span><span class="cx"> #define WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey @"WebKitLowPowerVideoAudioBufferSizeEnabled"
</span><ins>+#define WebKitUseLegacyTextAlignPositionedElementBehaviorPreferenceKey @"WebKitUseLegacyTextAlignPositionedElementBehavior"
</ins><span class="cx">
</span><span class="cx"> // These are private both because callers should be using the cover methods and because the
</span><span class="cx"> // cover methods themselves are private.
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebPreferences.mm (160422 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2013-12-11 12:00:40 UTC (rev 160422)
+++ branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -419,6 +419,9 @@
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitHiddenPageDOMTimerThrottlingEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitHiddenPageCSSAnimationSuspensionEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey,
</span><ins>+
+ [NSNumber numberWithBool:NO], WebKitUseLegacyTextAlignPositionedElementBehaviorPreferenceKey,
+
</ins><span class="cx"> nil];
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1840,6 +1843,16 @@
</span><span class="cx"> [self _setBoolValue:enabled forKey:WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)useLegacyTextAlignPositionedElementBehavior
+{
+ return [self _boolValueForKey:WebKitUseLegacyTextAlignPositionedElementBehaviorPreferenceKey];
+}
+
+- (void)setUseLegacyTextAlignPositionedElementBehavior:(BOOL)enabled
+{
+ [self _setBoolValue:enabled forKey:WebKitUseLegacyTextAlignPositionedElementBehaviorPreferenceKey];
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WebPreferences (WebInternal)
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (160422 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2013-12-11 12:00:40 UTC (rev 160422)
+++ branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -338,5 +338,7 @@
</span><span class="cx"> - (BOOL)lowPowerVideoAudioBufferSizeEnabled;
</span><span class="cx"> - (void)setLowPowerVideoAudioBufferSizeEnabled:(BOOL)enabled;
</span><span class="cx">
</span><ins>+- (void)setUseLegacyTextAlignPositionedElementBehavior:(BOOL)flag;
+- (BOOL)useLegacyTextAlignPositionedElementBehavior;
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebView.mm (160422 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebView.mm 2013-12-11 12:00:40 UTC (rev 160422)
+++ branches/safari-537.74-branch/Source/WebKit/mac/WebView/WebView.mm 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -1556,6 +1556,8 @@
</span><span class="cx"> settings->setDiagnosticLoggingEnabled([preferences diagnosticLoggingEnabled]);
</span><span class="cx"> settings->setLowPowerVideoAudioBufferSizeEnabled([preferences lowPowerVideoAudioBufferSizeEnabled]);
</span><span class="cx">
</span><ins>+ settings->setUseLegacyTextAlignPositionedElementBehavior([preferences useLegacyTextAlignPositionedElementBehavior]);
+
</ins><span class="cx"> switch ([preferences storageBlockingPolicy]) {
</span><span class="cx"> case WebAllowAllStorage:
</span><span class="cx"> settings->setStorageBlockingPolicy(SecurityOrigin::AllowAllStorage);
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit2/ChangeLog (160422 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit2/ChangeLog 2013-12-11 12:00:40 UTC (rev 160422)
+++ branches/safari-537.74-branch/Source/WebKit2/ChangeLog 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2013-12-11 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r159460
+
+ 2013-11-18 David Hyatt <hyatt@apple.com>
+
+ Add a quirk to not respect center text-align when positioning
+
+ <rdar://problem/15427571>
+ https://bugs.webkit.org/show_bug.cgi?id=124522
+
+ Reviewed by Simon Fraser.
+
+ Added fast/block/legacy-text-align-position-quirk.html
+
+ * Shared/WebPreferencesStore.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesUseLegacyTextAlignPositionedElementBehavior):
+ (WKPreferencesSetUseLegacyTextAlignPositionedElementBehavior):
+ * UIProcess/API/C/WKPreferencesPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
+2013-12-11 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r159173
</span><span class="cx">
</span><span class="cx"> 2013-11-12 Anders Carlsson <andersca@apple.com>
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebKit2SharedWebPreferencesStoreh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit2/Shared/WebPreferencesStore.h (160422 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit2/Shared/WebPreferencesStore.h 2013-12-11 12:00:40 UTC (rev 160422)
+++ branches/safari-537.74-branch/Source/WebKit2/Shared/WebPreferencesStore.h 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -161,6 +161,7 @@
</span><span class="cx"> macro(HiddenPageDOMTimerThrottlingEnabled, hiddenPageDOMTimerThrottlingEnabled, Bool, bool, DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED) \
</span><span class="cx"> macro(HiddenPageCSSAnimationSuspensionEnabled, hiddenPageCSSAnimationSuspensionEnabled, Bool, bool, DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED) \
</span><span class="cx"> macro(LowPowerVideoAudioBufferSizeEnabled, lowPowerVideoAudioBufferSizeEnabled, Bool, bool, false) \
</span><ins>+ macro(UseLegacyTextAlignPositionedElementBehavior, useLegacyTextAlignPositionedElementBehavior, Bool, bool, false) \
</ins><span class="cx"> \
</span><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (160422 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2013-12-11 12:00:40 UTC (rev 160422)
+++ branches/safari-537.74-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -524,6 +524,16 @@
</span><span class="cx"> toImpl(preferencesRef)->setNeedsSiteSpecificQuirks(flag);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WKPreferencesUseLegacyTextAlignPositionedElementBehavior(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->useLegacyTextAlignPositionedElementBehavior();
+}
+
+void WKPreferencesSetUseLegacyTextAlignPositionedElementBehavior(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setUseLegacyTextAlignPositionedElementBehavior(flag);
+}
+
</ins><span class="cx"> bool WKPreferencesGetNeedsSiteSpecificQuirks(WKPreferencesRef preferencesRef)
</span><span class="cx"> {
</span><span class="cx"> return toImpl(preferencesRef)->needsSiteSpecificQuirks();
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebKit2UIProcessAPICWKPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h (160422 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2013-12-11 12:00:40 UTC (rev 160422)
+++ branches/safari-537.74-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -289,6 +289,10 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKPreferencesResetTestRunnerOverrides(WKPreferencesRef preferencesRef);
</span><span class="cx">
</span><ins>+// Defaults to false.
+WK_EXPORT void WKPreferencesSetUseLegacyTextAlignPositionedElementBehavior(WKPreferencesRef preferencesRef, bool enabled);
+WK_EXPORT bool WKPreferencesUseLegacyTextAlignPositionedElementBehavior(WKPreferencesRef preferencesRef);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (160422 => 160423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-11 12:00:40 UTC (rev 160422)
+++ branches/safari-537.74-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-11 12:12:06 UTC (rev 160423)
</span><span class="lines">@@ -2617,6 +2617,8 @@
</span><span class="cx">
</span><span class="cx"> settings->setLowPowerVideoAudioBufferSizeEnabled(store.getBoolValueForKey(WebPreferencesKey::lowPowerVideoAudioBufferSizeEnabledKey()));
</span><span class="cx">
</span><ins>+ settings->setUseLegacyTextAlignPositionedElementBehavior(store.getBoolValueForKey(WebPreferencesKey::useLegacyTextAlignPositionedElementBehaviorKey()));
+
</ins><span class="cx"> platformPreferencesDidChange(store);
</span><span class="cx">
</span><span class="cx"> if (m_drawingArea)
</span></span></pre>
</div>
</div>
</body>
</html>