Bug 1290505 - Remove E10S NPAPI plugin windows special case. r=jimm
authorBenoit Girard <b56girard@gmail.com>
Fri, 29 Jul 2016 16:39:50 -0400
changeset 307519 192c7f9edb1cfbb7d6cfdd9e526ac0a766a9156b
parent 307518 738847eb38313539c6efc7678a53d84ee9fb0266
child 307520 eb9e8982f50cabcf45c596fb1fd9a2c97baad462
push id30962
push userb56girard@gmail.com
push dateMon, 01 Aug 2016 14:18:10 +0000
treeherderautoland@192c7f9edb1c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs1290505
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1290505 - Remove E10S NPAPI plugin windows special case. r=jimm MozReview-Commit-ID: 7F7JeVmudjq
dom/plugins/base/nsPluginInstanceOwner.cpp
--- a/dom/plugins/base/nsPluginInstanceOwner.cpp
+++ b/dom/plugins/base/nsPluginInstanceOwner.cpp
@@ -3463,25 +3463,16 @@ void nsPluginInstanceOwner::FixUpPluginW
   // fix up the clipping region
   mPluginWindow->clipRect.top  = 0;
   mPluginWindow->clipRect.left = 0;
 
   if (inPaintState == ePluginPaintDisable) {
     mPluginWindow->clipRect.bottom = mPluginWindow->clipRect.top;
     mPluginWindow->clipRect.right  = mPluginWindow->clipRect.left;
   }
-  else if (!XRE_IsParentProcess())
-  {
-    // For e10s we only support async windowless plugin. This means that
-    // we're always going to allocate a full window for the plugin to draw
-    // for even if the plugin is mostly outside of the scroll port. Thus
-    // we never trim the window to the bounds of the widget.
-    mPluginWindow->clipRect.bottom = mPluginWindow->clipRect.top + mPluginWindow->height;
-    mPluginWindow->clipRect.right  = mPluginWindow->clipRect.left + mPluginWindow->width;
-  }
   else if (inPaintState == ePluginPaintEnable)
   {
     mPluginWindow->clipRect.bottom = mPluginWindow->clipRect.top + widgetClip.height;
     mPluginWindow->clipRect.right  = mPluginWindow->clipRect.left + widgetClip.width;
   }
 
   // if the clip rect changed, call SetWindow()
   // (RealPlayer needs this to draw correctly)