797100 - replace internal usage of nsIPluginInstanceOwner with nsPluginInstanceOwner

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Josh Aas]

Attachment: fix v1.0

Replacing internal usage of nsIPluginInstanceOwner with nsPluginInstanceOwner will make our code cleaner and reduce unnecessary QIs and Addref/Release pairs.

Comment 1

[Josh Aas]

https://tbpl.mozilla.org/?tree=Try&rev=a1d7cef56543

Comment 2

[Johnny Stenback (:jst)]

Comment on attachment 667134 [details] [diff] [review]
fix v1.0

Nice cleanup! r=jst, with one comment:

- In dom/plugins/ipc/NPEventUnix.h:

 #ifdef MOZ_X11
 #include "mozilla/X11Util.h"
+#define KeyPress 2
 #endif

That change looks unrelated to this patch.

Comment 3

[Josh Aas]

(In reply to Johnny Stenback (:jst, [e-mail]) from comment #2)

> That change looks unrelated to this patch.

It isn't, sadly. In adding an include to nsPluginInstanceOwner.h somewhere I caused a build failure on Linux because we undef "KeyPress" all over the place. It was frustrating to figure out how to solve the problem, so I brute-forced it by just defining it via the X11 header value.

Comment 4

[Johnny Stenback (:jst)]

Wow, ok. That's really unfortunate, and I'd really prefer not to have to go there.

I did some quick mxr/dxr queries here, and I don't see that method actually being called anywhere... Is it actually needed? Maybe we can just remove it and eliminate this #undef madness?

Comment 5

[Josh Aas]

"SetXDisplay" is used right above its definition, in NPEventUnix.h, and that is used for serializing X events.

Comment 6

[Josh Aas]

Attachment: fix v1.1

Fix Android build failures. Android-only try run:

https://tbpl.mozilla.org/?tree=Try&rev=8613bf2d32ee

Comment 7

[Josh Aas]

Attachment: fix v1.2

Fix X11 build error re: "KeyPress" in a more elegant way.

Comment 8

[Josh Aas]

pushed to mozilla-inbound

https://hg.mozilla.org/integration/mozilla-inbound/rev/56e8259f189b

Comment 9

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/56e8259f189b