<!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>[161286] 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/161286">161286</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-03 14:28:19 -0800 (Fri, 03 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Upstream WebCore/css changes
https://bugs.webkit.org/show_bug.cgi?id=126237
Reviewed by Simon Fraser.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue): Added iOS-specific code and FIXME comment.
* css/CSSParser.cpp:
(WebCore::CSSParserContext::CSSParserContext): Ditto.
(WebCore::CSSParser::parseValue): Ditto.
* css/CSSPropertyNames.in: Added property -webkit-composition-fill-color. Also added FIXME comment.
* css/CSSValueKeywords.in: Added iOS-specific -apple-system-* values.
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder): Added iOS-specific code and FIXME comments.
* css/MediaFeatureNames.h: Added media feature -webkit-video-playable-inline.
* css/MediaQueryEvaluator.cpp:
(WebCore::isRunningOnIPhoneOrIPod): Added. Also added FIXME comment.
(WebCore::video_playable_inlineMediaFeatureEval): Added.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::canShareStyleWithElement): Substitute toHTMLMediaElement() for toMediaElement().
(WebCore::StyleResolver::applyProperty): Added iOS-specific code and FIXME comment.
* css/html.css: Added iOS-specific CSS styles.
(input, textarea, keygen, select, button, isindex):
(isindex):
(input[type="date"]):
(input[type="datetime"]):
(input[type="datetime-local"]):
(input[type="month"]):
(input[type="time"]):
(textarea):
(input:-webkit-autofill):
(input[type="radio"], input[type="checkbox"]):
(input[type="button"], input[type="submit"], input[type="reset"], input[type="file"]::-webkit-file-upload-button, button):
(input[type="range"]::-webkit-slider-thumb, input[type="range"]::-webkit-media-slider-thumb):
(input[type="range"]::-webkit-slider-thumb:active):
(input:disabled, textarea:disabled):
(input[readonly], textarea[readonly]):
(textarea::-webkit-input-placeholder):
(input[type="checkbox"]):
(input[type="radio"]):
(input[type="checkbox"]:checked, input[type="radio"]:checked):
(input[type="checkbox"]:checked:disabled, input[type="radio"]:checked:disabled):
(select:focus):
(select):
* css/mathml.css: Added iOS-specific CSS styles.
(math, mfenced > *):
(mo, mfenced):
* css/mediaControlsiOS.css: Added.
* css/svg.css: Added iOS-specific CSS styles.
(text, tspan, tref):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorecssMediaFeatureNamesh">trunk/Source/WebCore/css/MediaFeatureNames.h</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryEvaluatorcpp">trunk/Source/WebCore/css/MediaQueryEvaluator.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecsshtmlcss">trunk/Source/WebCore/css/html.css</a></li>
<li><a href="#trunkSourceWebCorecssmathmlcss">trunk/Source/WebCore/css/mathml.css</a></li>
<li><a href="#trunkSourceWebCorecsssvgcss">trunk/Source/WebCore/css/svg.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorecssmediaControlsiOScss">trunk/Source/WebCore/css/mediaControlsiOS.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161285 => 161286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-03 21:45:55 UTC (rev 161285)
+++ trunk/Source/WebCore/ChangeLog 2014-01-03 22:28:19 UTC (rev 161286)
</span><span class="lines">@@ -1,3 +1,56 @@
</span><ins>+2014-01-03 Daniel Bates <dabates@apple.com>
+
+ [iOS] Upstream WebCore/css changes
+ https://bugs.webkit.org/show_bug.cgi?id=126237
+
+ Reviewed by Simon Fraser.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue): Added iOS-specific code and FIXME comment.
+ * css/CSSParser.cpp:
+ (WebCore::CSSParserContext::CSSParserContext): Ditto.
+ (WebCore::CSSParser::parseValue): Ditto.
+ * css/CSSPropertyNames.in: Added property -webkit-composition-fill-color. Also added FIXME comment.
+ * css/CSSValueKeywords.in: Added iOS-specific -apple-system-* values.
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder): Added iOS-specific code and FIXME comments.
+ * css/MediaFeatureNames.h: Added media feature -webkit-video-playable-inline.
+ * css/MediaQueryEvaluator.cpp:
+ (WebCore::isRunningOnIPhoneOrIPod): Added. Also added FIXME comment.
+ (WebCore::video_playable_inlineMediaFeatureEval): Added.
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::canShareStyleWithElement): Substitute toHTMLMediaElement() for toMediaElement().
+ (WebCore::StyleResolver::applyProperty): Added iOS-specific code and FIXME comment.
+ * css/html.css: Added iOS-specific CSS styles.
+ (input, textarea, keygen, select, button, isindex):
+ (isindex):
+ (input[type="date"]):
+ (input[type="datetime"]):
+ (input[type="datetime-local"]):
+ (input[type="month"]):
+ (input[type="time"]):
+ (textarea):
+ (input:-webkit-autofill):
+ (input[type="radio"], input[type="checkbox"]):
+ (input[type="button"], input[type="submit"], input[type="reset"], input[type="file"]::-webkit-file-upload-button, button):
+ (input[type="range"]::-webkit-slider-thumb, input[type="range"]::-webkit-media-slider-thumb):
+ (input[type="range"]::-webkit-slider-thumb:active):
+ (input:disabled, textarea:disabled):
+ (input[readonly], textarea[readonly]):
+ (textarea::-webkit-input-placeholder):
+ (input[type="checkbox"]):
+ (input[type="radio"]):
+ (input[type="checkbox"]:checked, input[type="radio"]:checked):
+ (input[type="checkbox"]:checked:disabled, input[type="radio"]:checked:disabled):
+ (select:focus):
+ (select):
+ * css/mathml.css: Added iOS-specific CSS styles.
+ (math, mfenced > *):
+ (mo, mfenced):
+ * css/mediaControlsiOS.css: Added.
+ * css/svg.css: Added iOS-specific CSS styles.
+ (text, tspan, tref):
+
</ins><span class="cx"> 2014-01-03 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebGL] glScissor test is not accounted for when generating internal rendering textures.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (161285 => 161286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-01-03 21:45:55 UTC (rev 161285)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-01-03 22:28:19 UTC (rev 161286)
</span><span class="lines">@@ -348,6 +348,10 @@
</span><span class="cx"> CSSPropertyWebkitRtlOrdering,
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> CSSPropertyWebkitTouchCallout,
</span><ins>+
+ // FIXME: This property shouldn't be iOS-specific. Once we fix up its usage in InlineTextBox::paintCompositionBackground()
+ // we should move it outside the PLATFORM(IOS)-guard. See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
+ CSSPropertyWebkitCompositionFillColor,
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> CSSPropertyWebkitShapeInside,
</span><span class="lines">@@ -2739,6 +2743,12 @@
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyWebkitRtlOrdering:
</span><span class="cx"> return cssValuePool().createIdentifierValue(style->rtlOrdering() ? CSSValueVisual : CSSValueLogical);
</span><ins>+#if PLATFORM(IOS)
+ // FIXME: This property shouldn't be iOS-specific. Once we fix up its usage in InlineTextBox::paintCompositionBackground()
+ // we should remove the PLATFORM(IOS)-guard. See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
+ case CSSPropertyWebkitCompositionFillColor:
+ return currentColorOrValidColor(style.get(), style->compositionFillColor());
+#endif
</ins><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> case CSSPropertyWebkitTapHighlightColor:
</span><span class="cx"> return currentColorOrValidColor(style.get(), style->tapHighlightColor());
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (161285 => 161286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-01-03 21:45:55 UTC (rev 161285)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-01-03 22:28:19 UTC (rev 161286)
</span><span class="lines">@@ -264,6 +264,12 @@
</span><span class="cx"> , enforcesCSSMIMETypeInNoQuirksMode(true)
</span><span class="cx"> , useLegacyBackgroundSizeShorthandBehavior(false)
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ // FIXME: Force the site specific quirk below to work on iOS. Investigating other site specific quirks
+ // to see if we can enable the preference all together is to be handled by:
+ // <rdar://problem/8493309> Investigate Enabling Site Specific Quirks in MobileSafari and UIWebView
+ needsSiteSpecificQuirks = true;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSParserContext::CSSParserContext(Document& document, const URL& baseURL, const String& charset)
</span><span class="lines">@@ -280,6 +286,12 @@
</span><span class="cx"> , enforcesCSSMIMETypeInNoQuirksMode(!document.settings() || document.settings()->enforceCSSMIMETypeInNoQuirksMode())
</span><span class="cx"> , useLegacyBackgroundSizeShorthandBehavior(document.settings() ? document.settings()->useLegacyBackgroundSizeShorthandBehavior() : false)
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ // FIXME: Force the site specific quirk below to work on iOS. Investigating other site specific quirks
+ // to see if we can enable the preference all together is to be handled by:
+ // <rdar://problem/8493309> Investigate Enabling Site Specific Quirks in MobileSafari and UIWebView
+ needsSiteSpecificQuirks = true;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool operator==(const CSSParserContext& a, const CSSParserContext& b)
</span><span class="lines">@@ -2760,6 +2772,19 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+ // FIXME: CSSPropertyWebkitCompositionFillColor shouldn't be iOS-specific. Once we fix up its usage in
+ // InlineTextBox::paintCompositionBackground() we should move it outside the PLATFORM(IOS)-guard.
+ // See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
+ case CSSPropertyWebkitCompositionFillColor:
+ if ((id >= CSSValueAqua && id <= CSSValueWindowtext) || id == CSSValueMenu
+ || (id >= CSSValueWebkitFocusRingColor && id < CSSValueWebkitText && inQuirksMode())) {
+ validPrimitive = true;
+ } else {
+ parsedValue = parseColor();
+ if (parsedValue)
+ m_valueList->next();
+ }
+ break;
</ins><span class="cx"> case CSSPropertyWebkitTouchCallout:
</span><span class="cx"> if (id == CSSValueDefault || id == CSSValueNone)
</span><span class="cx"> validPrimitive = true;
</span><span class="lines">@@ -12729,7 +12754,8 @@
</span><span class="cx"> if (buffer[0] == '-') {
</span><span class="cx"> // If the prefix is -apple- or -khtml-, change it to -webkit-.
</span><span class="cx"> // This makes the string one character longer.
</span><del>- if (hasPrefix(buffer, length, "-apple-") || hasPrefix(buffer, length, "-khtml-")) {
</del><ins>+ // On iOS we don't want to change values starting with -apple-system to -webkit-system.
+ if ((hasPrefix(buffer, length, "-apple-") && !hasPrefix(buffer, length, "-apple-system")) || hasPrefix(buffer, length, "-khtml-")) {
</ins><span class="cx"> memmove(buffer + 7, buffer + 6, length + 1 - 6);
</span><span class="cx"> memcpy(buffer, "-webkit", 7);
</span><span class="cx"> ++length;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (161285 => 161286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-01-03 21:45:55 UTC (rev 161285)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-01-03 22:28:19 UTC (rev 161286)
</span><span class="lines">@@ -465,4 +465,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
</span><span class="cx"> -webkit-touch-callout [Inherited]
</span><ins>+
+// FIXME: This property shouldn't be iOS-specific. Once we fix up its usage in InlineTextBox::paintCompositionBackground()
+// we should move it outside the WTF_PLATFORM_IOS-guard.
+-webkit-composition-fill-color [Inherited]
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (161285 => 161286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2014-01-03 21:45:55 UTC (rev 161285)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2014-01-03 22:28:19 UTC (rev 161286)
</span><span class="lines">@@ -31,6 +31,23 @@
</span><span class="cx"> -webkit-mini-control
</span><span class="cx"> -webkit-small-control
</span><span class="cx"> -webkit-control
</span><ins>+
+#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
+-apple-system-headline
+-apple-system-body
+-apple-system-subheadline
+-apple-system-footnote
+-apple-system-caption1
+-apple-system-caption2
+-apple-system-short-headline
+-apple-system-short-body
+-apple-system-short-subheadline
+-apple-system-short-footnote
+-apple-system-short-caption1
+-apple-system-tall-body
+#endif
+
+// This has to go after the -apple-system versions.
</ins><span class="cx"> status-bar
</span><span class="cx">
</span><span class="cx"> //
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (161285 => 161286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-01-03 21:45:55 UTC (rev 161285)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-01-03 22:28:19 UTC (rev 161286)
</span><span class="lines">@@ -2312,7 +2312,15 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyImageResolution, ApplyPropertyImageResolution::createHandler());
</span><span class="cx"> #endif
</span><span class="cx"> setPropertyHandler(CSSPropertyLeft, ApplyPropertyLength<&RenderStyle::left, &RenderStyle::setLeft, &RenderStyle::initialOffset, AutoEnabled>::createHandler());
</span><ins>+
+ // FIXME: We should reconcile the difference in datatype between iOS and OpenSource. On iOS we want letter spacing to
+ // be float for sub-pixel kerning. See <https://bugs.webkit.org/show_bug.cgi?id=20606>.
+#if !PLATFORM(IOS)
</ins><span class="cx"> setPropertyHandler(CSSPropertyLetterSpacing, ApplyPropertyComputeLength<int, &RenderStyle::letterSpacing, &RenderStyle::setLetterSpacing, &RenderStyle::initialLetterWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createHandler());
</span><ins>+#else
+ setPropertyHandler(CSSPropertyLetterSpacing, ApplyPropertyComputeLength<float, &RenderStyle::letterSpacing, &RenderStyle::setLetterSpacing, &RenderStyle::initialLetterWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createHandler());
+#endif
+
</ins><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> setPropertyHandler(CSSPropertyLineHeight, ApplyPropertyLineHeightForIOSTextAutosizing::createHandler());
</span><span class="cx"> #else
</span><span class="lines">@@ -2528,7 +2536,15 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWidows, ApplyPropertyAuto<short, &RenderStyle::widows, &RenderStyle::setWidows, &RenderStyle::hasAutoWidows, &RenderStyle::setHasAutoWidows>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWidth, ApplyPropertyLength<&RenderStyle::width, &RenderStyle::setWidth, &RenderStyle::initialSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicEnabled, NoneDisabled, UndefinedDisabled>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWordBreak, ApplyPropertyDefault<EWordBreak, &RenderStyle::wordBreak, EWordBreak, &RenderStyle::setWordBreak, EWordBreak, &RenderStyle::initialWordBreak>::createHandler());
</span><ins>+
+ // FIXME: We should reconcile the difference in datatype between iOS and OpenSource. On iOS we want word spacing to
+ // be float for sub-pixel kerning. See <https://bugs.webkit.org/show_bug.cgi?id=20606>.
+#if !PLATFORM(IOS)
</ins><span class="cx"> setPropertyHandler(CSSPropertyWordSpacing, ApplyPropertyComputeLength<int, &RenderStyle::wordSpacing, &RenderStyle::setWordSpacing, &RenderStyle::initialLetterWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createHandler());
</span><ins>+#else
+ setPropertyHandler(CSSPropertyWordSpacing, ApplyPropertyComputeLength<float, &RenderStyle::wordSpacing, &RenderStyle::setWordSpacing, &RenderStyle::initialLetterWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createHandler());
+#endif
+
</ins><span class="cx"> // UAs must treat 'word-wrap' as an alternate name for the 'overflow-wrap' property. So using the same handlers.
</span><span class="cx"> setPropertyHandler(CSSPropertyWordWrap, ApplyPropertyDefault<EOverflowWrap, &RenderStyle::overflowWrap, EOverflowWrap, &RenderStyle::setOverflowWrap, EOverflowWrap, &RenderStyle::initialOverflowWrap>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyZIndex, ApplyPropertyAuto<int, &RenderStyle::zIndex, &RenderStyle::setZIndex, &RenderStyle::hasAutoZIndex, &RenderStyle::setHasAutoZIndex>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaFeatureNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaFeatureNames.h (161285 => 161286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaFeatureNames.h 2014-01-03 21:45:55 UTC (rev 161285)
+++ trunk/Source/WebCore/css/MediaFeatureNames.h 2014-01-03 22:28:19 UTC (rev 161286)
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> macro(transform_3d, "-webkit-transform-3d") \
</span><span class="cx"> macro(transition, "-webkit-transition") \
</span><span class="cx"> macro(animation, "-webkit-animation") \
</span><ins>+ macro(video_playable_inline, "-webkit-video-playable-inline") \
</ins><span class="cx"> CSS_MEDIAQUERY_VIEW_MODE(macro)
</span><span class="cx">
</span><span class="cx"> // end of macro
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryEvaluatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryEvaluator.cpp (161285 => 161286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2014-01-03 21:45:55 UTC (rev 161285)
+++ trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2014-01-03 22:28:19 UTC (rev 161286)
</span><span class="lines">@@ -59,6 +59,10 @@
</span><span class="cx"> #include "RenderLayerCompositor.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#include "WebCoreSystemInterface.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> using namespace MediaFeatureNames;
</span><span class="lines">@@ -624,6 +628,22 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(VIEW_MODE_CSS_MEDIA)
</span><span class="cx">
</span><ins>+// FIXME: Find a better place for this function. Maybe ChromeClient?
+static inline bool isRunningOnIPhoneOrIPod()
+{
+#if PLATFORM(IOS)
+ static wkDeviceClass deviceClass = iosDeviceClass();
+ return deviceClass == wkDeviceClassiPhone || deviceClass == wkDeviceClassiPod;
+#else
+ return false;
+#endif
+}
+
+static bool video_playable_inlineMediaFeatureEval(CSSValue*, RenderStyle*, Frame* frame, MediaFeaturePrefix)
+{
+ return !isRunningOnIPhoneOrIPod() || frame->settings().mediaPlaybackAllowsInline();
+}
+
</ins><span class="cx"> enum PointerDeviceType { TouchPointer, MousePointer, NoPointer, UnknownPointer };
</span><span class="cx">
</span><span class="cx"> static PointerDeviceType leastCapablePrimaryPointerDeviceType(Frame* frame)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (161285 => 161286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-01-03 21:45:55 UTC (rev 161285)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-01-03 22:28:19 UTC (rev 161286)
</span><span class="lines">@@ -712,7 +712,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
</span><span class="cx"> // With proxying, the media elements are backed by a RenderEmbeddedObject.
</span><del>- if ((element->hasTagName(videoTag) || element->hasTagName(audioTag)) && toMediaElement(element)->shouldUseVideoPluginProxy())
</del><ins>+ if ((element->hasTagName(videoTag) || element->hasTagName(audioTag)) && toHTMLMediaElement(element)->shouldUseVideoPluginProxy())
</ins><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -2609,6 +2609,17 @@
</span><span class="cx"> state.style()->setTouchCalloutEnabled(primitiveValue->getStringValue().lower() != "none");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
+ // FIXME: CSSPropertyWebkitCompositionFillColor shouldn't be iOS-specific. Once we fix up its usage in
+ // InlineTextBox::paintCompositionBackground() we should move it outside the PLATFORM(IOS)-guard.
+ // See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
+ case CSSPropertyWebkitCompositionFillColor: {
+ HANDLE_INHERIT_AND_INITIAL(compositionFillColor, CompositionFillColor);
+ if (!primitiveValue)
+ break;
+ state.style()->setCompositionFillColor(colorFromPrimitiveValue(primitiveValue));
+ return;
+ }
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> case CSSPropertyWebkitTapHighlightColor: {
</span></span></pre></div>
<a id="trunkSourceWebCorecsshtmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/html.css (161285 => 161286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/html.css 2014-01-03 21:45:55 UTC (rev 161285)
+++ trunk/Source/WebCore/css/html.css 2014-01-03 22:28:19 UTC (rev 161286)
</span><span class="lines">@@ -399,7 +399,9 @@
</span><span class="cx">
</span><span class="cx"> input, textarea, keygen, select, button, isindex {
</span><span class="cx"> margin: 0__qem;
</span><ins>+#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
</ins><span class="cx"> font: -webkit-small-control;
</span><ins>+#endif
</ins><span class="cx"> color: initial;
</span><span class="cx"> letter-spacing: normal;
</span><span class="cx"> word-spacing: normal;
</span><span class="lines">@@ -419,11 +421,25 @@
</span><span class="cx"> display: none
</span><span class="cx"> }
</span><span class="cx">
</span><del>-input, input[type="password"], input[type="search"], isindex {
</del><ins>+input,
+input[type="password"],
+input[type="search"],
+#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
+textarea,
+input[type="range"],
+#endif
+isindex {
</ins><span class="cx"> -webkit-appearance: textfield;
</span><del>- padding: 1px;
</del><span class="cx"> background-color: white;
</span><ins>+#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
+ border-radius: 5px;
+ font: 11px Helvetica, -webkit-pictograph;
+ border: 1px solid #4c4c4c;
+ padding: 0.2em 0.5em 0.3em 0.5em;
+#else
</ins><span class="cx"> border: 2px inset;
</span><ins>+ padding: 1px;
+#endif
</ins><span class="cx"> -webkit-rtl-ordering: logical;
</span><span class="cx"> -webkit-user-select: text;
</span><span class="cx"> cursor: auto;
</span><span class="lines">@@ -499,7 +515,9 @@
</span><span class="cx"> -webkit-appearance: menulist-button;
</span><span class="cx"> display: -webkit-inline-flex;
</span><span class="cx"> overflow: hidden;
</span><ins>+#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
</ins><span class="cx"> width: 10em;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) && ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE
</span><span class="lines">@@ -508,7 +526,9 @@
</span><span class="cx"> -webkit-appearance: menulist-button;
</span><span class="cx"> display: -webkit-inline-flex;
</span><span class="cx"> overflow: hidden;
</span><ins>+#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
</ins><span class="cx"> width: 10em;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_INPUT_TYPE_DATETIMELOCAL) && ENABLE_INPUT_TYPE_DATETIMELOCAL
</span><span class="lines">@@ -517,7 +537,9 @@
</span><span class="cx"> -webkit-appearance: menulist-button;
</span><span class="cx"> display: -webkit-inline-flex;
</span><span class="cx"> overflow: hidden;
</span><ins>+#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
</ins><span class="cx"> width: 10em;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_INPUT_TYPE_MONTH) && ENABLE_INPUT_TYPE_MONTH
</span><span class="lines">@@ -526,7 +548,9 @@
</span><span class="cx"> -webkit-appearance: menulist-button;
</span><span class="cx"> display: -webkit-inline-flex;
</span><span class="cx"> overflow: hidden;
</span><ins>+#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
</ins><span class="cx"> width: 10em;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_INPUT_TYPE_TIME) && ENABLE_INPUT_TYPE_TIME
</span><span class="lines">@@ -535,10 +559,13 @@
</span><span class="cx"> -webkit-appearance: menulist-button;
</span><span class="cx"> display: -webkit-inline-flex;
</span><span class="cx"> overflow: hidden;
</span><ins>+#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
</ins><span class="cx"> width: 10em;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_INPUT_TYPE_WEEK) && ENABLE_INPUT_TYPE_WEEK
</span><ins>+#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
</ins><span class="cx"> input[type="week"] {
</span><span class="cx"> -webkit-align-items: center;
</span><span class="cx"> -webkit-appearance: menulist-button;
</span><span class="lines">@@ -547,11 +574,14 @@
</span><span class="cx"> width: 10em;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
</ins><span class="cx"> input::-webkit-date-and-time-value {
</span><span class="cx"> margin: 1px 24px 1px 4px;
</span><span class="cx"> white-space: pre;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> input::-webkit-inner-spin-button {
</span><span class="cx"> -webkit-appearance: inner-spin-button;
</span><span class="lines">@@ -590,10 +620,15 @@
</span><span class="cx">
</span><span class="cx"> textarea {
</span><span class="cx"> -webkit-appearance: textarea;
</span><ins>+#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
</ins><span class="cx"> background-color: white;
</span><span class="cx"> border: 1px solid;
</span><span class="cx"> -webkit-rtl-ordering: logical;
</span><span class="cx"> -webkit-user-select: text;
</span><ins>+#else
+ -webkit-nbsp-mode: space;
+ -webkit-line-break: after-white-space;
+#endif
</ins><span class="cx"> -webkit-flex-direction: column;
</span><span class="cx"> resize: auto;
</span><span class="cx"> cursor: auto;
</span><span class="lines">@@ -634,16 +669,25 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> input:-webkit-autofill {
</span><ins>+#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
+ background-color: #F7EC87 !important;
+#else
</ins><span class="cx"> background-color: #FAFFBD !important;
</span><ins>+#endif
</ins><span class="cx"> background-image:none !important;
</span><span class="cx"> color: #000000 !important;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> input[type="radio"], input[type="checkbox"] {
</span><span class="cx"> margin: 3px 0.5ex;
</span><ins>+#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
+ border: 1px solid #4c4c4c;
+ box-sizing: border-box;
+#else
</ins><span class="cx"> padding: initial;
</span><span class="cx"> background-color: initial;
</span><span class="cx"> border: initial;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> input[type="button"], input[type="submit"], input[type="reset"] {
</span><span class="lines">@@ -664,9 +708,17 @@
</span><span class="cx"> text-align: center;
</span><span class="cx"> cursor: default;
</span><span class="cx"> color: ButtonText;
</span><ins>+#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
</ins><span class="cx"> padding: 2px 6px 3px 6px;
</span><span class="cx"> border: 2px outset ButtonFace;
</span><span class="cx"> background-color: ButtonFace;
</span><ins>+#else
+ padding: 0 1.0em;
+ border: 1px solid #4c4c4c;
+ /* We want to be as close to background-color:transparent as possible without actually being transparent. */
+ background-color: rgba(255, 255, 255, 0.01);
+ font: 11px Helvetica;
+#endif
</ins><span class="cx"> box-sizing: border-box
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -700,8 +752,31 @@
</span><span class="cx"> box-sizing: border-box;
</span><span class="cx"> -webkit-user-modify: read-only !important;
</span><span class="cx"> display: block;
</span><ins>+#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
+ background-color: white;
+ border: 1px solid rgb(66, 66, 66);
+ padding: 0px;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
+input[type="range"]::-webkit-slider-thumb:active {
+ background-color: black;
+}
+
+input:disabled, textarea:disabled {
+ opacity: 0.4;
+}
+
+input[readonly], textarea[readonly] {
+ border-color: rgb(188, 188, 188);
+}
+
+textarea::-webkit-input-placeholder {
+ text-indent: 2px;
+}
+#endif
+
</ins><span class="cx"> input[type="button"]:disabled, input[type="submit"]:disabled, input[type="reset"]:disabled,
</span><span class="cx"> input[type="file"]:disabled::-webkit-file-upload-button, button:disabled,
</span><span class="cx"> select:disabled, keygen:disabled, optgroup:disabled, option:disabled,
</span><span class="lines">@@ -709,6 +784,7 @@
</span><span class="cx"> color: GrayText
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
</ins><span class="cx"> input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active, input[type="file"]:active::-webkit-file-upload-button, button:active {
</span><span class="cx"> border-style: inset
</span><span class="cx"> }
</span><span class="lines">@@ -716,6 +792,7 @@
</span><span class="cx"> input[type="button"]:active:disabled, input[type="submit"]:active:disabled, input[type="reset"]:active:disabled, input[type="file"]:active:disabled::-webkit-file-upload-button, button:active:disabled {
</span><span class="cx"> border-style: outset
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> area, param {
</span><span class="cx"> display: none
</span><span class="lines">@@ -723,14 +800,53 @@
</span><span class="cx">
</span><span class="cx"> input[type="checkbox"] {
</span><span class="cx"> -webkit-appearance: checkbox;
</span><ins>+#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
</ins><span class="cx"> box-sizing: border-box;
</span><ins>+#else
+ border-radius: 5px;
+ width: 16px;
+ height: 16px;
+ padding: 0px;
+ /* We want to be as close to background:transparent as possible without actually being transparent */
+ background-color: rgba(255, 255, 255, 0.01);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
</ins><span class="cx"> input[type="radio"] {
</span><span class="cx"> -webkit-appearance: radio;
</span><ins>+ border-radius: 8px;
+ width: 16px;
+ height: 16px;
+ padding: 0px;
+ /* We want to be as close to background:transparent as possible without actually being transparent */
+ background-color: rgba(255, 255, 255, 0.01);
+}
+
+input[type="checkbox"]:checked, input[type="radio"]:checked {
+ background:rgba(0, 0, 0, 0.8);
+ border-color:rgba(255, 255, 255, 0.0);
+}
+
+input[type="checkbox"]:checked:disabled, input[type="radio"]:checked:disabled {
+ opacity:0.4;
+ background:rgba(0, 0, 0, 0.8);
+}
+#endif
+
+#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
+input[type="radio"] {
+ -webkit-appearance: radio;
</ins><span class="cx"> box-sizing: border-box;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
+select:focus {
+ border-color: rgb(17, 46, 135);
+}
+#endif
+
</ins><span class="cx"> #if defined(ENABLE_INPUT_TYPE_COLOR) && ENABLE_INPUT_TYPE_COLOR
</span><span class="cx">
</span><span class="cx"> input[type="color"] {
</span><span class="lines">@@ -777,17 +893,30 @@
</span><span class="cx"> #endif // defined(ENABLE_INPUT_TYPE_COLOR) && ENABLE_INPUT_TYPE_COLOR
</span><span class="cx">
</span><span class="cx"> select {
</span><ins>+ box-sizing: border-box;
+#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
+ -webkit-appearance: menulist-button;
+ letter-spacing: normal;
+ word-spacing: normal;
+ line-height: normal;
+ border: 1px solid #4c4c4c;
+ /* We want to be as close to background:transparent as possible without actually being transparent */
+ background-color: rgba(255, 255, 255, 0.01);
+ font: 11px Helvetica;
+ padding: 0 0.5em 0 0.5em;
+#else
</ins><span class="cx"> -webkit-appearance: menulist;
</span><del>- box-sizing: border-box;
</del><ins>+ border: 1px solid;
+ color: black;
+ background-color: white;
+#endif
</ins><span class="cx"> -webkit-align-items: center;
</span><del>- border: 1px solid;
</del><span class="cx"> white-space: pre;
</span><span class="cx"> -webkit-rtl-ordering: logical;
</span><del>- color: black;
- background-color: white;
</del><span class="cx"> cursor: default;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
</ins><span class="cx"> select[size],
</span><span class="cx"> select[multiple],
</span><span class="cx"> select[size][multiple] {
</span><span class="lines">@@ -806,6 +935,7 @@
</span><span class="cx"> border-radius: 5px;
</span><span class="cx"> white-space: pre;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> optgroup {
</span><span class="cx"> font-weight: bolder;
</span></span></pre></div>
<a id="trunkSourceWebCorecssmathmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/mathml.css (161285 => 161286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/mathml.css 2014-01-03 21:45:55 UTC (rev 161285)
+++ trunk/Source/WebCore/css/mathml.css 2014-01-03 22:28:19 UTC (rev 161286)
</span><span class="lines">@@ -11,11 +11,21 @@
</span><span class="cx">
</span><span class="cx"> /* Keep font-family and other defaults here consistent with http://mxr.mozilla.org/mozilla-central/source/layout/mathml/mathml.css and feedback from www-math. */
</span><span class="cx"> math, mfenced > * {
</span><ins>+#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
+ /* We explicitly include the font Symbol as it's the iOS equivalent of font STIXGeneral. */
+ font-family: STIXGeneral, Symbol, "Times New Roman", sans-serif;
+#else
</ins><span class="cx"> font-family: MathJax_Main, STIXGeneral, "DejaVu Serif", Cambria, "Cambria Math", Times, serif;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> mo, mfenced {
</span><ins>+#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
+ /* We explicitly include the font Symbol as it's the iOS equivalent of font STIXGeneral. */
+ font-family: STIXGeneral, Symbol, "Times New Roman", sans-serif;
+#else
</ins><span class="cx"> font-family: MathJax_Main, STIXGeneral, STIXSizeOneSym, "DejaVu Sans", "DejaVu Serif", Cambria, "Cambria Math",
</span><span class="cx"> "Lucida Sans Unicode", "Arial Unicode MS", "Lucida Grande", OpenSymbol, "Standard Symbols L", sans-serif;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> math {
</span></span></pre></div>
<a id="trunkSourceWebCorecssmediaControlsiOScss"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/mediaControlsiOS.css (0 => 161286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/mediaControlsiOS.css (rev 0)
+++ trunk/Source/WebCore/css/mediaControlsiOS.css 2014-01-03 22:28:19 UTC (rev 161286)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+/*
+ * Copyright (C) 2012 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 COMPUTER, INC. ``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 COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * 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.
+ */
+
+/* alternate media controls - Extend mediaControls.css */
+
+video::-webkit-media-text-track-container {
+ margin-bottom: 47px;
+}
+
+audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
+ display: none;
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorecsssvgcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/svg.css (161285 => 161286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/svg.css 2014-01-03 21:45:55 UTC (rev 161285)
+++ trunk/Source/WebCore/css/svg.css 2014-01-03 22:28:19 UTC (rev 161286)
</span><span class="lines">@@ -55,6 +55,12 @@
</span><span class="cx"> white-space: nowrap
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
+text, tspan, tref {
+ -webkit-text-size-adjust: none;
+}
+#endif
+
</ins><span class="cx"> /* states */
</span><span class="cx">
</span><span class="cx"> :focus {
</span></span></pre>
</div>
</div>
</body>
</html>