<!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>[199998] releases/WebKitGTK/webkit-2.12</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/199998">199998</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-25 05:48:23 -0700 (Mon, 25 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/199512">r199512</a> - Non-resizable text field looks resizable
https://bugs.webkit.org/show_bug.cgi?id=152271
Reviewed by Darin Adler.
Source/WebCore:
The 'resizability' of an HTML element is controlled by its 'resize' CSS property value.
By default it is 'none', but certain HTML elements, including <textarea>, have it
set to 'both' by default (defined in html.css). These values mean no resize at all, and
resizable in both vertical and horizontal axis, respectively.
Additionally, 'vertical' and 'horizontal' values are also valid.
Problem here is that the way WebKit handles the 'resize' property on single line
input elements (e.g. <input>) is different than other engines (read Gecko, Blink and Presto):
- Match: WebKit, Firefox, Presto and Blink all force single line input elements to be non-resizable,
regardless of either the 'resize' properly is set or not.
- Mismatch: WebKit is the only engine that actually paints the resize control on single line
input elements, even it having no effect.
On WebKit, this happens because the 'resize' property is wrongly implemented as 'inheritable',
differently from other engines. In the way WebKit contructs its RenderTree, 'resize' property
ends up spilling out of <input> and entering its shadow representation, carrying the 'resize'
property on.
Patch fixes this by making the 'resize' properly be non-inherited, matching other vendors
and the spec [1].
[1] https://drafts.csswg.org/css-ui/#resize
Tests: fast/css/resize-not-inherited.html
fast/css/resize-single-line-input-no-paint.html
* rendering/style/RenderStyle.h:
* rendering/style/StyleRareInheritedData.cpp:
(WebCore::StyleRareInheritedData::StyleRareInheritedData):
(WebCore::StyleRareInheritedData::operator==):
* rendering/style/StyleRareInheritedData.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:
LayoutTests:
* fast/css/resize-not-inherited-expected.html: Added.
* fast/css/resize-not-inherited.html: Added.
* fast/css/resize-single-line-input-no-paint-expected.html: Added.
* fast/css/resize-single-line-input-no-paint.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingstyleRenderStyleh">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingstyleStyleRareInheritedDatacpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareInheritedData.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingstyleStyleRareInheritedDatah">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareInheritedData.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingstyleStyleRareNonInheritedDatah">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastcssresizenotinheritedexpectedhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-not-inherited-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastcssresizenotinheritedhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-not-inherited.html</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastcssresizesinglelineinputnopaintexpectedhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-single-line-input-no-paint-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastcssresizesinglelineinputnopainthtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-single-line-input-no-paint.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (199997 => 199998)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-25 12:36:42 UTC (rev 199997)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-25 12:48:23 UTC (rev 199998)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-04-13 Antonio Gomes <tonikitoo@webkit.org>
+
+ Non-resizable text field looks resizable
+ https://bugs.webkit.org/show_bug.cgi?id=152271
+
+ Reviewed by Darin Adler.
+
+ * fast/css/resize-not-inherited-expected.html: Added.
+ * fast/css/resize-not-inherited.html: Added.
+ * fast/css/resize-single-line-input-no-paint-expected.html: Added.
+ * fast/css/resize-single-line-input-no-paint.html: Added.
+
</ins><span class="cx"> 2016-04-11 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> fast/loader/opaque-base-url.html crashing during mac and ios debug tests
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastcssresizenotinheritedexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-not-inherited-expected.html (0 => 199998)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-not-inherited-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-not-inherited-expected.html 2016-04-25 12:48:23 UTC (rev 199998)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<style>
+.container {
+ width:100px;
+ height:100px;
+ overflow:hidden;
+ position:absolute;
+ background-color:pink;
+}
+</style>
+
+<p>Test ensures that a 'resize' property is not inherited by its children. Test passes if the resizer (green square) is not seen at the bottom right.</p>
+<div>
+ <div class="container"></div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastcssresizenotinheritedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-not-inherited.html (0 => 199998)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-not-inherited.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-not-inherited.html 2016-04-25 12:48:23 UTC (rev 199998)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<style>
+.container {
+ width:100px;
+ height:100px;
+ overflow:hidden;
+ position:absolute;
+ background-color:pink;
+}
+
+.container::-webkit-resizer {
+ background-color: rgba(0, 127, 0, 0.5);
+}
+</style>
+
+<p>Test ensures that a 'resize' property is not inherited by its children. Test passes if the resizer (green square) is not seen at the bottom right.</p>
+<div style="resize:vertical;">
+ <div class="container"></div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastcssresizesinglelineinputnopaintexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-single-line-input-no-paint-expected.html (0 => 199998)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-single-line-input-no-paint-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-single-line-input-no-paint-expected.html 2016-04-25 12:48:23 UTC (rev 199998)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<input type="text">
+<input type="text">
+<input type="text">
+<input type="text">
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastcssresizesinglelineinputnopainthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-single-line-input-no-paint.html (0 => 199998)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-single-line-input-no-paint.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/resize-single-line-input-no-paint.html 2016-04-25 12:48:23 UTC (rev 199998)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<input type="text" style="resize:vertical">
+<input type="text" style="resize:horizontal">
+<input type="text" style="resize:both">
+<input type="text" style="resize:none">
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199997 => 199998)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-25 12:36:42 UTC (rev 199997)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-25 12:48:23 UTC (rev 199998)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2016-04-13 Antonio Gomes <tonikitoo@webkit.org>
+
+ Non-resizable text field looks resizable
+ https://bugs.webkit.org/show_bug.cgi?id=152271
+
+ Reviewed by Darin Adler.
+
+ The 'resizability' of an HTML element is controlled by its 'resize' CSS property value.
+ By default it is 'none', but certain HTML elements, including <textarea>, have it
+ set to 'both' by default (defined in html.css). These values mean no resize at all, and
+ resizable in both vertical and horizontal axis, respectively.
+ Additionally, 'vertical' and 'horizontal' values are also valid.
+
+ Problem here is that the way WebKit handles the 'resize' property on single line
+ input elements (e.g. <input>) is different than other engines (read Gecko, Blink and Presto):
+
+ - Match: WebKit, Firefox, Presto and Blink all force single line input elements to be non-resizable,
+ regardless of either the 'resize' properly is set or not.
+
+ - Mismatch: WebKit is the only engine that actually paints the resize control on single line
+ input elements, even it having no effect.
+
+ On WebKit, this happens because the 'resize' property is wrongly implemented as 'inheritable',
+ differently from other engines. In the way WebKit contructs its RenderTree, 'resize' property
+ ends up spilling out of <input> and entering its shadow representation, carrying the 'resize'
+ property on.
+
+ Patch fixes this by making the 'resize' properly be non-inherited, matching other vendors
+ and the spec [1].
+
+ [1] https://drafts.csswg.org/css-ui/#resize
+
+ Tests: fast/css/resize-not-inherited.html
+ fast/css/resize-single-line-input-no-paint.html
+
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleRareInheritedData.cpp:
+ (WebCore::StyleRareInheritedData::StyleRareInheritedData):
+ (WebCore::StyleRareInheritedData::operator==):
+ * rendering/style/StyleRareInheritedData.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+
</ins><span class="cx"> 2016-04-12 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> Fixed uninitialization of Node::DataUnion with GCC 4.8.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/RenderStyle.h (199997 => 199998)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/RenderStyle.h 2016-04-25 12:36:42 UTC (rev 199997)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/RenderStyle.h 2016-04-25 12:48:23 UTC (rev 199998)
</span><span class="lines">@@ -998,7 +998,7 @@
</span><span class="cx"> const AtomicString& hyphenationString() const { return rareInheritedData->hyphenationString; }
</span><span class="cx"> const AtomicString& locale() const { return fontDescription().locale(); }
</span><span class="cx"> EBorderFit borderFit() const { return static_cast<EBorderFit>(rareNonInheritedData->m_borderFit); }
</span><del>- EResize resize() const { return static_cast<EResize>(rareInheritedData->resize); }
</del><ins>+ EResize resize() const { return static_cast<EResize>(rareNonInheritedData->m_resize); }
</ins><span class="cx"> ColumnAxis columnAxis() const { return static_cast<ColumnAxis>(rareNonInheritedData->m_multiCol->m_axis); }
</span><span class="cx"> bool hasInlineColumnAxis() const {
</span><span class="cx"> ColumnAxis axis = columnAxis();
</span><span class="lines">@@ -1575,7 +1575,7 @@
</span><span class="cx"> void setHyphenationLimitLines(short limit) { SET_VAR(rareInheritedData, hyphenationLimitLines, limit); }
</span><span class="cx"> void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData, hyphenationString, h); }
</span><span class="cx"> void setBorderFit(EBorderFit b) { SET_VAR(rareNonInheritedData, m_borderFit, b); }
</span><del>- void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); }
</del><ins>+ void setResize(EResize r) { SET_VAR(rareNonInheritedData, m_resize, r); }
</ins><span class="cx"> void setColumnAxis(ColumnAxis axis) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_axis, axis); }
</span><span class="cx"> void setColumnProgression(ColumnProgression progression) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_progression, progression); }
</span><span class="cx"> void setColumnWidth(float f) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_autoWidth, false); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_width, f); }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingstyleStyleRareInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (199997 => 199998)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2016-04-25 12:36:42 UTC (rev 199997)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2016-04-25 12:48:23 UTC (rev 199998)
</span><span class="lines">@@ -85,7 +85,6 @@
</span><span class="cx"> , overflowWrap(RenderStyle::initialOverflowWrap())
</span><span class="cx"> , nbspMode(NBNORMAL)
</span><span class="cx"> , lineBreak(LineBreakAuto)
</span><del>- , resize(RenderStyle::initialResize())
</del><span class="cx"> , userSelect(RenderStyle::initialUserSelect())
</span><span class="cx"> , speak(SpeakNormal)
</span><span class="cx"> , hyphens(HyphensManual)
</span><span class="lines">@@ -168,7 +167,6 @@
</span><span class="cx"> , overflowWrap(o.overflowWrap)
</span><span class="cx"> , nbspMode(o.nbspMode)
</span><span class="cx"> , lineBreak(o.lineBreak)
</span><del>- , resize(o.resize)
</del><span class="cx"> , userSelect(o.userSelect)
</span><span class="cx"> , speak(o.speak)
</span><span class="cx"> , hyphens(o.hyphens)
</span><span class="lines">@@ -269,7 +267,6 @@
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> && textSizeAdjust == o.textSizeAdjust
</span><span class="cx"> #endif
</span><del>- && resize == o.resize
</del><span class="cx"> && userSelect == o.userSelect
</span><span class="cx"> && speak == o.speak
</span><span class="cx"> && hyphens == o.hyphens
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingstyleStyleRareInheritedDatah"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareInheritedData.h (199997 => 199998)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareInheritedData.h 2016-04-25 12:36:42 UTC (rev 199997)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareInheritedData.h 2016-04-25 12:48:23 UTC (rev 199998)
</span><span class="lines">@@ -92,7 +92,6 @@
</span><span class="cx"> unsigned overflowWrap : 1; // EOverflowWrap
</span><span class="cx"> unsigned nbspMode : 1; // ENBSPMode
</span><span class="cx"> unsigned lineBreak : 3; // LineBreak
</span><del>- unsigned resize : 2; // EResize
</del><span class="cx"> unsigned userSelect : 2; // EUserSelect
</span><span class="cx"> unsigned colorSpace : 1; // ColorSpace
</span><span class="cx"> unsigned speak : 3; // ESpeak
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (199997 => 199998)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2016-04-25 12:36:42 UTC (rev 199997)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2016-04-25 12:48:23 UTC (rev 199998)
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx"> , m_breakBefore(RenderStyle::initialBreakBetween())
</span><span class="cx"> , m_breakAfter(RenderStyle::initialBreakBetween())
</span><span class="cx"> , m_breakInside(RenderStyle::initialBreakInside())
</span><ins>+ , m_resize(RenderStyle::initialResize())
</ins><span class="cx"> {
</span><span class="cx"> m_maskBoxImage.setMaskDefaults();
</span><span class="cx"> }
</span><span class="lines">@@ -199,6 +200,7 @@
</span><span class="cx"> , m_breakBefore(o.m_breakBefore)
</span><span class="cx"> , m_breakAfter(o.m_breakAfter)
</span><span class="cx"> , m_breakInside(o.m_breakInside)
</span><ins>+ , m_resize(o.m_resize)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -301,7 +303,8 @@
</span><span class="cx"> && m_objectFit == o.m_objectFit
</span><span class="cx"> && m_breakAfter == o.m_breakAfter
</span><span class="cx"> && m_breakBefore == o.m_breakBefore
</span><del>- && m_breakInside == o.m_breakInside;
</del><ins>+ && m_breakInside == o.m_breakInside
+ && m_resize == o.m_resize;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInheritedData& o) const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (199997 => 199998)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2016-04-25 12:36:42 UTC (rev 199997)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2016-04-25 12:48:23 UTC (rev 199998)
</span><span class="lines">@@ -223,6 +223,7 @@
</span><span class="cx"> unsigned m_breakBefore : 4; // BreakBetween
</span><span class="cx"> unsigned m_breakAfter : 4;
</span><span class="cx"> unsigned m_breakInside : 3; // BreakInside
</span><ins>+ unsigned m_resize : 2; // EResize
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> StyleRareNonInheritedData();
</span></span></pre>
</div>
</div>
</body>
</html>