diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-27 18:17:24 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-27 18:17:24 +0000 |
| commit | e5cd46b27d3591663ba43428e4b2e2249bf9733e (patch) | |
| tree | 0812842b1917d201e7610412d35d31c4d3c72c80 /webkit/glue | |
| parent | e1a853a919b8011cec35b1ba6eb170e16f56391c (diff) | |
| download | chromium_src-e5cd46b27d3591663ba43428e4b2e2249bf9733e.zip chromium_src-e5cd46b27d3591663ba43428e4b2e2249bf9733e.tar.gz chromium_src-e5cd46b27d3591663ba43428e4b2e2249bf9733e.tar.bz2 | |
More linux ifdef tweaks. This reverts my earlier change (13503).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/100046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14628 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webcursor.h | 4 | ||||
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webplugin_impl.cc | 7 |
3 files changed, 5 insertions, 8 deletions
diff --git a/webkit/glue/webcursor.h b/webkit/glue/webcursor.h index a411ebc..8ecc9d0 100644 --- a/webkit/glue/webcursor.h +++ b/webkit/glue/webcursor.h @@ -15,7 +15,7 @@ typedef struct HINSTANCE__* HINSTANCE; typedef struct HICON__* HICON; typedef HICON HCURSOR; -#elif defined(TOOLKIT_GTK) +#elif defined(OS_LINUX) // GdkCursorType is an enum, which we can't forward-declare. :( // If you work around this, be sure to fix webkit.gyp:glue to not put // GTK in the export_dependent_settings section! @@ -73,7 +73,7 @@ class WebCursor { // APIs on it. void InitFromExternalCursor(HCURSOR handle); -#elif defined(TOOLKIT_GTK) +#elif defined(OS_LINUX) // Return the stock GdkCursorType for this cursor, or GDK_CURSOR_IS_PIXMAP // if it's a custom cursor. Return GDK_LAST_CURSOR to indicate that the cursor // should be set to the system default. diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 1d21d0a..dfed0aa 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -155,7 +155,7 @@ MSVC_POP_WARNING(); #include "webkit/glue/webtextinput_impl.h" #include "webkit/glue/webview_impl.h" -#if defined(TOOLKIT_GTK) +#if defined(OS_LINUX) #include <gdk/gdk.h> #endif diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc index 2ddc777..de428a3 100644 --- a/webkit/glue/webplugin_impl.cc +++ b/webkit/glue/webplugin_impl.cc @@ -706,15 +706,12 @@ void WebPluginImpl::paint(WebCore::GraphicsContext* gc, gc->translate(static_cast<float>(origin.x()), static_cast<float>(origin.y())); -#if defined(OS_WIN) || defined(TOOLKIT_GTK) +#if defined(OS_WIN) || defined(OS_LINUX) // Note that |context| is only used when in windowless mode. gfx::NativeDrawingContext context = gc->platformContext()->canvas()->beginPlatformPaint(); #elif defined(OS_MACOSX) gfx::NativeDrawingContext context = gc->platformContext(); -#else - NOTIMPLEMENTED(); - gfx::NativeDrawingContext context = NULL; #endif WebCore::IntRect window_rect = @@ -723,7 +720,7 @@ void WebPluginImpl::paint(WebCore::GraphicsContext* gc, delegate_->Paint(context, webkit_glue::FromIntRect(window_rect)); -#if defined(OS_WIN) || defined(TOOLKIT_GTK) +#if defined(OS_WIN) || defined(OS_LINUX) gc->platformContext()->canvas()->endPlatformPaint(); #endif gc->restore(); |