Changeset 161286 in webkit


Ignore:
Timestamp:
Jan 3, 2014, 2:28:19 PM (12 years ago)
Author:
dbates@webkit.org
Message:

[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):

Location:
trunk/Source/WebCore
Files:
1 added
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r161285 r161286  
     12014-01-03  Daniel Bates  <dabates@apple.com>
     2
     3        [iOS] Upstream WebCore/css changes
     4        https://bugs.webkit.org/show_bug.cgi?id=126237
     5
     6        Reviewed by Simon Fraser.
     7
     8        * css/CSSComputedStyleDeclaration.cpp:
     9        (WebCore::ComputedStyleExtractor::propertyValue): Added iOS-specific code and FIXME comment.
     10        * css/CSSParser.cpp:
     11        (WebCore::CSSParserContext::CSSParserContext): Ditto.
     12        (WebCore::CSSParser::parseValue): Ditto.
     13        * css/CSSPropertyNames.in: Added property -webkit-composition-fill-color. Also added FIXME comment.
     14        * css/CSSValueKeywords.in: Added iOS-specific -apple-system-* values.
     15        * css/DeprecatedStyleBuilder.cpp:
     16        (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder): Added iOS-specific code and FIXME comments.
     17        * css/MediaFeatureNames.h: Added media feature -webkit-video-playable-inline.
     18        * css/MediaQueryEvaluator.cpp:
     19        (WebCore::isRunningOnIPhoneOrIPod): Added. Also added FIXME comment.
     20        (WebCore::video_playable_inlineMediaFeatureEval): Added.
     21        * css/StyleResolver.cpp:
     22        (WebCore::StyleResolver::canShareStyleWithElement): Substitute toHTMLMediaElement() for toMediaElement().
     23        (WebCore::StyleResolver::applyProperty): Added iOS-specific code and FIXME comment.
     24        * css/html.css: Added iOS-specific CSS styles.
     25        (input, textarea, keygen, select, button, isindex):
     26        (isindex):
     27        (input[type="date"]):
     28        (input[type="datetime"]):
     29        (input[type="datetime-local"]):
     30        (input[type="month"]):
     31        (input[type="time"]):
     32        (textarea):
     33        (input:-webkit-autofill):
     34        (input[type="radio"], input[type="checkbox"]):
     35        (input[type="button"], input[type="submit"], input[type="reset"], input[type="file"]::-webkit-file-upload-button, button):
     36        (input[type="range"]::-webkit-slider-thumb, input[type="range"]::-webkit-media-slider-thumb):
     37        (input[type="range"]::-webkit-slider-thumb:active):
     38        (input:disabled, textarea:disabled):
     39        (input[readonly], textarea[readonly]):
     40        (textarea::-webkit-input-placeholder):
     41        (input[type="checkbox"]):
     42        (input[type="radio"]):
     43        (input[type="checkbox"]:checked, input[type="radio"]:checked):
     44        (input[type="checkbox"]:checked:disabled, input[type="radio"]:checked:disabled):
     45        (select:focus):
     46        (select):
     47        * css/mathml.css: Added iOS-specific CSS styles.
     48        (math, mfenced > *):
     49        (mo, mfenced):
     50        * css/mediaControlsiOS.css: Added.
     51        * css/svg.css: Added iOS-specific CSS styles.
     52        (text, tspan, tref):
     53
    1542014-01-03  Brent Fulgham  <bfulgham@apple.com>
    255

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r161209 r161286  
    349349#if PLATFORM(IOS)
    350350    CSSPropertyWebkitTouchCallout,
     351
     352    // FIXME: This property shouldn't be iOS-specific. Once we fix up its usage in InlineTextBox::paintCompositionBackground()
     353    // we should move it outside the PLATFORM(IOS)-guard. See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
     354    CSSPropertyWebkitCompositionFillColor,
    351355#endif
    352356#if ENABLE(CSS_SHAPES)
    … …  
    27402744        case CSSPropertyWebkitRtlOrdering:
    27412745            return cssValuePool().createIdentifierValue(style->rtlOrdering() ? CSSValueVisual : CSSValueLogical);
     2746#if PLATFORM(IOS)
     2747        // FIXME: This property shouldn't be iOS-specific. Once we fix up its usage in InlineTextBox::paintCompositionBackground()
     2748        // we should remove the PLATFORM(IOS)-guard. See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
     2749        case CSSPropertyWebkitCompositionFillColor:
     2750            return currentColorOrValidColor(style.get(), style->compositionFillColor());
     2751#endif
    27422752#if ENABLE(TOUCH_EVENTS)
    27432753        case CSSPropertyWebkitTapHighlightColor:

  • trunk/Source/WebCore/css/CSSParser.cpp

    r161086 r161286  
    265265    , useLegacyBackgroundSizeShorthandBehavior(false)
    266266{
     267#if PLATFORM(IOS)
     268    // FIXME: Force the site specific quirk below to work on iOS. Investigating other site specific quirks
     269    // to see if we can enable the preference all together is to be handled by:
     270    // <rdar://problem/8493309> Investigate Enabling Site Specific Quirks in MobileSafari and UIWebView
     271    needsSiteSpecificQuirks = true;
     272#endif
    267273}
    268274
    … …  
    281287    , useLegacyBackgroundSizeShorthandBehavior(document.settings() ? document.settings()->useLegacyBackgroundSizeShorthandBehavior() : false)
    282288{
     289#if PLATFORM(IOS)
     290    // FIXME: Force the site specific quirk below to work on iOS. Investigating other site specific quirks
     291    // to see if we can enable the preference all together is to be handled by:
     292    // <rdar://problem/8493309> Investigate Enabling Site Specific Quirks in MobileSafari and UIWebView
     293    needsSiteSpecificQuirks = true;
     294#endif
    283295}
    284296
    … …  
    27612773
    27622774#if PLATFORM(IOS)
     2775    // FIXME: CSSPropertyWebkitCompositionFillColor shouldn't be iOS-specific. Once we fix up its usage in
     2776    // InlineTextBox::paintCompositionBackground() we should move it outside the PLATFORM(IOS)-guard.
     2777    // See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
     2778    case CSSPropertyWebkitCompositionFillColor:
     2779        if ((id >= CSSValueAqua && id <= CSSValueWindowtext) || id == CSSValueMenu
     2780            || (id >= CSSValueWebkitFocusRingColor && id < CSSValueWebkitText && inQuirksMode())) {
     2781            validPrimitive = true;
     2782        } else {
     2783            parsedValue = parseColor();
     2784            if (parsedValue)
     2785                m_valueList->next();
     2786        }
     2787        break;
    27632788    case CSSPropertyWebkitTouchCallout:
    27642789        if (id == CSSValueDefault || id == CSSValueNone)
    … …  
    1273012755        // If the prefix is -apple- or -khtml-, change it to -webkit-.
    1273112756        // This makes the string one character longer.
    12732         if (hasPrefix(buffer, length, "-apple-") || hasPrefix(buffer, length, "-khtml-")) {
     12757        // On iOS we don't want to change values starting with -apple-system to -webkit-system.
     12758        if ((hasPrefix(buffer, length, "-apple-") && !hasPrefix(buffer, length, "-apple-system")) || hasPrefix(buffer, length, "-khtml-")) {
    1273312759            memmove(buffer + 7, buffer + 6, length + 1 - 6);
    1273412760            memcpy(buffer, "-webkit", 7);

  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r160200 r161286  
    466466#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
    467467-webkit-touch-callout [Inherited]
    468 #endif
     468
     469// FIXME: This property shouldn't be iOS-specific. Once we fix up its usage in InlineTextBox::paintCompositionBackground()
     470// we should move it outside the WTF_PLATFORM_IOS-guard.
     471-webkit-composition-fill-color [Inherited]
     472#endif

  • trunk/Source/WebCore/css/CSSValueKeywords.in

    r161067 r161286  
    3232-webkit-small-control
    3333-webkit-control
     34
     35#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
     36-apple-system-headline
     37-apple-system-body
     38-apple-system-subheadline
     39-apple-system-footnote
     40-apple-system-caption1
     41-apple-system-caption2
     42-apple-system-short-headline
     43-apple-system-short-body
     44-apple-system-short-subheadline
     45-apple-system-short-footnote
     46-apple-system-short-caption1
     47-apple-system-tall-body
     48#endif
     49
     50// This has to go after the -apple-system versions.
    3451status-bar
    3552

  • trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

    r161209 r161286  
    23132313#endif
    23142314    setPropertyHandler(CSSPropertyLeft, ApplyPropertyLength<&RenderStyle::left, &RenderStyle::setLeft, &RenderStyle::initialOffset, AutoEnabled>::createHandler());
     2315
     2316    // FIXME: We should reconcile the difference in datatype between iOS and OpenSource. On iOS we want letter spacing to
     2317    // be float for sub-pixel kerning. See <https://bugs.webkit.org/show_bug.cgi?id=20606>.
     2318#if !PLATFORM(IOS)
    23152319    setPropertyHandler(CSSPropertyLetterSpacing, ApplyPropertyComputeLength<int, &RenderStyle::letterSpacing, &RenderStyle::setLetterSpacing, &RenderStyle::initialLetterWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createHandler());
     2320#else
     2321    setPropertyHandler(CSSPropertyLetterSpacing, ApplyPropertyComputeLength<float, &RenderStyle::letterSpacing, &RenderStyle::setLetterSpacing, &RenderStyle::initialLetterWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createHandler());
     2322#endif
     2323
    23162324#if ENABLE(IOS_TEXT_AUTOSIZING)
    23172325    setPropertyHandler(CSSPropertyLineHeight, ApplyPropertyLineHeightForIOSTextAutosizing::createHandler());
    … …  
    25292537    setPropertyHandler(CSSPropertyWidth, ApplyPropertyLength<&RenderStyle::width, &RenderStyle::setWidth, &RenderStyle::initialSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicEnabled, NoneDisabled, UndefinedDisabled>::createHandler());
    25302538    setPropertyHandler(CSSPropertyWordBreak, ApplyPropertyDefault<EWordBreak, &RenderStyle::wordBreak, EWordBreak, &RenderStyle::setWordBreak, EWordBreak, &RenderStyle::initialWordBreak>::createHandler());
     2539
     2540    // FIXME: We should reconcile the difference in datatype between iOS and OpenSource. On iOS we want word spacing to
     2541    // be float for sub-pixel kerning. See <https://bugs.webkit.org/show_bug.cgi?id=20606>.
     2542#if !PLATFORM(IOS)
    25312543    setPropertyHandler(CSSPropertyWordSpacing, ApplyPropertyComputeLength<int, &RenderStyle::wordSpacing, &RenderStyle::setWordSpacing, &RenderStyle::initialLetterWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createHandler());
     2544#else
     2545    setPropertyHandler(CSSPropertyWordSpacing, ApplyPropertyComputeLength<float, &RenderStyle::wordSpacing, &RenderStyle::setWordSpacing, &RenderStyle::initialLetterWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createHandler());
     2546#endif
     2547
    25322548    // UAs must treat 'word-wrap' as an alternate name for the 'overflow-wrap' property. So using the same handlers.
    25332549    setPropertyHandler(CSSPropertyWordWrap, ApplyPropertyDefault<EOverflowWrap, &RenderStyle::overflowWrap, EOverflowWrap, &RenderStyle::setOverflowWrap, EOverflowWrap, &RenderStyle::initialOverflowWrap>::createHandler());

  • trunk/Source/WebCore/css/MediaFeatureNames.h

    r148431 r161286  
    7474    macro(transition, "-webkit-transition") \
    7575    macro(animation, "-webkit-animation") \
     76    macro(video_playable_inline, "-webkit-video-playable-inline") \
    7677    CSS_MEDIAQUERY_VIEW_MODE(macro)
    7778

  • trunk/Source/WebCore/css/MediaQueryEvaluator.cpp

    r160763 r161286  
    6060#endif
    6161
     62#if PLATFORM(IOS)
     63#include "WebCoreSystemInterface.h"
     64#endif
     65
    6266namespace WebCore {
    6367
    … …  
    625629#endif // ENABLE(VIEW_MODE_CSS_MEDIA)
    626630
     631// FIXME: Find a better place for this function. Maybe ChromeClient?
     632static inline bool isRunningOnIPhoneOrIPod()
     633{
     634#if PLATFORM(IOS)
     635    static wkDeviceClass deviceClass = iosDeviceClass();
     636    return deviceClass == wkDeviceClassiPhone || deviceClass == wkDeviceClassiPod;
     637#else
     638    return false;
     639#endif
     640}
     641
     642static bool video_playable_inlineMediaFeatureEval(CSSValue*, RenderStyle*, Frame* frame, MediaFeaturePrefix)
     643{
     644    return !isRunningOnIPhoneOrIPod() || frame->settings().mediaPlaybackAllowsInline();
     645}
     646
    627647enum PointerDeviceType { TouchPointer, MousePointer, NoPointer, UnknownPointer };
    628648

  • trunk/Source/WebCore/css/StyleResolver.cpp

    r160973 r161286  
    713713#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
    714714    // With proxying, the media elements are backed by a RenderEmbeddedObject.
    715     if ((element->hasTagName(videoTag) || element->hasTagName(audioTag)) && toMediaElement(element)->shouldUseVideoPluginProxy())
     715    if ((element->hasTagName(videoTag) || element->hasTagName(audioTag)) && toHTMLMediaElement(element)->shouldUseVideoPluginProxy())
    716716        return false;
    717717#endif
    … …  
    26082608
    26092609        state.style()->setTouchCalloutEnabled(primitiveValue->getStringValue().lower() != "none");
     2610        return;
     2611    }
     2612
     2613    // FIXME: CSSPropertyWebkitCompositionFillColor shouldn't be iOS-specific. Once we fix up its usage in
     2614    // InlineTextBox::paintCompositionBackground() we should move it outside the PLATFORM(IOS)-guard.
     2615    // See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
     2616    case CSSPropertyWebkitCompositionFillColor: {
     2617        HANDLE_INHERIT_AND_INITIAL(compositionFillColor, CompositionFillColor);
     2618        if (!primitiveValue)
     2619            break;
     2620        state.style()->setCompositionFillColor(colorFromPrimitiveValue(primitiveValue));
    26102621        return;
    26112622    }

  • trunk/Source/WebCore/css/html.css

    r155324 r161286  
    400400input, textarea, keygen, select, button, isindex {
    401401    margin: 0__qem;
     402#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
    402403    font: -webkit-small-control;
     404#endif
    403405    color: initial;
    404406    letter-spacing: normal;
    … …  
    420422}
    421423
    422 input, input[type="password"], input[type="search"], isindex {
     424input,
     425input[type="password"],
     426input[type="search"],
     427#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
     428textarea,
     429input[type="range"],
     430#endif
     431isindex {
    423432    -webkit-appearance: textfield;
     433    background-color: white;
     434#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
     435    border-radius: 5px;
     436    font: 11px Helvetica, -webkit-pictograph;
     437    border: 1px solid #4c4c4c;
     438    padding: 0.2em 0.5em 0.3em 0.5em;
     439#else
     440    border: 2px inset;
    424441    padding: 1px;
    425     background-color: white;
    426     border: 2px inset;
     442#endif
    427443    -webkit-rtl-ordering: logical;
    428444    -webkit-user-select: text;
    … …  
    500516    display: -webkit-inline-flex;
    501517    overflow: hidden;
     518#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
    502519    width: 10em;
     520#endif
    503521}
    504522#endif
    … …  
    509527    display: -webkit-inline-flex;
    510528    overflow: hidden;
     529#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
    511530    width: 10em;
     531#endif
    512532}
    513533#endif
    … …  
    518538    display: -webkit-inline-flex;
    519539    overflow: hidden;
     540#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
    520541    width: 10em;
     542#endif
    521543}
    522544#endif
    … …  
    527549    display: -webkit-inline-flex;
    528550    overflow: hidden;
     551#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
    529552    width: 10em;
     553#endif
    530554}
    531555#endif
    … …  
    536560    display: -webkit-inline-flex;
    537561    overflow: hidden;
     562#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
    538563    width: 10em;
     564#endif
    539565}
    540566#endif
    541567#if defined(ENABLE_INPUT_TYPE_WEEK) && ENABLE_INPUT_TYPE_WEEK
     568#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
    542569input[type="week"] {
    543570    -webkit-align-items: center;
    … …  
    548575}
    549576#endif
    550 
     577#endif
     578
     579#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
    551580input::-webkit-date-and-time-value {
    552581    margin: 1px 24px 1px 4px;
    553582    white-space: pre;
    554583}
     584#endif
    555585
    556586input::-webkit-inner-spin-button {
    … …  
    591621textarea {
    592622    -webkit-appearance: textarea;
     623#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
    593624    background-color: white;
    594625    border: 1px solid;
    595626    -webkit-rtl-ordering: logical;
    596627    -webkit-user-select: text;
     628#else
     629    -webkit-nbsp-mode: space;
     630    -webkit-line-break: after-white-space;
     631#endif
    597632    -webkit-flex-direction: column;
    598633    resize: auto;
    … …  
    635670
    636671input:-webkit-autofill {
     672#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
     673    background-color: #F7EC87 !important;
     674#else
    637675    background-color: #FAFFBD !important;
     676#endif
    638677    background-image:none !important;
    639678    color: #000000 !important;
    … …  
    642681input[type="radio"], input[type="checkbox"] {
    643682    margin: 3px 0.5ex;
     683#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
     684    border: 1px solid #4c4c4c;
     685    box-sizing: border-box;
     686#else
    644687    padding: initial;
    645688    background-color: initial;
    646689    border: initial;
     690#endif
    647691}
    648692
    … …  
    665709    cursor: default;
    666710    color: ButtonText;
     711#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
    667712    padding: 2px 6px 3px 6px;
    668713    border: 2px outset ButtonFace;
    669714    background-color: ButtonFace;
     715#else
     716    padding: 0 1.0em;
     717    border: 1px solid #4c4c4c;
     718    /* We want to be as close to background-color:transparent as possible without actually being transparent. */
     719    background-color: rgba(255, 255, 255, 0.01);
     720    font: 11px Helvetica;
     721#endif
    670722    box-sizing: border-box
    671723}
    … …  
    701753    -webkit-user-modify: read-only !important;
    702754    display: block;
    703 }
     755#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
     756    background-color: white;
     757    border: 1px solid rgb(66, 66, 66);
     758    padding: 0px;
     759#endif
     760}
     761
     762#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
     763input[type="range"]::-webkit-slider-thumb:active {
     764    background-color: black;
     765}
     766
     767input:disabled, textarea:disabled {
     768    opacity: 0.4;
     769}
     770
     771input[readonly], textarea[readonly] {
     772    border-color: rgb(188, 188, 188);
     773}
     774
     775textarea::-webkit-input-placeholder {
     776    text-indent: 2px;
     777}
     778#endif
    704779
    705780input[type="button"]:disabled, input[type="submit"]:disabled, input[type="reset"]:disabled,
    … …  
    710785}
    711786
     787#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
    712788input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active, input[type="file"]:active::-webkit-file-upload-button, button:active {
    713789    border-style: inset
    … …  
    717793    border-style: outset
    718794}
     795#endif
    719796
    720797area, param {
    … …  
    724801input[type="checkbox"] {
    725802    -webkit-appearance: checkbox;
    726     box-sizing: border-box;
    727 }
    728 
     803#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
     804    box-sizing: border-box;
     805#else
     806    border-radius: 5px;
     807    width: 16px;
     808    height: 16px;
     809    padding: 0px;
     810    /* We want to be as close to background:transparent as possible without actually being transparent */
     811    background-color: rgba(255, 255, 255, 0.01);
     812#endif
     813}
     814
     815#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
    729816input[type="radio"] {
    730817    -webkit-appearance: radio;
    731     box-sizing: border-box;
    732 }
     818    border-radius: 8px;
     819    width: 16px;
     820    height: 16px;
     821    padding: 0px;
     822    /* We want to be as close to background:transparent as possible without actually being transparent */
     823    background-color: rgba(255, 255, 255, 0.01);
     824}
     825
     826input[type="checkbox"]:checked, input[type="radio"]:checked {
     827    background:rgba(0, 0, 0, 0.8);
     828    border-color:rgba(255, 255, 255, 0.0);
     829}
     830
     831input[type="checkbox"]:checked:disabled, input[type="radio"]:checked:disabled {
     832    opacity:0.4;
     833    background:rgba(0, 0, 0, 0.8);
     834}
     835#endif
     836
     837#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
     838input[type="radio"] {
     839    -webkit-appearance: radio;
     840    box-sizing: border-box;
     841}
     842#endif
     843
     844#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
     845select:focus {
     846    border-color: rgb(17, 46, 135);
     847}
     848#endif
    733849
    734850#if defined(ENABLE_INPUT_TYPE_COLOR) && ENABLE_INPUT_TYPE_COLOR
    … …  
    778894
    779895select {
     896    box-sizing: border-box;
     897#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
     898    -webkit-appearance: menulist-button;
     899    letter-spacing: normal;
     900    word-spacing: normal;
     901    line-height: normal;
     902    border: 1px solid #4c4c4c;
     903    /* We want to be as close to background:transparent as possible without actually being transparent */
     904    background-color: rgba(255, 255, 255, 0.01);
     905    font: 11px Helvetica;
     906    padding: 0 0.5em 0 0.5em;
     907#else
    780908    -webkit-appearance: menulist;
    781     box-sizing: border-box;
     909    border: 1px solid;
     910    color: black;
     911    background-color: white;
     912#endif
    782913    -webkit-align-items: center;
    783     border: 1px solid;
    784914    white-space: pre;
    785915    -webkit-rtl-ordering: logical;
    786     color: black;
    787     background-color: white;
    788916    cursor: default;
    789917}
    790918
     919#if !(defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS)
    791920select[size],
    792921select[multiple],
    … …  
    807936    white-space: pre;
    808937}
     938#endif
    809939
    810940optgroup {

  • trunk/Source/WebCore/css/mathml.css

    r160711 r161286  
    1212/* 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. */
    1313math, mfenced > * {
     14#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
     15    /* We explicitly include the font Symbol as it's the iOS equivalent of font STIXGeneral. */
     16    font-family: STIXGeneral, Symbol, "Times New Roman", sans-serif;
     17#else
    1418    font-family: MathJax_Main, STIXGeneral, "DejaVu Serif", Cambria, "Cambria Math", Times, serif;
     19#endif
    1520}
    1621mo, mfenced {
     22#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
     23    /* We explicitly include the font Symbol as it's the iOS equivalent of font STIXGeneral. */
     24    font-family: STIXGeneral, Symbol, "Times New Roman", sans-serif;
     25#else
    1726    font-family: MathJax_Main, STIXGeneral, STIXSizeOneSym, "DejaVu Sans", "DejaVu Serif", Cambria, "Cambria Math",
    1827        "Lucida Sans Unicode", "Arial Unicode MS", "Lucida Grande", OpenSymbol, "Standard Symbols L", sans-serif;
     28#endif
    1929}
    2030

  • trunk/Source/WebCore/css/svg.css

    r145168 r161286  
    5656}
    5757
     58#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
     59text, tspan, tref {
     60   -webkit-text-size-adjust: none;
     61}
     62#endif
     63
    5864/* states */
    5965
Note: See TracChangeset for help on using the changeset viewer.