Title: [179096] branches/safari-600.1.4.15-branch/Source/WebCore
- Revision
- 179096
- Author
- [email protected]
- Date
- 2015-01-25 16:14:25 -0800 (Sun, 25 Jan 2015)
Log Message
Merged r177306. rdar://problem/19419933
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179095 => 179096)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-26 00:14:21 UTC (rev 179095)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-26 00:14:25 UTC (rev 179096)
@@ -1,5 +1,16 @@
2015-01-25 David Kilzer <[email protected]>
+ Merge r177306.
+
+ 2014-12-15 Myles C. Maxfield <[email protected]>
+
+ Unreviewed build fix after r177301
+
+ * html/ColorInputType.cpp:
+ (WebCore::ColorInputType::elementRectRelativeToRootView):
+
+2015-01-25 David Kilzer <[email protected]>
+
Merge r177301.
* html/shadow/TextControlInnerElements.cpp:
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/html/ColorInputType.cpp (179095 => 179096)
--- branches/safari-600.1.4.15-branch/Source/WebCore/html/ColorInputType.cpp 2015-01-26 00:14:21 UTC (rev 179095)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/html/ColorInputType.cpp 2015-01-26 00:14:25 UTC (rev 179096)
@@ -206,7 +206,7 @@
{
if (!element().renderer())
return IntRect();
- element().document().view()->contentsToRootView(element().renderer()->absoluteBoundingBoxRect());
+ return element().document().view()->contentsToRootView(element().renderer()->absoluteBoundingBoxRect());
}
Color ColorInputType::currentColor()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
