diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/plugins/win/PluginViewWin.cpp | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/plugins/win/PluginViewWin.cpp')
| -rw-r--r-- | Source/WebCore/plugins/win/PluginViewWin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/plugins/win/PluginViewWin.cpp b/Source/WebCore/plugins/win/PluginViewWin.cpp index f575709..2723c2c 100644 --- a/Source/WebCore/plugins/win/PluginViewWin.cpp +++ b/Source/WebCore/plugins/win/PluginViewWin.cpp @@ -82,7 +82,7 @@ #define LOG_PLUGIN_NET_ERROR() #endif -#if PLATFORM(CAIRO) +#if USE(CAIRO) #include "PlatformContextCairo.h" #include <cairo-win32.h> #endif @@ -569,7 +569,7 @@ void PluginView::paintWindowedPluginIntoContext(GraphicsContext* context, const LocalWindowsContext windowsContext(context, frameRect(), false); -#if PLATFORM(CAIRO) +#if USE(CAIRO) // Must flush drawings up to this point to the backing metafile, otherwise the // plugin region will be overwritten with any clear regions specified in the // cairo-controlled portions of the rendering. |