Changeset 63989 in webkit

Timestamp:

Jul 23, 2010 11:38:22 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-23 Patrick Gansterer <​paroga@paroga.com>

Reviewed by Adam Roben.

[WINCE] Buildfix for GraphicsContext
​https://bugs.webkit.org/show_bug.cgi?id=42888

Use AffineTransform insted of TransformationMatrix and
add ColorSpace parameter to the drawBitmap methods.

• platform/graphics/GraphicsContext.h:
• platform/graphics/wince/GraphicsContextWince.cpp: (WebCore::GraphicsContext::affineTransform): (WebCore::GraphicsContext::fillRoundedRect): (WebCore::GraphicsContext::drawBitmap): (WebCore::GraphicsContext::drawBitmapPattern):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext.h (modified) (2 diffs)
• platform/graphics/wince/GraphicsContextWince.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-23  Patrick Gansterer  <paroga@paroga.com>
+
+        Reviewed by Adam Roben.
+
+        [WINCE] Buildfix for GraphicsContext
+        https://bugs.webkit.org/show_bug.cgi?id=42888
+
+        Use AffineTransform insted of TransformationMatrix and
+        add ColorSpace parameter to the drawBitmap methods.
+
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/wince/GraphicsContextWince.cpp:
+        (WebCore::GraphicsContext::affineTransform):
+        (WebCore::GraphicsContext::fillRoundedRect):
+        (WebCore::GraphicsContext::drawBitmap):
+        (WebCore::GraphicsContext::drawBitmapPattern):
+
 2010-07-23  Rafael Antognolli  <antognolli@profusion.mobi>
 

trunk/WebCore/platform/graphics/GraphicsContext.h

@@ -308 +308 @@
 #if OS(WINCE) && !PLATFORM(QT)
         void setBitmap(PassRefPtr<SharedBitmap>);
-        const TransformationMatrix& affineTransform() const;
-        TransformationMatrix& affineTransform();
+        const AffineTransform& affineTransform() const;
+        AffineTransform& affineTransform();
         void resetAffineTransform();
         void fillRect(const FloatRect&, const Gradient*);
@@ -316 +316 @@
         void drawFocusRect(const IntRect& rect);
         void paintTextField(const IntRect& rect, unsigned state);
-        void drawBitmap(SharedBitmap*, const IntRect& dstRect, const IntRect& srcRect, CompositeOperator compositeOp);
-        void drawBitmapPattern(SharedBitmap*, const FloatRect& tileRectIn, const AffineTransform& patternTransform, const FloatPoint& phase, CompositeOperator op, const FloatRect& destRect, const IntSize& origSourceSize);
+        void drawBitmap(SharedBitmap*, const IntRect& dstRect, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp);
+        void drawBitmapPattern(SharedBitmap*, const FloatRect& tileRectIn, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, const IntSize& origSourceSize);
         void drawIcon(HICON icon, const IntRect& dstRect, UINT flags);
         HDC getWindowsContext(const IntRect&, bool supportAlphaBlend = false, bool mayCreateBitmap = true); // The passed in rect is used to create a bitmap for compositing inside transparency layers.

trunk/WebCore/platform/graphics/wince/GraphicsContextWince.cpp

@@ -1161 +1161 @@
 }
 
-TransformationMatrix& GraphicsContext::affineTransform()
+AffineTransform& GraphicsContext::affineTransform()
 {
     return m_data->m_transform;
 }
 
-const TransformationMatrix& GraphicsContext::affineTransform() const
+const AffineTransform& GraphicsContext::affineTransform() const
 {
     return m_data->m_transform;
@@ -1269 +1269 @@
     IntRect dstRect = fillRect;
     
-    dstRect.move(shadowSize);
-    dstRect.inflate(shadowBlur);
+    dstRect.move(stableRound(shadowSize.width()), stableRound(shadowSize.height()));
+    dstRect.inflate(stableRound(shadowBlur));
     dstRect = m_data->mapRect(dstRect);
   
@@ -1869 +1869 @@
 }
 
-void GraphicsContext::drawBitmap(SharedBitmap* bmp, const IntRect& dstRectIn, const IntRect& srcRect, CompositeOperator compositeOp)
+void GraphicsContext::drawBitmap(SharedBitmap* bmp, const IntRect& dstRectIn, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp)
 {
     if (!m_data->m_opacity)
@@ -1892 +1892 @@
 
 void GraphicsContext::drawBitmapPattern(SharedBitmap* bmp, const FloatRect& tileRectIn, const AffineTransform& patternTransform,
-                const FloatPoint& phase, CompositeOperator op, const FloatRect& destRectIn, const IntSize& origSourceSize)
+                const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRectIn, const IntSize& origSourceSize)
 {
     if (!m_data->m_opacity)
@@ -1913 +1913 @@
     transform.translate(moved.width(), moved.height());
 
-    bmp->drawPattern(dc, transform, tileRectIn, patternTransform, phase, op, destRectIn, origSourceSize);
+    bmp->drawPattern(dc, transform, tileRectIn, patternTransform, phase, styleColorSpace, op, destRectIn, origSourceSize);
 
     if (!bmp->hasAlpha())