diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index 0865948266fd..9c00c3eac8fd 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -1195,7 +1195,6 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext, if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) { -#ifdef _NEW_METHOD_ADDED_ //~~~ #ifdef XP_WIN nsIPluginInstance * inst; @@ -1208,12 +1207,11 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext, if(window->type == nsPluginWindowType_Drawable) { PRUint32 hdc; - aRenderingContext.RetrieveCurrentNativeDC(&hdc); + aRenderingContext.RetrieveCurrentNativeGraphicData(&hdc); mInstanceOwner->Paint(aDirtyRect, hdc); return NS_OK; } } -#endif #endif const nsStyleFont* font = (const nsStyleFont*)mStyleContext->GetStyleData(eStyleStruct_Font); diff --git a/layout/html/base/src/nsObjectFrame.cpp b/layout/html/base/src/nsObjectFrame.cpp index 0865948266fd..9c00c3eac8fd 100644 --- a/layout/html/base/src/nsObjectFrame.cpp +++ b/layout/html/base/src/nsObjectFrame.cpp @@ -1195,7 +1195,6 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext, if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) { -#ifdef _NEW_METHOD_ADDED_ //~~~ #ifdef XP_WIN nsIPluginInstance * inst; @@ -1208,12 +1207,11 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext, if(window->type == nsPluginWindowType_Drawable) { PRUint32 hdc; - aRenderingContext.RetrieveCurrentNativeDC(&hdc); + aRenderingContext.RetrieveCurrentNativeGraphicData(&hdc); mInstanceOwner->Paint(aDirtyRect, hdc); return NS_OK; } } -#endif #endif const nsStyleFont* font = (const nsStyleFont*)mStyleContext->GetStyleData(eStyleStruct_Font);