Index: win/PluginViewWin.cpp
===================================================================
--- Source/WebCore/plugins/win/PluginViewWin.cpp (revision 63895)
+++ Source/WebCore/plugins/win/PluginViewWin.cpp (working copy)
@@ -618,7 +618,8 @@
ASSERT(parent()->isFrameView());
IntRect rectInWindow = static_cast<FrameView*>(parent())->contentsToWindow(
frameRect());
- LocalWindowsContext windowsContext(context, rectInWindow, m_isTransparent);
+ HDC hdc = context->getWindowsContext(rectInWindow, m_isTransparent);
+
// On Safari/Windows without transparency layers the GraphicsContext return
s the HDC
// of the window and the plugin expects that the passed in DC has window co
ordinates.
@@ -627,14 +628,15 @@
#if !PLATFORM(QT) && !OS(WINCE)
if (!context->inTransparencyLayer()) {
XFORM transform;
- GetWorldTransform(windowsContext.hdc(), &transform);
+ GetWorldTransform(hdc, &transform);
transform.eDx = 0;
transform.eDy = 0;
- SetWorldTransform(windowsContext.hdc(), &transform);
+ SetWorldTransform(hdc, &transform);
}
#endif
- paintIntoTransformedContext(windowsContext.hdc());
+ paintIntoTransformedContext(hdc);
+ context->releaseWindowsContext(hdc, frameRect(), m_isTransparent);
}
Index: win/PluginViewWin.cpp
===================================================================
--- Source/WebCore/plugins/win/PluginViewWin.cpp (revision 63895)
+++ Source/WebCore/plugins/win/PluginViewWin.cpp (working copy)
@@ -618,7 +618,8 @@
ASSERT(parent()->isFrameView());
IntRect rectInWindow = static_cast<FrameView*>(parent())->contentsToWindow(
frameRect());
- LocalWindowsContext windowsContext(context, rectInWindow, m_isTransparent);
+ HDC hdc = context->getWindowsContext(rectInWindow, m_isTransparent);
+
// On Safari/Windows without transparency layers the GraphicsContext return
s the HDC
// of the window and the plugin expects that the passed in DC has window co
ordinates.
@@ -627,14 +628,15 @@
#if !PLATFORM(QT) && !OS(WINCE)
if (!context->inTransparencyLayer()) {
XFORM transform;
- GetWorldTransform(windowsContext.hdc(), &transform);
+ GetWorldTransform(hdc, &transform);
transform.eDx = 0;
transform.eDy = 0;
- SetWorldTransform(windowsContext.hdc(), &transform);
+ SetWorldTransform(hdc, &transform);
}
#endif
- paintIntoTransformedContext(windowsContext.hdc());
+ paintIntoTransformedContext(hdc);
+ context->releaseWindowsContext(hdc, frameRect(), m_isTransparent);
}
To copy to clipboard, switch view to plain text mode
Bookmarks