← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-updates

« back to all changes in this revision

Viewing changes to WebCore/platform/graphics/GraphicsContext.h

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-01-06 21:25:06 UTC
  • mfrom: (1.2.6 upstream) (4.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100106212506-gd0czn4zrwf1j19l
http://bugs.debian.org/529271
http://bugs.debian.org/559420
* New upstream release
- adds basic Content-Encoding support, thanks to soup
  (Closes: #529271)
- fixes over-advertising content types as supported by
  the media player (Closes: #559420)
* debian/control:
- updated libsoup build requirement (>= 2.28.2)
* debian/libwebkit-1.0-2.symbols:
- updated with new symbols
* debian/copyright:
- updated information since 1.1.17
* Imported patch from https://bugs.webkit.org/show_bug.cgi?id=30623
- I am shipping this patch because I believe it is correct, it is the
  way to go, it fixes a race, and it needs testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/platform/graphics/GraphicsContext.h
71
71
class BView;
72
72
typedef BView PlatformGraphicsContext;
73
73
struct pattern;
74
 
#elif PLATFORM(WINCE)
 
74
#elif OS(WINCE)
75
75
typedef struct HDC__ PlatformGraphicsContext;
76
76
#else
77
77
typedef void PlatformGraphicsContext;
96
96
 
97
97
namespace WebCore {
98
98
 
99
 
#if PLATFORM(WINCE) && !PLATFORM(QT)
 
99
#if OS(WINCE) && !PLATFORM(QT)
100
100
    class SharedBitmap;
101
101
    class SimpleFontData;
102
102
    class GlyphBuffer;
144
144
        GraphicsContext(PlatformGraphicsContext*);
145
145
        ~GraphicsContext();
146
146
 
147
 
#if !PLATFORM(WINCE) || PLATFORM(QT)
 
147
#if !OS(WINCE) || PLATFORM(QT)
148
148
        PlatformGraphicsContext* platformContext() const;
149
149
#endif
150
150
 
262
262
        bool getShadow(IntSize&, int&, Color&) const;
263
263
        void clearShadow();
264
264
 
265
 
        void initFocusRing(int width, int offset);
266
 
        void addFocusRingRect(const IntRect&);
267
 
        void drawFocusRing(const Color&);
268
 
        void clearFocusRing();
269
 
        IntRect focusRingBoundingRect();
 
265
        void drawFocusRing(const Vector<IntRect>&, int width, int offset, const Color&);
270
266
 
271
267
        void setLineCap(LineCap);
272
268
        void setLineDash(const DashArray&, float dashOffset);
303
299
        void concatCTM(const TransformationMatrix&);
304
300
        TransformationMatrix getCTM() const;
305
301
 
306
 
#if PLATFORM(WINCE) && !PLATFORM(QT)
 
302
#if OS(WINCE) && !PLATFORM(QT)
307
303
        void setBitmap(PassRefPtr<SharedBitmap>);
308
304
        const TransformationMatrix& affineTransform() const;
309
305
        TransformationMatrix& affineTransform();
361
357
        void drawWindowsBitmap(WindowsBitmap*, const IntPoint&);
362
358
#endif
363
359
 
364
 
#if (PLATFORM(QT) && defined(Q_WS_WIN)) || (PLATFORM(WX) && PLATFORM(WIN_OS))
 
360
#if (PLATFORM(QT) && defined(Q_WS_WIN)) || (PLATFORM(WX) && OS(WINDOWS))
365
361
        HDC getWindowsContext(const IntRect&, bool supportAlphaBlend = true, bool mayCreateBitmap = true);
366
362
        void releaseWindowsContext(HDC, const IntRect&, bool supportAlphaBlend = true, bool mayCreateBitmap = true);
367
363
        bool shouldIncludeChildWindows() const { return false; }
411
407
 
412
408
        static void adjustLineToPixelBoundaries(FloatPoint& p1, FloatPoint& p2, float strokeWidth, const StrokeStyle&);
413
409
 
414
 
        int focusRingWidth() const;
415
 
        int focusRingOffset() const;
416
 
        const Vector<IntRect>& focusRingRects() const;
417
 
 
418
410
        static GraphicsContextPrivate* createGraphicsContextPrivate();
419
411
        static void destroyGraphicsContextPrivate(GraphicsContextPrivate*);
420
412