Merge lp:~justinmcp/oxide/pepper-flash into lp:~oxide-developers/oxide/oxide.trunk

[Justin McPherson]

Basic support for Pepper Flash plugin

[Justin McPherson (justinmcp)]

Heads up; this one is still in need of review.

[lp:~justinmcp/oxide/pepper-flash]

684. By Justin McPherson <justin@phablet-dev> on 2014-11-05

Merge from trunk.

[Chris Coulson (chrisccoulson)]

We talked about this branch during the meeting today. Once the dust has settled with the Arale bring-up, and the handful of other bugs that are critical for the device are done, I shall finally give this a proper review. It would be nice to get this one done (and for me to finish the support for the GTalk plugin too).

I haven't forgotten about it :)

[Justin McPherson (justinmcp)]

NP. I'll bring it up to trunk ASAP.

[lp:~justinmcp/oxide/pepper-flash]

685. By Justin McPherson <justin@phablet-dev> on 2015-03-13

Merge from trunk.

686. By Justin McPherson <justin@phablet-dev> on 2015-05-05

Merge from trunk.

687. By Justin McPherson <justin@phablet-dev> on 2015-05-06

Fixups and changes to match trunk.

688. By Justin McPherson <justin@phablet-dev> on 2015-06-19

Merge from trunk.

689. By Justin McPherson <justin@phablet-dev> on 2015-06-25

WIP

[Chris Coulson (chrisccoulson)]

Ok, I've added a few comments for stuff in shared/browser and shared/common - nothing too major so far, although I've not finished reviewing shared/renderer yet.

As a general comment, it would be worth creating shared/browser/pepper and shared/renderer/pepper subfolders and putting all new and existing oxide_pepper_* files in there

review: Needs Fixing

[lp:~justinmcp/oxide/pepper-flash]

690. By Justin McPherson <justin@phablet-dev> on 2015-07-03

WIP

[Chris Coulson (chrisccoulson)]

I've basically done reviewing this now, I think.

In addition to the comments, there's a few minor nits in various places:

- When implementing virtual methods in sub-classes, you don't need to use both the "virtual" and "override" keywords. Just "override" will do.
- I'm not entirely sure what to do with license headers in files that contain a lot of copy/paste code. In other places, I've done something like this: http://bazaar.launchpad.net/~oxide-developers/oxide/oxide.trunk/view/head:/shared/browser/oxide_gpu_info_collector_linux.cc#L1
- If you're implementing interfaces that are only called from Chromium, you can put the implementation in the private: section of the class.
- There's quite a lot of places in shared/renderer that don't have braces around if statements.

Other than that, it's mostly minor comments

review: Needs Fixing

[lp:~justinmcp/oxide/pepper-flash]

691. By Justin McPherson on 2015-08-31

WIP

692. By Justin McPherson on 2015-08-31

Merge from trunk.

[Chris Coulson (chrisccoulson)]

Let's get this one in. I created https://blueprints.launchpad.net/oxide/+spec/pepper-flash-support a few weeks ago to group together the missing bits for Flash support, and given that it's off by default, we can just report bugs for issues as we find them

review: Approve

[lp:~justinmcp/oxide/pepper-flash]

693. By Justin McPherson on 2015-10-07

Merge from trunk.

694. By Justin McPherson on 2015-10-08

Merge from trunk.

695. By Justin McPherson on 2015-10-08

Change to match new function signature

=== modified file 'qt/examples/oxide-test-browser/index.html'
--- qt/examples/oxide-test-browser/index.html	2014-02-14 19:30:54 +0000
+++ qt/examples/oxide-test-browser/index.html	2015-10-08 02:28:09 +0000
@@ -16,6 +16,10 @@
 	<li><a href="http://peacekeeper.futuremark.com/">Peacekeeper</a></li>
 	<li><a href="http://webglsamples.googlecode.com/hg/aquarium/aquarium.html">http://webglsamples.googlecode.com/hg/aquarium/aquarium.html</a></li>
 	<li><a href="http://chrome.angrybirds.com/">http://chrome.angrybirds.com/</a></li>
+	<li><a href="http://www.youtube.com/">http://www.youtube.com/</a></li>
+	<li><a href="http://www.sjgames.com/ourgames/flash.html">SJ Games</a></li>
+	<li><a href="http://armorgames.com/play/1716/gemcraft">GemCraft</a></li>
+	<li><a href="http://24hoursofhappy.com">Happy</a></li>
 </ul>
 </body>
 </html>

=== modified file 'qt/examples/oxide-test-browser/oxide-test-browser.qml'
--- qt/examples/oxide-test-browser/oxide-test-browser.qml	2014-02-14 20:05:24 +0000
+++ qt/examples/oxide-test-browser/oxide-test-browser.qml	2015-10-08 02:28:09 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import com.canonical.Oxide 0.1
+import com.canonical.Oxide 1.7
 
 MainView {
     objectName: "mainView"

=== modified file 'shared/browser/oxide_browser_process_main.cc'
--- shared/browser/oxide_browser_process_main.cc	2015-09-23 18:25:36 +0000
+++ shared/browser/oxide_browser_process_main.cc	2015-10-08 02:28:09 +0000
@@ -303,6 +303,10 @@
     command_line->AppendSwitch(switches::kAllowSandboxDebugging);
   }
 
+  if (IsEnvironmentOptionEnabled("ENABLE_PEPPER_FLASH_PLUGIN")) {
+    command_line->AppendSwitch(switches::kEnablePepperFlashPlugin);
+  }
+
   if (IsEnvironmentOptionEnabled("ENABLE_MEDIA_HUB_AUDIO")) {
     command_line->AppendSwitch(switches::kEnableMediaHubAudio);
   }

=== modified file 'shared/browser/oxide_content_browser_client.cc'
--- shared/browser/oxide_content_browser_client.cc	2015-09-28 16:44:05 +0000
+++ shared/browser/oxide_content_browser_client.cc	2015-10-08 02:28:09 +0000
@@ -58,7 +58,7 @@
 #include "content/public/browser/browser_ppapi_host.h"
 #include "ppapi/host/ppapi_host.h"
 
