Closed Bug 1028996 Opened 7 years ago Closed 5 years ago

[Skia] Remove patches directory and clarify commit procedure

Categories

(Core :: Graphics, defect)

x86_64
Linux
defect
Not set
normal

Tracking

()

RESOLVED FIXED
mozilla33

People

(Reporter: gw280, Assigned: gw280)

Details

Attachments

(1 file, 1 obsolete file)

There is some confusion over the patches directory. We are no longer using it because the focus is now on ensuring that any changes we make to Skia are upstreamed.

- Remove the patches directory to avoid this confusion
- Add a README_COMMITTING file explaining that any patches made to skia must be upstreamed simultaneously.
Comment on attachment 8444539 [details] [diff] [review]
0001-Bug-1028996-Remove-patches-directory-in-Skia-and-cla.patch

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

::: gfx/skia/README_COMMITTING
@@ +1,1 @@
> +Any changes to the Skia tree should be upstreamed simultaneously.

I would say go a little futher here? As in, we won't accept changes which are not upstreamed. At all.
Attachment #8444539 - Flags: review?(snorp) → review+
I'd rather leave it more flexible for now whilst we're dealing with Skia content work. So long as the patches are submitted upstream and a conversation is started (and followed up) with them, then I think that's all we can realistically ask for for now.
(In reply to George Wright (:gw280) from comment #3)
> I'd rather leave it more flexible for now whilst we're dealing with Skia
> content work. So long as the patches are submitted upstream and a
> conversation is started (and followed up) with them, then I think that's all
> we can realistically ask for for now.

I think things could easily fall through the cracks there, and then we'll end up clobbering stuff when we take a new skia update. Maybe you could mark bugs that are pending upstreaming in Skia? That way you could at least find stuff like that.
That's a very good idea. We can use the [skia-upstream] whiteboard tag to keep track and require that they are submitted upstream by the author.
How about this? I've tightened up the language in README_COMMITTING but I've left the final discretion up to Skia peers. Does that sound reasonable?
Attachment #8444644 - Flags: review?(snorp)
Attachment #8444539 - Attachment is obsolete: true
Comment on attachment 8444644 [details] [diff] [review]
0001-Bug-1028996-Remove-patches-directory-in-Skia-and-cla.patch

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

I like it.
Attachment #8444644 - Flags: review?(snorp) → review+
https://hg.mozilla.org/mozilla-central/rev/ce071553b950
Status: NEW → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla33
Assignee: nobody → gw
You need to log in before you can comment on or make changes to this bug.