Merge 118096

Merge 118096
BUG=128157
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=119622

[tkent, 2012-06-06 22:19:44]

No, we shouldn't merge this.  It made a lot of regressions.
We should merge http://trac.webkit.org/changeset/118725 instead.

[cevans, 2012-06-06 22:29:28]

On Wed, Jun 6, 2012 at 3:19 PM, <tkent@chromium.org> wrote:

> No, we shouldn't merge this.  It made a lot of regressions.
> We should merge
http://trac.webkit.org/**changeset/118725<http://trac.webkit.org/changeset/11....
>

I'm just landing that now.

Was 118096 ultimately reverted from trunk? I didn't see a note to that
effect but could have missed something.


>
>
>
https://chromiumcodereview.**appspot.com/10545041/<https://chromiumcodereview...
>

[cevans, 2012-06-06 22:48:35]

Adding Abhishek to the discussion.

On Wed, Jun 6, 2012 at 3:29 PM, Chris Evans <cevans@google.com> wrote:

> On Wed, Jun 6, 2012 at 3:19 PM, <tkent@chromium.org> wrote:
>
>> No, we shouldn't merge this.  It made a lot of regressions.
>> We should merge
http://trac.webkit.org/**changeset/118725<http://trac.webkit.org/changeset/11....
>>
>
> I'm just landing that now.
>
> Was 118096 ultimately reverted from trunk? I didn't see a note to that
> effect but could have missed something.
>
>
>>
>>
>>
https://chromiumcodereview.**appspot.com/10545041/<https://chromiumcodereview...
>>
>
>

[tkent, 2012-06-06 23:20:09]

I should have made a comment about it in crbug.com/128157.  I'm sorry for it.

http://trac.webkit.org/changeset/118096 was rolled out by
http://trac.webkit.org/changeset/118203. http://trac.webkit.org/changeset/118725
doesn't depend on r118096.  So we should revert this merge.

[cevans, 2012-06-07 00:57:54]

Reverted at r119656, thanks

On Wed, Jun 6, 2012 at 4:20 PM, <tkent@chromium.org> wrote:

> I should have made a comment about it in crbug.com/128157.  I'm sorry for
> it.
>
>
http://trac.webkit.org/**changeset/118096<http://trac.webkit.org/changeset/11...
rolled out by
>
http://trac.webkit.org/**changeset/118203<http://trac.webkit.org/changeset/11....
>
http://trac.webkit.org/**changeset/118725<http://trac.webkit.org/changeset/11...
> doesn't depend on r118096.  So we should revert this merge.
>
>
>
https://chromiumcodereview.**appspot.com/10545041/<https://chromiumcodereview...
>