-#include "oxide_pepper_host_factory_browser.h"
+#include "pepper/oxide_pepper_host_factory_browser.h"
 #endif
 
 namespace oxide {
@@ -106,6 +106,7 @@
   // This can be called on the UI or IO thread
   static const char* const kSwitchNames[] = {
     switches::kEnableGoogleTalkPlugin,
+    switches::kEnablePepperFlashPlugin,
     switches::kEnableMediaHubAudio,
     switches::kFormFactor,
     switches::kMediaHubFixedSessionDomains

=== removed file 'shared/browser/oxide_pepper_host_factory_browser.cc'
--- shared/browser/oxide_pepper_host_factory_browser.cc	2015-04-20 18:50:54 +0000
+++ shared/browser/oxide_pepper_host_factory_browser.cc	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-// vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2014 Canonical Ltd.
-
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#include "oxide_pepper_host_factory_browser.h"
-
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "content/public/browser/browser_ppapi_host.h"
-#include "ppapi/host/ppapi_host.h"
-#include "ppapi/host/resource_host.h"
-#include "ppapi/proxy/ppapi_messages.h"
-#include "ppapi/shared_impl/ppapi_permissions.h"
-
-namespace oxide {
-
-PepperHostFactoryBrowser::PepperHostFactoryBrowser(
-    content::BrowserPpapiHost* host) :
-    host_(host) {}
-
-PepperHostFactoryBrowser::~PepperHostFactoryBrowser() {}
-
-scoped_ptr<ppapi::host::ResourceHost>
-PepperHostFactoryBrowser::CreateResourceHost(ppapi::host::PpapiHost* host,
-                                             PP_Resource resource,
-                                             PP_Instance instance,
-                                             const IPC::Message& message) {
-  DCHECK(host == host_->GetPpapiHost());
-
-  if (!host_->IsValidInstance(instance)) {
-    return nullptr;
-  }
-
-  // Dev interfaces:
-  // TODO:
-  //  PpapiHostMsg_ExtensionsCommon_Create
-
-  // Private interfaces:
-  // TODO:
-  //  PpapiHostMsg_Broker_Create
-
-  // Flash interfaces:
-  // TODO:
-  //  PpapiHostMsg_Flash_Create
-  //  PpapiHostMsg_FlashClipboard_Create
-  //  PpapiHostMsg_FlashDRM_Create
-
-  return nullptr;
-}
-
-} // namespace oxide

=== removed file 'shared/browser/oxide_pepper_host_factory_browser.h'
--- shared/browser/oxide_pepper_host_factory_browser.h	2014-11-21 23:28:35 +0000
+++ shared/browser/oxide_pepper_host_factory_browser.h	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-// vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2014 Canonical Ltd.
-
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#ifndef _OXIDE_SHARED_BROWSER_PEPPER_HOST_FACTORY_H_
-#define _OXIDE_SHARED_BROWSER_PEPPER_HOST_FACTORY_H_
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "ppapi/host/host_factory.h"
-
-namespace content {
-class BrowserPpapiHost;
-}
-
-namespace oxide {
-
-class PepperHostFactoryBrowser final : public ppapi::host::HostFactory {
- public:
-  PepperHostFactoryBrowser(content::BrowserPpapiHost* host);
-  ~PepperHostFactoryBrowser();
-
-  scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost(
-      ppapi::host::PpapiHost* host,
-      PP_Resource resource,
-      PP_Instance instance,
-      const IPC::Message& message) final;
-
- private:
-  content::BrowserPpapiHost* host_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(PepperHostFactoryBrowser);
-};
-
-} // namespace oxide
-
-#endif // _OXIDE_SHARED_BROWSER_PEPPER_HOST_FACTORY_H_

=== added directory 'shared/browser/pepper'
=== added file 'shared/browser/pepper/oxide_pepper_flash_browser_host.cc'
--- shared/browser/pepper/oxide_pepper_flash_browser_host.cc	1970-01-01 00:00:00 +0000
+++ shared/browser/pepper/oxide_pepper_flash_browser_host.cc	2015-10-08 02:28:09 +0000
@@ -0,0 +1,137 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (c) 2013 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 "oxide_pepper_flash_browser_host.h"
+
+#include "base/logging.h"
+#include "base/time/time.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/browser_ppapi_host.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/cookie_store_factory.h"
+#include "ppapi/c/pp_errors.h"
+#include "ppapi/host/dispatch_host_message.h"
+#include "ppapi/host/host_message_context.h"
+#include "ppapi/host/ppapi_host.h"
+#include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/shared_impl/time_conversion.h"
+#include "shared/browser/oxide_browser_context.h"
+#include "shared/browser/oxide_browser_context_delegate.h"
+
+namespace oxide {
+
+namespace {
+
+// Do work on the UI thread
+int32_t GetRestrictions(int render_process_id,
+    const GURL& document_url,
+    const GURL& plugin_url
+) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+
+  int32_t restrictions = PP_FLASHLSORESTRICTIONS_NONE;
+  if (!document_url.is_valid()) {
+    return restrictions;
+  }
+
+  BrowserContextIOData* io_data = nullptr;
+  content::RenderProcessHost* render_process_host =
+      content::RenderProcessHost::FromID(render_process_id);
+  if (render_process_host) {
+    io_data = BrowserContextIOData::FromResourceContext(
+      render_process_host->GetBrowserContext()->GetResourceContext());
+  }
+
+  if (!io_data) {
+    return restrictions;
+  }
+
+  // TODO(chrisccoulson): Implement PP_FLASHLSORESTRICTIONS_IN_MEMORY when
+  // we have content settings
+
+  if (!io_data->CanAccessCookies(document_url, plugin_url, false)) {
+      restrictions = PP_FLASHLSORESTRICTIONS_BLOCK;
+  }
+
+  return restrictions;
+}
+
+}  // namespace
+
+
+PepperFlashBrowserHost::PepperFlashBrowserHost(content::BrowserPpapiHost* host,
+                                               PP_Instance instance,
+                                               PP_Resource resource)
+    : ResourceHost(host->GetPpapiHost(), instance, resource),
+      host_(host),
+      weak_factory_(this) {
+  int unused;
+  host->GetRenderFrameIDsForInstance(instance, &render_process_id_, &unused);
+}
+
+PepperFlashBrowserHost::~PepperFlashBrowserHost() {}
+
+int32_t PepperFlashBrowserHost::OnResourceMessageReceived(
+    const IPC::Message& msg,
+    ppapi::host::HostMessageContext* context) {
+
+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashBrowserHost, msg)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_Flash_UpdateActivity,
+                                        OnUpdateActivity)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_GetLocalTimeZoneOffset,
+                                      OnGetLocalTimeZoneOffset)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(
+        PpapiHostMsg_Flash_GetLocalDataRestrictions, OnGetLocalDataRestrictions)
+  PPAPI_END_MESSAGE_MAP()
+
+  return PP_ERROR_FAILED;
+}
+
+int32_t PepperFlashBrowserHost::OnUpdateActivity(
+    ppapi::host::HostMessageContext* host_context) {
+  return PP_OK;
+}
+
+int32_t PepperFlashBrowserHost::OnGetLocalTimeZoneOffset(
+    ppapi::host::HostMessageContext* host_context,
+    const base::Time& t) {
+
+  // The reason for this processing being in the browser process is that on
+  // Linux, the localtime calls require filesystem access prohibited by the
+  // sandbox.
+
+  host_context->reply_msg = PpapiPluginMsg_Flash_GetLocalTimeZoneOffsetReply(
+    ppapi::PPGetLocalTimeZoneOffset(t));
+
+  return PP_OK;
+}
+
+int32_t PepperFlashBrowserHost::OnGetLocalDataRestrictions(
+    ppapi::host::HostMessageContext* context) {
+
+  GURL document_url = host_->GetDocumentURLForInstance(pp_instance());
+  GURL plugin_url = host_->GetPluginURLForInstance(pp_instance());
+
+  content::BrowserThread::PostTaskAndReplyWithResult(
+    content::BrowserThread::UI,
+    FROM_HERE,
+    base::Bind(&GetRestrictions, render_process_id_, document_url, plugin_url),
+    base::Bind(&PepperFlashBrowserHost::GetLocalDataRestrictions,
+               weak_factory_.GetWeakPtr(),
+               context->MakeReplyMessageContext()));
+
+  return PP_OK_COMPLETIONPENDING;
+}
+
+void PepperFlashBrowserHost::GetLocalDataRestrictions(
+    ppapi::host::ReplyMessageContext reply_context,
+    int32_t restrictions) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+
+  SendReply(reply_context,
+            PpapiPluginMsg_Flash_GetLocalDataRestrictionsReply(restrictions));
+}
+
+} // namespace oxide

