Changeset 30513 in webkit

Timestamp:

Feb 22, 2008 8:18:40 PM (16 years ago)

Author:

mrowe@apple.com

Message:

Roll out r30500 as it breaks non-Windows use of Cairo.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (13 diffs)
• platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h (modified) (1 diff)
• platform/graphics/win/GraphicsContextCGWin.cpp (modified) (1 diff)
• platform/graphics/win/GraphicsContextCairoWin.cpp (modified) (1 diff)
• platform/graphics/win/GraphicsContextWin.cpp (modified) (2 diffs)
• platform/win/DragImageCairoWin.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ -146 +146 @@
         * platform/win/BString.h:
         * platform/win/PasteboardWin.cpp:
-
-2008-02-22  Brent Fulgham  <bfulgham@gmail.com>
-
-        Reviewed by Adam Roben.
-
-        http://bugs.webkit.org/show_bug.cgi?id=17442
-        Correct the Windows Cairo implementation of GraphicsContext so
-        that Windows 'WorldTransform' is kept in sync with the Cairo
-        transformations.
-
-        Also corrects an uninitialized variable in the Cairo Windows
-        image drag handler.
-
-        * platform/graphics/cairo/GraphicsContextCairo.cpp:  Modify
-          methods to call GraphicsContextPlatformPrivate calls, just
-          as is done for the CoreGraphics version.  These calls are
-          nop's for everything but Windows.
-        (WebCore::GraphicsContext::savePlatformState):
-        (WebCore::GraphicsContext::restorePlatformState):
-        (WebCore::GraphicsContext::clip):
-        (WebCore::GraphicsContext::drawLineForMisspellingOrBadGrammar):
-        (WebCore::GraphicsContext::translate):
-        (WebCore::GraphicsContext::concatCTM): Re-enable for Windows
-        (WebCore::GraphicsContext::beginTransparencyLayer):
-        (WebCore::GraphicsContext::endTransparencyLayer):
-        (WebCore::GraphicsContext::rotate):
-        (WebCore::GraphicsContext::scale):
-        * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
-        * platform/graphics/win/GraphicsContextCGWin.cpp:  Move common
-          code for handling WorldTransform calls to parent class.
-        * platform/graphics/win/GraphicsContextCairoWin.cpp:  Add common
-          code for handling WorldTransform calls.
-          (WebCore::GraphicsContextPlatformPrivate::concatCTM):  Change
-          implementation so that it only handles WorldTransform.  The
-          Cairo update is done in GraphicsContextCairo.cpp
-        * platform/graphics/win/GraphicsContextWin.cpp:  Call platform-private
-          methods to keep WorldTransform in sync.
-        (WebCore::GraphicsContextPlatformPrivate::save):
-        (WebCore::GraphicsContextPlatformPrivate::restore):
-        (WebCore::GraphicsContextPlatformPrivate::clip):
-        (WebCore::GraphicsContextPlatformPrivate::scale):
-        (WebCore::GraphicsContextPlatformPrivate::rotate):
-        (WebCore::GraphicsContextPlatformPrivate::translate):
-        * platform/win/DragImageCairoWin.cpp:
-        (WebCore::createDragImageFromImage):  Correct uninitialized value
 
 2008-02-22  Sam Weinig  <sam@webkit.org>

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

@@ -104 +104 @@
 {
     cairo_save(m_data->cr);
-    m_data->save();
 }
 
@@ -110 +109 @@
 {
     cairo_restore(m_data->cr);
-    m_data->restore();
 }
 
@@ -383 +381 @@
     cairo_clip(cr);
     cairo_set_fill_rule(cr, savedFillRule);
-    m_data->clip(rect);
 }
 
@@ -435 +432 @@
         return;
 
+#if PLATFORM(GTK)
     cairo_t* cr = m_data->cr;
     cairo_save(cr);
@@ -445 +443 @@
         cairo_set_source_rgb(cr, 1, 0, 0);
 
-#if PLATFORM(GTK)
     // We ignore most of the provided constants in favour of the platform style
     pango_cairo_show_error_underline(cr, origin.x(), origin.y(), width, cMisspellingLineThickness);
+
+    cairo_restore(cr);
 #else
     notImplemented();
 #endif
-
-    cairo_restore(cr);
 }
 
@@ -485 +482 @@
     cairo_t* cr = m_data->cr;
     cairo_translate(cr, x, y);
-    m_data->translate(x, y);
 }
 
@@ -549 +545 @@
 }
 
