This CL is for Neb. It contains his change 501124, with conflicts merged.

chrome/renderer/webplugin_delegate_pepper.cc

 // Copyright (c) 2009 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.
 
 #define PEPPER_APIS_ENABLED 1
 
 #include "chrome/renderer/webplugin_delegate_pepper.h"
 
 #include <string>
 #include <vector>
@@ skipping 575 matching lines @@
 WebPluginDelegatePepper::~WebPluginDelegatePepper() {
   DestroyInstance();
 }
 
 void WebPluginDelegatePepper::PluginDestroyed() {
   delete this;
 }
 
 void WebPluginDelegatePepper::Paint(WebKit::WebCanvas* canvas,
                                     const gfx::Rect& rect) {
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
   if (nested_delegate_) {
     // TODO(apatrick): The GPU plugin will render to an offscreen render target.
     //    Need to copy it to the screen here.
   } else {
     // Blit from background_context to context.
     if (!committed_bitmap_.isNull()) {
       gfx::Point origin(window_rect_.origin().x(), window_rect_.origin().y());
       canvas->drawBitmap(committed_bitmap_,
                          SkIntToScalar(window_rect_.origin().x()),
                          SkIntToScalar(window_rect_.origin().y()));
@@ skipping 124 matching lines @@
       BuildCharEvent(&event, &npevent);
       break;
     case NPEventType_Minimize:
     case NPEventType_Focus:
     case NPEventType_Device:
       // NOTIMPLEMENTED();
       break;
   }
   return instance()->NPP_HandleEvent(&npevent) != 0;
 }