=== added file 'shared/browser/pepper/oxide_pepper_flash_browser_host.h'
--- shared/browser/pepper/oxide_pepper_flash_browser_host.h	1970-01-01 00:00:00 +0000
+++ shared/browser/pepper/oxide_pepper_flash_browser_host.h	2015-10-08 02:28:09 +0000
@@ -0,0 +1,59 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (c) 2013 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.
+
+#ifndef _OXIDE_SHARED_BROWSER_PEPPER_FLASH_BROWSER_HOST_H_
+#define _OXIDE_SHARED_BROWSER_PEPPER_FLASH_BROWSER_HOST_H_
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "base/memory/weak_ptr.h"
+#include "ppapi/host/resource_host.h"
+
+class CookieSettings;
+class GURL;
+
+namespace base {
+class Time;
+}
+
+namespace content {
+class BrowserPpapiHost;
+}
+
+namespace oxide {
+
+class BrowserContext;
+
+
+class PepperFlashBrowserHost final : public ppapi::host::ResourceHost {
+ public:
+  PepperFlashBrowserHost(content::BrowserPpapiHost* host,
+                         PP_Instance instance,
+                         PP_Resource resource);
+  ~PepperFlashBrowserHost();
+
+ private:
+  int32_t OnResourceMessageReceived(
+      const IPC::Message& msg,
+      ppapi::host::HostMessageContext* context) override;
+
+  int32_t OnUpdateActivity(ppapi::host::HostMessageContext* host_context);
+  int32_t OnGetLocalTimeZoneOffset(
+      ppapi::host::HostMessageContext* host_context,
+      const base::Time& t);
+  int32_t OnGetLocalDataRestrictions(ppapi::host::HostMessageContext* context);
+
+  void GetLocalDataRestrictions(ppapi::host::ReplyMessageContext reply_context,
+                                int32_t restrictions);
+  content::BrowserPpapiHost* host_;
+  int render_process_id_;
+  base::WeakPtrFactory<PepperFlashBrowserHost> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(PepperFlashBrowserHost);
+};
+
+} // namespace oxide
+
+#endif // _OXIDE_SHARED_BROWSER_PEPPER_FLASH_BROWSER_HOST_H_

=== added file 'shared/browser/pepper/oxide_pepper_host_factory_browser.cc'
--- shared/browser/pepper/oxide_pepper_host_factory_browser.cc	1970-01-01 00:00:00 +0000
+++ shared/browser/pepper/oxide_pepper_host_factory_browser.cc	2015-10-08 02:28:09 +0000
@@ -0,0 +1,77 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "oxide_pepper_host_factory_browser.h"
+
+#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
+#include "content/public/browser/browser_ppapi_host.h"
+#include "ppapi/host/ppapi_host.h"
+#include "ppapi/host/resource_host.h"
+#include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/shared_impl/ppapi_permissions.h"
+
+#include "oxide_pepper_flash_browser_host.h"
+
+namespace oxide {
+
+PepperHostFactoryBrowser::PepperHostFactoryBrowser(
+    content::BrowserPpapiHost* host) :
+    host_(host) {}
+
+PepperHostFactoryBrowser::~PepperHostFactoryBrowser() {}
+
+scoped_ptr<ppapi::host::ResourceHost>
+PepperHostFactoryBrowser::CreateResourceHost(
+    ppapi::host::PpapiHost* host,
+    PP_Resource resource,
+    PP_Instance instance,
+    const IPC::Message& message
+) {
+  DCHECK(host == host_->GetPpapiHost());
+
+  if (!host_->IsValidInstance(instance)) {
+    return nullptr;
+  }
+
+  // Dev interfaces:
+  // TODO:
+  //  PpapiHostMsg_ExtensionsCommon_Create
+
+  // Private interfaces:
+  // TODO:
+  //  PpapiHostMsg_Broker_Create
+
+  // Flash interfaces:
+  // TODO:
+  //  PpapiHostMsg_FlashClipboard_Create
+  //  PpapiHostMsg_FlashDRM_Create
+  if (host_->GetPpapiHost()->permissions().HasPermission(
+          ppapi::PERMISSION_FLASH)) {
+      switch (message.type()) {
+        case PpapiHostMsg_Flash_Create::ID:
+          return scoped_ptr<ppapi::host::ResourceHost>(
+            new PepperFlashBrowserHost(host_, instance, resource));
+        default:
+          ;
+      }
+  }
+
+  return nullptr;
+}
+
+} // namespace oxide

=== added file 'shared/browser/pepper/oxide_pepper_host_factory_browser.h'
--- shared/browser/pepper/oxide_pepper_host_factory_browser.h	1970-01-01 00:00:00 +0000
+++ shared/browser/pepper/oxide_pepper_host_factory_browser.h	2015-10-08 02:28:09 +0000
@@ -0,0 +1,50 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_SHARED_BROWSER_PEPPER_HOST_FACTORY_H_
+#define _OXIDE_SHARED_BROWSER_PEPPER_HOST_FACTORY_H_
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "ppapi/host/host_factory.h"
+
+namespace content {
+class BrowserPpapiHost;
+}
+
+namespace oxide {
+
+class PepperHostFactoryBrowser final : public ppapi::host::HostFactory {
+ public:
+  PepperHostFactoryBrowser(content::BrowserPpapiHost* host);
+  ~PepperHostFactoryBrowser();
+
+  scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost(
+      ppapi::host::PpapiHost* host,
+      PP_Resource resource,
+      PP_Instance instance,
+      const IPC::Message& message) final;
+
+ private:
+  content::BrowserPpapiHost* host_;
+
+  DISALLOW_COPY_AND_ASSIGN(PepperHostFactoryBrowser);
+};
+
+} // namespace oxide
+
+#endif // _OXIDE_SHARED_BROWSER_PEPPER_HOST_FACTORY_H_