+#if PLATFORM(GTK)
+// FIXME:  This should be moved to something like GraphicsContextCairoGTK.cpp,
+// as there is a Windows implementation in platform/graphics/win/GraphicsContextCairoWin.cpp
 void GraphicsContext::concatCTM(const AffineTransform& transform)
 {
@@ -557 +556 @@
     const cairo_matrix_t* matrix = reinterpret_cast<const cairo_matrix_t*>(&transform);
     cairo_transform(cr, matrix);
-    m_data->concatCTM(transform);
-}
+}
+#endif
 
 void GraphicsContext::addInnerRoundedRectClip(const IntRect& rect, int thickness)
@@ -602 +601 @@
     cairo_push_group(cr);
     m_data->layers.append(opacity);
-    m_data->beginTransparencyLayer();
 }
 
@@ -615 +613 @@
     cairo_paint_with_alpha(cr, m_data->layers.last());
     m_data->layers.removeLast();
-    m_data->endTransparencyLayer();
 }
 
@@ -777 +774 @@
     cairo_clip(cr);
     cairo_set_fill_rule(cr, savedFillRule);
-    m_data->clip(path);
 }
 
@@ -803 +799 @@
 
     cairo_rotate(m_data->cr, radians);
-    m_data->rotate(radians);
 }
 
@@ -812 +807 @@
 
     cairo_scale(m_data->cr, size.width(), size.height());
-    m_data->scale(size);
 }
 

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

@@ -63 +63 @@
 #if PLATFORM(WIN)
     // On Windows, we need to update the HDC for form controls to draw in the right place.
-    void save();
-    void restore();
-    void clip(const IntRect&);
-    void clip(const Path&);
-    void scale(const FloatSize&);
-    void rotate(float);
-    void translate(float, float);
-    void concatCTM(const AffineTransform&);
     void beginTransparencyLayer() { m_transparencyCount++; }
     void endTransparencyLayer() { m_transparencyCount--; }

trunk/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp

@@ -169 +169 @@
 }
 
+void GraphicsContextPlatformPrivate::save()
+{
+    if (!m_hdc)
+        return;
+    SaveDC(m_hdc);
+}
+
+void GraphicsContextPlatformPrivate::restore()
+{
+    if (!m_hdc)
+        return;
+    RestoreDC(m_hdc, -1);
+}
+
+void GraphicsContextPlatformPrivate::clip(const IntRect& clipRect)
+{
+    if (!m_hdc)
+        return;
+    IntersectClipRect(m_hdc, clipRect.x(), clipRect.y(), clipRect.right(), clipRect.bottom());
+}
+
+void GraphicsContextPlatformPrivate::clip(const Path&)
+{
+    notImplemented();
+}
+
+void GraphicsContextPlatformPrivate::scale(const FloatSize& size)
+{
+    if (!m_hdc)
+        return;
+    XFORM xform;
+    xform.eM11 = size.width();
+    xform.eM12 = 0.0f;
+    xform.eM21 = 0.0f;
+    xform.eM22 = size.height();
+    xform.eDx = 0.0f;
+    xform.eDy = 0.0f;
+    ModifyWorldTransform(m_hdc, &xform, MWT_LEFTMULTIPLY);
+}
+
+static const double deg2rad = 0.017453292519943295769; // pi/180
+
+void GraphicsContextPlatformPrivate::rotate(float degreesAngle)
+{
+    float radiansAngle = degreesAngle * deg2rad;
+    float cosAngle = cosf(radiansAngle);
+    float sinAngle = sinf(radiansAngle);
+    XFORM xform;
+    xform.eM11 = cosAngle;
+    xform.eM12 = -sinAngle;
+    xform.eM21 = sinAngle;
+    xform.eM22 = cosAngle;
+    xform.eDx = 0.0f;
+    xform.eDy = 0.0f;
+    ModifyWorldTransform(m_hdc, &xform, MWT_LEFTMULTIPLY);
+}
+
+void GraphicsContextPlatformPrivate::translate(float x , float y)
+{
+    if (!m_hdc)
+        return;
+    XFORM xform;
+    xform.eM11 = 1.0f;
+    xform.eM12 = 0.0f;
+    xform.eM21 = 0.0f;
+    xform.eM22 = 1.0f;
+    xform.eDx = x;
+    xform.eDy = y;
+    ModifyWorldTransform(m_hdc, &xform, MWT_LEFTMULTIPLY);
+}
+
 void GraphicsContextPlatformPrivate::concatCTM(const AffineTransform& transform)
 {

trunk/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp

@@ -93 +93 @@
 }
 
