diff options
| author | dgozman <dgozman@chromium.org> | 2016-03-22 14:33:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 21:35:23 +0000 |
| commit | c2ec05d98bce21ef672e6775e6f682d41f945f4e (patch) | |
| tree | 860bb5126b4461f9f7a4d8fb0b3b5d34a6b378d7 /content/browser/renderer_host/render_widget_host_impl.h | |
| parent | 1e6a2bc451904125ced0e829f030056b8e2bd8e2 (diff) | |
| download | chromium_src-c2ec05d98bce21ef672e6775e6f682d41f945f4e.zip chromium_src-c2ec05d98bce21ef672e6775e6f682d41f945f4e.tar.gz chromium_src-c2ec05d98bce21ef672e6775e6f682d41f945f4e.tar.bz2 | |
Revert of Remove a bunch of NPAPI quirks and related support code (patchset #1 id:80001 of https://codereview.chromium.org/1813143002/ )
Reason for revert:
Speculative revert: could have broken Win8 GN build. See crbug.com/597032
Original issue's description:
> Remove a bunch of NPAPI quirks and related support code
>
> BUG=493212
> CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
>
> Committed: https://crrev.com/f8396023a9e38d3ec249cdf1f730e4b79cebbc7e
> Cr-Commit-Position: refs/heads/master@{#382642}
TBR=dcheng@chromium.org,jam@chromium.org,piman@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=493212
Review URL: https://codereview.chromium.org/1825253002
Cr-Commit-Position: refs/heads/master@{#382684}
Diffstat (limited to 'content/browser/renderer_host/render_widget_host_impl.h')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_impl.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h index f9600fc..6094b9b 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -589,6 +589,12 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost, void OnShowDisambiguationPopup(const gfx::Rect& rect_pixels, const gfx::Size& size, const cc::SharedBitmapId& id); +#if defined(OS_WIN) + void OnWindowlessPluginDummyWindowCreated( + gfx::NativeViewId dummy_activation_window); + void OnWindowlessPluginDummyWindowDestroyed( + gfx::NativeViewId dummy_activation_window); +#endif void OnSelectionChanged(const base::string16& text, uint32_t offset, const gfx::Range& range); @@ -798,6 +804,10 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost, // being sent, in which case the timer should fire). bool received_paint_after_load_; +#if defined(OS_WIN) + std::list<HWND> dummy_windows_for_activation_; +#endif + RenderWidgetHostLatencyTracker latency_tracker_; int next_browser_snapshot_id_; |