191821 - Merge Chimera plugin changes to trunk

Status: VERIFIED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Simon Fraser [no longer active]]

Bug to track landing of chimera plugin changes.

Comment 1

[Simon Fraser [no longer active]]

Attachment: mozilla/widget patch

This patch adds an implementation of nsIPluginWidget on Mac, which consists of
GetPluginClipRect() calculating top-level window-relative clipping and offset,
and pre/post drawing methods.

Comment 2

[Simon Fraser [no longer active]]

Attachment: mozilla/modules/plugin/base patch

This patch fixes the plugin viewer (full-page plugins) to use nsIPluginWidget
on mac, thus removing GetWidgetPosClipAndVis().

Comment 3

[Simon Fraser [no longer active]]

Attachment: mozilla/layout/html/base patch

This patch merges nsObjectFrame changes, which are mainly use of
nsIPluginWidget, removal of GetWidgetPosClipAndVis, and fixes to register
scroll position listeners on all the scrolling views up to the top.

Note that diffs are -b (ignore space change); the code does not contain tabs,
and lines up correctly.

Comment 4

[Peter Lubczynski]

This fix causes Flash to animate through tabs on disney.com which doesn't happen
in today's Mach-O build. 

Steps to reproduce:
1. Load http://www.disney.com
2. Press Apple+T
3. Notice you can see Flash animation from other tab in current tab

Comment 5

[Simon Fraser [no longer active]]

Will look into it.

Comment 6

[Simon Fraser [no longer active]]

Attachment: Revised layout/html/base (nsObjectFrame.cpp) patch

This patch fixes the issue with Flash drawing through tabs, by removing the #if
defined(MOZ_WIDGET_COCOA) near the end of the patch.

Comment 7

[Brian Ryner (not reading)]

Comment on attachment 115057 [details] [diff] [review]
Revised layout/html/base (nsObjectFrame.cpp) patch

>+#ifdef DO_DIRTY_INTERSECT
>   // convert relative coordinates to absolute
>   static void ConvertRelativeToWindowAbsolute(nsIFrame* aFrame, nsIPresContext* aPresContext, nsPoint& aRel, nsPoint& aAbs, nsIWidget *&aContainerWidget);
>+#endif
>+
>+  enum { ePluginPaintIgnore, ePluginPaintEnable, ePluginPaintDisable };
>+
> #endif // XP_MAC

When is DO_DIRTY_INTERSECT ever defined?

Other than that, sr=bryner.

Comment 8

[Brian Ryner (not reading)]

Comment on attachment 113453 [details] [diff] [review]
mozilla/modules/plugin/base patch

>@@ -1513,15 +1487,14 @@
>       }
>     }
> 
> #if defined(MOZ_WIDGET_COCOA)
>+  // why just done for cocoa?
>     if (!mWidgetVisible) {
>       mPluginWindow->clipRect.right = mPluginWindow->clipRect.left;
>       mPluginWindow->clipRect.bottom = mPluginWindow->clipRect.top;
>     }
> #endif
>     return pluginPort;
>-  }
>-  return nsnull;
> }
> 
> #endif

Should this #ifdef be removed like the one in nsObjectFrame?

Comment 9

[Simon Fraser [no longer active]]

> When is DO_DIRTY_INTERSECT ever defined?

I don't think it is. Looks like experimental code left around by beard or someone.

> Should this #ifdef be removed like the one in nsObjectFrame?

Yeah, if the plugin viewer lives long enough to see my patch.

Comment 10

[Peter Lubczynski]

Comment on attachment 115057 [details] [diff] [review]
Revised layout/html/base (nsObjectFrame.cpp) patch

r=peterl

Comment 11

[Brian Ryner (not reading)]

Comment on attachment 113453 [details] [diff] [review]
mozilla/modules/plugin/base patch

Ok, sr=bryner with that #ifdef removed (and feel free to remove the
DIRTY_INTERSECT code if you want).

Comment 12

[Simon Fraser [no longer active]]

Patches checked in.

Comment 13

[bmartin]

Marking Verified Fixed.

Compared attached patch to checkin:
http://bonsai.mozilla.org/cvsview2.cgi?diff_mode=context&whitespace_mode=show&file=nsPluginViewer.cpp&root=/cvsroot&subdir=mozilla/modules/plugin/base/src&command=DIFF_FRAMESET&rev1=1.133&rev2=1.134