Title: [168770] branches/safari-538.34-branch/Source/WebCore
- Revision
- 168770
- Author
- bshaf...@apple.com
- Date
- 2014-05-13 20:13:22 -0700 (Tue, 13 May 2014)
Log Message
Merged r168742.
Modified Paths
Diff
Modified: branches/safari-538.34-branch/Source/WebCore/ChangeLog (168769 => 168770)
--- branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 03:11:00 UTC (rev 168769)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 03:13:22 UTC (rev 168770)
@@ -1,5 +1,21 @@
2014-05-13 Babak Shafiei <bshaf...@apple.com>
+ Merge r168742
+
+ 2014-05-13 Brady Eidson <beid...@apple.com>
+
+ Followup to: Update positioning/drawing of the image controls button.
+ <rdar://problem/16885077> and https://bugs.webkit.org/show_bug.cgi?id=132883
+
+ Reviewed by Tim Horton.
+
+ Cleared up the actual intent behind review feedback on the original patch.
+
+ * html/shadow/mac/ImageControlsButtonElementMac.cpp:
+ (WebCore::ImageControlsButtonElementMac::maybeCreate):
+
+2014-05-13 Babak Shafiei <bshaf...@apple.com>
+
Merge r168728
2014-05-13 Brady Eidson <beid...@apple.com>
Modified: branches/safari-538.34-branch/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp (168769 => 168770)
--- branches/safari-538.34-branch/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2014-05-14 03:11:00 UTC (rev 168769)
+++ branches/safari-538.34-branch/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2014-05-14 03:13:22 UTC (rev 168770)
@@ -98,10 +98,10 @@
button->setAttribute(HTMLNames::classAttr, "x-webkit-image-controls-button");
IntSize positionOffset = document.page()->theme().imageControlsButtonPositionOffset();
- button->setInlineStyleProperty(CSSPropertyTop, String::format("%ipx", positionOffset.height()));
+ button->setInlineStyleProperty(CSSPropertyTop, positionOffset.height(), CSSPrimitiveValue::CSS_PX);
// FIXME: Why is right: 0px off the right edge of the parent?
- button->setInlineStyleProperty(CSSPropertyRight, String::format("%ipx", positionOffset.width()));
+ button->setInlineStyleProperty(CSSPropertyRight, positionOffset.width(), CSSPrimitiveValue::CSS_PX);
return button.release();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