=== modified file 'shared/common/oxide_constants.cc'
--- shared/common/oxide_constants.cc	2015-09-08 12:39:14 +0000
+++ shared/common/oxide_constants.cc	2015-10-08 02:28:09 +0000
@@ -20,6 +20,7 @@
 namespace switches {
 
 const char kEnableGoogleTalkPlugin[] = "enable-google-talk-plugin";
+const char kEnablePepperFlashPlugin[] = "enable-pepper-flash-plugin";
 const char kFormFactor[] = "form-factor";
 const char kFormFactorDesktop[] = "desktop";
 const char kFormFactorTablet[] = "tablet";

=== modified file 'shared/common/oxide_constants.h'
--- shared/common/oxide_constants.h	2015-09-08 12:39:14 +0000
+++ shared/common/oxide_constants.h	2015-10-08 02:28:09 +0000
@@ -21,6 +21,7 @@
 namespace switches {
 
 extern const char kEnableGoogleTalkPlugin[];
+extern const char kEnablePepperFlashPlugin[];
 extern const char kFormFactor[];
 extern const char kFormFactorDesktop[];
 extern const char kFormFactorTablet[];

=== modified file 'shared/common/oxide_content_client.cc'
--- shared/common/oxide_content_client.cc	2015-09-23 18:25:36 +0000
+++ shared/common/oxide_content_client.cc	2015-10-08 02:28:09 +0000
@@ -27,6 +27,19 @@
 #include "shared/browser/oxide_content_browser_client.h"
 #include "shared/renderer/oxide_content_renderer_client.h"
 
+#if defined(ENABLE_PLUGINS)
+#include "base/command_line.h"
+#include "base/files/file_path.h"
+#include "base/path_service.h"
+#include "content/public/common/pepper_plugin_info.h"
+#include "content/public/common/webplugininfo.h"
+#include "content/public/common/content_constants.h"
+#include "ppapi/shared_impl/ppapi_permissions.h"
+
+#include "shared/common/oxide_constants.h"
+#include "shared/common/oxide_paths.h"
+#endif
+
 #include "oxide_form_factor.h"
 #include "oxide_user_agent.h"
 
@@ -37,7 +50,34 @@
 }
 
 void ContentClient::AddPepperPlugins(
-    std::vector<content::PepperPluginInfo>* plugins) {}
+    std::vector<content::PepperPluginInfo>* plugins) {
+#if defined(ENABLE_PLUGINS)
+  base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kEnablePepperFlashPlugin)) {
+    base::FilePath path;
+    if (PathService::Get(FILE_PEPPER_FLASH_PLUGIN, &path)) {
+      content::PepperPluginInfo pf;
+
+      pf.path = path;
+      pf.is_out_of_process = true;
+      pf.name = content::kFlashPluginName;
+      pf.permissions = ppapi::PERMISSION_DEV |
+                          ppapi::PERMISSION_PRIVATE |
+                          ppapi::PERMISSION_BYPASS_USER_GESTURE |
+                          ppapi::PERMISSION_FLASH;
+
+      pf.description = "Shockwave Flash Pepper Plugin (under Oxide)";
+      pf.mime_types.push_back(content::WebPluginMimeType(content::kFlashPluginSwfMimeType,
+                                             content::kFlashPluginSwfExtension,
+                                             content::kFlashPluginSwfDescription));
+      pf.mime_types.push_back(content::WebPluginMimeType(content::kFlashPluginSplMimeType,
+                                             content::kFlashPluginSplExtension,
+                                             content::kFlashPluginSplDescription));
+      plugins->push_back(pf);
+    }
+  }
+#endif
+}
 
 std::string ContentClient::GetUserAgent() const {
   return oxide::GetUserAgent();

=== modified file 'shared/common/oxide_paths.cc'
--- shared/common/oxide_paths.cc	2015-04-09 22:20:49 +0000
+++ shared/common/oxide_paths.cc	2015-10-08 02:28:09 +0000
@@ -17,14 +17,44 @@
 
 #include "oxide_paths.h"
 
+#include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/path_service.h"
 
 namespace oxide {
 
 namespace {
 
+const base::FilePath::CharType* kPepperFlashPluginDirs[] = {
+  FILE_PATH_LITERAL("/usr/lib/adobe-flashplugin"),
+  FILE_PATH_LITERAL("/opt/google/chrome/PepperFlash"),
+};
+const base::FilePath::CharType kPepperFlashPluginFilename[] =
+  FILE_PATH_LITERAL("libpepflashplayer.so");
+
+
 bool PathProvider(int key, base::FilePath* result) {
   switch (key) {
+    case DIR_PEPPER_FLASH_PLUGIN: {
+      for (size_t i = 0; i < arraysize(kPepperFlashPluginDirs); ++i) {
+        base::FilePath path(kPepperFlashPluginDirs[i]);
+        if (base::PathExists(path.Append(kPepperFlashPluginFilename))) {
+          *result = path;
+          return true;
+        }
+      }
+      return false;
+    }
+
+    case FILE_PEPPER_FLASH_PLUGIN: {
+      base::FilePath path;
+      if (!PathService::Get(DIR_PEPPER_FLASH_PLUGIN, &path)) {
+        return false;
+      }
+      *result = path.Append(kPepperFlashPluginFilename);
+      return true;
+    }
+
     default:
       return false;
   }

=== modified file 'shared/common/oxide_paths.h'
--- shared/common/oxide_paths.h	2015-04-09 22:20:49 +0000
+++ shared/common/oxide_paths.h	2015-10-08 02:28:09 +0000
@@ -23,6 +23,9 @@
 enum {
   PATH_START = 1000, // Same as Chrome
 
+  DIR_PEPPER_FLASH_PLUGIN,
+  FILE_PEPPER_FLASH_PLUGIN,
+
   PATH_END
 };
 

=== modified file 'shared/renderer/oxide_content_renderer_client.cc'
--- shared/renderer/oxide_content_renderer_client.cc	2015-09-29 13:59:26 +0000
+++ shared/renderer/oxide_content_renderer_client.cc	2015-10-08 02:28:09 +0000
@@ -46,6 +46,10 @@
 #include "oxide_user_script_slave.h"
 #include "oxide_web_content_settings_client.h"
 
+#if defined(ENABLE_PLUGINS)
+#include "pepper/oxide_pepper_render_frame_observer.h"
+#endif
+
 #if defined(ENABLE_MEDIAHUB)
 #include "media/oxide_renderer_media_player_manager.h"
 #include "media/oxide_web_media_player.h"
@@ -77,6 +81,9 @@
     content::RenderFrame* render_frame) {
   new ScriptMessageDispatcherRenderer(render_frame);
   new WebContentSettingsClient(render_frame);
+#if defined(ENABLE_PLUGINS)
+  new PepperRenderFrameObserver(render_frame);
+#endif
 #if defined(ENABLE_MEDIAHUB)
   new RendererMediaPlayerManager(render_frame);
 #endif

=== added directory 'shared/renderer/pepper'
=== added file 'shared/renderer/pepper/oxide_pepper_flash_menu_host.cc'
--- shared/renderer/pepper/oxide_pepper_flash_menu_host.cc	1970-01-01 00:00:00 +0000
+++ shared/renderer/pepper/oxide_pepper_flash_menu_host.cc	2015-10-08 02:28:09 +0000
@@ -0,0 +1,213 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (c) 2012 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 "oxide_pepper_flash_menu_host.h"
+
+#include "base/strings/utf_string_conversions.h"
+#include "content/public/common/context_menu_params.h"
+#include "content/public/renderer/render_frame.h"
+#include "content/public/renderer/renderer_ppapi_host.h"
+#include "ipc/ipc_message.h"
+#include "ppapi/c/private/ppb_flash_menu.h"
+#include "ppapi/host/dispatch_host_message.h"
+#include "ppapi/host/ppapi_host.h"
+#include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/proxy/serialized_flash_menu.h"
+#include "ui/gfx/geometry/point.h"
+
+namespace {
+
+// Maximum depth of submenus allowed (e.g., 1 indicates that submenus are
+// allowed, but not sub-submenus).
+const size_t kMaxMenuDepth = 2;
+
+// Maximum number of entries in any single menu (including separators).
+const size_t kMaxMenuEntries = 50;
+
+// Maximum total number of entries in the |menu_id_map| (see below).
+// (Limit to 500 real entries; reserve the 0 action as an invalid entry.)
+const size_t kMaxMenuIdMapEntries = 501;
+
+// Converts menu data from one form to another.
+//  - |depth| is the current nested depth (call it starting with 0).
+//  - |menu_id_map| is such that |menu_id_map[output_item.action] ==
+//    input_item.id| (where |action| is what a |MenuItem| has, |id| is what a
+//    |PP_Flash_MenuItem| has).
+bool ConvertMenuData(const PP_Flash_Menu* in_menu,
+                     size_t depth,
+                     std::vector<content::MenuItem>* out_menu,
+                     std::vector<int32_t>* menu_id_map) {
+  if (depth > kMaxMenuDepth || !in_menu) {
+    return false;
+  }
+
+  // Clear the output, just in case.
+  out_menu->clear();
+
+  if (!in_menu->count) {
+    return true;  // Nothing else to do.
+  }
+  if (!in_menu->items || in_menu->count > kMaxMenuEntries) {
+    return false;
+  }
+  for (uint32_t i = 0; i < in_menu->count; i++) {
+    content::MenuItem item;
+
+    PP_Flash_MenuItem_Type type = in_menu->items[i].type;
+    switch (type) {
+      case PP_FLASH_MENUITEM_TYPE_NORMAL:
+        item.type = content::MenuItem::OPTION;
+        break;
+      case PP_FLASH_MENUITEM_TYPE_CHECKBOX:
+        item.type = content::MenuItem::CHECKABLE_OPTION;
+        break;
+      case PP_FLASH_MENUITEM_TYPE_SEPARATOR:
+        item.type = content::MenuItem::SEPARATOR;
+        break;
+      case PP_FLASH_MENUITEM_TYPE_SUBMENU:
+        item.type = content::MenuItem::SUBMENU;
+        break;
+      default:
+        return false;
+    }
+    if (in_menu->items[i].name) {
+      item.label = base::UTF8ToUTF16(in_menu->items[i].name);
+    }
+    if (menu_id_map->size() >= kMaxMenuIdMapEntries) {
+      return false;
+    }
+    item.action = static_cast<unsigned>(menu_id_map->size());
+    // This sets |(*menu_id_map)[item.action] = in_menu->items[i].id|.
+    menu_id_map->push_back(in_menu->items[i].id);
+    item.enabled = PP_ToBool(in_menu->items[i].enabled);
+    item.checked = PP_ToBool(in_menu->items[i].checked);
+    if (type == PP_FLASH_MENUITEM_TYPE_SUBMENU) {
+      if (!ConvertMenuData(
+              in_menu->items[i].submenu, depth + 1, &item.submenu, menu_id_map)) {
+        return false;
+      }
+    }
+
+    out_menu->push_back(item);
+  }
+
+  return true;
+}
+
+}  // namespace
+
+namespace oxide {
+
+PepperFlashMenuHost::PepperFlashMenuHost(
+    content::RendererPpapiHost* host,
+    PP_Instance instance,
+    PP_Resource resource,
+    const ppapi::proxy::SerializedFlashMenu& serial_menu)
+    : ppapi::host::ResourceHost(host->GetPpapiHost(), instance, resource),
+      renderer_ppapi_host_(host),
+      showing_context_menu_(false),
+      context_menu_request_id_(0),
+      has_saved_context_menu_action_(false),
+      saved_context_menu_action_(0) {
+  menu_id_map_.push_back(0);  // Reserve |menu_id_map_[0]|.
+  if (!ConvertMenuData(serial_menu.pp_menu(), 0, &menu_data_, &menu_id_map_)) {
+    menu_data_.clear();
+    menu_id_map_.clear();
+  }
+}
+
+PepperFlashMenuHost::~PepperFlashMenuHost() {
+  if (showing_context_menu_) {
+    content::RenderFrame* render_frame =
+        renderer_ppapi_host_->GetRenderFrameForInstance(pp_instance());
+    if (render_frame) {
+      render_frame->CancelContextMenu(context_menu_request_id_);
+    }
+  }
+}
+
+int32_t PepperFlashMenuHost::OnResourceMessageReceived(
+    const IPC::Message& msg,
+    ppapi::host::HostMessageContext* context) {
+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashMenuHost, msg)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FlashMenu_Show,
+                                      OnHostMsgShow)
+  PPAPI_END_MESSAGE_MAP()
+  return PP_ERROR_FAILED;
+}
+
+int32_t PepperFlashMenuHost::OnHostMsgShow(
+    ppapi::host::HostMessageContext* context,
+    const PP_Point& location) {
+  // Note that all early returns must do a SendMenuReply. The sync result for
+  // this message isn't used, so to forward the error to the plugin, we need to
+  // additionally call SendMenuReply explicitly.
+  if (menu_data_.empty()) {
+    SendMenuReply(PP_ERROR_FAILED, -1);
+    return PP_ERROR_FAILED;
+  }
+  if (showing_context_menu_) {
+    SendMenuReply(PP_ERROR_INPROGRESS, -1);
+    return PP_ERROR_INPROGRESS;
+  }
+
+  content::RenderFrame* render_frame =
+      renderer_ppapi_host_->GetRenderFrameForInstance(pp_instance());
+
+  content::ContextMenuParams params;
+  params.x = location.x;
+  params.y = location.y;
+  params.custom_context.is_pepper_menu = true;
+  params.custom_context.render_widget_id =
+      renderer_ppapi_host_->GetRoutingIDForWidget(pp_instance());
+  params.custom_items = menu_data_;
+
+  // Transform the position to be in render frame's coordinates.
+  gfx::Point render_frame_pt = renderer_ppapi_host_->PluginPointToRenderFrame(
+      pp_instance(), gfx::Point(location.x, location.y));
+  params.x = render_frame_pt.x();
+  params.y = render_frame_pt.y();
+
+  showing_context_menu_ = true;
+  context_menu_request_id_ = render_frame->ShowContextMenu(this, params);
+
+  // Note: the show message is sync so this OK is for the sync reply which we
+  // don't actually use (see the comment in the resource file for this). The
+  // async message containing the context menu action will be sent in the
+  // future.
+  return PP_OK;
+}
+
+void PepperFlashMenuHost::OnMenuAction(int request_id, unsigned action) {
+  // Just save the action.
+  DCHECK(!has_saved_context_menu_action_);
+  has_saved_context_menu_action_ = true;
+  saved_context_menu_action_ = action;
+}
+
+void PepperFlashMenuHost::OnMenuClosed(int request_id) {
+  if (has_saved_context_menu_action_ &&
+      saved_context_menu_action_ < menu_id_map_.size()) {
+    SendMenuReply(PP_OK, menu_id_map_[saved_context_menu_action_]);
+    has_saved_context_menu_action_ = false;
+    saved_context_menu_action_ = 0;
+  } else {
+    SendMenuReply(PP_ERROR_USERCANCEL, -1);
+  }
+
+  showing_context_menu_ = false;
+  context_menu_request_id_ = 0;
+}
+
+void PepperFlashMenuHost::SendMenuReply(int32_t result, int action) {
+  ppapi::host::ReplyMessageContext reply_context(
+      ppapi::proxy::ResourceMessageReplyParams(pp_resource(), 0),
+      NULL,
+      MSG_ROUTING_NONE);
+  reply_context.params.set_result(result);
+  host()->SendReply(reply_context, PpapiPluginMsg_FlashMenu_ShowReply(action));
+}
+
+} // oxide

=== added file 'shared/renderer/pepper/oxide_pepper_flash_menu_host.h'
--- shared/renderer/pepper/oxide_pepper_flash_menu_host.h	1970-01-01 00:00:00 +0000
+++ shared/renderer/pepper/oxide_pepper_flash_menu_host.h	2015-10-08 02:28:09 +0000
@@ -0,0 +1,79 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (c) 2012 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.
+
+#ifndef _OXIDE_SHARED_PEPPER_FLASH_MENU_HOST_H_
+#define _OXIDE_SHARED_PEPPER_FLASH_MENU_HOST_H_
+
+#include <vector>
+
+#include "base/compiler_specific.h"
+#include "content/public/renderer/context_menu_client.h"
+#include "ppapi/c/pp_point.h"
+#include "ppapi/host/host_message_context.h"
+#include "ppapi/host/resource_host.h"
+
+namespace content {
+class RendererPpapiHost;
+struct MenuItem;
+}
+
+namespace ppapi {
+namespace proxy {
+class SerializedFlashMenu;
+}
+namespace hsot {
+class HostMessageContext;
+}
+}
+
+struct PP_Point;
+
+namespace oxide {
+
+class PepperFlashMenuHost : public ppapi::host::ResourceHost,
+                            public content::ContextMenuClient {
+ public:
+  PepperFlashMenuHost(content::RendererPpapiHost* host,
+                      PP_Instance instance,
+                      PP_Resource resource,
+                      const ppapi::proxy::SerializedFlashMenu& serial_menu);
+  ~PepperFlashMenuHost() override;
+
+ private:
+  int32_t OnResourceMessageReceived(
+      const IPC::Message& msg,
+      ppapi::host::HostMessageContext* context) override;
+
+  int32_t OnHostMsgShow(ppapi::host::HostMessageContext* context,
+                        const PP_Point& location);
+
+  // ContextMenuClient implementation.
+  virtual void OnMenuAction(int request_id, unsigned action) override;
+  virtual void OnMenuClosed(int request_id) override;
+
+  void SendMenuReply(int32_t result, int action);
+
+  content::RendererPpapiHost* renderer_ppapi_host_;
+
+  bool showing_context_menu_;
+  int context_menu_request_id_;
+
+  std::vector<content::MenuItem> menu_data_;
+
+  // We send |MenuItem|s, which have an |unsigned| "action" field instead of
+  // an |int32_t| ID. (CONTENT also limits the range of valid values for
+  // actions.) This maps actions to IDs.
+  std::vector<int32_t> menu_id_map_;
+
+  // Used to send a single context menu "completion" upon menu close.
+  bool has_saved_context_menu_action_;
+  unsigned saved_context_menu_action_;
+
+  DISALLOW_COPY_AND_ASSIGN(PepperFlashMenuHost);
+};
+
+}
+
+#endif // _OXIDE_SHARED_PEPPER_FLASH_MENU_HOST_H_

=== added file 'shared/renderer/pepper/oxide_pepper_flash_renderer_host.cc'
--- shared/renderer/pepper/oxide_pepper_flash_renderer_host.cc	1970-01-01 00:00:00 +0000
+++ shared/renderer/pepper/oxide_pepper_flash_renderer_host.cc	2015-10-08 02:28:09 +0000
@@ -0,0 +1,119 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (c) 2012 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 "oxide_pepper_flash_renderer_host.h"
+
+#include "ppapi/host/dispatch_host_message.h"
+#include "ppapi/host/host_message_context.h"
+#include "ppapi/proxy/host_dispatcher.h"
+#include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/proxy/resource_message_params.h"
+#include "ppapi/proxy/serialized_structs.h"
+#include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppb_image_data_api.h"
+#include "content/public/renderer/renderer_ppapi_host.h"
+#include "content/public/renderer/render_thread.h"
+#include "content/public/renderer/pepper_plugin_instance.h"
+#include "ui/gfx/geometry/rect.h"
+
+
+namespace oxide {
+
+PepperFlashRendererHost::PepperFlashRendererHost(
+    content::RendererPpapiHost* host,
+    PP_Instance instance,
+    PP_Resource resource)
+    : ResourceHost(host->GetPpapiHost(), instance, resource),
+      host_(host),
+      weak_factory_(this) {}
+
+PepperFlashRendererHost::~PepperFlashRendererHost() {
+}
+
+int32_t PepperFlashRendererHost::OnResourceMessageReceived(
+    const IPC::Message& msg,
+    ppapi::host::HostMessageContext* context) {
+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashRendererHost, msg)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_GetProxyForURL,
+                                      OnGetProxyForURL)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_SetInstanceAlwaysOnTop,
+                                      OnSetInstanceAlwaysOnTop)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_DrawGlyphs,
+                                      OnDrawGlyphs)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_Navigate, OnNavigate)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_IsRectTopmost,
+                                      OnIsRectTopmost)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_Flash_InvokePrinting,
+                                        OnInvokePrinting)
+  PPAPI_END_MESSAGE_MAP()
+  return PP_ERROR_FAILED;
+}
+
+int32_t PepperFlashRendererHost::OnGetProxyForURL(
+    ppapi::host::HostMessageContext* host_context,
+    const std::string& url) {
+  GURL gurl(url);
+  if (!gurl.is_valid())
+    return PP_ERROR_FAILED;
+  std::string proxy;
+  bool result = content::RenderThread::Get()->ResolveProxy(gurl, &proxy);
+  if (!result)
+    return PP_ERROR_FAILED;
+  host_context->reply_msg = PpapiPluginMsg_Flash_GetProxyForURLReply(proxy);
+  return PP_OK;
+}
+
+int32_t PepperFlashRendererHost::OnSetInstanceAlwaysOnTop(
+    ppapi::host::HostMessageContext* host_context,
+    bool on_top) {
+  content::PepperPluginInstance* plugin_instance =
+      host_->GetPluginInstance(pp_instance());
+  if (plugin_instance)
+    plugin_instance->SetAlwaysOnTop(on_top);
+  // Since no reply is sent for this message, it doesn't make sense to return an
+  // error.
+  return PP_OK;
+}
+
+int32_t PepperFlashRendererHost::OnDrawGlyphs(
+    ppapi::host::HostMessageContext* host_context,
+    ppapi::proxy::PPBFlash_DrawGlyphs_Params params) {
+  if (params.glyph_indices.size() != params.glyph_advances.size() ||
+      params.glyph_indices.empty())
+    return PP_ERROR_FAILED;
+
+  return PP_OK;
+}
+
+int32_t PepperFlashRendererHost::OnNavigate(
+    ppapi::host::HostMessageContext* host_context,
+    const ppapi::URLRequestInfoData& data,
+    const std::string& target,
+    bool from_user_action) {
+  return PP_OK_COMPLETIONPENDING;
+}
+
+int32_t PepperFlashRendererHost::OnIsRectTopmost(
+    ppapi::host::HostMessageContext* host_context,
+    const PP_Rect& rect) {
+
+  content::PepperPluginInstance* plugin_instance =
+      host_->GetPluginInstance(pp_instance());
+
+  if (plugin_instance &&
+      plugin_instance->IsRectTopmost(gfx::Rect(
+          rect.point.x, rect.point.y, rect.size.width, rect.size.height)))
+    return PP_OK;
+
+  return PP_ERROR_FAILED;
+}
+
+int32_t PepperFlashRendererHost::OnInvokePrinting(
+    ppapi::host::HostMessageContext* host_context) {
+
+  return PP_OK;
+}
+
+} // oxide

