1085696 - Move files in widget/xpwidgets/* and widget/shared/* into widget/

Status: RESOLVED FIXED

(Core :: Widget, defect)

Description

[Mason Chang [Inactive] [:mchang]]

Attachment: Move files in widget/xpwidget to widget/shared

From irc, shared widget code should go in mozilla-central/widget/shared but lots of shared widget code exists in widget/xpwidget/. Xpwidget isn't a very descriptive name compared to shared. Move the files from the xpwidget directory to the shared directory. 

This patch moves the files from widget/xpwidget to widget/shared. It also updates local includes that referenced /widget/xpwidget to /widget/shared. Finally, it merges the moz.build from /widget/shared and /widget/xpwidgets. We can update references to widget/xpwidget/moz.build in another patch. Does this also mean we should delete /widget/xpwidget as a directory?

Comment 1

[Mason Chang [Inactive] [:mchang]]

Hmm, bugzilla doesn't show moves in the review view. The raw patch has file renames.

Comment 2

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Comment on attachment 8508308 [details] [diff] [review]
Move files in widget/xpwidget to widget/shared

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

Looks great, but I've got an even better idea: let's move widget/xpwidgets/* and widget/shared/* into widget/.

Comment 3

[Mason Chang [Inactive] [:mchang]]

Attachment: WIP: Part 1: Move /widget/xpwidgets into /widget

WIP to move just /widget/xpwidgets into /widget. Will move /widget/shared directory in part 2. Most of the work is in merging /widget/xpwidgets/moz.build and /widget/moz.build. Treeherder build - https://treeherder.mozilla.org/ui/#/jobs?repo=try&revision=43c02a7e746f

Comment 4

[Mason Chang [Inactive] [:mchang]]

Attachment: Part 1: Move /widget/xpwidgets to /widget

From comment 2. Part 1 moves files in /widget/xpwidgest into /widget and the respective moz.build files. Also merged /widget/shared/WidgetUtils.h into /widget/WidgetUtils.h.

Comment 5

[Mason Chang [Inactive] [:mchang]]

Attachment: Part 2: Move /widget/shared to /widget

Moves the remaining files in /widget/shared to /widget along with their respective moz.build files. 

Successful try build - https://treeherder.mozilla.org/ui/#/jobs?repo=try&revision=22ec0da91152

Also tested with non-unified builds on Linux.

Comment 6

[Mason Chang [Inactive] [:mchang]]

Attachment: Part 1: Move /widget/xpwidgets to /widget

Carrying r+, rebased for master.

Comment 7

[Mason Chang [Inactive] [:mchang]]

Attachment: Part 2: Move /widget/shared to /widget

Carrying r+. Rebased on master. Treeherder build: https://treeherder.mozilla.org/ui/#/jobs?repo=try&revision=92350efecec6

Comment 8

[Mason Chang [Inactive] [:mchang]]

In mozilla-inbound:

https://hg.mozilla.org/integration/mozilla-inbound/rev/41c37790896e
https://hg.mozilla.org/integration/mozilla-inbound/rev/ccd53912eb4c

Comment 9

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/41c37790896e
https://hg.mozilla.org/mozilla-central/rev/ccd53912eb4c