Fix rendering of flash content inside an out-of-process iframe.

content/renderer/render_view_impl.h

 // 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 CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 105 matching lines @@
 class WebHitTestResult;
 #endif
 }  // namespace blink
 
 namespace content {
 
 class HistoryController;
 class HistoryEntry;
 class MouseLockDispatcher;
 class PageState;
-class PepperPluginInstanceImpl;
 class RenderViewImplTest;
 class RenderViewObserver;
 class RenderViewTest;
 class RendererDateTimePicker;
 class RendererWebColorChooserImpl;
 class SpeechRecognitionDispatcher;
 class WebPluginDelegateProxy;
 struct DropData;
 struct FaviconURL;
 struct FileChooserParams;
@@ skipping 95 matching lines @@
   void FrameDidStopLoading(blink::WebFrame* frame);
 
   // Sets the zoom level and notifies observers. Doesn't call zoomLevelChanged,
   // as that is only for changes that aren't initiated by the client.
   void SetZoomLevel(double zoom_level);
 
   double page_zoom_level() {
     return page_zoom_level_;
   }
 
-  // Indicates whether this page has been focused by the browser.
-  bool has_focus() const { return has_focus_; }
-
   // Sets page-level focus in this view and notifies plugins and Blink's
   // FocusController.
   void SetFocus(bool enable);
 
   void AttachWebFrameWidget(blink::WebFrameWidget* frame_widget);
 
   // Plugin-related functions --------------------------------------------------
 
 #if defined(ENABLE_PLUGINS)
-  PepperPluginInstanceImpl* focused_pepper_plugin() {
-    return focused_pepper_plugin_;
-  }
-  PepperPluginInstanceImpl* pepper_last_mouse_event_target() {
-    return pepper_last_mouse_event_target_;
-  }
-  void set_pepper_last_mouse_event_target(PepperPluginInstanceImpl* plugin) {
-    pepper_last_mouse_event_target_ = plugin;
-  }
-
-  // Indicates that the given instance has been created.
-  void PepperInstanceCreated(PepperPluginInstanceImpl* instance);
-
-  // Indicates that the given instance is being destroyed. This is called from
-  // the destructor, so it's important that the instance is not dereferenced
-  // from this call.
-  void PepperInstanceDeleted(PepperPluginInstanceImpl* instance);
-
-  // Notification that the given plugin is focused or unfocused.
-  void PepperFocusChanged(PepperPluginInstanceImpl* instance, bool focused);
+  PepperPluginInstanceImpl* GetFocusedPepperPlugin();
 #endif  // ENABLE_PLUGINS
 
   void TransferActiveWheelFlingAnimation(
       const blink::WebActiveWheelFlingParameters& params);
 
   // Starts a timer to send an UpdateState message on behalf of |frame|, if the
   // timer isn't already running. This allows multiple state changing events to
   // be coalesced into one update.
   void StartNavStateSyncTimerIfNecessary(RenderFrameImpl* frame);
 
@@ skipping 312 matching lines @@
   void RenderWidgetDidSetColorProfile(
       const std::vector<char>& color_profile) override;
   void RenderWidgetFocusChangeComplete() override;
   bool DoesRenderWidgetHaveTouchEventHandlersAt(
       const gfx::Point& point) const override;
   void RenderWidgetDidHandleKeyEvent() override;
   bool RenderWidgetWillHandleGestureEvent(
       const blink::WebGestureEvent& event) override;
   bool RenderWidgetWillHandleMouseEvent(
       const blink::WebMouseEvent& event) override;
-  void RenderWidgetDidCommitAndDrawCompositorFrame() override;
   void RenderWidgetDidFlushPaint() override;
 
   // Old WebFrameClient implementations ----------------------------------------
 
   // RenderViewImpl used to be a WebFrameClient, but now RenderFrameImpl is the
   // WebFrameClient. However, many implementations of WebFrameClient methods
   // still live here and are called from RenderFrameImpl. These implementations
   // are to be moved to RenderFrameImpl <http://crbug.com/361761>.
 
   void didChangeIcon(blink::WebLocalFrame*, blink::WebIconURL::Type);
@@ skipping 273 matching lines @@
   TopControlsState top_controls_constraints_;
 #endif
 
   // Whether or not Blink's viewport size should be shrunk by the height of the
   // URL-bar.
   bool top_controls_shrink_blink_size_;
 
   // The height of the top controls.
   float top_controls_height_;
 
-  // Indicates whether this page has been focused/unfocused by the browser.
-  bool has_focus_;
-
   // View ----------------------------------------------------------------------
 
   blink::WebView* webview_;
 
   // Cache the preferred size of the page in order to prevent sending the IPC
   // when layout() recomputes but doesn't actually change sizes.
   gfx::Size preferred_size_;
 
   // Used to delay determining the preferred size (to avoid intermediate
   // states for the sizes).
@@ skipping 34 matching lines @@
 
   // Expected id of the next content intent launched. Used to prevent scheduled
   // intents to be launched if aborted.
   size_t expected_content_intent_id_;
 
   // List of click-based content detectors.
   std::vector<std::unique_ptr<ContentDetector>> content_detectors_;
 
   // A date/time picker object for date and time related input elements.
   std::unique_ptr<RendererDateTimePicker> date_time_picker_client_;
-#endif
 
-  // Plugins -------------------------------------------------------------------
-#if defined(ENABLE_PLUGINS)
-  typedef std::set<PepperPluginInstanceImpl*> PepperPluginSet;
-  PepperPluginSet active_pepper_instances_;
-
-  // TODO(jam): these belong on RenderFrame, once the browser knows which frame
-  // is focused and sends the IPCs which use these to the correct frame. Until
-  // then, we must store these on RenderView as that's the one place that knows
-  // about all the RenderFrames for a page.
-
-  // Whether or not the focus is on a PPAPI plugin
-  PepperPluginInstanceImpl* focused_pepper_plugin_;
-
-  // The plugin instance that received the last mouse event. It is set to NULL
-  // if the last mouse event went to elements other than Pepper plugins.
-  // |pepper_last_mouse_event_target_| is not owned by this class. We depend on
-  // the RenderFrameImpl to NULL it out when it destructs.
-  PepperPluginInstanceImpl* pepper_last_mouse_event_target_;
 #endif
 
   // Misc ----------------------------------------------------------------------
 
   // The current and pending file chooser completion objects. If the queue is
   // nonempty, the first item represents the currently running file chooser
   // callback, and the remaining elements are the other file chooser completion
   // still waiting to be run (in order).
   struct PendingFileChooser;
   std::deque<std::unique_ptr<PendingFileChooser>> file_chooser_completions_;
@@ skipping 38 matching lines @@
   // use the Observer interface to filter IPC messages and receive frame change
   // notifications.
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_