=== added file 'shared/renderer/pepper/oxide_pepper_flash_renderer_host.h'
--- shared/renderer/pepper/oxide_pepper_flash_renderer_host.h	1970-01-01 00:00:00 +0000
+++ shared/renderer/pepper/oxide_pepper_flash_renderer_host.h	2015-10-08 02:28:09 +0000
@@ -0,0 +1,72 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (c) 2012 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.
+
+#ifndef _OXIDE_SHARED_PEPPER_FLASH_RENDERER_HOST_H_
+#define _OXIDE_SHARED_PEPPER_FLASH_RENDERER_HOST_H_
+
+#include <string>
+#include <vector>
+
+#include "base/basictypes.h"
+#include "base/memory/weak_ptr.h"
+#include "ppapi/host/resource_host.h"
+
+struct PP_Rect;
+
+namespace ppapi {
+struct URLRequestInfoData;
+}
+
+namespace ppapi {
+namespace proxy {
+struct PPBFlash_DrawGlyphs_Params;
+}
+namespace host {
+class HostMessageContext;
+}
+}
+
+namespace content {
+class RendererPpapiHost;
+}
+
+
+namespace oxide {
+
+class PepperFlashRendererHost final : public ppapi::host::ResourceHost {
+ public:
+  PepperFlashRendererHost(content::RendererPpapiHost* host,
+                          PP_Instance instance,
+                          PP_Resource resource);
+  ~PepperFlashRendererHost();
+
+  int32_t OnResourceMessageReceived(const IPC::Message& msg,
+      ppapi::host::HostMessageContext* context) override;
+
+ private:
+  int32_t OnGetProxyForURL(ppapi::host::HostMessageContext* host_context,
+                           const std::string& url);
+  int32_t OnSetInstanceAlwaysOnTop(
+      ppapi::host::HostMessageContext* host_context,
+      bool on_top);
+  int32_t OnDrawGlyphs(ppapi::host::HostMessageContext* host_context,
+                       ppapi::proxy::PPBFlash_DrawGlyphs_Params params);
+  int32_t OnNavigate(ppapi::host::HostMessageContext* host_context,
+                     const ppapi::URLRequestInfoData& data,
+                     const std::string& target,
+                     bool from_user_action);
+  int32_t OnIsRectTopmost(ppapi::host::HostMessageContext* host_context,
+                          const PP_Rect& rect);
+  int32_t OnInvokePrinting(ppapi::host::HostMessageContext* host_context);
+
+  content::RendererPpapiHost* host_;
+  base::WeakPtrFactory<PepperFlashRendererHost> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(PepperFlashRendererHost);
+};
+
+} // oxide
+
+#endif // _OXIDE_SHARED_PEPPER_FLASH_RENDERER_HOST_H_

