More linux ifdef tweaks. This reverts my earlier change (13503)....

webkit/glue/webplugin_impl.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "webkit/glue/webplugin_impl.h"
 
 #include "Cursor.h"
 #include "Document.h"
 #include "DocumentLoader.h"
@@ skipping 688 matching lines @@
 
   DCHECK(parent()->isFrameView());
   WebCore::FrameView* view = static_cast<WebCore::FrameView*>(parent());
 
   // The plugin is positioned in window coordinates, so it needs to be painted
   // in window coordinates.
   WebCore::IntPoint origin = view->windowToContents(WebCore::IntPoint(0, 0));
   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 =
       WebCore::IntRect(view->contentsToWindow(damage_rect.location()),
                        damage_rect.size());
 
   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();
 }
 
 void WebPluginImpl::print(WebCore::GraphicsContext* gc) {
   if (gc->paintingDisabled())
     return;
 
   if (!parent())
@@ skipping 686 matching lines @@
     client_index = clients_.erase(client_index);
     if (resource_client)
       resource_client->DidFail();
   }
 
   // This needs to be called now and not in the destructor since the
   // webframe_ might not be valid anymore.
   webframe_->set_plugin_delegate(NULL);
   webframe_ = NULL;
 }