[chromium-dev] Re: webkit/port is moving into third_party/WebKit/WebCore
On Mon, Jan 5, 2009 at 8:30 AM, Mike Pinkerton wrote: > > Awesome! > > Now that so much of our code is in the webkit tree, is there a > (public) wiki page describing the steps necessary to make changes to > anything within third_party/WebKit/WebCore? i.e, does everything have > to go upstream, are there any circumstances when forking is allowed on > a vendor branch, when should DEPS be rolled in this new world, etc? > Seems like things have changed so quickly over the last few months (in > a good way), it might be helpful to lay out the current state of > things for everyone to re-baseline their knowledge. Currently our port is not upstream, it is just checked into our local copy of WebKit where they will soon be checked in upstream. So you can continue to change our port when you want, although you will have to roll webkit deps by updating src/DEPS to pull your change into Chrome. Once we check in upstream, all changes should be checked in upstream, and they will be pulled in the next day's WebKit merge. Brett --~--~-~--~~~---~--~~ Chromium Developers mailing list: chromium-dev@googlegroups.com View archives, change email options, or unsubscribe: http://groups.google.com/group/chromium-dev -~--~~~~--~~--~--~---
[chromium-dev] Re: webkit/port is moving into third_party/WebKit/WebCore
Awesome!
Now that so much of our code is in the webkit tree, is there a
(public) wiki page describing the steps necessary to make changes to
anything within third_party/WebKit/WebCore? i.e, does everything have
to go upstream, are there any circumstances when forking is allowed on
a vendor branch, when should DEPS be rolled in this new world, etc?
Seems like things have changed so quickly over the last few months (in
a good way), it might be helpful to lay out the current state of
things for everyone to re-baseline their knowledge.
On Wed, Dec 24, 2008 at 3:46 PM, Dimitri Glazkov wrote:
>
> As of Christmas Eve, we have:
>
> webkit/port/bindings/{scripts,v8}
> webkit/port/platform/image-decoders
> webkit/port/platform/graphics/mac
> webkit/port/DerivedSources.make
>
> Merry Christmas and/or Festivus, everyone!
>
> Oh, and I broke the build yesterday, and eroman fixed it. He da man.
>
> :DG<
>
> On Tue, Dec 23, 2008 at 3:48 PM, Darin Fisher wrote:
>> For now, just operate the same as you would had these files still resided in
>> webkit/port. Just don't forget to roll DEPS :)
>> We'll eventually be updating the merge tracker
>> (http://build.chromium.org/merge) to indicate the set of files and diffs
>> that have yet to be upstreamed.
>> -Darin
>>
>> On Tue, Dec 23, 2008 at 2:51 PM, Adam Barth wrote:
>>>
>>> I see. Can I make changes to them in third_party, or should I wait
>>> for them to appear upstream?
>>>
>>> Adam
>>>
>>>
>>> On Tue, Dec 23, 2008 at 1:35 PM, Dimitri Glazkov
>>> wrote:
>>> >
>>> >
>>> > http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/WebKit/WebCore/platform/graphics/
>>> >
>>> > These haven't been yet upstreamed. We just started by moving them into
>>> > our vendor branch.
>>> >
>>> > :DG<
>>> >
>>> > On Tue, Dec 23, 2008 at 1:31 PM, Adam Barth wrote:
>>> >>
>>> >> I'm confused. I need to fix a bug in ImageSourceSkia.cpp, but I can't
>>> >> find it
>>> >>
>>> >>
>>> >> http://src.chromium.org/viewvc/chrome/trunk/src/webkit/port/platform/graphics/
>>> >>
>>> >> or
>>> >>
>>> >> http://trac.webkit.org/browser/trunk/WebCore/platform/graphics
>>> >>
>>> >> Where did it go?
>>> >>
>>> >> Adam
>>> >>
>>> >>
>>> >> On Mon, Dec 22, 2008 at 8:42 PM, Darin Fisher
>>> >> wrote:
>>> >>> OK, much of webkit/port now lives in third_party/WebKit.
>>> >>> All that remains is:
>>> >>> webkit/port/bindings/{scripts,v8}
>>> >>> webkit/port/bridge/chromium
>>> >>> webkit/port/page/chromium
>>> >>> webkit/port/page/inspector
>>> >>> webkit/port/platform/image-decoders
>>> >>> webkit/port/platform/mac
>>> >>> webkit/port/platform/graphics/mac
>>> >>> webkit/port/DerivedSources.make
>>> >>> We should be able to finish moving most of the rest of these files
>>> >>> tomorrow.
>>> >>> -Darin
>>> >>>
>>> >>> On Mon, Dec 22, 2008 at 11:48 AM, Mohamed Mansour
>>> >>>
>>> >>> wrote:
>>>
>>> I guess I will stop till your done!
>>>
>>>
>>> On Mon, Dec 22, 2008 at 2:42 PM, Darin Fisher
>>> wrote:
>>> >
>>> > FYI
>>> > Please expect conflicts if you are trying to make changes to
>>> > webkit/port.
>>> > -Darin
>>> >
>>>
>>>
>>>
>>> >>>
>>> >>>
>>> >>> >
>>> >>>
>>> >>
>>> >> >
>>> >>
>>> >
>>> > >
>>> >
>>>
>>>
>>
>>
>> >
>>
>
> >
>
--
Mike Pinkerton
Mac Weenie
pinker...@google.com
--~--~-~--~~~---~--~~
Chromium Developers mailing list: chromium-dev@googlegroups.com
View archives, change email options, or unsubscribe:
http://groups.google.com/group/chromium-dev
-~--~~~~--~~--~--~---
[chromium-dev] Re: webkit/port is moving into third_party/WebKit/WebCore
As of Christmas Eve, we have:
webkit/port/bindings/{scripts,v8}
webkit/port/platform/image-decoders
webkit/port/platform/graphics/mac
webkit/port/DerivedSources.make
Merry Christmas and/or Festivus, everyone!
Oh, and I broke the build yesterday, and eroman fixed it. He da man.
:DG<
On Tue, Dec 23, 2008 at 3:48 PM, Darin Fisher wrote:
> For now, just operate the same as you would had these files still resided in
> webkit/port. Just don't forget to roll DEPS :)
> We'll eventually be updating the merge tracker
> (http://build.chromium.org/merge) to indicate the set of files and diffs
> that have yet to be upstreamed.
> -Darin
>
> On Tue, Dec 23, 2008 at 2:51 PM, Adam Barth wrote:
>>
>> I see. Can I make changes to them in third_party, or should I wait
>> for them to appear upstream?
>>
>> Adam
>>
>>
>> On Tue, Dec 23, 2008 at 1:35 PM, Dimitri Glazkov
>> wrote:
>> >
>> >
>> > http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/WebKit/WebCore/platform/graphics/
>> >
>> > These haven't been yet upstreamed. We just started by moving them into
>> > our vendor branch.
>> >
>> > :DG<
>> >
>> > On Tue, Dec 23, 2008 at 1:31 PM, Adam Barth wrote:
>> >>
>> >> I'm confused. I need to fix a bug in ImageSourceSkia.cpp, but I can't
>> >> find it
>> >>
>> >>
>> >> http://src.chromium.org/viewvc/chrome/trunk/src/webkit/port/platform/graphics/
>> >>
>> >> or
>> >>
>> >> http://trac.webkit.org/browser/trunk/WebCore/platform/graphics
>> >>
>> >> Where did it go?
>> >>
>> >> Adam
>> >>
>> >>
>> >> On Mon, Dec 22, 2008 at 8:42 PM, Darin Fisher
>> >> wrote:
>> >>> OK, much of webkit/port now lives in third_party/WebKit.
>> >>> All that remains is:
>> >>> webkit/port/bindings/{scripts,v8}
>> >>> webkit/port/bridge/chromium
>> >>> webkit/port/page/chromium
>> >>> webkit/port/page/inspector
>> >>> webkit/port/platform/image-decoders
>> >>> webkit/port/platform/mac
>> >>> webkit/port/platform/graphics/mac
>> >>> webkit/port/DerivedSources.make
>> >>> We should be able to finish moving most of the rest of these files
>> >>> tomorrow.
>> >>> -Darin
>> >>>
>> >>> On Mon, Dec 22, 2008 at 11:48 AM, Mohamed Mansour
>> >>>
>> >>> wrote:
>>
>> I guess I will stop till your done!
>>
>>
>> On Mon, Dec 22, 2008 at 2:42 PM, Darin Fisher
>> wrote:
>> >
>> > FYI
>> > Please expect conflicts if you are trying to make changes to
>> > webkit/port.
>> > -Darin
>> >
>>
>>
>>
>> >>>
>> >>>
>> >>> >
>> >>>
>> >>
>> >> >
>> >>
>> >
>> > >
>> >
>>
>>
>
>
> >
>
--~--~-~--~~~---~--~~
Chromium Developers mailing list: chromium-dev@googlegroups.com
View archives, change email options, or unsubscribe:
http://groups.google.com/group/chromium-dev
-~--~~~~--~~--~--~---
[chromium-dev] Re: webkit/port is moving into third_party/WebKit/WebCore
For now, just operate the same as you would had these files still resided in
webkit/port. Just don't forget to roll DEPS :)
We'll eventually be updating the merge tracker (
http://build.chromium.org/merge) to indicate the set of files and diffs that
have yet to be upstreamed.
-Darin
On Tue, Dec 23, 2008 at 2:51 PM, Adam Barth wrote:
>
> I see. Can I make changes to them in third_party, or should I wait
> for them to appear upstream?
>
> Adam
>
>
> On Tue, Dec 23, 2008 at 1:35 PM, Dimitri Glazkov
> wrote:
> >
> >
> http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/WebKit/WebCore/platform/graphics/
> >
> > These haven't been yet upstreamed. We just started by moving them into
> > our vendor branch.
> >
> > :DG<
> >
> > On Tue, Dec 23, 2008 at 1:31 PM, Adam Barth wrote:
> >>
> >> I'm confused. I need to fix a bug in ImageSourceSkia.cpp, but I can't
> find it
> >>
> >>
> http://src.chromium.org/viewvc/chrome/trunk/src/webkit/port/platform/graphics/
> >>
> >> or
> >>
> >> http://trac.webkit.org/browser/trunk/WebCore/platform/graphics
> >>
> >> Where did it go?
> >>
> >> Adam
> >>
> >>
> >> On Mon, Dec 22, 2008 at 8:42 PM, Darin Fisher
> wrote:
> >>> OK, much of webkit/port now lives in third_party/WebKit.
> >>> All that remains is:
> >>> webkit/port/bindings/{scripts,v8}
> >>> webkit/port/bridge/chromium
> >>> webkit/port/page/chromium
> >>> webkit/port/page/inspector
> >>> webkit/port/platform/image-decoders
> >>> webkit/port/platform/mac
> >>> webkit/port/platform/graphics/mac
> >>> webkit/port/DerivedSources.make
> >>> We should be able to finish moving most of the rest of these files
> tomorrow.
> >>> -Darin
> >>>
> >>> On Mon, Dec 22, 2008 at 11:48 AM, Mohamed Mansour <
> m0.interact...@gmail.com>
> >>> wrote:
>
> I guess I will stop till your done!
>
>
> On Mon, Dec 22, 2008 at 2:42 PM, Darin Fisher
> wrote:
> >
> > FYI
> > Please expect conflicts if you are trying to make changes to
> webkit/port.
> > -Darin
> >
>
>
>
> >>>
> >>>
> >>> >
> >>>
> >>
> >> >
> >>
> >
> > >
> >
>
> >
>
--~--~-~--~~~---~--~~
Chromium Developers mailing list: chromium-dev@googlegroups.com
View archives, change email options, or unsubscribe:
http://groups.google.com/group/chromium-dev
-~--~~~~--~~--~--~---
[chromium-dev] Re: webkit/port is moving into third_party/WebKit/WebCore
We haven't started upstreaming yet, so I'd say until some time, you
can work on them directly.
This of course will change when the upstreaming starts.
:DG<
On Tue, Dec 23, 2008 at 2:51 PM, Adam Barth wrote:
>
> I see. Can I make changes to them in third_party, or should I wait
> for them to appear upstream?
>
> Adam
>
>
> On Tue, Dec 23, 2008 at 1:35 PM, Dimitri Glazkov wrote:
>>
>> http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/WebKit/WebCore/platform/graphics/
>>
>> These haven't been yet upstreamed. We just started by moving them into
>> our vendor branch.
>>
>> :DG<
>>
>> On Tue, Dec 23, 2008 at 1:31 PM, Adam Barth wrote:
>>>
>>> I'm confused. I need to fix a bug in ImageSourceSkia.cpp, but I can't find
>>> it
>>>
>>> http://src.chromium.org/viewvc/chrome/trunk/src/webkit/port/platform/graphics/
>>>
>>> or
>>>
>>> http://trac.webkit.org/browser/trunk/WebCore/platform/graphics
>>>
>>> Where did it go?
>>>
>>> Adam
>>>
>>>
>>> On Mon, Dec 22, 2008 at 8:42 PM, Darin Fisher wrote:
OK, much of webkit/port now lives in third_party/WebKit.
All that remains is:
webkit/port/bindings/{scripts,v8}
webkit/port/bridge/chromium
webkit/port/page/chromium
webkit/port/page/inspector
webkit/port/platform/image-decoders
webkit/port/platform/mac
webkit/port/platform/graphics/mac
webkit/port/DerivedSources.make
We should be able to finish moving most of the rest of these files
tomorrow.
-Darin
On Mon, Dec 22, 2008 at 11:48 AM, Mohamed Mansour
wrote:
>
> I guess I will stop till your done!
>
>
> On Mon, Dec 22, 2008 at 2:42 PM, Darin Fisher wrote:
>>
>> FYI
>> Please expect conflicts if you are trying to make changes to webkit/port.
>> -Darin
>>
>
>
>
>
>>>
>>> >
>>>
>>
>> >
>>
>
> >
>
--~--~-~--~~~---~--~~
Chromium Developers mailing list: chromium-dev@googlegroups.com
View archives, change email options, or unsubscribe:
http://groups.google.com/group/chromium-dev
-~--~~~~--~~--~--~---
[chromium-dev] Re: webkit/port is moving into third_party/WebKit/WebCore
I see. Can I make changes to them in third_party, or should I wait
for them to appear upstream?
Adam
On Tue, Dec 23, 2008 at 1:35 PM, Dimitri Glazkov wrote:
>
> http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/WebKit/WebCore/platform/graphics/
>
> These haven't been yet upstreamed. We just started by moving them into
> our vendor branch.
>
> :DG<
>
> On Tue, Dec 23, 2008 at 1:31 PM, Adam Barth wrote:
>>
>> I'm confused. I need to fix a bug in ImageSourceSkia.cpp, but I can't find
>> it
>>
>> http://src.chromium.org/viewvc/chrome/trunk/src/webkit/port/platform/graphics/
>>
>> or
>>
>> http://trac.webkit.org/browser/trunk/WebCore/platform/graphics
>>
>> Where did it go?
>>
>> Adam
>>
>>
>> On Mon, Dec 22, 2008 at 8:42 PM, Darin Fisher wrote:
>>> OK, much of webkit/port now lives in third_party/WebKit.
>>> All that remains is:
>>> webkit/port/bindings/{scripts,v8}
>>> webkit/port/bridge/chromium
>>> webkit/port/page/chromium
>>> webkit/port/page/inspector
>>> webkit/port/platform/image-decoders
>>> webkit/port/platform/mac
>>> webkit/port/platform/graphics/mac
>>> webkit/port/DerivedSources.make
>>> We should be able to finish moving most of the rest of these files tomorrow.
>>> -Darin
>>>
>>> On Mon, Dec 22, 2008 at 11:48 AM, Mohamed Mansour
>>> wrote:
I guess I will stop till your done!
On Mon, Dec 22, 2008 at 2:42 PM, Darin Fisher wrote:
>
> FYI
> Please expect conflicts if you are trying to make changes to webkit/port.
> -Darin
>
>>>
>>>
>>> >
>>>
>>
>> >
>>
>
> >
>
--~--~-~--~~~---~--~~
Chromium Developers mailing list: chromium-dev@googlegroups.com
View archives, change email options, or unsubscribe:
http://groups.google.com/group/chromium-dev
-~--~~~~--~~--~--~---
[chromium-dev] Re: webkit/port is moving into third_party/WebKit/WebCore
http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/WebKit/WebCore/platform/graphics/
These haven't been yet upstreamed. We just started by moving them into
our vendor branch.
:DG<
On Tue, Dec 23, 2008 at 1:31 PM, Adam Barth wrote:
>
> I'm confused. I need to fix a bug in ImageSourceSkia.cpp, but I can't find it
>
> http://src.chromium.org/viewvc/chrome/trunk/src/webkit/port/platform/graphics/
>
> or
>
> http://trac.webkit.org/browser/trunk/WebCore/platform/graphics
>
> Where did it go?
>
> Adam
>
>
> On Mon, Dec 22, 2008 at 8:42 PM, Darin Fisher wrote:
>> OK, much of webkit/port now lives in third_party/WebKit.
>> All that remains is:
>> webkit/port/bindings/{scripts,v8}
>> webkit/port/bridge/chromium
>> webkit/port/page/chromium
>> webkit/port/page/inspector
>> webkit/port/platform/image-decoders
>> webkit/port/platform/mac
>> webkit/port/platform/graphics/mac
>> webkit/port/DerivedSources.make
>> We should be able to finish moving most of the rest of these files tomorrow.
>> -Darin
>>
>> On Mon, Dec 22, 2008 at 11:48 AM, Mohamed Mansour
>> wrote:
>>>
>>> I guess I will stop till your done!
>>>
>>>
>>> On Mon, Dec 22, 2008 at 2:42 PM, Darin Fisher wrote:
FYI
Please expect conflicts if you are trying to make changes to webkit/port.
-Darin
>>>
>>>
>>>
>>
>>
>> >
>>
>
> >
>
--~--~-~--~~~---~--~~
Chromium Developers mailing list: chromium-dev@googlegroups.com
View archives, change email options, or unsubscribe:
http://groups.google.com/group/chromium-dev
-~--~~~~--~~--~--~---
[chromium-dev] Re: webkit/port is moving into third_party/WebKit/WebCore
I'm confused. I need to fix a bug in ImageSourceSkia.cpp, but I can't find it
http://src.chromium.org/viewvc/chrome/trunk/src/webkit/port/platform/graphics/
or
http://trac.webkit.org/browser/trunk/WebCore/platform/graphics
Where did it go?
Adam
On Mon, Dec 22, 2008 at 8:42 PM, Darin Fisher wrote:
> OK, much of webkit/port now lives in third_party/WebKit.
> All that remains is:
> webkit/port/bindings/{scripts,v8}
> webkit/port/bridge/chromium
> webkit/port/page/chromium
> webkit/port/page/inspector
> webkit/port/platform/image-decoders
> webkit/port/platform/mac
> webkit/port/platform/graphics/mac
> webkit/port/DerivedSources.make
> We should be able to finish moving most of the rest of these files tomorrow.
> -Darin
>
> On Mon, Dec 22, 2008 at 11:48 AM, Mohamed Mansour
> wrote:
>>
>> I guess I will stop till your done!
>>
>>
>> On Mon, Dec 22, 2008 at 2:42 PM, Darin Fisher wrote:
>>>
>>> FYI
>>> Please expect conflicts if you are trying to make changes to webkit/port.
>>> -Darin
>>>
>>
>>
>>
>
>
> >
>
--~--~-~--~~~---~--~~
Chromium Developers mailing list: chromium-dev@googlegroups.com
View archives, change email options, or unsubscribe:
http://groups.google.com/group/chromium-dev
-~--~~~~--~~--~--~---
[chromium-dev] Re: webkit/port is moving into third_party/WebKit/WebCore
That's fantastic! Congrats!
-eric
On Mon, Dec 22, 2008 at 10:42 PM, Darin Fisher wrote:
> OK, much of webkit/port now lives in third_party/WebKit.
> All that remains is:
> webkit/port/bindings/{scripts,v8}
> webkit/port/bridge/chromium
> webkit/port/page/chromium
> webkit/port/page/inspector
> webkit/port/platform/image-decoders
> webkit/port/platform/mac
> webkit/port/platform/graphics/mac
> webkit/port/DerivedSources.make
> We should be able to finish moving most of the rest of these files tomorrow.
> -Darin
>
> On Mon, Dec 22, 2008 at 11:48 AM, Mohamed Mansour
> wrote:
>>
>> I guess I will stop till your done!
>>
>>
>> On Mon, Dec 22, 2008 at 2:42 PM, Darin Fisher wrote:
>>>
>>> FYI
>>> Please expect conflicts if you are trying to make changes to webkit/port.
>>> -Darin
>>>
>>
>>
>>
>
>
> >
>
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups
"Chromium-dev" group.
To post to this group, send email to chromium-dev@googlegroups.com
To unsubscribe from this group, send email to
chromium-dev+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/chromium-dev?hl=en
-~--~~~~--~~--~--~---
[chromium-dev] Re: webkit/port is moving into third_party/WebKit/WebCore
OK, much of webkit/port now lives in third_party/WebKit.
All that remains is:
webkit/port/bindings/{scripts,v8}
webkit/port/bridge/chromium
webkit/port/page/chromium
webkit/port/page/inspector
webkit/port/platform/image-decoders
webkit/port/platform/mac
webkit/port/platform/graphics/mac
webkit/port/DerivedSources.make
We should be able to finish moving most of the rest of these files tomorrow.
-Darin
On Mon, Dec 22, 2008 at 11:48 AM, Mohamed Mansour
wrote:
> I guess I will stop till your done!
>
>
>
> On Mon, Dec 22, 2008 at 2:42 PM, Darin Fisher wrote:
>
>> FYI
>> Please expect conflicts if you are trying to make changes to webkit/port.
>>
>> -Darin
>>
>>
>>
>
> >
>
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups
"Chromium-dev" group.
To post to this group, send email to chromium-dev@googlegroups.com
To unsubscribe from this group, send email to
chromium-dev+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/chromium-dev?hl=en
-~--~~~~--~~--~--~---
[chromium-dev] Re: webkit/port is moving into third_party/WebKit/WebCore
I guess I will stop till your done! On Mon, Dec 22, 2008 at 2:42 PM, Darin Fisher wrote: > FYI > Please expect conflicts if you are trying to make changes to webkit/port. > > -Darin > > > > --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Chromium-dev" group. To post to this group, send email to chromium-dev@googlegroups.com To unsubscribe from this group, send email to chromium-dev+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/chromium-dev?hl=en -~--~~~~--~~--~--~---