=== added file 'shared/renderer/pepper/oxide_pepper_render_frame_observer.cc'
--- shared/renderer/pepper/oxide_pepper_render_frame_observer.cc	1970-01-01 00:00:00 +0000
+++ shared/renderer/pepper/oxide_pepper_render_frame_observer.cc	2015-10-08 02:28:09 +0000
@@ -0,0 +1,45 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "content/public/renderer/renderer_ppapi_host.h"
+#include "ppapi/host/ppapi_host.h"
+
+#include "oxide_pepper_shared_memory_message_filter.h"
+#include "oxide_pepper_render_frame_observer.h"
+#include "oxide_pepper_renderer_host_factory.h"
+
+namespace oxide {
+
+PepperRenderFrameObserver::PepperRenderFrameObserver(
+    content::RenderFrame* render_frame)
+    : RenderFrameObserver(render_frame) {}
+
+PepperRenderFrameObserver::~PepperRenderFrameObserver() {}
+
+void PepperRenderFrameObserver::DidCreatePepperPlugin(content::RendererPpapiHost* host) {
+
+  host->GetPpapiHost()->AddHostFactoryFilter(
+      scoped_ptr<ppapi::host::HostFactory>(
+          new PepperRendererHostFactory(host)));
+
+  host->GetPpapiHost()->AddInstanceMessageFilter(
+      scoped_ptr<ppapi::host::InstanceMessageFilter>(
+          new ::PepperSharedMemoryMessageFilter(host)));
+
+}
+
+} // namespace oxide

