2011-03-30 Martin Robinson <mrobinson@igalia.com>
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Mar 2011 20:56:40 +0000 (20:56 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Mar 2011 20:56:40 +0000 (20:56 +0000)
commit9e8bcdce3a4be0ffe877fe0c167a64e42ca67a72
treeb761fdb7c01aaf1ce9f4a7a04b5190672a88d0a9
parent20020b6ac16133a2931a37bbd30c47af75a94f01
2011-03-30  Martin Robinson  <mrobinson@igalia.com>

        Reviewed by Dirk Schulze.

        [Cairo] Better separate the concerns of GraphicsContextCairo
        https://bugs.webkit.org/show_bug.cgi?id=55150

        Add a PlatformContextCairo which right now stores the cairo_t* for a
        GraphicsContextCairo. Later patches will move logic for tracking ContextShadow
        and image masking layers into this PlatformContextCairo class.

        No new tests. This patch is only a code cleanup.

        * GNUmakefile.am:
        * platform/graphics/GraphicsContext.h: The platform context is no longer a
        cairo_t, but our new class the PlatformContextCairo.
        * platform/graphics/cairo/ContextShadowCairo.cpp: Updated to reflect new class.j
        * platform/graphics/cairo/FontCairo.cpp: Ditto.
        * platform/graphics/cairo/GradientCairo.cpp: Ditto.
        * platform/graphics/cairo/GraphicsContextCairo.cpp: Mostly mechanical
        changes which now reference platformContext()->cr() to get the cairo_t.
        * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h: Now hold the
        PlatformContextCairo instead of the cairo_t.
        * platform/graphics/cairo/ImageBufferCairo.cpp: Update to reflect new class.
        * platform/graphics/cairo/ImageCairo.cpp: Ditto.
        * platform/graphics/cairo/PathCairo.cpp: Ditto.
        * platform/graphics/cairo/PlatformContextCairo.cpp: Added.
        * platform/graphics/cairo/PlatformContextCairo.h: Added.
        * platform/graphics/gtk/FontGtk.cpp: Update to reflect new class.
        * platform/graphics/gtk/IconGtk.cpp: Ditto.
        * platform/graphics/win/GraphicsContextCairoWin.cpp: Now fill out
        m_data with a private section containing the platform context instead of
        just a cairo_t.
        * platform/gtk/RenderThemeGtk.cpp: Update to reflect new class.
        * platform/gtk/WidgetRenderingContext.cpp: Ditto.
        (WebCore::WidgetRenderingContext::~WidgetRenderingContext): Ditto.
        * plugins/gtk/PluginViewGtk.cpp: Ditto.
2011-03-30  Martin Robinson  <mrobinson@igalia.com>

        Reviewed by Dirk Schulze.

        [Cairo] Better separate the concerns of GraphicsContextCairo
        https://bugs.webkit.org/show_bug.cgi?id=55150

        Add a PlatformContextCairo which right now stores the cairo_t* for a
        GraphicsContextCairo. Later patches will move logic for tracking ContextShadow
        and image masking layers into this PlatformContextCairo class.

        * webkit/webkitwebframe.cpp:
        (draw_page_callback):
        * webkit/webkitwebview.cpp:
        (webkit_web_view_expose_event):
        (webkit_web_view_draw):
2011-03-30  Martin Robinson  <mrobinson@igalia.com>

        Reviewed by Dirk Schulze.

        [Cairo] Better separate the concerns of GraphicsContextCairo
        https://bugs.webkit.org/show_bug.cgi?id=55150

        * WebFrame.cpp:
        (hdcFromContext): Modify this method to take PlatformContextCairo
        instead of a cairo_t.
        (WebFrame::spoolPage): Update to reflect new platform context.
        (WebFrame::spoolPages): Ditto.
        * WebFrame.h: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@82496 268f45cc-cd09-0410-ab3c-d52691b4dbfc
26 files changed:
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebCore/platform/graphics/GraphicsContext.h
Source/WebCore/platform/graphics/cairo/ContextShadowCairo.cpp
Source/WebCore/platform/graphics/cairo/FontCairo.cpp
Source/WebCore/platform/graphics/cairo/GradientCairo.cpp
Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h
Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp
Source/WebCore/platform/graphics/cairo/ImageBufferData.h
Source/WebCore/platform/graphics/cairo/ImageCairo.cpp
Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp [new file with mode: 0644]
Source/WebCore/platform/graphics/cairo/PlatformContextCairo.h [new file with mode: 0644]
Source/WebCore/platform/graphics/gtk/FontGtk.cpp
Source/WebCore/platform/graphics/gtk/IconGtk.cpp
Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp
Source/WebCore/platform/gtk/RenderThemeGtk.cpp
Source/WebCore/platform/gtk/WidgetRenderingContext.cpp
Source/WebCore/plugins/gtk/PluginViewGtk.cpp
Source/WebCore/plugins/win/PluginViewWin.cpp
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/webkit/webkitwebframe.cpp
Source/WebKit/gtk/webkit/webkitwebview.cpp
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebFrame.cpp
Source/WebKit/win/WebFrame.h