diff options
Diffstat (limited to 'WebCore/platform/graphics/win')
4 files changed, 15 insertions, 11 deletions
diff --git a/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp b/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp index c9288e5..1ad6bc1 100644 --- a/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp +++ b/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp @@ -124,7 +124,7 @@ void GraphicsContext::drawWindowsBitmap(WindowsBitmap* image, const IntPoint& po CGContextDrawImage(m_data->m_cgContext.get(), CGRectMake(point.x(), point.y(), image->size().width(), image->size().height()), cgImage.get()); } -void GraphicsContext::drawFocusRing(const Vector<Path>& paths, int width, int offset, const Color& color) +void GraphicsContext::drawFocusRing(const Path& path, int width, int offset, const Color& color) { // FIXME: implement } @@ -228,20 +228,17 @@ void GraphicsContext::drawLineForTextChecking(const IntPoint& point, int width, const float lowerOpacity = 0.88f; //Top line - CGContextSetLineDash(context, edge_offset, edge_dash_lengths, - sizeof(edge_dash_lengths) / sizeof(edge_dash_lengths[0])); + CGContextSetLineDash(context, edge_offset, edge_dash_lengths, WTF_ARRAY_LENGTH(edge_dash_lengths)); CGContextSetAlpha(context, upperOpacity); CGContextStrokeLineSegments(context, upperPoints, 2); // Middle line - CGContextSetLineDash(context, middle_offset, middle_dash_lengths, - sizeof(middle_dash_lengths) / sizeof(middle_dash_lengths[0])); + CGContextSetLineDash(context, middle_offset, middle_dash_lengths, WTF_ARRAY_LENGTH(middle_dash_lengths)); CGContextSetAlpha(context, middleOpacity); CGContextStrokeLineSegments(context, middlePoints, 2); // Bottom line - CGContextSetLineDash(context, edge_offset, edge_dash_lengths, - sizeof(edge_dash_lengths) / sizeof(edge_dash_lengths[0])); + CGContextSetLineDash(context, edge_offset, edge_dash_lengths, WTF_ARRAY_LENGTH(edge_dash_lengths)); CGContextSetAlpha(context, lowerOpacity); CGContextStrokeLineSegments(context, lowerPoints, 2); diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp index 34a8817..2b24a24 100644 --- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp +++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp @@ -254,7 +254,8 @@ void MediaPlayerPrivateQuickTimeVisualContext::setUpCookiesForQuickTime(const St // WebCore loaded the page with the movie URL with CFNetwork but QuickTime will // use WinINet to download the movie, so we need to copy any cookies needed to // download the movie into WinInet before asking QuickTime to open it. - Frame* frame = m_player->frameView() ? m_player->frameView()->frame() : 0; + Document* document = m_player->mediaPlayerClient()->mediaPlayerOwningDocument(); + Frame* frame = document ? document->frame() : 0; if (!frame || !frame->page() || !frame->page()->cookieEnabled()) return; @@ -315,7 +316,7 @@ static void disableComponentsOnce() {'eat ', 'TEXT', 'tx3g', 0, 0}, }; - for (size_t i = 0; i < sizeof(componentsToDisable) / sizeof(componentsToDisable[0]); ++i) + for (size_t i = 0; i < WTF_ARRAY_LENGTH(componentsToDisable); ++i) QTMovie::disableComponent(componentsToDisable[i]); } diff --git a/WebCore/platform/graphics/win/QTMovie.cpp b/WebCore/platform/graphics/win/QTMovie.cpp index e425bf8..efaf218 100644 --- a/WebCore/platform/graphics/win/QTMovie.cpp +++ b/WebCore/platform/graphics/win/QTMovie.cpp @@ -548,7 +548,7 @@ void QTMovie::load(CFURLRef url, bool preservesPitch) movieProps[moviePropCount].propStatus = 0; moviePropCount++; - ASSERT(moviePropCount <= sizeof(movieProps) / sizeof(movieProps[0])); + ASSERT(moviePropCount <= WTF_ARRAY_LENGTH(movieProps)); m_private->m_loadError = NewMovieFromProperties(moviePropCount, movieProps, 0, 0, &m_private->m_movie); end: diff --git a/WebCore/platform/graphics/win/cairo/FontPlatformData.h b/WebCore/platform/graphics/win/cairo/FontPlatformData.h index 05f9eab..d8f538a 100644 --- a/WebCore/platform/graphics/win/cairo/FontPlatformData.h +++ b/WebCore/platform/graphics/win/cairo/FontPlatformData.h @@ -3,6 +3,7 @@ * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com * Copyright (C) 2007 Holger Hans Peter Freyther * Copyright (C) 2007 Pioneer Research Center USA, Inc. + * Copyright (C) 2010 Brent Fulgham <bfulgham@webkit.org> * All rights reserved. * * This library is free software; you can redistribute it and/or @@ -25,7 +26,7 @@ #ifndef FontPlatformDataCairoWin_h #define FontPlatformDataCairoWin_h -#include "FontDescription.h" +#include "FontOrientation.h" #include "GlyphBuffer.h" #include "RefCountedGDIHandle.h" #include "StringImpl.h" @@ -37,6 +38,8 @@ typedef struct HFONT__* HFONT; namespace WebCore { +class FontDescription; + class FontPlatformData { public: FontPlatformData(WTF::HashTableDeletedValueType) @@ -73,6 +76,9 @@ public: void setSize(float size) { m_size = size; } bool syntheticBold() const { return m_syntheticBold; } bool syntheticOblique() const { return m_syntheticOblique; } + + FontOrientation orientation() const { return Horizontal; } // FIXME: Implement. + cairo_scaled_font_t* scaledFont() const { return m_scaledFont; } unsigned hash() const |