=== added file 'shared/renderer/pepper/oxide_pepper_render_frame_observer.h'
--- shared/renderer/pepper/oxide_pepper_render_frame_observer.h	1970-01-01 00:00:00 +0000
+++ shared/renderer/pepper/oxide_pepper_render_frame_observer.h	2015-10-08 02:28:09 +0000
@@ -0,0 +1,46 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_SHARED_PEPPER_RENDER_FRAME_OBSERVER_H_
+#define _OXIDE_SHARED_PEPPER_RENDER_FRAME_OBSERVER_H_
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "content/public/renderer/render_frame_observer.h"
+
+
+namespace content {
+class RenderFrame;
+}
+
+namespace oxide {
+
+class PepperRenderFrameObserver final : public content::RenderFrameObserver {
+ public:
+  explicit PepperRenderFrameObserver(content::RenderFrame* render_frame);
+  ~PepperRenderFrameObserver();
+
+  void DidCreatePepperPlugin(content::RendererPpapiHost* host) override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(PepperRenderFrameObserver);
+};
+
+} // namespace oxide
+
+#endif // _OXIDE_SHARED_PEPPER_RENDER_FRAME_OBSERVER_H_
+

=== added file 'shared/renderer/pepper/oxide_pepper_renderer_host_factory.cc'
--- shared/renderer/pepper/oxide_pepper_renderer_host_factory.cc	1970-01-01 00:00:00 +0000
+++ shared/renderer/pepper/oxide_pepper_renderer_host_factory.cc	2015-10-08 02:28:09 +0000
@@ -0,0 +1,66 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (c) 2013 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 "oxide_pepper_renderer_host_factory.h"
+#include "oxide_pepper_flash_renderer_host.h"
+#include "oxide_pepper_flash_menu_host.h"
+
+#include "content/public/renderer/renderer_ppapi_host.h"
+#include "ppapi/host/ppapi_host.h"
+#include "ppapi/host/resource_host.h"
+#include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/proxy/ppapi_message_utils.h"
+#include "ppapi/shared_impl/ppapi_permissions.h"
+
+
+namespace oxide {
+
+PepperRendererHostFactory::PepperRendererHostFactory(content::RendererPpapiHost* host)
+    : host_(host) {}
+
+PepperRendererHostFactory::~PepperRendererHostFactory()
+{}
+
+scoped_ptr<ppapi::host::ResourceHost> PepperRendererHostFactory::CreateResourceHost(
+    ppapi::host::PpapiHost* host,
+    PP_Resource resource,
+    PP_Instance instance,
+    const IPC::Message& message
+) {
+  DCHECK_EQ(host_->GetPpapiHost(), host);
+
+  if (!host_->IsValidInstance(instance)) {
+    return nullptr;
+  }
+
+  if (host_->GetPpapiHost()->permissions().HasPermission(
+        ppapi::PERMISSION_FLASH)) {
+    switch (message.type()) {
+      case PpapiHostMsg_Flash_Create::ID: {
+        return make_scoped_ptr(
+            new PepperFlashRendererHost(host_, instance, resource));
+      }
+//      case PpapiHostMsg_FlashFullscreen_Create::ID: {
+//       return scoped_ptr<ppapi::host::ResourceHost>(new PepperFlashFullscreenHost(
+//            host_, instance, params.pp_resource()));
+//      }
+      case PpapiHostMsg_FlashMenu_Create::ID: {
+        ppapi::proxy::SerializedFlashMenu serialized_menu;
+        if (ppapi::UnpackMessage<PpapiHostMsg_FlashMenu_Create>(
+          message, &serialized_menu)) {
+          return make_scoped_ptr(
+              new PepperFlashMenuHost(host_, instance, resource, serialized_menu));
+        }
+        break;
+      }
+      default:
+        ;
+    }
+  }
+
+  return scoped_ptr<ppapi::host::ResourceHost>();
+}
+
+} // oxide

