diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/platform/gtk/WidgetRenderingContext.h | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/platform/gtk/WidgetRenderingContext.h')
| -rw-r--r-- | Source/WebCore/platform/gtk/WidgetRenderingContext.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/WebCore/platform/gtk/WidgetRenderingContext.h b/Source/WebCore/platform/gtk/WidgetRenderingContext.h index 7334656..8b2a0e2 100644 --- a/Source/WebCore/platform/gtk/WidgetRenderingContext.h +++ b/Source/WebCore/platform/gtk/WidgetRenderingContext.h @@ -22,6 +22,8 @@ #ifndef WidgetRenderingContext_h #define WidgetRenderingContext_h +#ifdef GTK_API_VERSION_2 + #include "IntRect.h" #include "gtkdrawing.h" @@ -46,15 +48,11 @@ private: GdkRectangle m_paintRect; IntSize m_extraSpace; bool m_hadError; - -#ifdef GTK_API_VERSION_2 GdkDrawable* m_target; -#else - cairo_t* m_target; -#endif }; } -#endif +#endif // GTK_API_VERSION_2 +#endif // WidgetRenderingContext_h |