Title: [149559] trunk/Source/WebCore
- Revision
- 149559
- Author
- [email protected]
- Date
- 2013-05-04 08:27:45 -0700 (Sat, 04 May 2013)
Log Message
RenderObject: don't change GraphicsContext state when not drawing dashed/dotted lines.
>From Blink r149546 by <[email protected]>
<http://src.chromium.org/viewvc/blink?view=revision&revision=149546>
Previously, there was asymmetry between changing and restoring state (certain state
would be restored only if thickness was positive, i.e. a line was actually drawn.)
* rendering/RenderObject.cpp:
(WebCore::RenderObject::drawLineForBoxSide):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149558 => 149559)
--- trunk/Source/WebCore/ChangeLog 2013-05-04 15:18:29 UTC (rev 149558)
+++ trunk/Source/WebCore/ChangeLog 2013-05-04 15:27:45 UTC (rev 149559)
@@ -1,3 +1,16 @@
+2013-05-04 Andreas Kling <[email protected]>
+
+ RenderObject: don't change GraphicsContext state when not drawing dashed/dotted lines.
+
+ From Blink r149546 by <[email protected]>
+ <http://src.chromium.org/viewvc/blink?view=revision&revision=149546>
+
+ Previously, there was asymmetry between changing and restoring state (certain state
+ would be restored only if thickness was positive, i.e. a line was actually drawn.)
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::drawLineForBoxSide):
+
2013-05-03 Andreas Kling <[email protected]>
Remove CSS selector profiler branches from ElementRuleCollector loop.
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (149558 => 149559)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2013-05-04 15:18:29 UTC (rev 149558)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2013-05-04 15:27:45 UTC (rev 149559)
@@ -874,14 +874,13 @@
return;
case DOTTED:
case DASHED: {
- graphicsContext->setStrokeColor(color, m_style->colorSpace());
- graphicsContext->setStrokeThickness(thickness);
- StrokeStyle oldStrokeStyle = graphicsContext->strokeStyle();
- graphicsContext->setStrokeStyle(style == DASHED ? DashedStroke : DottedStroke);
-
if (thickness > 0) {
bool wasAntialiased = graphicsContext->shouldAntialias();
+ StrokeStyle oldStrokeStyle = graphicsContext->strokeStyle();
graphicsContext->setShouldAntialias(antialias);
+ graphicsContext->setStrokeColor(color, m_style->colorSpace());
+ graphicsContext->setStrokeThickness(thickness);
+ graphicsContext->setStrokeStyle(style == DASHED ? DashedStroke : DottedStroke);
switch (side) {
case BSBottom:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
