Diff
Modified: trunk/Source/WebCore/ChangeLog (153528 => 153529)
--- trunk/Source/WebCore/ChangeLog 2013-07-31 18:18:37 UTC (rev 153528)
+++ trunk/Source/WebCore/ChangeLog 2013-07-31 18:41:08 UTC (rev 153529)
@@ -1,3 +1,32 @@
+2013-07-31 Ryosuke Niwa <[email protected]>
+
+ Convert most callers of setInlineStyleProperty passing strings to enums or doubles instead
+ https://bugs.webkit.org/show_bug.cgi?id=119304
+
+ Reviewed by Andreas Kling.
+
+ Merge https://chromium.googlesource.com/chromium/blink/+/8157dd9381716759f183fabbfed29c52962be746
+
+ * editing/DeleteButtonController.cpp:
+ (WebCore::DeleteButtonController::createDeletionUI):
+ (WebCore::DeleteButtonController::show):
+ * html/HTMLTextFormControlElement.cpp:
+ (WebCore::HTMLTextFormControlElement::updatePlaceholderVisibility):
+ * html/ImageDocument.cpp:
+ (WebCore::ImageDocument::resizeImageToFit):
+ (WebCore::ImageDocument::restoreImageSize):
+ (WebCore::ImageDocument::windowSizeChanged):
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlTextTrackContainerElement::updateDisplay):
+ (WebCore::MediaControlTextTrackContainerElement::updateTimerFired):
+ * html/track/TextTrackCue.cpp:
+ (WebCore::TextTrackCue::setFontSize):
+ * html/track/TextTrackCueGeneric.cpp:
+ (WebCore::TextTrackCueGenericBoxElement::applyCSSProperties):
+ (WebCore::TextTrackCueGeneric::setFontSize):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::resize):
+
2013-07-31 Jae Hyun Park <[email protected]>
[Coordinated Graphics] Use m_ prefix only for member variable
Modified: trunk/Source/WebCore/editing/DeleteButtonController.cpp (153528 => 153529)
--- trunk/Source/WebCore/editing/DeleteButtonController.cpp 2013-07-31 18:18:37 UTC (rev 153528)
+++ trunk/Source/WebCore/editing/DeleteButtonController.cpp 2013-07-31 18:41:08 UTC (rev 153529)
@@ -212,10 +212,10 @@
container->setInlineStyleProperty(CSSPropertyVisibility, CSSValueHidden);
container->setInlineStyleProperty(CSSPropertyPosition, CSSValueAbsolute);
container->setInlineStyleProperty(CSSPropertyCursor, CSSValueDefault);
- container->setInlineStyleProperty(CSSPropertyTop, "0");
- container->setInlineStyleProperty(CSSPropertyRight, "0");
- container->setInlineStyleProperty(CSSPropertyBottom, "0");
- container->setInlineStyleProperty(CSSPropertyLeft, "0");
+ container->setInlineStyleProperty(CSSPropertyTop, 0, CSSPrimitiveValue::CSS_PX);
+ container->setInlineStyleProperty(CSSPropertyRight, 0, CSSPrimitiveValue::CSS_PX);
+ container->setInlineStyleProperty(CSSPropertyBottom, 0, CSSPrimitiveValue::CSS_PX);
+ container->setInlineStyleProperty(CSSPropertyLeft, 0, CSSPrimitiveValue::CSS_PX);
RefPtr<HTMLDivElement> outline = HTMLDivElement::create(m_target->document());
outline->setIdAttribute(outlineElementIdentifier);
@@ -225,12 +225,14 @@
outline->setInlineStyleProperty(CSSPropertyPosition, CSSValueAbsolute);
outline->setInlineStyleProperty(CSSPropertyZIndex, String::number(-1000000));
- outline->setInlineStyleProperty(CSSPropertyTop, String::number(-borderWidth - m_target->renderBox()->borderTop()) + "px");
- outline->setInlineStyleProperty(CSSPropertyRight, String::number(-borderWidth - m_target->renderBox()->borderRight()) + "px");
- outline->setInlineStyleProperty(CSSPropertyBottom, String::number(-borderWidth - m_target->renderBox()->borderBottom()) + "px");
- outline->setInlineStyleProperty(CSSPropertyLeft, String::number(-borderWidth - m_target->renderBox()->borderLeft()) + "px");
- outline->setInlineStyleProperty(CSSPropertyBorder, String::number(borderWidth) + "px solid rgba(0, 0, 0, 0.6)");
- outline->setInlineStyleProperty(CSSPropertyWebkitBorderRadius, String::number(borderRadius) + "px");
+ outline->setInlineStyleProperty(CSSPropertyTop, -borderWidth - m_target->renderBox()->borderTop(), CSSPrimitiveValue::CSS_PX);
+ outline->setInlineStyleProperty(CSSPropertyRight, -borderWidth - m_target->renderBox()->borderRight(), CSSPrimitiveValue::CSS_PX);
+ outline->setInlineStyleProperty(CSSPropertyBottom, -borderWidth - m_target->renderBox()->borderBottom(), CSSPrimitiveValue::CSS_PX);
+ outline->setInlineStyleProperty(CSSPropertyLeft, -borderWidth - m_target->renderBox()->borderLeft(), CSSPrimitiveValue::CSS_PX);
+ outline->setInlineStyleProperty(CSSPropertyBorderWidth, borderWidth, CSSPrimitiveValue::CSS_PX);
+ outline->setInlineStyleProperty(CSSPropertyBorderStyle, CSSValueSolid);
+ outline->setInlineStyleProperty(CSSPropertyBorderColor, "rgba(0, 0, 0, 0.6)");
+ outline->setInlineStyleProperty(CSSPropertyBorderRadius, borderRadius, CSSPrimitiveValue::CSS_PX);
outline->setInlineStyleProperty(CSSPropertyVisibility, CSSValueVisible);
ExceptionCode ec = 0;
@@ -248,10 +250,10 @@
button->setInlineStyleProperty(CSSPropertyPosition, CSSValueAbsolute);
button->setInlineStyleProperty(CSSPropertyZIndex, String::number(1000000));
- button->setInlineStyleProperty(CSSPropertyTop, String::number((-buttonHeight / 2) - m_target->renderBox()->borderTop() - (borderWidth / 2) + buttonBottomShadowOffset) + "px");
- button->setInlineStyleProperty(CSSPropertyLeft, String::number((-buttonWidth / 2) - m_target->renderBox()->borderLeft() - (borderWidth / 2)) + "px");
- button->setInlineStyleProperty(CSSPropertyWidth, String::number(buttonWidth) + "px");
- button->setInlineStyleProperty(CSSPropertyHeight, String::number(buttonHeight) + "px");
+ button->setInlineStyleProperty(CSSPropertyTop, (-buttonHeight / 2) - m_target->renderBox()->borderTop() - (borderWidth / 2) + buttonBottomShadowOffset, CSSPrimitiveValue::CSS_PX);
+ button->setInlineStyleProperty(CSSPropertyLeft, (-buttonWidth / 2) - m_target->renderBox()->borderLeft() - (borderWidth / 2), CSSPrimitiveValue::CSS_PX);
+ button->setInlineStyleProperty(CSSPropertyWidth, buttonWidth, CSSPrimitiveValue::CSS_PX);
+ button->setInlineStyleProperty(CSSPropertyHeight, buttonHeight, CSSPrimitiveValue::CSS_PX);
button->setInlineStyleProperty(CSSPropertyVisibility, CSSValueVisible);
float deviceScaleFactor = WebCore::deviceScaleFactor(m_frame);
@@ -314,7 +316,7 @@
}
if (m_target->renderer()->style()->hasAutoZIndex()) {
- m_target->setInlineStyleProperty(CSSPropertyZIndex, "0");
+ m_target->setInlineStyleProperty(CSSPropertyZIndex, String::number(0));
m_wasAutoZIndex = true;
}
}
Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp (153528 => 153529)
--- trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2013-07-31 18:18:37 UTC (rev 153528)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2013-07-31 18:41:08 UTC (rev 153529)
@@ -166,7 +166,7 @@
HTMLElement* placeholder = placeholderElement();
if (!placeholder)
return;
- placeholder->setInlineStyleProperty(CSSPropertyVisibility, placeholderShouldBeVisible() ? ASCIILiteral("visible") : ASCIILiteral("hidden"));
+ placeholder->setInlineStyleProperty(CSSPropertyVisibility, placeholderShouldBeVisible() ? CSSValueVisible : CSSValueHidden);
}
void HTMLTextFormControlElement::fixPlaceholderRenderer(HTMLElement* placeholder, HTMLElement* siblingElement)
Modified: trunk/Source/WebCore/html/ImageDocument.cpp (153528 => 153529)
--- trunk/Source/WebCore/html/ImageDocument.cpp 2013-07-31 18:18:37 UTC (rev 153528)
+++ trunk/Source/WebCore/html/ImageDocument.cpp 2013-07-31 18:41:08 UTC (rev 153529)
@@ -255,7 +255,7 @@
m_imageElement->setWidth(static_cast<int>(imageSize.width() * scale));
m_imageElement->setHeight(static_cast<int>(imageSize.height() * scale));
- m_imageElement->setInlineStyleProperty(CSSPropertyCursor, "-webkit-zoom-in", false);
+ m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueWebkitZoomIn);
}
void ImageDocument::imageClicked(int x, int y)
@@ -311,7 +311,7 @@
if (imageFitsInWindow())
m_imageElement->removeInlineStyleProperty(CSSPropertyCursor);
else
- m_imageElement->setInlineStyleProperty(CSSPropertyCursor, "-webkit-zoom-out", false);
+ m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueWebkitZoomOut);
m_didShrinkImage = false;
}
@@ -344,7 +344,7 @@
if (fitsInWindow)
m_imageElement->removeInlineStyleProperty(CSSPropertyCursor);
else
- m_imageElement->setInlineStyleProperty(CSSPropertyCursor, "-webkit-zoom-out", false);
+ m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueWebkitZoomOut);
return;
}
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (153528 => 153529)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2013-07-31 18:18:37 UTC (rev 153528)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2013-07-31 18:41:08 UTC (rev 153529)
@@ -1302,8 +1302,8 @@
m_textTrackRepresentation->setContentScale(page->deviceScaleFactor());
m_textTrackRepresentation->update();
- setInlineStyleProperty(CSSPropertyWidth, String::number(m_videoDisplaySize.size().width()) + "px");
- setInlineStyleProperty(CSSPropertyHeight, String::number(m_videoDisplaySize.size().height()) + "px");
+ setInlineStyleProperty(CSSPropertyWidth, m_videoDisplaySize.size().width(), CSSPrimitiveValue::CSS_PX);
+ setInlineStyleProperty(CSSPropertyHeight, m_videoDisplaySize.size().height(), CSSPrimitiveValue::CSS_PX);
}
} else {
hide();
@@ -1317,8 +1317,8 @@
return;
if (m_textTrackRepresentation) {
- setInlineStyleProperty(CSSPropertyWidth, String::number(m_videoDisplaySize.size().width()) + "px");
- setInlineStyleProperty(CSSPropertyHeight, String::number(m_videoDisplaySize.size().height()) + "px");
+ setInlineStyleProperty(CSSPropertyWidth, m_videoDisplaySize.size().width(), CSSPrimitiveValue::CSS_PX);
+ setInlineStyleProperty(CSSPropertyHeight, m_videoDisplaySize.size().height(), CSSPrimitiveValue::CSS_PX);
}
HTMLMediaElement* mediaElement = toParentMediaElement(this);
Modified: trunk/Source/WebCore/html/track/TextTrackCue.cpp (153528 => 153529)
--- trunk/Source/WebCore/html/track/TextTrackCue.cpp 2013-07-31 18:18:37 UTC (rev 153528)
+++ trunk/Source/WebCore/html/track/TextTrackCue.cpp 2013-07-31 18:41:08 UTC (rev 153529)
@@ -1212,7 +1212,7 @@
LOG(Media, "TextTrackCue::setFontSize - setting cue font size to %i", fontSize);
- displayTreeInternal()->setInlineStyleProperty(CSSPropertyFontSize, String::number(fontSize) + "px", important);
+ displayTreeInternal()->setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue::CSS_PX, important);
}
} // namespace WebCore
Modified: trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp (153528 => 153529)
--- trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp 2013-07-31 18:18:37 UTC (rev 153528)
+++ trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp 2013-07-31 18:41:08 UTC (rev 153529)
@@ -70,7 +70,7 @@
float size = static_cast<float>(cue->getCSSSize());
if (cue->useDefaultPosition()) {
- setInlineStyleProperty(CSSPropertyBottom, "0");
+ setInlineStyleProperty(CSSPropertyBottom, 0, CSSPrimitiveValue::CSS_PX);
setInlineStyleProperty(CSSPropertyMarginBottom, 1.0, CSSPrimitiveValue::CSS_PERCENTAGE);
} else {
setInlineStyleProperty(CSSPropertyLeft, static_cast<float>(cue->position()), CSSPrimitiveValue::CSS_PERCENTAGE);
@@ -147,7 +147,7 @@
double size = videoSize.height() * baseFontSizeRelativeToVideoHeight() / 100;
if (fontSizeMultiplier())
size *= fontSizeMultiplier() / 100;
- displayTreeInternal()->setInlineStyleProperty(CSSPropertyFontSize, String::number(lround(size)) + "px");
+ displayTreeInternal()->setInlineStyleProperty(CSSPropertyFontSize, lround(size), CSSPrimitiveValue::CSS_PX);
LOG(Media, "TextTrackCueGeneric::setFontSize - setting cue font size to %li", lround(size));
}
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (153528 => 153529)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-07-31 18:18:37 UTC (rev 153528)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-07-31 18:41:08 UTC (rev 153529)
@@ -2528,23 +2528,23 @@
if (resize != RESIZE_VERTICAL && difference.width()) {
if (element->isFormControlElement()) {
// Make implicit margins from the theme explicit (see <http://bugs.webkit.org/show_bug.cgi?id=9547>).
- styledElement->setInlineStyleProperty(CSSPropertyMarginLeft, String::number(renderer->marginLeft() / zoomFactor) + "px", false);
- styledElement->setInlineStyleProperty(CSSPropertyMarginRight, String::number(renderer->marginRight() / zoomFactor) + "px", false);
+ styledElement->setInlineStyleProperty(CSSPropertyMarginLeft, renderer->marginLeft() / zoomFactor, CSSPrimitiveValue::CSS_PX);
+ styledElement->setInlineStyleProperty(CSSPropertyMarginRight, renderer->marginRight() / zoomFactor, CSSPrimitiveValue::CSS_PX);
}
LayoutUnit baseWidth = renderer->width() - (isBoxSizingBorder ? LayoutUnit() : renderer->borderAndPaddingWidth());
baseWidth = baseWidth / zoomFactor;
- styledElement->setInlineStyleProperty(CSSPropertyWidth, String::number(roundToInt(baseWidth + difference.width())) + "px", false);
+ styledElement->setInlineStyleProperty(CSSPropertyWidth, roundToInt(baseWidth + difference.width()), CSSPrimitiveValue::CSS_PX);
}
if (resize != RESIZE_HORIZONTAL && difference.height()) {
if (element->isFormControlElement()) {
// Make implicit margins from the theme explicit (see <http://bugs.webkit.org/show_bug.cgi?id=9547>).
- styledElement->setInlineStyleProperty(CSSPropertyMarginTop, String::number(renderer->marginTop() / zoomFactor) + "px", false);
- styledElement->setInlineStyleProperty(CSSPropertyMarginBottom, String::number(renderer->marginBottom() / zoomFactor) + "px", false);
+ styledElement->setInlineStyleProperty(CSSPropertyMarginTop, renderer->marginTop() / zoomFactor, CSSPrimitiveValue::CSS_PX);
+ styledElement->setInlineStyleProperty(CSSPropertyMarginBottom, renderer->marginBottom() / zoomFactor, CSSPrimitiveValue::CSS_PX);
}
LayoutUnit baseHeight = renderer->height() - (isBoxSizingBorder ? LayoutUnit() : renderer->borderAndPaddingHeight());
baseHeight = baseHeight / zoomFactor;
- styledElement->setInlineStyleProperty(CSSPropertyHeight, String::number(roundToInt(baseHeight + difference.height())) + "px", false);
+ styledElement->setInlineStyleProperty(CSSPropertyHeight, roundToInt(baseHeight + difference.height()), CSSPrimitiveValue::CSS_PX);
}
document->updateLayout();