=== added file 'shared/renderer/pepper/oxide_pepper_renderer_host_factory.h'
--- shared/renderer/pepper/oxide_pepper_renderer_host_factory.h	1970-01-01 00:00:00 +0000
+++ shared/renderer/pepper/oxide_pepper_renderer_host_factory.h	2015-10-08 02:28:09 +0000
@@ -0,0 +1,44 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (c) 2012 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.
+
+#ifndef _OXIDE_SHARED_PEPPER_RENDERER_HOST_FACTORY_H_
+#define _OXIDE_SHARED_PEPPER_RENDERER_HOST_FACTORY_H_
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "ppapi/host/host_factory.h"
+#include "content/public/renderer/render_frame_observer.h"
+
+namespace ppapi {
+namespace host {
+class PpapiHost;
+class ResourceHost;
+}
+}
+
+namespace oxide {
+
+class PepperRendererHostFactory : public ppapi::host::HostFactory {
+ public:
+  explicit PepperRendererHostFactory(content::RendererPpapiHost* host);
+  ~PepperRendererHostFactory();
+
+  // HostFactory.
+  scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost(
+      ppapi::host::PpapiHost* host,
+      PP_Resource resource,
+      PP_Instance instance,
+      const IPC::Message& message) override;
+
+ private:
+  // Not owned by this object.
+  content::RendererPpapiHost* host_;
+
+  DISALLOW_COPY_AND_ASSIGN(PepperRendererHostFactory);
+};
+
+} // namespace oxide
+
+#endif // _OXIDE_SHARED_PEPPER_RENDERER_HOST_FACTORY_H_

=== added file 'shared/renderer/pepper/oxide_pepper_shared_memory_message_filter.cc'
--- shared/renderer/pepper/oxide_pepper_shared_memory_message_filter.cc	1970-01-01 00:00:00 +0000
+++ shared/renderer/pepper/oxide_pepper_shared_memory_message_filter.cc	2015-10-08 02:28:09 +0000
@@ -0,0 +1,72 @@
+// Copyright (c) 2013 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 "chrome/renderer/pepper/pepper_shared_memory_message_filter.h"
+
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
+#include "base/process/process_handle.h"
+#include "content/public/common/content_client.h"
+#include "content/public/renderer/pepper_plugin_instance.h"
+#include "content/public/renderer/render_thread.h"
+#include "content/public/renderer/renderer_ppapi_host.h"
+#include "ppapi/host/ppapi_host.h"
+#include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/shared_impl/var_tracker.h"
+
+PepperSharedMemoryMessageFilter::PepperSharedMemoryMessageFilter(
+    content::RendererPpapiHost* host)
+    : InstanceMessageFilter(host->GetPpapiHost()), host_(host) {}
+
+PepperSharedMemoryMessageFilter::~PepperSharedMemoryMessageFilter() {}
+
+bool PepperSharedMemoryMessageFilter::OnInstanceMessageReceived(
+    const IPC::Message& msg) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(PepperSharedMemoryMessageFilter, msg)
+    IPC_MESSAGE_HANDLER(PpapiHostMsg_SharedMemory_CreateSharedMemory,
+                        OnHostMsgCreateSharedMemory)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
+}
+
+bool PepperSharedMemoryMessageFilter::Send(IPC::Message* msg) {
+  return host_->GetPpapiHost()->Send(msg);
+}
+
+void PepperSharedMemoryMessageFilter::OnHostMsgCreateSharedMemory(
+    PP_Instance instance,
+    uint32_t size,
+    int* host_handle_id,
+    ppapi::proxy::SerializedHandle* plugin_handle) {
+  plugin_handle->set_null_shmem();
+  *host_handle_id = -1;
+  scoped_ptr<base::SharedMemory> shm(content::RenderThread::Get()
+                                         ->HostAllocateSharedMemoryBuffer(size)
+                                         .Pass());
+  if (!shm.get())
+    return;
+
+  base::SharedMemoryHandle host_shm_handle;
+  shm->ShareToProcess(base::GetCurrentProcessHandle(), &host_shm_handle);
+  *host_handle_id =
+      content::PepperPluginInstance::Get(instance)
+          ->GetVarTracker()
+          ->TrackSharedMemoryHandle(instance, host_shm_handle, size);
+
+  base::PlatformFile host_handle =
+#if defined(OS_WIN)
+      host_shm_handle;
+#elif defined(OS_POSIX)
+      host_shm_handle.fd;
+#else
+#error Not implemented.
+#endif
+  // We set auto_close to false since we need our file descriptor to
+  // actually be duplicated on linux. The shared memory destructor will
+  // close the original handle for us.
+  plugin_handle->set_shmem(host_->ShareHandleWithRemote(host_handle, false),
+                           size);
+}

=== added file 'shared/renderer/pepper/oxide_pepper_shared_memory_message_filter.h'
--- shared/renderer/pepper/oxide_pepper_shared_memory_message_filter.h	1970-01-01 00:00:00 +0000
+++ shared/renderer/pepper/oxide_pepper_shared_memory_message_filter.h	2015-10-08 02:28:09 +0000
@@ -0,0 +1,48 @@
+// Copyright (c) 2013 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.
+
+#ifndef CHROME_RENDERER_PEPPER_PEPPER_SHARED_MEMORY_MESSAGE_FILTER_H_
+#define CHROME_RENDERER_PEPPER_PEPPER_SHARED_MEMORY_MESSAGE_FILTER_H_
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "ppapi/c/pp_instance.h"
+#include "ppapi/host/instance_message_filter.h"
+
+namespace content {
+class RendererPpapiHost;
+}
+
+namespace ppapi {
+namespace proxy {
+class SerializedHandle;
+}
+}
+
+// Implements the backend for shared memory messages from a plugin process.
+class PepperSharedMemoryMessageFilter
+    : public ppapi::host::InstanceMessageFilter {
+ public:
+  explicit PepperSharedMemoryMessageFilter(content::RendererPpapiHost* host);
+  virtual ~PepperSharedMemoryMessageFilter();
+
+  // InstanceMessageFilter:
+  virtual bool OnInstanceMessageReceived(const IPC::Message& msg) override;
+
+  bool Send(IPC::Message* msg);
+
+ private:
+  // Message handlers.
+  void OnHostMsgCreateSharedMemory(
+      PP_Instance instance,
+      uint32_t size,
+      int* host_shm_handle_id,
+      ppapi::proxy::SerializedHandle* plugin_shm_handle);
+
+  content::RendererPpapiHost* host_;
+
+  DISALLOW_COPY_AND_ASSIGN(PepperSharedMemoryMessageFilter);
+};
+
+#endif  // CHROME_RENDERER_PEPPER_PEPPER_SHARED_MEMORY_MESSAGE_FILTER_H_

=== modified file 'shared/shared.gyp'
--- shared/shared.gyp	2015-10-07 13:53:34 +0000
+++ shared/shared.gyp	2015-10-08 02:28:09 +0000
@@ -549,8 +549,20 @@
       'conditions': [
         ['enable_plugins==1', {
           'sources': [
-            'browser/oxide_pepper_host_factory_browser.cc',
-            'browser/oxide_pepper_host_factory_browser.h',
+            'browser/pepper/oxide_pepper_host_factory_browser.cc',
+            'browser/pepper/oxide_pepper_host_factory_browser.h',
+            'browser/pepper/oxide_pepper_flash_browser_host.cc',
+            'browser/pepper/oxide_pepper_flash_browser_host.h',
+            'renderer/pepper/oxide_pepper_renderer_host_factory.cc',
+            'renderer/pepper/oxide_pepper_renderer_host_factory.h',
+            'renderer/pepper/oxide_pepper_render_frame_observer.cc',
+            'renderer/pepper/oxide_pepper_render_frame_observer.h',
+            'renderer/pepper/oxide_pepper_flash_renderer_host.cc',
+            'renderer/pepper/oxide_pepper_flash_renderer_host.h',
+            'renderer/pepper/oxide_pepper_flash_menu_host.cc',
+            'renderer/pepper/oxide_pepper_flash_menu_host.h',
+            'renderer/pepper/oxide_pepper_shared_memory_message_filter.cc',
+            'renderer/pepper/oxide_pepper_shared_memory_message_filter.h',
           ],
           'dependencies': [
             '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_host',