87036 2012-05-21 12:02:29 -0700 RenderInline::absoluteRects does some incorrect layout math 2012-05-22 18:38:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66687 1 abarth abarth aelias eae eric jchaffraix leviw ojan peter simon.fraser trchen webkit.review.bot oldest_to_newest 629349 0 abarth 2012-05-21 12:02:29 -0700 REGRESSION(88297) Tap shadow is down and to the right on the chrome web store 629351 1 143072 abarth 2012-05-21 12:03:55 -0700 Created attachment 143072 Patch 629353 2 abarth 2012-05-21 12:04:35 -0700 trchen fixes this in the OS(ANDROID) branch in https://gerrit-int.chromium.org/#change,3456 Any hints about how to write a test are welcome! 629450 3 143072 eric 2012-05-21 13:46:19 -0700 Comment on attachment 143072 Patch How do we test this so we don't typo again? 629466 4 143072 eric 2012-05-21 13:54:14 -0700 Comment on attachment 143072 Patch To test this, you'll need to use something like getClientRects: https://developer.mozilla.org/en/DOM/element.getClientRects You'll need an inline (aka, span) which is split by a block to cause a continuation. That continuation itself will need to be a block, which is not immediately clear to me what cases that is. Presumably this will work: <span>foo<div>bar</div>baz</span> The code was wrong before because it was adding the box (in this case "div")'s size instead of it's location! Which is just wrong. You might have more luck with a more controlled example like this: <span><img style="width: 50px; height: 50px"><div style="width: 75px; height: 200px "></div><img style="width: 50px; height: 50px"></span> Which would allow you to better predict the sizes. Warning: css line-height and the line decent below the <img> tag will effect the total height of the span rects, so they may be 4-8px larger than what you expect. It's also possible that getClientRects doesn't use absoluteRects() (we have several similarly named rect functions) but I think it does. 629467 5 eric 2012-05-21 13:55:02 -0700 We may need to assist Dr. Barth in creating a test. He's not a frequent contributor to the world or rendering. :) 629475 6 trchen 2012-05-21 14:00:54 -0700 Ah ha, peter just talked to me about upstreaming this patch last week. I'll paste the conversation here: On Wed, May 16, 2012 at 5:24 PM, Tien-Ren Chen <trchen@google.com> wrote: > On Wed, May 16, 2012 at 5:19 PM, Tien-Ren Chen <trchen@google.com> wrote: >> On Wed, May 16, 2012 at 2:57 AM, Peter Beverloo <beverloo@google.com> wrote: >>> I've got a question related to this commit of yours: >>> https://gerrit-int.chromium.org/#change,3456 (bug: http://b/issue?id=5050880) >>> >>> Upstream WebKit uses size() instead of locationOffset(), so this would have >>> to be upstreamed. Is this something a layout test could be written for, as >>> it would influence behavior on upstream platforms as well? >> >> I doubt there is any real rendering code using absoluteRects(), as it >> doesn't support CSS transforms. >> Our tap highlighting code used to use absoluteRects(), but it is no >> longer the case. I believe all new code are encouraged to use >> absoluteQuads() instead. > > Ah, find an old thread discussing with <hyatt@apple.com>: > ==== >> > 2. Are we going to deprecate RenderObject::absoluteRects in favor of >> > absoluteQuads anytime soon? As they don't and will never support CSS >> > transformation. We can get rid of a lot of duplicate code by removing >> > those functions. >> Yeah it would be nice to get rid of. Nobody has gotten around to doing it. > ==== > > I don't have time for that currently, but I would say don't bother > with absoluteRects() for now. > >> I guess our goal is to de-fork from upstream. It probably won't hurt >> to revert that change. Or if we do want to upstream it, I think David >> Hyatt has the authority over that code. My opinion is that we should avoid introducing new code that depends on absoluteRect(GestureTapHighlighter is an example). I'm right now working on integrating 84487 with my version of the highlighter in 84936. I would say, leave this bug alone the GestureTapHighlighter is still broken beyond repair. I have multiple test cases that it can produce a horribly wrong highlight. (like relative positioned element) 629545 7 abarth 2012-05-21 15:00:13 -0700 Either we need to revert this change downstream or we need to land this change upstream. My understanding from Eric is that this patch is correct, which means we should fix this bug by landing this patch. I just need to find a way to test it. 629639 8 143118 abarth 2012-05-21 15:49:06 -0700 Created attachment 143118 Patch 629672 9 ojan 2012-05-21 16:10:03 -0700 Simon might have ideas of how to test this. I'm not too familiar with this code. 629683 10 simon.fraser 2012-05-21 16:20:46 -0700 Looks like Internals::boundingBox() should hit this code path. 629687 11 abarth 2012-05-21 16:24:10 -0700 > Looks like Internals::boundingBox() should hit this code path. Thanks. I missed absoluteBoundingBoxRectIgnoringTransforms! 629798 12 143155 abarth 2012-05-21 18:02:30 -0700 Created attachment 143155 Test detects code change---unsure how to finish test 630835 13 143380 abarth 2012-05-22 15:39:15 -0700 Created attachment 143380 Patch 630840 14 143380 eric 2012-05-22 15:43:35 -0700 Comment on attachment 143380 Patch Yay! I would have just used js-test-pre, but this is fine. 631053 15 143380 webkit.review.bot 2012-05-22 18:38:26 -0700 Comment on attachment 143380 Patch Clearing flags on attachment: 143380 Committed r118094: <http://trac.webkit.org/changeset/118094> 631054 16 webkit.review.bot 2012-05-22 18:38:33 -0700 All reviewed patches have been landed. Closing bug. 143072 2012-05-21 12:03:55 -0700 2012-05-21 15:49:01 -0700 Patch bug-87036-20120521120354.patch text/plain 1839 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3ODA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmRlYWExMDM5ZjIwM2Nl Mzk2Y2Q4NDQwNzVkMmVlZTQ3ZmJjYmUxOC4uNTZmYjJkYTM1YzI5YzljNTU5ZTUzOTZkNGFjNzli NDRmZDAxZDg4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA1LTIxICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTig4ODI5Nykg VGFwIHNoYWRvdyBpcyBkb3duIGFuZCB0byB0aGUgcmlnaHQgb24gdGhlIGNocm9tZSB3ZWIgc3Rv cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MDM2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXBwYXJl bnRseSBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC84ODI5Ny90cnVuay9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAorICAgICAgICBjb250YWlucyBhIHR5 cG8sIHdoaWNoIGlzIGZpeGVkIGJ5IHRoaXMgcGF0Y2guCisKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVySW5saW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcklubGluZTo6YWJzb2x1 dGVSZWN0cyk6CisgICAgICAgIChXZWJDb3JlKToKKwogMjAxMi0wNS0yMSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZWZh Y3RvciByZXZpc2lvbiBoaXN0b3J5IHRvIG5vdCBpbmNsdWRlIHJlc291cmNlIGl0c2VsZi4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKaW5kZXggMzhhODc0YjRhMWEw NTZmYzA5ZDk4YzBjNGRlNjNiNTgzYjEyMzVmMC4uYmRjYjkwZjQwZmM2N2E1NmY1MzJjZTRiYzJm MzkzOTljYzdiNWM1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl cklubGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5j cHAKQEAgLTYwOSw3ICs2MDksNyBAQCB2b2lkIFJlbmRlcklubGluZTo6YWJzb2x1dGVSZWN0cyhW ZWN0b3I8SW50UmVjdD4mIHJlY3RzLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdQogICAgIGlmIChj b250aW51YXRpb24oKSkgewogICAgICAgICBpZiAoY29udGludWF0aW9uKCktPmlzQm94KCkpIHsK ICAgICAgICAgICAgIFJlbmRlckJveCogYm94ID0gdG9SZW5kZXJCb3goY29udGludWF0aW9uKCkp OwotICAgICAgICAgICAgY29udGludWF0aW9uKCktPmFic29sdXRlUmVjdHMocmVjdHMsIHRvTGF5 b3V0UG9pbnQoYWNjdW11bGF0ZWRPZmZzZXQgLSBjb250YWluaW5nQmxvY2soKS0+bG9jYXRpb24o KSArIGJveC0+c2l6ZSgpKSk7CisgICAgICAgICAgICBjb250aW51YXRpb24oKS0+YWJzb2x1dGVS ZWN0cyhyZWN0cywgdG9MYXlvdXRQb2ludChhY2N1bXVsYXRlZE9mZnNldCAtIGNvbnRhaW5pbmdC bG9jaygpLT5sb2NhdGlvbigpICsgYm94LT5sb2NhdGlvbk9mZnNldCgpKSk7CiAgICAgICAgIH0g ZWxzZQogICAgICAgICAgICAgY29udGludWF0aW9uKCktPmFic29sdXRlUmVjdHMocmVjdHMsIHRv TGF5b3V0UG9pbnQoYWNjdW11bGF0ZWRPZmZzZXQgLSBjb250YWluaW5nQmxvY2soKS0+bG9jYXRp b24oKSkpOwogICAgIH0K 143118 2012-05-21 15:49:06 -0700 2012-05-21 18:02:25 -0700 Patch bug-87036-20120521154905.patch text/plain 2503 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3ODA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmRlYWExMDM5ZjIwM2Nl Mzk2Y2Q4NDQwNzVkMmVlZTQ3ZmJjYmUxOC4uNWQ4NTMxY2Y2NThjZGFjYmI1OThlNWI0NWUzZDMw NGVjMDE5Y2M5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTA1LTIxICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVuZGVySW5saW5lOjphYnNv bHV0ZVJlY3RzIGRvZXMgc29tZSBpbmNvcnJlY3QgbGF5b3V0IG1hdGgKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MDM2CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXBwYXJlbnRseSBodHRwOi8vdHJhYy53 ZWJraXQub3JnL2NoYW5nZXNldC84ODI5Ny90cnVuay9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVySW5saW5lLmNwcAorICAgICAgICBjb250YWlucyBhIHR5cG8sIHdoaWNoIGlzIGZpeGVk IGJ5IHRoaXMgcGF0Y2guCisKKyAgICAgICAgSXQncyB1bmNsZWFyIHdoZXRoZXIgdGhpcyBjaGFu Z2UgaGFzIGFuIG9ic2VydmFibGUgZWZmZWN0cy4gTW9zdAorICAgICAgICBjYWxsZXJzIGhhdmUg YWxyZWFkeSBiZWVuIGNvbnZlcnRlZCB0byBhYnNvbHV0ZVF1YWRzLiBUaGUgdHdvIHJlbWFpbmlu ZworICAgICAgICBjYWxsZXJzIGFwcGVhciB0byBiZSBOb2RlOjpoYXNOb25FbXB0eUJvdW5kaW5n Qm94IGFuZAorICAgICAgICBSZW5kZXJPYmplY3Q6OmFic29sdXRlQm91bmRpbmdCb3hSZWN0LiBU aGlzIGJ1ZyBzaG91bGRuJ3QgYWZmZWN0CisgICAgICAgIE5vZGU6Omhhc05vbkVtcHR5Qm91bmRp bmdCb3guIFJlbmRlck9iamVjdDo6YWJzb2x1dGVCb3VuZGluZ0JveFJlY3QgaXMKKyAgICAgICAg dXNlZCBpbiBhIGNvdXBsZSBwbGFjZXMsIGZvciBleGFtcGxlIE5vZGU6OmdldFJlY3QsIGJ1dCBn ZXRSZWN0IGlzCisgICAgICAgIG92ZXJyaWRlbiBieSBDb250YWluZXJOb2RlIHRvIHVzZSBhbiBl bnRpcmVseSBkaWZmZXJlbnQgYWxnb3JpdGhtLgorCisgICAgICAgIFRoYXQgc2FpZCwgdGhpcyBj b2RlIGlzIHN0aWxsIHdyb25nLiBJJ20gaW5jbGluZWQgdG8gZml4IGl0IGFuZCBob3BlCisgICAg ICAgIHRoYXQgaXQgd2lsbCBnZXQgZGVsZXRlZCBzb29uIGluIGZhdm9yIGNvZGUgY2FsbGluZyBh YnNvbHV0ZVF1YWRzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbmxpbmU6OmFic29sdXRlUmVjdHMpOgorICAgICAgICAo V2ViQ29yZSk6CisKIDIwMTItMDUtMjEgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogcmVmYWN0b3IgcmV2aXNpb24gaGlzdG9y eSB0byBub3QgaW5jbHVkZSByZXNvdXJjZSBpdHNlbGYuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJJbmxpbmUuY3BwCmluZGV4IDM4YTg3NGI0YTFhMDU2ZmMwOWQ5OGMwYzRkZTYzYjU4 M2IxMjM1ZjAuLmJkY2I5MGY0MGZjNjdhNTZmNTMyY2U0YmMyZjM5Mzk5Y2M3YjVjNTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCkBAIC02MDksNyArNjA5LDcg QEAgdm9pZCBSZW5kZXJJbmxpbmU6OmFic29sdXRlUmVjdHMoVmVjdG9yPEludFJlY3Q+JiByZWN0 cywgY29uc3QgTGF5b3V0UG9pbnQmIGFjY3UKICAgICBpZiAoY29udGludWF0aW9uKCkpIHsKICAg ICAgICAgaWYgKGNvbnRpbnVhdGlvbigpLT5pc0JveCgpKSB7CiAgICAgICAgICAgICBSZW5kZXJC b3gqIGJveCA9IHRvUmVuZGVyQm94KGNvbnRpbnVhdGlvbigpKTsKLSAgICAgICAgICAgIGNvbnRp bnVhdGlvbigpLT5hYnNvbHV0ZVJlY3RzKHJlY3RzLCB0b0xheW91dFBvaW50KGFjY3VtdWxhdGVk T2Zmc2V0IC0gY29udGFpbmluZ0Jsb2NrKCktPmxvY2F0aW9uKCkgKyBib3gtPnNpemUoKSkpOwor ICAgICAgICAgICAgY29udGludWF0aW9uKCktPmFic29sdXRlUmVjdHMocmVjdHMsIHRvTGF5b3V0 UG9pbnQoYWNjdW11bGF0ZWRPZmZzZXQgLSBjb250YWluaW5nQmxvY2soKS0+bG9jYXRpb24oKSAr IGJveC0+bG9jYXRpb25PZmZzZXQoKSkpOwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIGNv bnRpbnVhdGlvbigpLT5hYnNvbHV0ZVJlY3RzKHJlY3RzLCB0b0xheW91dFBvaW50KGFjY3VtdWxh dGVkT2Zmc2V0IC0gY29udGFpbmluZ0Jsb2NrKCktPmxvY2F0aW9uKCkpKTsKICAgICB9Cg== 143155 2012-05-21 18:02:30 -0700 2012-05-22 15:39:09 -0700 Test detects code change---unsure how to finish test bug-87036-20120521180229.patch text/plain 3747 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNzg0NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEyLTA1LTIxICBBZGFtIEJh cnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVuZGVySW5saW5lOjphYnNvbHV0 ZVJlY3RzIGRvZXMgc29tZSBpbmNvcnJlY3QgbGF5b3V0IG1hdGgKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MDM2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgRXJpYyBTZWlkZWwuCisKKyAgICAgICAgQXBwYXJlbnRseSBodHRwOi8vdHJhYy53ZWJraXQu b3JnL2NoYW5nZXNldC84ODI5Ny90cnVuay9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy SW5saW5lLmNwcAorICAgICAgICBjb250YWlucyBhIHR5cG8sIHdoaWNoIGlzIGZpeGVkIGJ5IHRo aXMgcGF0Y2guCisKKyAgICAgICAgSXQncyB1bmNsZWFyIHdoZXRoZXIgdGhpcyBjaGFuZ2UgaGFz IGFuIG9ic2VydmFibGUgZWZmZWN0cy4gTW9zdAorICAgICAgICBjYWxsZXJzIGhhdmUgYWxyZWFk eSBiZWVuIGNvbnZlcnRlZCB0byBhYnNvbHV0ZVF1YWRzLiBUaGUgdHdvIHJlbWFpbmluZworICAg ICAgICBjYWxsZXJzIGFwcGVhciB0byBiZSBOb2RlOjpoYXNOb25FbXB0eUJvdW5kaW5nQm94IGFu ZAorICAgICAgICBSZW5kZXJPYmplY3Q6OmFic29sdXRlQm91bmRpbmdCb3hSZWN0LiBUaGlzIGJ1 ZyBzaG91bGRuJ3QgYWZmZWN0CisgICAgICAgIE5vZGU6Omhhc05vbkVtcHR5Qm91bmRpbmdCb3gu IFJlbmRlck9iamVjdDo6YWJzb2x1dGVCb3VuZGluZ0JveFJlY3QgaXMKKyAgICAgICAgdXNlZCBp biBhIGNvdXBsZSBwbGFjZXMsIGZvciBleGFtcGxlIE5vZGU6OmdldFJlY3QsIGJ1dCBnZXRSZWN0 IGlzCisgICAgICAgIG92ZXJyaWRlbiBieSBDb250YWluZXJOb2RlIHRvIHVzZSBhbiBlbnRpcmVs eSBkaWZmZXJlbnQgYWxnb3JpdGhtLgorCisgICAgICAgIFRoYXQgc2FpZCwgdGhpcyBjb2RlIGlz IHN0aWxsIHdyb25nLiBJJ20gaW5jbGluZWQgdG8gZml4IGl0IGFuZCBob3BlCisgICAgICAgIHRo YXQgaXQgd2lsbCBnZXQgZGVsZXRlZCBzb29uIGluIGZhdm9yIGNvZGUgY2FsbGluZyBhYnNvbHV0 ZVF1YWRzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJJbmxpbmU6OmFic29sdXRlUmVjdHMpOgorICAgICAgICAoV2ViQ29y ZSk6CisKIDIwMTItMDUtMjEgIEVtaWwgQSBFa2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIE1vdmUgcGFkZGluZy9tYXJnaW4vb2Zmc2V0IHdyaXRpbmcgbW9kZSBsb2dpYyBmcm9t IFJlbmRlclN0eWxlIHRvIExlbmd0aEJveApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlcklubGluZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlcklubGluZS5jcHAJKHJldmlzaW9uIDExNzg0NCkKKysrIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MDksNyArNjA5LDcg QEAgdm9pZCBSZW5kZXJJbmxpbmU6OmFic29sdXRlUmVjdHMoVmVjdG9yPAogICAgIGlmIChjb250 aW51YXRpb24oKSkgewogICAgICAgICBpZiAoY29udGludWF0aW9uKCktPmlzQm94KCkpIHsKICAg ICAgICAgICAgIFJlbmRlckJveCogYm94ID0gdG9SZW5kZXJCb3goY29udGludWF0aW9uKCkpOwot ICAgICAgICAgICAgY29udGludWF0aW9uKCktPmFic29sdXRlUmVjdHMocmVjdHMsIHRvTGF5b3V0 UG9pbnQoYWNjdW11bGF0ZWRPZmZzZXQgLSBjb250YWluaW5nQmxvY2soKS0+bG9jYXRpb24oKSAr IGJveC0+c2l6ZSgpKSk7CisgICAgICAgICAgICBjb250aW51YXRpb24oKS0+YWJzb2x1dGVSZWN0 cyhyZWN0cywgdG9MYXlvdXRQb2ludChhY2N1bXVsYXRlZE9mZnNldCAtIGNvbnRhaW5pbmdCbG9j aygpLT5sb2NhdGlvbigpICsgYm94LT5sb2NhdGlvbk9mZnNldCgpKSk7CiAgICAgICAgIH0gZWxz ZQogICAgICAgICAgICAgY29udGludWF0aW9uKCktPmFic29sdXRlUmVjdHMocmVjdHMsIHRvTGF5 b3V0UG9pbnQoYWNjdW11bGF0ZWRPZmZzZXQgLSBjb250YWluaW5nQmxvY2soKS0+bG9jYXRpb24o KSkpOwogICAgIH0KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvaW5saW5lL2JvdW5kaW5nQm94LXdp dGgtY29udGludWF0aW9uLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9m YXN0L2lubGluZS9ib3VuZGluZ0JveC13aXRoLWNvbnRpbnVhdGlvbi1leHBlY3RlZC50eHQJKHJl dmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2lubGluZS9ib3VuZGluZ0JveC13aXRoLWNv bnRpbnVhdGlvbi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMyBAQAorCisK K3siYm90dG9tIjoyNjIsInRvcCI6LTIxMCwibGVmdCI6OCwid2lkdGgiOjc4NCwicmlnaHQiOjc5 MiwiaGVpZ2h0Ijo0NzJ9CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2lubGluZS9ib3VuZGluZ0Jv eC13aXRoLWNvbnRpbnVhdGlvbi5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3Qv aW5saW5lL2JvdW5kaW5nQm94LXdpdGgtY29udGludWF0aW9uLmh0bWwJKHJldmlzaW9uIDApCisr KyBMYXlvdXRUZXN0cy9mYXN0L2lubGluZS9ib3VuZGluZ0JveC13aXRoLWNvbnRpbnVhdGlvbi5o dG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDIyIEBACis8IWRvY3R5cGUgaHRtbD4gPGh0bWw+ IDxoZWFkPgorPHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAg d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKQorCitmdW5jdGlvbiBydW5U ZXN0KCkKK3sKKyAgICB2YXIgZWxlbSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0Jyk7 CisgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpIHsKKyAgICAgICAgdmFyIHJlY3QgPSBpbnRlcm5h bHMuYm91bmRpbmdCb3goZWxlbSk7CisgICAgICAgIGlmIChyZWN0LnRvcCA+IDAgfHwgcmVjdC5s ZWZ0ID4gMCkKKyAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb25zb2xlJyku aW5uZXJIVE1MID0gSlNPTi5zdHJpbmdpZnkocmVjdCk7CisgICAgfQorfQorPC9zY3JpcHQ+Cis8 L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8c3BhbiBpZD0idGVzdCI+PGltZyBz dHlsZT0id2lkdGg6IDUwcHg7IGhlaWdodDogNTBweCIgc3JjPSJhYm91dDpibGFuayI+PGRpdiBz dHlsZT0id2lkdGg6IDc1cHg7IGhlaWdodDogMjAwcHggIj48L2Rpdj48aW1nIHN0eWxlPSJ3aWR0 aDogNTBweDsgaGVpZ2h0OiA1MHB4IiBzcmM9ImFib3V0OmJsYW5rIj48L3NwYW4+Cis8ZGl2IGlk PSJjb25zb2xlIj5GQUlMPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CisK 143380 2012-05-22 15:39:15 -0700 2012-05-22 18:38:26 -0700 Patch bug-87036-20120522153913.patch text/plain 3927 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExODA2NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTIyICBBZGFtIEJh cnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVuZGVySW5saW5lOjphYnNvbHV0 ZVJlY3RzIGRvZXMgc29tZSBpbmNvcnJlY3QgbGF5b3V0IG1hdGgKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MDM2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFu Z2VzZXQvODgyOTcvdHJ1bmsvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5j cHAKKyAgICAgICAgY29udGFpbmVkIGEgdHlwby4gIFdlIHNob3VsZCBhY2N1bXVsYXRlIG9mZnNl dHMsIG5vdCBhZGQgc2l6ZXMgdG8KKyAgICAgICAgb2Zmc2V0cy4KKworICAgICAgICBUZXN0OiBm YXN0L2lubGluZS9ib3VuZGluZ0JveC13aXRoLWNvbnRpbnVhdGlvbi5odG1sCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcklu bGluZTo6YWJzb2x1dGVSZWN0cyk6CisgICAgICAgIChXZWJDb3JlKToKKwogMjAxMi0wNS0yMiAg S2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1Y4XSBSZXBs YWNlICdzZXRET01FeGNlcHRpb24oKTsgcmV0dXJuIFVuZGVmaW5lZCgpOycgd2l0aCAncmV0dXJu IHNldERPTUV4Y2VwdGlvbigpOycKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJJbmxpbmUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJJbmxpbmUuY3BwCShyZXZpc2lvbiAxMTc4NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVySW5saW5lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjA5LDcgKzYwOSw3IEBAIHZv aWQgUmVuZGVySW5saW5lOjphYnNvbHV0ZVJlY3RzKFZlY3RvcjwKICAgICBpZiAoY29udGludWF0 aW9uKCkpIHsKICAgICAgICAgaWYgKGNvbnRpbnVhdGlvbigpLT5pc0JveCgpKSB7CiAgICAgICAg ICAgICBSZW5kZXJCb3gqIGJveCA9IHRvUmVuZGVyQm94KGNvbnRpbnVhdGlvbigpKTsKLSAgICAg ICAgICAgIGNvbnRpbnVhdGlvbigpLT5hYnNvbHV0ZVJlY3RzKHJlY3RzLCB0b0xheW91dFBvaW50 KGFjY3VtdWxhdGVkT2Zmc2V0IC0gY29udGFpbmluZ0Jsb2NrKCktPmxvY2F0aW9uKCkgKyBib3gt PnNpemUoKSkpOworICAgICAgICAgICAgY29udGludWF0aW9uKCktPmFic29sdXRlUmVjdHMocmVj dHMsIHRvTGF5b3V0UG9pbnQoYWNjdW11bGF0ZWRPZmZzZXQgLSBjb250YWluaW5nQmxvY2soKS0+ bG9jYXRpb24oKSArIGJveC0+bG9jYXRpb25PZmZzZXQoKSkpOwogICAgICAgICB9IGVsc2UKICAg ICAgICAgICAgIGNvbnRpbnVhdGlvbigpLT5hYnNvbHV0ZVJlY3RzKHJlY3RzLCB0b0xheW91dFBv aW50KGFjY3VtdWxhdGVkT2Zmc2V0IC0gY29udGFpbmluZ0Jsb2NrKCktPmxvY2F0aW9uKCkpKTsK ICAgICB9CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMTgwNjcpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wNS0yMiAgQWRhbSBCYXJ0 aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbmRlcklubGluZTo6YWJzb2x1dGVS ZWN0cyBkb2VzIHNvbWUgaW5jb3JyZWN0IGxheW91dCBtYXRoCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzAzNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9pbmxpbmUvYm91bmRpbmdCb3gtd2l0 aC1jb250aW51YXRpb24tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2lubGlu ZS9ib3VuZGluZ0JveC13aXRoLWNvbnRpbnVhdGlvbi5odG1sOiBBZGRlZC4KKwogMjAxMi0wNS0y MiAgSm9zaHVhIEJlbGwgIDxqc2JlbGxAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1 bV0gQWRkIG1pc3NpbmcgYmFzZWxpbmVzIGZvciByMTE4MDM5LgpJbmRleDogTGF5b3V0VGVzdHMv ZmFzdC9pbmxpbmUvYm91bmRpbmdCb3gtd2l0aC1jb250aW51YXRpb24tZXhwZWN0ZWQudHh0Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvaW5saW5lL2JvdW5kaW5nQm94LXdpdGgtY29u dGludWF0aW9uLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3Qv aW5saW5lL2JvdW5kaW5nQm94LXdpdGgtY29udGludWF0aW9uLWV4cGVjdGVkLnR4dAkocmV2aXNp b24gMCkKQEAgLTAsMCArMSwzIEBACisKKworUEFTUwpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9p bmxpbmUvYm91bmRpbmdCb3gtd2l0aC1jb250aW51YXRpb24uaHRtbAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9mYXN0L2lubGluZS9ib3VuZGluZ0JveC13aXRoLWNvbnRpbnVhdGlvbi5odG1s CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvYm91bmRpbmdCb3gtd2l0 aC1jb250aW51YXRpb24uaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyNCBAQAorPCFkb2N0 eXBlIGh0bWw+IDxodG1sPiA8aGVhZD4KKzxzY3JpcHQ+CitpZiAod2luZG93LmxheW91dFRlc3RD b250cm9sbGVyKQorICAgIHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCkK KworZnVuY3Rpb24gcnVuVGVzdCgpCit7CisgICAgdmFyIGVsZW0gPSBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgndGVzdCcpOworICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKSB7CisgICAgICAgIHZh ciByZWN0ID0gaW50ZXJuYWxzLmJvdW5kaW5nQm94KGVsZW0pOworICAgICAgICBpZiAocmVjdC53 aWR0aCA9PSA0MDApCisgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29uc29s ZScpLmlubmVySFRNTCA9ICJQQVNTIgorICAgICAgICBlbHNlCisgICAgICAgICAgICBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgnY29uc29sZScpLmlubmVySFRNTCA9ICJGQUlMOiB3aWR0aCB3YXMg bm90IDQwMDogIiArIEpTT04uc3RyaW5naWZ5KHJlY3QpOworICAgIH0KK30KKzwvc2NyaXB0Pgor PC9oZWFkPgorPGJvZHkgb25sb2FkPSJydW5UZXN0KCkiPgorPGRpdiBpZD0iY29udGFpbmVyIiBz dHlsZT0id2lkdGg6NDAwcHgiPjxzcGFuIGlkPSJ0ZXN0Ij48aW1nIHN0eWxlPSJ3aWR0aDogNTBw eDsgaGVpZ2h0OiA1MHB4IiBzcmM9ImFib3V0OmJsYW5rIj48ZGl2IHN0eWxlPSJ3aWR0aDogNzVw eDsgaGVpZ2h0OiAyMDBweCAiPjwvZGl2PjxpbWcgc3R5bGU9IndpZHRoOiA1MHB4OyBoZWlnaHQ6 IDUwcHgiIHNyYz0iYWJvdXQ6YmxhbmsiPjwvc3Bhbj48L2Rpdj4KKzxkaXYgaWQ9ImNvbnNvbGUi PkZBSUw6IFRlc3QgZGlkIG5vdCBydW4uPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CisK