<!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>[178100] trunk/Source/WebCore</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/178100">178100</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-07 21:33:07 -0800 (Wed, 07 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move '-webkit-dashboard-region' CSS property to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=140204
Reviewed by Darin Adler.
Move '-webkit-dashboard-region' CSS property to the new StyleBuilder.
* css/CSSPropertyNames.in:
* css/StyleBuilderCustom.h:
(WebCore::convertToIntLength):
(WebCore::StyleBuilderCustom::applyValueWebkitDashboardRegion):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
(WebCore::convertToIntLength): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178099 => 178100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-08 05:18:20 UTC (rev 178099)
+++ trunk/Source/WebCore/ChangeLog 2015-01-08 05:33:07 UTC (rev 178100)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-01-07 Chris Dumez <cdumez@apple.com>
+
+ Move '-webkit-dashboard-region' CSS property to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=140204
+
+ Reviewed by Darin Adler.
+
+ Move '-webkit-dashboard-region' CSS property to the new StyleBuilder.
+
+ * css/CSSPropertyNames.in:
+ * css/StyleBuilderCustom.h:
+ (WebCore::convertToIntLength):
+ (WebCore::StyleBuilderCustom::applyValueWebkitDashboardRegion):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+ (WebCore::convertToIntLength): Deleted.
+
</ins><span class="cx"> 2015-01-07 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> The ASCII decoding for non ASCII character is incorrect if this character comes after going through the fast decoding code path and before the end of the text by less than a machine word size of characters.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (178099 => 178100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2015-01-08 05:18:20 UTC (rev 178099)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2015-01-08 05:33:07 UTC (rev 178100)
</span><span class="lines">@@ -582,7 +582,7 @@
</span><span class="cx"> -webkit-tap-highlight-color [Inherited, LegacyStyleBuilder]
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_DASHBOARD_SUPPORT) && ENABLE_DASHBOARD_SUPPORT
</span><del>--webkit-dashboard-region [LegacyStyleBuilder]
</del><ins>+-webkit-dashboard-region [NameForMethods=DashboardRegions, Custom=Value]
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) && ENABLE_ACCELERATED_OVERFLOW_SCROLLING
</span><span class="cx"> -webkit-overflow-scrolling [Inherited, LegacyStyleBuilder]
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (178099 => 178100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2015-01-08 05:18:20 UTC (rev 178099)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2015-01-08 05:33:07 UTC (rev 178100)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "Counter.h"
</span><span class="cx"> #include "CounterContent.h"
</span><span class="cx"> #include "CursorList.h"
</span><ins>+#include "DashboardRegion.h"
</ins><span class="cx"> #include "ElementAncestorIterator.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "HTMLElement.h"
</span><span class="lines">@@ -109,6 +110,9 @@
</span><span class="cx"> static void applyValueLineHeight(StyleResolver&, CSSValue&);
</span><span class="cx"> #endif
</span><span class="cx"> static void applyValueVerticalAlign(StyleResolver&, CSSValue&);
</span><ins>+#if ENABLE(DASHBOARD_SUPPORT)
+ static void applyValueWebkitDashboardRegion(StyleResolver&, CSSValue&);
+#endif
</ins><span class="cx"> static void applyValueWebkitJustifySelf(StyleResolver&, CSSValue&);
</span><span class="cx"> static void applyValueWebkitLocale(StyleResolver&, CSSValue&);
</span><span class="cx"> static void applyValueWebkitTextOrientation(StyleResolver&, CSSValue&);
</span><span class="lines">@@ -285,6 +289,51 @@
</span><span class="cx"> styleResolver.style()->setVerticalAlignLength(primitiveValue.convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion>(styleResolver.state().cssToLengthConversionData()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(DASHBOARD_SUPPORT)
+static Length convertToIntLength(const CSSPrimitiveValue* primitiveValue, const CSSToLengthConversionData& conversionData)
+{
+ return primitiveValue ? primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion>(conversionData) : Length(Undefined);
+}
+
+inline void StyleBuilderCustom::applyValueWebkitDashboardRegion(StyleResolver& styleResolver, CSSValue& value)
+{
+ auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+ if (primitiveValue.getValueID() == CSSValueNone) {
+ styleResolver.style()->setDashboardRegions(RenderStyle::noneDashboardRegions());
+ return;
+ }
+
+ DashboardRegion* region = primitiveValue.getDashboardRegionValue();
+ if (!region)
+ return;
+
+ DashboardRegion* first = region;
+ while (region) {
+ Length top = convertToIntLength(region->top(), styleResolver.state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f));
+ Length right = convertToIntLength(region->right(), styleResolver.state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f));
+ Length bottom = convertToIntLength(region->bottom(), styleResolver.state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f));
+ Length left = convertToIntLength(region->left(), styleResolver.state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f));
+
+ if (top.isUndefined())
+ top = Length();
+ if (right.isUndefined())
+ right = Length();
+ if (bottom.isUndefined())
+ bottom = Length();
+ if (left.isUndefined())
+ left = Length();
+
+ if (region->m_isCircle)
+ styleResolver.style()->setDashboardRegion(StyleDashboardRegion::Circle, region->m_label, top, right, bottom, left, region == first ? false : true);
+ else if (region->m_isRectangle)
+ styleResolver.style()->setDashboardRegion(StyleDashboardRegion::Rectangle, region->m_label, top, right, bottom, left, region == first ? false : true);
+ region = region->m_next.get();
+ }
+
+ styleResolver.document().setHasAnnotatedRegions(true);
+}
+#endif // ENABLE(DASHBOARD_SUPPORT)
+
</ins><span class="cx"> #if ENABLE(CSS_IMAGE_RESOLUTION)
</span><span class="cx"> inline void StyleBuilderCustom::applyInheritImageResolution(StyleResolver& styleResolver)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (178099 => 178100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-08 05:18:20 UTC (rev 178099)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-08 05:33:07 UTC (rev 178100)
</span><span class="lines">@@ -1527,13 +1527,6 @@
</span><span class="cx">
</span><span class="cx"> // -------------------------------------------------------------------------------------
</span><span class="cx">
</span><del>-#if ENABLE(DASHBOARD_SUPPORT)
-static Length convertToIntLength(const CSSPrimitiveValue* primitiveValue, const CSSToLengthConversionData& conversionData)
-{
- return primitiveValue ? primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion>(conversionData) : Length(Undefined);
-}
-#endif
-
</del><span class="cx"> static Length convertToFloatLength(const CSSPrimitiveValue* primitiveValue, const CSSToLengthConversionData& conversionData)
</span><span class="cx"> {
</span><span class="cx"> return primitiveValue ? primitiveValue->convertToLength<FixedFloatConversion | PercentConversion | CalculatedConversion>(conversionData) : Length(Undefined);
</span><span class="lines">@@ -2092,50 +2085,6 @@
</span><span class="cx"> return;
</span><span class="cx"> case CSSPropertyUnicodeRange: // Only used in @font-face rules.
</span><span class="cx"> return;
</span><del>-#if ENABLE(DASHBOARD_SUPPORT)
- case CSSPropertyWebkitDashboardRegion:
- {
- HANDLE_INHERIT_AND_INITIAL(dashboardRegions, DashboardRegions)
- if (!primitiveValue)
- return;
-
- if (primitiveValue->getValueID() == CSSValueNone) {
- state.style()->setDashboardRegions(RenderStyle::noneDashboardRegions());
- return;
- }
-
- DashboardRegion* region = primitiveValue->getDashboardRegionValue();
- if (!region)
- return;
-
- DashboardRegion* first = region;
- while (region) {
- Length top = convertToIntLength(region->top(), state.cssToLengthConversionData().copyWithAdjustedZoom(1.0f));
- Length right = convertToIntLength(region->right(), state.cssToLengthConversionData().copyWithAdjustedZoom(1.0f));
- Length bottom = convertToIntLength(region->bottom(), state.cssToLengthConversionData().copyWithAdjustedZoom(1.0f));
- Length left = convertToIntLength(region->left(), state.cssToLengthConversionData().copyWithAdjustedZoom(1.0f));
-
- if (top.isUndefined())
- top = Length();
- if (right.isUndefined())
- right = Length();
- if (bottom.isUndefined())
- bottom = Length();
- if (left.isUndefined())
- left = Length();
-
- if (region->m_isCircle)
- state.style()->setDashboardRegion(StyleDashboardRegion::Circle, region->m_label, top, right, bottom, left, region == first ? false : true);
- else if (region->m_isRectangle)
- state.style()->setDashboardRegion(StyleDashboardRegion::Rectangle, region->m_label, top, right, bottom, left, region == first ? false : true);
- region = region->m_next.get();
- }
-
- state.document().setHasAnnotatedRegions(true);
-
- return;
- }
-#endif
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> case CSSPropertyWebkitTouchCallout: {
</span><span class="cx"> HANDLE_INHERIT_AND_INITIAL(touchCalloutEnabled, TouchCalloutEnabled);
</span><span class="lines">@@ -2293,6 +2242,9 @@
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> case CSSPropertyWebkitTextSizeAdjust:
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(DASHBOARD_SUPPORT)
+ case CSSPropertyWebkitDashboardRegion:
+#endif
</ins><span class="cx"> case CSSPropertyLeft:
</span><span class="cx"> case CSSPropertyLetterSpacing:
</span><span class="cx"> case CSSPropertyLineHeight:
</span></span></pre>
</div>
</div>
</body>
</html>