The default bug view has changed. See this FAQ.

move nsPluginInstanceOwner to its own files in dom/plugins/base/

RESOLVED FIXED

Status

()

Core
Plug-ins
RESOLVED FIXED
6 years ago
6 years ago

People

(Reporter: Josh Aas, Assigned: Josh Aas)

Tracking

Trunk
Points:
---
Dependency tree / graph

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(2 attachments, 6 obsolete attachments)

(Assignee)

Description

6 years ago
We should move nsPluginInstanceOwner to its own files in dom/plugins/base/. This is part of bug 90268, after which nsObjectFrame will no longer be the instance owner.
OS: Mac OS X → All
Hardware: x86 → All

Updated

6 years ago
Blocks: 598425
(Assignee)

Comment 1

6 years ago
Created attachment 536220 [details] [diff] [review]
fix v1.0
You forgot to attach the new files.

You might get a nice diff if you hg copy nsObjectFrame.cpp to nsPluginInstanceOwner.cpp and then modify the latter.
(Assignee)

Comment 3

6 years ago
Created attachment 536222 [details] [diff] [review]
fix v1.1

Add new files. I've only compiled and run this on Mac OS X so far. Working on Linux now.
Attachment #536220 - Attachment is obsolete: true
(Assignee)

Comment 4

6 years ago
Created attachment 536239 [details] [diff] [review]
fix v1.2

Linux build fixes.
Attachment #536222 - Attachment is obsolete: true
Comment on attachment 536239 [details] [diff] [review]
fix v1.2

>+  PRInt32 blockPopups =
>+  Preferences::GetInt("privacy.popups.disable_from_plugins");

nit: fix the wrong indentation.
(Assignee)

Comment 6

6 years ago
Created attachment 536307 [details] [diff] [review]
fix v1.3
Attachment #536239 - Attachment is obsolete: true
(Assignee)

Updated

6 years ago
Attachment #536307 - Flags: review?(roc)
(Assignee)

Comment 7

6 years ago
This patch doesn't minimize the number of #includes in nsObjectFrame.cpp but we can take care of that in followup. This should be good enough for round one.
This patch doesn't do what I suggested in comment #2 ... any particular reason why?
(Assignee)

Comment 9

6 years ago
Created attachment 536459 [details] [diff] [review]
fix v1.4

QT build fixes.
Attachment #536307 - Attachment is obsolete: true
Attachment #536307 - Flags: review?(roc)
(Assignee)

Comment 10

6 years ago
No reason, I just had it started a different way. I can do that if you want.
You should just be able to move aside your new file, "hg copy" nsObjectFrame.cpp over, then replace the copy with your new file. If we're lucky we'll get a nicer diff.
(Assignee)

Comment 12

6 years ago
Created attachment 536501 [details] [diff] [review]
fix v1.5

This is a patch produced by moving nsObjectFrame.cpp.
Attachment #536459 - Attachment is obsolete: true
Attachment #536501 - Flags: review?
(Assignee)

Updated

6 years ago
Attachment #536501 - Flags: review? → review?(roc)
Comment on attachment 536501 [details] [diff] [review]
fix v1.5

Review of attachment 536501 [details] [diff] [review]:
-----------------------------------------------------------------

r+ with that fixed

::: dom/plugins/base/Makefile.in
@@ +128,5 @@
>  endif
>  
>  LOCAL_INCLUDES = \
>    -I$(topsrcdir)/xpcom/base/ \
> +  $(MOZ_CAIRO_CFLAGS) \

This doesn't seem right, LOCAL_INCLUDES should just include -I options, right?

I know you just copied this, but why not add them to CXXFLAGS instead?
Comment on attachment 536501 [details] [diff] [review]
fix v1.5

Review of attachment 536501 [details] [diff] [review]:
-----------------------------------------------------------------
Attachment #536501 - Flags: review?(roc) → review+
(Assignee)

Comment 15

6 years ago
I had originally put a bunch of the functions in a different order, the diff wasn't very nice until I put them back in the correct order. I did a bunch of that, not all of it though. Thanks for the review!
(Assignee)

Comment 16

6 years ago
s/correct order/original order/
(Assignee)

Comment 17

6 years ago
Created attachment 536508 [details] [diff] [review]
fix v1.6

Makefile change that roc suggested.
(Assignee)

Comment 18

6 years ago
Created attachment 536522 [details] [diff] [review]
fix v1.7

Another QT build fix.
Attachment #536508 - Attachment is obsolete: true
(Assignee)

Comment 19

6 years ago
pushed to mozilla-central

http://hg.mozilla.org/mozilla-central/rev/c4999efc5a84
(Assignee)

Updated

6 years ago
Status: NEW → RESOLVED
Last Resolved: 6 years ago
Resolution: --- → FIXED
(Assignee)

Comment 20

6 years ago
bustage fix

http://hg.mozilla.org/mozilla-central/rev/e63c5dba5f4d
Depends on: 662089

Updated

6 years ago
Depends on: 670230
You need to log in before you can comment on or make changes to this bug.