Changeset 38001 in webkit

Timestamp:

Oct 30, 2008 7:09:59 AM (15 years ago)

Author:

alp@webkit.org

Message:

2008-10-30 Dirk Schulze <​vbs85@gmx.de>

Reviewed by Alp Toker.

​https://bugs.webkit.org/show_bug.cgi?id=21883
[CAIRO] globalAlpha has to be stored and restored

Cairo's globalAlpha has to be stored and reloaded on calling
save() and restore(). We use the power of GraphicsContextState for this.

• platform/graphics/GraphicsContextPrivate.h: (WebCore::GraphicsContextState::GraphicsContextState):
• platform/graphics/cairo/GraphicsContextCairo.cpp: (WebCore::GraphicsContext::fillPath): (WebCore::GraphicsContext::strokePath): (WebCore::GraphicsContext::setAlpha): (WebCore::GraphicsContext::getAlpha):
• platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h: (WebCore::GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContextPrivate.h (modified) (2 diffs)
• platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (7 diffs)
• platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-30  Dirk Schulze  <vbs85@gmx.de>
+
+        Reviewed by Alp Toker.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21883
+        [CAIRO] globalAlpha has to be stored and restored
+
+        Cairo's globalAlpha has to be stored and reloaded on calling
+        save() and restore(). We use the power of GraphicsContextState for this.
+
+        * platform/graphics/GraphicsContextPrivate.h:
+        (WebCore::GraphicsContextState::GraphicsContextState):
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::fillPath):
+        (WebCore::GraphicsContext::strokePath):
+        (WebCore::GraphicsContext::setAlpha):
+        (WebCore::GraphicsContext::getAlpha):
+        * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
+        (WebCore::GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate):
+
 2008-10-29  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/platform/graphics/GraphicsContextPrivate.h

@@ -51 +51 @@
             , strokeStyle(SolidStroke)
             , strokeThickness(0)
+#if PLATFORM(CAIRO)
+            , globalAlpha(1.0f)
+#endif
             , strokeColorSpace(SolidColorSpace)
             , strokeColor(Color::black)
@@ -66 +69 @@
         StrokeStyle strokeStyle;
         float strokeThickness;
+#if PLATFORM(CAIRO)
+        float globalAlpha;
+#endif
         ColorSpace strokeColorSpace;
         Color strokeColor;

trunk/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

@@ -448 +448 @@
             setColor(cr, fillColor());
             cairo_clip(cr);
-            cairo_paint_with_alpha(cr, m_data->globalAlpha);
+            cairo_paint_with_alpha(cr, m_common->state.globalAlpha);
         }
         break;
@@ -454 +454 @@
         cairo_set_source(cr, m_common->state.fillPattern.get()->createPlatformPattern(getCTM()));
         cairo_clip(cr);
-        cairo_paint_with_alpha(cr, m_data->globalAlpha);
+        cairo_paint_with_alpha(cr, m_common->state.globalAlpha);
         break;
     case GradientColorSpace:
@@ -461 +461 @@
         cairo_set_source(cr, pattern);
         cairo_clip(cr);
-        cairo_paint_with_alpha(cr, m_data->globalAlpha);
+        cairo_paint_with_alpha(cr, m_common->state.globalAlpha);
         break;
     }
@@ -478 +478 @@
         if (strokeColor().alpha()) {
             setColor(cr, strokeColor());
-            if (m_data->globalAlpha < 1.0f) {
+            if (m_common->state.globalAlpha < 1.0f) {
                 cairo_push_group(cr);
-                cairo_paint_with_alpha(cr, m_data->globalAlpha);
+                cairo_paint_with_alpha(cr, m_common->state.globalAlpha);
                 cairo_pop_group_to_source(cr);
             }
@@ -488 +488 @@
     case PatternColorSpace:
         cairo_set_source(cr, m_common->state.strokePattern.get()->createPlatformPattern(getCTM()));
-        if (m_data->globalAlpha < 1.0f) {
+        if (m_common->state.globalAlpha < 1.0f) {
             cairo_push_group(cr);
-            cairo_paint_with_alpha(cr, m_data->globalAlpha);
+            cairo_paint_with_alpha(cr, m_common->state.globalAlpha);
             cairo_pop_group_to_source(cr);
         }
@@ -499 +499 @@
         pattern = applySpreadMethod(pattern, spreadMethod());
         cairo_set_source(cr, pattern);
-        if (m_data->globalAlpha < 1.0f) {
+        if (m_common->state.globalAlpha < 1.0f) {
             cairo_push_group(cr);
-            cairo_paint_with_alpha(cr, m_data->globalAlpha);
+            cairo_paint_with_alpha(cr, m_common->state.globalAlpha);
             cairo_pop_group_to_source(cr);
         }
@@ -888 +888 @@
 void GraphicsContext::setAlpha(float alpha)
 {
-    m_data->globalAlpha = alpha;
+    m_common->state.globalAlpha = alpha;
 }
 
 float GraphicsContext::getAlpha()
 {
-    return m_data->globalAlpha;
+    return m_common->state.globalAlpha;
 }
 

trunk/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h

@@ -46 +46 @@
     GraphicsContextPlatformPrivate()
         : cr(0)
-        , globalAlpha(1.0f)
 #if PLATFORM(GTK)
         , expose(0)
@@ -89 +88 @@
 
     cairo_t* cr;
-    float globalAlpha;
     Vector<float> layers;