-void GraphicsContextPlatformPrivate::concatCTM(const AffineTransform& transform)
+void GraphicsContext::concatCTM(const AffineTransform& transform)
 {
-    cairo_surface_t* surface = cairo_get_target(cr);
+    cairo_surface_t* surface = cairo_get_target(platformContext());
     HDC hdc = cairo_win32_surface_get_dc(surface);   
     SaveDC(hdc);
 
-    const cairo_matrix_t* matrix = reinterpret_cast<const cairo_matrix_t*>(&transform);
-
+    cairo_matrix_t mat;
+    cairo_get_matrix(platformContext(), &mat);
     XFORM xform;
-    xform.eM11 = matrix->xx;
-    xform.eM12 = matrix->xy;
-    xform.eM21 = matrix->yx;
-    xform.eM22 = matrix->yy;
-    xform.eDx = matrix->x0;
-    xform.eDy = matrix->y0;
+    xform.eM11 = mat.xx;
+    xform.eM12 = mat.xy;
+    xform.eM21 = mat.yx;
+    xform.eM22 = mat.yy;
+    xform.eDx = mat.x0;
+    xform.eDy = mat.y0;
 
     ModifyWorldTransform(hdc, &xform, MWT_LEFTMULTIPLY);

trunk/WebCore/platform/graphics/win/GraphicsContextWin.cpp

@@ -27 +27 @@
 #include "GraphicsContext.h"
 
-#if PLATFORM(CG)
-#include "GraphicsContextPlatformPrivateCG.h"
-#elif PLATFORM(CAIRO)
-#include "GraphicsContextPlatformPrivateCairo.h"
-#endif
-
 #include "AffineTransform.h"
 #include "NotImplemented.h"
@@ -44 +38 @@
 class SVGResourceImage;
 
-void GraphicsContextPlatformPrivate::save()
-{
-    if (!m_hdc)
-        return;
-    SaveDC(m_hdc);
-}
-
-void GraphicsContextPlatformPrivate::restore()
-{
-    if (!m_hdc)
-        return;
-    RestoreDC(m_hdc, -1);
-}
-
-void GraphicsContextPlatformPrivate::clip(const IntRect& clipRect)
-{
-    if (!m_hdc)
-        return;
-    IntersectClipRect(m_hdc, clipRect.x(), clipRect.y(), clipRect.right(), clipRect.bottom());
-}
-
-void GraphicsContextPlatformPrivate::clip(const Path&)
-{
-    notImplemented();
-}
-
-void GraphicsContextPlatformPrivate::scale(const FloatSize& size)
-{
-    if (!m_hdc)
-        return;
-    XFORM xform;
-    xform.eM11 = size.width();
-    xform.eM12 = 0.0f;
-    xform.eM21 = 0.0f;
-    xform.eM22 = size.height();
-    xform.eDx = 0.0f;
-    xform.eDy = 0.0f;
-    ModifyWorldTransform(m_hdc, &xform, MWT_LEFTMULTIPLY);
-}
-
-static const double deg2rad = 0.017453292519943295769; // pi/180
-
-void GraphicsContextPlatformPrivate::rotate(float degreesAngle)
-{
-    float radiansAngle = degreesAngle * deg2rad;
-    float cosAngle = cosf(radiansAngle);
-    float sinAngle = sinf(radiansAngle);
-    XFORM xform;
-    xform.eM11 = cosAngle;
-    xform.eM12 = -sinAngle;
-    xform.eM21 = sinAngle;
-    xform.eM22 = cosAngle;
-    xform.eDx = 0.0f;
-    xform.eDy = 0.0f;
-    ModifyWorldTransform(m_hdc, &xform, MWT_LEFTMULTIPLY);
-}
-
-void GraphicsContextPlatformPrivate::translate(float x , float y)
-{
-    if (!m_hdc)
-        return;
-    XFORM xform;
-    xform.eM11 = 1.0f;
-    xform.eM12 = 0.0f;
-    xform.eM21 = 0.0f;
-    xform.eM22 = 1.0f;
-    xform.eDx = x;
-    xform.eDy = y;
-    ModifyWorldTransform(m_hdc, &xform, MWT_LEFTMULTIPLY);
-}
-
 #if ENABLE(SVG)
 GraphicsContext* contextForImage(SVGResourceImage*)

trunk/WebCore/platform/win/DragImageCairoWin.cpp

@@ -48 +48 @@
     notImplemented();
 
-    return 0;
+    DragImageRef temp;
+    return temp;
 }