- attempt to fix Windows build after my last check-in
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Apr 2006 07:49:15 +0000 (07:49 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Apr 2006 07:49:15 +0000 (07:49 +0000)
        * WebCore.vcproj/Image Viewer/ImageView.cpp: Changed calls to use the
        new IntRect-based API.

        * html/CanvasPattern.cpp: (WebCore::CanvasPattern::CanvasPattern):
        Put appropriate ifdefs around the m_platformImage initializer.

        * page/Frame.cpp: Make Frame::adjustPageHeight Mac-OS-X-only for now
        since it's used for printing and we don't have printing going on any
        other platforms yet.

        * platform/cairo/GraphicsContextCairo.cpp: Take out constructor that
        takes only the "for printing" boolean for now.

        * platform/cairo/ImageCairo.cpp: Include the GraphicsContext.h header.

        * platform/win/TemporaryLinkStubs.cpp: (GraphicsContext::setShadow):
        Fix up this stub and remove the GraphicsContext empty constructor stub.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13994 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/WebCore.vcproj/Image Viewer/ImageView.cpp
WebCore/html/CanvasPattern.cpp
WebCore/page/Frame.cpp
WebCore/platform/cairo/GraphicsContextCairo.cpp
WebCore/platform/cairo/ImageCairo.cpp
WebCore/platform/win/TemporaryLinkStubs.cpp

index 16832f11a4d8497d2a8e71d94076fb946c68090a..68f0ae3699258f9e354fdee9bde894c7b801c7e0 100644 (file)
@@ -1,3 +1,25 @@
+2006-04-21  Darin Adler  <darin@apple.com>
+
+        - attempt to fix Windows build after my last check-in
+
+        * WebCore.vcproj/Image Viewer/ImageView.cpp: Changed calls to use the
+        new IntRect-based API.
+
+        * html/CanvasPattern.cpp: (WebCore::CanvasPattern::CanvasPattern):
+        Put appropriate ifdefs around the m_platformImage initializer.
+
+        * page/Frame.cpp: Make Frame::adjustPageHeight Mac-OS-X-only for now
+        since it's used for printing and we don't have printing going on any
+        other platforms yet.
+
+        * platform/cairo/GraphicsContextCairo.cpp: Take out constructor that
+        takes only the "for printing" boolean for now.
+
+        * platform/cairo/ImageCairo.cpp: Include the GraphicsContext.h header.
+
+        * platform/win/TemporaryLinkStubs.cpp: (GraphicsContext::setShadow):
+        Fix up this stub and remove the GraphicsContext empty constructor stub.
+
 2006-04-21  Darin Adler  <darin@apple.com>
 
         - fix build
index b449ab92d18c4d495af2569ccecfd91c067e1915..0b158ee506c3d403c1990cd23250f16f6215f1cf 100644 (file)
@@ -88,7 +88,7 @@ void ImageView::OnDraw(CDC* pDC)
     cairo_t* context = cairo_create(surface);
     GraphicsContext gc(context);
     // Fill with white.
-    gc.fillRect(IntRect(0, 0, rect.right, rect.bottom), Brush(Color::white));
+    gc.fillRect(IntRect(0, 0, rect.right, rect.bottom), Color::white);
 
     // Comment in to test overlapping.
     bool overlapping = false; // true;
@@ -111,8 +111,7 @@ void ImageView::OnDraw(CDC* pDC)
     if (tile)
         gc.drawTiledImage(image, IntRect(left, top, width, height), IntPoint(srcPoint.x(), srcPoint.y()), image->size());
     else {
-        gc.drawImage(image, dstRect,
-            imageRect.x(), imageRect.y(), imageRect.width(), imageRect.height(), Image::CompositeSourceOver);
+        gc.drawImage(image, dstRect, imageRect);
     //    if (overlapping)
      //       image->drawInRect(FloatRect(dstRect.x() + dstRect.width()/2, dstRect.y(), dstRect.width(), dstRect.height()),
      //                        imageRect, Image::CompositeSourceOver, context);
index 4e42ea57b7fcc410973e1e0d126620be752b312b..574c042ae60fbed3781705c27039eb0434bd7de0 100644 (file)
@@ -76,8 +76,12 @@ CanvasPattern::CanvasPattern(CGImageRef image, bool repeatX, bool repeatY)
 #endif
 
 CanvasPattern::CanvasPattern(CachedImage* cachedImage, bool repeatX, bool repeatY)
-    : m_platformImage(0)
-    , m_cachedImage(cachedImage)
+    :
+#if __APPLE__
+      m_platformImage(0)
+    ,
+#endif
+      m_cachedImage(cachedImage)
     , m_repeatX(repeatX)
     , m_repeatY(repeatY)
 {
index 0014a8151c4e8c27830a68debe8ea017c1a9597e..ac2ddb40993ac6a29cb80dd22dad12ab6b77d17e 100644 (file)
@@ -2717,6 +2717,8 @@ void Frame::paint(GraphicsContext* p, const IntRect& rect)
         LOG_ERROR("called Frame::paint with nil renderer");
 }
 
+#if __APPLE__
+
 void Frame::adjustPageHeight(float *newBottom, float oldTop, float oldBottom, float bottomLimit)
 {
     RenderCanvas *root = static_cast<RenderCanvas *>(document()->renderer());
@@ -2733,6 +2735,8 @@ void Frame::adjustPageHeight(float *newBottom, float oldTop, float oldBottom, fl
         *newBottom = oldBottom;
 }
 
+#endif
+
 PausedTimeouts *Frame::pauseTimeouts()
 {
 #if SVG_SUPPORT
index 611d8205b33f641c19cad6221900e9dbe555d943..e6c4bacc7ce52a51bac445e2bbb9ee54b9b594c2 100644 (file)
@@ -87,12 +87,6 @@ GraphicsContext::GraphicsContext(cairo_t* context)
     m_data->context = cairo_reference(context);
 }
 
-GraphicsContext::GraphicsContext(bool forPrinting)
-    : m_common(createGraphicsContextPrivate(forPrinting))
-    , m_data(new GraphicsContextPlatformPrivate)
-{
-}
-
 GraphicsContext::~GraphicsContext()
 {
     destroyGraphicsContextPrivate(m_common);
index 21baf990f5b06fb5c5b3c9635b126b2b174732fe..ba019799db05935010e65624074856a3bff477a1 100644 (file)
@@ -27,6 +27,7 @@
 #include "Image.h"
 
 #include "FloatRect.h"
+#include "GraphicsContext.h"
 #include <cairo.h>
 #include <math.h>
 
index 14c6dd1647fdd3bf67e2e46fe6b253b999000c48..261ce6c6ef40a85b2fe14d492ebc7cc035a82805 100644 (file)
@@ -117,8 +117,6 @@ void QLineEdit::setSelection(int,int) { notImplemented(); }
 void QLineEdit::setMaxResults(int) { notImplemented(); }
 bool QLineEdit::edited() const { notImplemented(); return 0; }
 
-GraphicsContext::GraphicsContext() { notImplemented(); }
-
 QSlider::QSlider() { notImplemented(); }
 IntSize QSlider::sizeHint() const { notImplemented(); return IntSize(); }
 void QSlider::setValue(double) { notImplemented(); }
@@ -270,7 +268,7 @@ void ScrollView::removeChild(Widget*) { }
 void ScrollView::scrollPointRecursively(int x, int y) { }
 bool ScrollView::inWindow() const { return true; }
 
-void GraphicsContext::setShadow(int,int,int,Color const&) { }
+void GraphicsContext::setShadow(IntSize const&,int,Color const&) { }
 void GraphicsContext::clearShadow() { }
 void GraphicsContext::beginTransparencyLayer(float) { }
 void GraphicsContext::endTransparencyLayer() { }