94473 2012-08-20 05:48:21 -0700 Clicking input type=range with padding or border sets wrong value 2012-08-21 06:39:57 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 94578 1 keishi keishi mifenton tkent webkit.review.bot zan oldest_to_newest 699436 0 keishi 2012-08-20 05:48:21 -0700 Clicking input type=range with padding or border sets wrong value. 699451 1 159409 keishi 2012-08-20 06:19:04 -0700 Created attachment 159409 Patch 700340 2 159409 tkent 2012-08-20 19:08:21 -0700 Comment on attachment 159409 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159409&action=review > Source/WebCore/html/shadow/SliderThumbElement.cpp:273 > trackSize = input->renderBox()->contentHeight() - renderBox()->height(); Need to change to trackElement->renderBox()->contentHeight()? > Source/WebCore/html/shadow/SliderThumbElement.cpp:274 > + position = offset.y() - renderBox()->height() / 2 - trackBoundingBox.y() + inputBoundingBox.y(); Doesn't - (input->renderBox()->borderTop() + input->renderBox()->paddingTop()) work? If it works, we can remove trackBoundingBox and inputBoundingBox. 700361 3 159409 keishi 2012-08-20 19:30:16 -0700 Comment on attachment 159409 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159409&action=review >> Source/WebCore/html/shadow/SliderThumbElement.cpp:274 >> + position = offset.y() - renderBox()->height() / 2 - trackBoundingBox.y() + inputBoundingBox.y(); > > Doesn't - (input->renderBox()->borderTop() + input->renderBox()->paddingTop()) work? If it works, we can remove trackBoundingBox and inputBoundingBox. I think that will work for all cases where user is styling the input element, but using trackBoundingBox will be more robust to styling pseudo elements. (e.g. adding margin to the track element or adding ::before to slider container element) 700393 4 159602 keishi 2012-08-20 20:15:18 -0700 Created attachment 159602 Patch 700394 5 159602 tkent 2012-08-20 20:16:10 -0700 Comment on attachment 159602 Patch ok 700438 6 159602 webkit.review.bot 2012-08-20 21:27:43 -0700 Comment on attachment 159602 Patch Clearing flags on attachment: 159602 Committed r126132: <http://trac.webkit.org/changeset/126132> 700439 7 webkit.review.bot 2012-08-20 21:27:46 -0700 All reviewed patches have been landed. Closing bug. 700552 8 zan 2012-08-21 00:51:44 -0700 The test introduced in the reviewed patch has been failing on all non-Chromium ports: http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40ToT%20-%20webkit.org&tests=fast%2Fforms%2Frange%2Frange-hit-test-with-padding.html How is this test expected to behave on ports that have Shadom DOM or subpixel layout or perhaps both disabled? 700660 9 keishi 2012-08-21 05:40:37 -0700 (In reply to comment #8) > The test introduced in the reviewed patch has been failing on all non-Chromium ports: > http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40ToT%20-%20webkit.org&tests=fast%2Fforms%2Frange%2Frange-hit-test-with-padding.html > > How is this test expected to behave on ports that have Shadom DOM or subpixel layout or perhaps both disabled? Ports without subpixel layout won't match up exactly. I will be changing the test in Bug 94585. Please rebaseline when it lands. I don't know of any ports that support <input type=range> but don't have Shadow DOM. 700686 10 keishi 2012-08-21 06:12:30 -0700 Bug 94585 is in the commit queue. I was able to change the test in a way that you won't need to rebaseline. 700704 11 keishi 2012-08-21 06:39:57 -0700 > I don't know of any ports that support <input type=range> but don't have Shadow DOM. I misunderstood. This patch has nothing to do with the Shadow DOM flag. 159409 2012-08-20 06:19:04 -0700 2012-08-20 20:15:14 -0700 Patch bug-94473-20120820221824.patch text/plain 6766 keishi U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1OTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTEyODkxOTk4YWEwMGU0 Y2U1MmFlODA5MTZhZjE1Yjc2NTNiNWZjYy4uN2QxNWE5ODc0YzYyZjljMTAzZDNiMmViYjQyYjll NzA2Njk2MjllZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA4LTIwICBLZWlz aGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgorCisgICAgICAgIENsaWNraW5nIGlucHV0 IHR5cGU9cmFuZ2Ugd2l0aCBwYWRkaW5nIG9yIGJvcmRlciBzZXRzIHdyb25nIHZhbHVlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDQ3MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIHNob3VsZCB0YWtl IHRoZSBwYWRkaW5nIGFuZCBib3JkZXIgd2lkdGggaW50byBhY2NvdW50IHdoZW4gY2FsY3VsYXRp bmcgdGhlIHZhbHVlIGZyb20gdGhlIG1vdXNlIGxvY2F0aW9uLgorCisgICAgICAgIFRlc3Q6IGZh c3QvZm9ybXMvcmFuZ2UvcmFuZ2UtaGl0LXRlc3Qtd2l0aC1wYWRkaW5nLmh0bWwKKworICAgICAg ICAqIGh0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpzbGlkZXJUcmFja0VsZW1lbnRPZik6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdl YkNvcmU6OlNsaWRlclRodW1iRWxlbWVudDo6c2V0UG9zaXRpb25Gcm9tUG9pbnQpOgorICAgICAg ICAqIGh0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5oOgorICAgICAgICAoV2ViQ29yZSk6 CisKIDIwMTItMDgtMTkgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbkB3ZWJraXQub3JnPgog CiAgICAgICAgIFJlbW92ZSB0aGUgc3RhdGljIFN0cmluZ3MgdXNlZCBmb3Igb3V0cHV0dGluZyB2 YWx1ZXMgb2YgQ1NTX0FUVFIsIENTU19DT1VOVEVSLCBDU1NfUkVDVApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAKaW5kZXggYmFjYTg2Yzdi NjU0YjhlZDJkNWYzODJjNmFjMjM2MTgzMDRjNDc4OC4uMjBjMzY0MzkxNmFmY2YzMjVmMmRmNTMw ZWM2MDk1MzY1ODAwMDYxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cv U2xpZGVyVGh1bWJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9T bGlkZXJUaHVtYkVsZW1lbnQuY3BwCkBAIC04Myw2ICs4MywxNiBAQCBTbGlkZXJUaHVtYkVsZW1l bnQqIHNsaWRlclRodW1iRWxlbWVudE9mKE5vZGUqIG5vZGUpCiAgICAgcmV0dXJuIHRvU2xpZGVy VGh1bWJFbGVtZW50KHRodW1iKTsKIH0KIAorSFRNTEVsZW1lbnQqIHNsaWRlclRyYWNrRWxlbWVu dE9mKE5vZGUqIG5vZGUpCit7CisgICAgQVNTRVJUKG5vZGUpOworICAgIFNoYWRvd1Jvb3QqIHNo YWRvdyA9IG5vZGUtPnRvSW5wdXRFbGVtZW50KCktPnVzZXJBZ2VudFNoYWRvd1Jvb3QoKTsKKyAg ICBBU1NFUlQoc2hhZG93KTsKKyAgICBOb2RlKiB0cmFjayA9IHNoYWRvdy0+Zmlyc3RDaGlsZCgp LT5maXJzdENoaWxkKCk7CisgICAgQVNTRVJUKHRyYWNrKTsKKyAgICByZXR1cm4gdG9IVE1MRWxl bWVudCh0cmFjayk7Cit9CisKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAK IFJlbmRlclNsaWRlclRodW1iOjpSZW5kZXJTbGlkZXJUaHVtYihOb2RlKiBub2RlKQpAQCAtMjQw LDggKzI1MCw5IEBAIHZvaWQgU2xpZGVyVGh1bWJFbGVtZW50OjpkcmFnRnJvbShjb25zdCBMYXlv dXRQb2ludCYgcG9pbnQpCiB2b2lkIFNsaWRlclRodW1iRWxlbWVudDo6c2V0UG9zaXRpb25Gcm9t UG9pbnQoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KQogewogICAgIEhUTUxJbnB1dEVsZW1lbnQq IGlucHV0ID0gaG9zdElucHV0KCk7CisgICAgSFRNTEVsZW1lbnQqIHRyYWNrRWxlbWVudCA9IHNs aWRlclRyYWNrRWxlbWVudE9mKGlucHV0KTsKIAotICAgIGlmICghaW5wdXQtPnJlbmRlcmVyKCkg fHwgIXJlbmRlcmVyKCkpCisgICAgaWYgKCFpbnB1dC0+cmVuZGVyZXIoKSB8fCAhcmVuZGVyZXIo KSB8fCAhdHJhY2tFbGVtZW50LT5yZW5kZXJlcigpKQogICAgICAgICByZXR1cm47CiAKICAgICBp bnB1dC0+c2V0VGV4dEFzT2ZMYXN0Rm9ybUNvbnRyb2xDaGFuZ2VFdmVudChpbnB1dC0+dmFsdWUo KSk7CkBAIC0yNTYsMTMgKzI2NywxNSBAQCB2b2lkIFNsaWRlclRodW1iRWxlbWVudDo6c2V0UG9z aXRpb25Gcm9tUG9pbnQoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KQogICAgIC8vIEZJWE1FOiBU aGlzIHNob3VsZCBwcm9iYWJseSByZXNwZWN0IHRyYW5zZm9ybXMuCiAgICAgTGF5b3V0UG9pbnQg YWJzb2x1dGVUaHVtYk9yaWdpbiA9IHJlbmRlckJveCgpLT5hYnNvbHV0ZUJvdW5kaW5nQm94UmVj dElnbm9yaW5nVHJhbnNmb3JtcygpLmxvY2F0aW9uKCk7CiAgICAgTGF5b3V0UG9pbnQgYWJzb2x1 dGVTbGlkZXJDb250ZW50T3JpZ2luID0gcm91bmRlZExheW91dFBvaW50KGlucHV0LT5yZW5kZXJl cigpLT5sb2NhbFRvQWJzb2x1dGUoKSk7CisgICAgSW50UmVjdCB0cmFja0JvdW5kaW5nQm94ID0g dHJhY2tFbGVtZW50LT5yZW5kZXJlcigpLT5hYnNvbHV0ZUJvdW5kaW5nQm94UmVjdElnbm9yaW5n VHJhbnNmb3JtcygpOworICAgIEludFJlY3QgaW5wdXRCb3VuZGluZ0JveCA9IGlucHV0LT5yZW5k ZXJlcigpLT5hYnNvbHV0ZUJvdW5kaW5nQm94UmVjdElnbm9yaW5nVHJhbnNmb3JtcygpOwogICAg IGlmIChpc1ZlcnRpY2FsKSB7CiAgICAgICAgIHRyYWNrU2l6ZSA9IGlucHV0LT5yZW5kZXJCb3go KS0+Y29udGVudEhlaWdodCgpIC0gcmVuZGVyQm94KCktPmhlaWdodCgpOwotICAgICAgICBwb3Np dGlvbiA9IG9mZnNldC55KCkgLSByZW5kZXJCb3goKS0+aGVpZ2h0KCkgLyAyOworICAgICAgICBw b3NpdGlvbiA9IG9mZnNldC55KCkgLSByZW5kZXJCb3goKS0+aGVpZ2h0KCkgLyAyIC0gdHJhY2tC b3VuZGluZ0JveC55KCkgKyBpbnB1dEJvdW5kaW5nQm94LnkoKTsKICAgICAgICAgY3VycmVudFBv c2l0aW9uID0gYWJzb2x1dGVUaHVtYk9yaWdpbi55KCkgLSBhYnNvbHV0ZVNsaWRlckNvbnRlbnRP cmlnaW4ueSgpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIHRyYWNrU2l6ZSA9IGlucHV0LT5yZW5k ZXJCb3goKS0+Y29udGVudFdpZHRoKCkgLSByZW5kZXJCb3goKS0+d2lkdGgoKTsKLSAgICAgICAg cG9zaXRpb24gPSBvZmZzZXQueCgpIC0gcmVuZGVyQm94KCktPndpZHRoKCkgLyAyOworICAgICAg ICB0cmFja1NpemUgPSB0cmFja0VsZW1lbnQtPnJlbmRlckJveCgpLT5jb250ZW50V2lkdGgoKTsK KyAgICAgICAgcG9zaXRpb24gPSBvZmZzZXQueCgpIC0gcmVuZGVyQm94KCktPndpZHRoKCkgLyAy IC0gdHJhY2tCb3VuZGluZ0JveC54KCkgKyBpbnB1dEJvdW5kaW5nQm94LngoKTsKICAgICAgICAg Y3VycmVudFBvc2l0aW9uID0gYWJzb2x1dGVUaHVtYk9yaWdpbi54KCkgLSBhYnNvbHV0ZVNsaWRl ckNvbnRlbnRPcmlnaW4ueCgpOwogICAgIH0KICAgICBwb3NpdGlvbiA9IG1heDxMYXlvdXRVbml0 PigwLCBtaW4ocG9zaXRpb24sIHRyYWNrU2l6ZSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1lbnQuaAppbmRleCAwNGU0MWM3YmY0OTlmOGY1MjgyODY1 NGIyZTJlZjgxYzFmZTMyNTY2Li5iODkxMmMyNzJiNTllZGU5N2Q5NmNlOGVhMTUzNWI4YWI0NzYx ZWRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVs ZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1l bnQuaApAQCAtMTAwLDYgKzEwMCw3IEBAIGlubGluZSBTbGlkZXJUaHVtYkVsZW1lbnQqIHRvU2xp ZGVyVGh1bWJFbGVtZW50KE5vZGUqIG5vZGUpCiAvLyBUaGlzIGFsd2F5cyByZXR1cm4gYSB2YWxp ZCBwb2ludGVyLgogLy8gQW4gYXNzZXJ0aW9uIGZhaWxzIGlmIHRoZSBzcGVjaWZpZWQgbm9kZSBp cyBub3QgYSByYW5nZSBpbnB1dC4KIFNsaWRlclRodW1iRWxlbWVudCogc2xpZGVyVGh1bWJFbGVt ZW50T2YoTm9kZSopOworSFRNTEVsZW1lbnQqIHNsaWRlclRyYWNrRWxlbWVudE9mKE5vZGUqKTsK IAogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDkyZTkzM2Nl MjNmNTI4YmYxMDM3YTNlYmYxMjMxZjYzZDZmOWY2NWIuLmMzZTkzNThkNWRiYzdlNjI0Zjk5MjZh Y2U2NDBiYzhiNWQ4MjJmN2QgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wOC0yMCAgS2Vp c2hpIEhhdHRvcmkgIDxrZWlzaGlAd2Via2l0Lm9yZz4KKworICAgICAgICBDbGlja2luZyBpbnB1 dCB0eXBlPXJhbmdlIHdpdGggcGFkZGluZyBvciBib3JkZXIgc2V0cyB3cm9uZyB2YWx1ZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ0NzMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvZm9ybXMv cmFuZ2UvcmFuZ2UtaGl0LXRlc3Qtd2l0aC1wYWRkaW5nLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogZmFzdC9mb3Jtcy9yYW5nZS9yYW5nZS1oaXQtdGVzdC13aXRoLXBhZGRpbmcuaHRt bDogQWRkZWQuCisKIDIwMTItMDgtMTkgIFJpayBDYWJhbmllciAgPGNhYmFuaWVyQGFkb2JlLmNv bT4KIAogICAgICAgICBwYXJzZSBDU1MgYXR0cmlidXRlIC13ZWJraXQtYmxlbmQtbW9kZQpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9yYW5nZS9yYW5nZS1oaXQtdGVzdC13aXRo LXBhZGRpbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9yYW5nZS9yYW5n ZS1oaXQtdGVzdC13aXRoLXBhZGRpbmctZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjY2NGM4YmE5 NGI5ZDZiYTJlYjU1MzI5ZTUwZDhmZWU3MjdmODNmMDEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L2Zvcm1zL3JhbmdlL3JhbmdlLWhpdC10ZXN0LXdpdGgtcGFkZGluZy1leHBl Y3RlZC50eHQKQEAgLTAsMCArMSw3IEBACitDbGlja2luZyBtaWRkbGUgb2YgaW5wdXQgdHlwZT1y YW5nZSB3aXRoIHBhZGRpbmcgc2hvdWxkIHNldCB0aGUgdmFsdWUgdG8gbWlkZGxlLgorCitQQVNT IGlucHV0LnZhbHVlIGlzICI1MDAiCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisK K1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9yYW5n ZS9yYW5nZS1oaXQtdGVzdC13aXRoLXBhZGRpbmcuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZm9y bXMvcmFuZ2UvcmFuZ2UtaGl0LXRlc3Qtd2l0aC1wYWRkaW5nLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGM1 NjEyOGY1OTg5NGFkY2JlYTU4MmJhYWZhODVhMDlkZjg4YWMyYQotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvcmFuZ2UvcmFuZ2UtaGl0LXRlc3Qtd2l0aC1wYWRkaW5n Lmh0bWwKQEAgLTAsMCArMSwyNiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgor PHNjcmlwdCBzcmM9Ii4uLy4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+ Cis8L2hlYWQ+Cis8Ym9keT4KKzxwIGlkPSJkZXNjcmlwdGlvbiI+Q2xpY2tpbmcgbWlkZGxlIG9m IGlucHV0IHR5cGU9cmFuZ2Ugd2l0aCBwYWRkaW5nIHNob3VsZCBzZXQgdGhlIHZhbHVlIHRvIG1p ZGRsZS48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxpbnB1dCBpZD0iaW5wdXQiIHR5 cGU9cmFuZ2UgbWluPTAgbWF4PTEwMDAgc3RlcD0xIHZhbHVlPSIwIiBzdHlsZT0id2lkdGg6IDEw MHB4OyBwYWRkaW5nOiAwIDIwcHg7Ij4KKzxzY3JpcHQ+Cit2YXIgaW5wdXQgPSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiaW5wdXQiKTsKK2Z1bmN0aW9uIGNsaWNrU2xpZGVyKG9mZnNldExlZnQp IHsKKyAgICB2YXIgY2VudGVyWSA9IGlucHV0Lm9mZnNldFRvcCArIGlucHV0Lm9mZnNldEhlaWdo dCAvIDI7CisgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oaW5wdXQub2Zmc2V0TGVmdCArIG9m ZnNldExlZnQsIGNlbnRlclkpOworICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgIGV2 ZW50U2VuZGVyLm1vdXNlVXAoKTsKK30KKworY2xpY2tTbGlkZXIoNzApOyAvLyBsZWZ0IHBhZGRp bmcgKDIwcHgpICsgbWlkZGxlICg1MHB4KQorc2hvdWxkQmUoJ2lucHV0LnZhbHVlJywgJyI1MDAi Jyk7CisKKzwvc2NyaXB0PgorCis8c2NyaXB0IHNyYz0iLi4vLi4vanMvcmVzb3VyY2VzL2pzLXRl c3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 159602 2012-08-20 20:15:18 -0700 2012-08-20 21:27:43 -0700 Patch bug-94473-20120821121438.patch text/plain 6966 keishi U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1OTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTEyODkxOTk4YWEwMGU0 Y2U1MmFlODA5MTZhZjE1Yjc2NTNiNWZjYy4uN2QxNWE5ODc0YzYyZjljMTAzZDNiMmViYjQyYjll NzA2Njk2MjllZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA4LTIwICBLZWlz aGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgorCisgICAgICAgIENsaWNraW5nIGlucHV0 IHR5cGU9cmFuZ2Ugd2l0aCBwYWRkaW5nIG9yIGJvcmRlciBzZXRzIHdyb25nIHZhbHVlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDQ3MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIHNob3VsZCB0YWtl IHRoZSBwYWRkaW5nIGFuZCBib3JkZXIgd2lkdGggaW50byBhY2NvdW50IHdoZW4gY2FsY3VsYXRp bmcgdGhlIHZhbHVlIGZyb20gdGhlIG1vdXNlIGxvY2F0aW9uLgorCisgICAgICAgIFRlc3Q6IGZh c3QvZm9ybXMvcmFuZ2UvcmFuZ2UtaGl0LXRlc3Qtd2l0aC1wYWRkaW5nLmh0bWwKKworICAgICAg ICAqIGh0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpzbGlkZXJUcmFja0VsZW1lbnRPZik6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdl YkNvcmU6OlNsaWRlclRodW1iRWxlbWVudDo6c2V0UG9zaXRpb25Gcm9tUG9pbnQpOgorICAgICAg ICAqIGh0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5oOgorICAgICAgICAoV2ViQ29yZSk6 CisKIDIwMTItMDgtMTkgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbkB3ZWJraXQub3JnPgog CiAgICAgICAgIFJlbW92ZSB0aGUgc3RhdGljIFN0cmluZ3MgdXNlZCBmb3Igb3V0cHV0dGluZyB2 YWx1ZXMgb2YgQ1NTX0FUVFIsIENTU19DT1VOVEVSLCBDU1NfUkVDVApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAKaW5kZXggYmFjYTg2Yzdi NjU0YjhlZDJkNWYzODJjNmFjMjM2MTgzMDRjNDc4OC4uZjg2ODUyNzllNGZkZTQ5OWIwMGZmNDE1 YmE2Nzk3YTJkOWVlYzU1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cv U2xpZGVyVGh1bWJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9T bGlkZXJUaHVtYkVsZW1lbnQuY3BwCkBAIC04Myw2ICs4MywxNiBAQCBTbGlkZXJUaHVtYkVsZW1l bnQqIHNsaWRlclRodW1iRWxlbWVudE9mKE5vZGUqIG5vZGUpCiAgICAgcmV0dXJuIHRvU2xpZGVy VGh1bWJFbGVtZW50KHRodW1iKTsKIH0KIAorSFRNTEVsZW1lbnQqIHNsaWRlclRyYWNrRWxlbWVu dE9mKE5vZGUqIG5vZGUpCit7CisgICAgQVNTRVJUKG5vZGUpOworICAgIFNoYWRvd1Jvb3QqIHNo YWRvdyA9IG5vZGUtPnRvSW5wdXRFbGVtZW50KCktPnVzZXJBZ2VudFNoYWRvd1Jvb3QoKTsKKyAg ICBBU1NFUlQoc2hhZG93KTsKKyAgICBOb2RlKiB0cmFjayA9IHNoYWRvdy0+Zmlyc3RDaGlsZCgp LT5maXJzdENoaWxkKCk7CisgICAgQVNTRVJUKHRyYWNrKTsKKyAgICByZXR1cm4gdG9IVE1MRWxl bWVudCh0cmFjayk7Cit9CisKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAK IFJlbmRlclNsaWRlclRodW1iOjpSZW5kZXJTbGlkZXJUaHVtYihOb2RlKiBub2RlKQpAQCAtMjQw LDggKzI1MCw5IEBAIHZvaWQgU2xpZGVyVGh1bWJFbGVtZW50OjpkcmFnRnJvbShjb25zdCBMYXlv dXRQb2ludCYgcG9pbnQpCiB2b2lkIFNsaWRlclRodW1iRWxlbWVudDo6c2V0UG9zaXRpb25Gcm9t UG9pbnQoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KQogewogICAgIEhUTUxJbnB1dEVsZW1lbnQq IGlucHV0ID0gaG9zdElucHV0KCk7CisgICAgSFRNTEVsZW1lbnQqIHRyYWNrRWxlbWVudCA9IHNs aWRlclRyYWNrRWxlbWVudE9mKGlucHV0KTsKIAotICAgIGlmICghaW5wdXQtPnJlbmRlcmVyKCkg fHwgIXJlbmRlcmVyKCkpCisgICAgaWYgKCFpbnB1dC0+cmVuZGVyZXIoKSB8fCAhcmVuZGVyZXIo KSB8fCAhdHJhY2tFbGVtZW50LT5yZW5kZXJlcigpKQogICAgICAgICByZXR1cm47CiAKICAgICBp bnB1dC0+c2V0VGV4dEFzT2ZMYXN0Rm9ybUNvbnRyb2xDaGFuZ2VFdmVudChpbnB1dC0+dmFsdWUo KSk7CkBAIC0yNTYsMTMgKzI2NywxNSBAQCB2b2lkIFNsaWRlclRodW1iRWxlbWVudDo6c2V0UG9z aXRpb25Gcm9tUG9pbnQoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KQogICAgIC8vIEZJWE1FOiBU aGlzIHNob3VsZCBwcm9iYWJseSByZXNwZWN0IHRyYW5zZm9ybXMuCiAgICAgTGF5b3V0UG9pbnQg YWJzb2x1dGVUaHVtYk9yaWdpbiA9IHJlbmRlckJveCgpLT5hYnNvbHV0ZUJvdW5kaW5nQm94UmVj dElnbm9yaW5nVHJhbnNmb3JtcygpLmxvY2F0aW9uKCk7CiAgICAgTGF5b3V0UG9pbnQgYWJzb2x1 dGVTbGlkZXJDb250ZW50T3JpZ2luID0gcm91bmRlZExheW91dFBvaW50KGlucHV0LT5yZW5kZXJl cigpLT5sb2NhbFRvQWJzb2x1dGUoKSk7CisgICAgSW50UmVjdCB0cmFja0JvdW5kaW5nQm94ID0g dHJhY2tFbGVtZW50LT5yZW5kZXJlcigpLT5hYnNvbHV0ZUJvdW5kaW5nQm94UmVjdElnbm9yaW5n VHJhbnNmb3JtcygpOworICAgIEludFJlY3QgaW5wdXRCb3VuZGluZ0JveCA9IGlucHV0LT5yZW5k ZXJlcigpLT5hYnNvbHV0ZUJvdW5kaW5nQm94UmVjdElnbm9yaW5nVHJhbnNmb3JtcygpOwogICAg IGlmIChpc1ZlcnRpY2FsKSB7Ci0gICAgICAgIHRyYWNrU2l6ZSA9IGlucHV0LT5yZW5kZXJCb3go KS0+Y29udGVudEhlaWdodCgpIC0gcmVuZGVyQm94KCktPmhlaWdodCgpOwotICAgICAgICBwb3Np dGlvbiA9IG9mZnNldC55KCkgLSByZW5kZXJCb3goKS0+aGVpZ2h0KCkgLyAyOworICAgICAgICB0 cmFja1NpemUgPSB0cmFja0VsZW1lbnQtPnJlbmRlckJveCgpLT5jb250ZW50SGVpZ2h0KCk7Cisg ICAgICAgIHBvc2l0aW9uID0gb2Zmc2V0LnkoKSAtIHJlbmRlckJveCgpLT5oZWlnaHQoKSAvIDIg LSB0cmFja0JvdW5kaW5nQm94LnkoKSArIGlucHV0Qm91bmRpbmdCb3gueSgpOwogICAgICAgICBj dXJyZW50UG9zaXRpb24gPSBhYnNvbHV0ZVRodW1iT3JpZ2luLnkoKSAtIGFic29sdXRlU2xpZGVy Q29udGVudE9yaWdpbi55KCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgdHJhY2tTaXplID0gaW5w dXQtPnJlbmRlckJveCgpLT5jb250ZW50V2lkdGgoKSAtIHJlbmRlckJveCgpLT53aWR0aCgpOwot ICAgICAgICBwb3NpdGlvbiA9IG9mZnNldC54KCkgLSByZW5kZXJCb3goKS0+d2lkdGgoKSAvIDI7 CisgICAgICAgIHRyYWNrU2l6ZSA9IHRyYWNrRWxlbWVudC0+cmVuZGVyQm94KCktPmNvbnRlbnRX aWR0aCgpOworICAgICAgICBwb3NpdGlvbiA9IG9mZnNldC54KCkgLSByZW5kZXJCb3goKS0+d2lk dGgoKSAvIDIgLSB0cmFja0JvdW5kaW5nQm94LngoKSArIGlucHV0Qm91bmRpbmdCb3gueCgpOwog ICAgICAgICBjdXJyZW50UG9zaXRpb24gPSBhYnNvbHV0ZVRodW1iT3JpZ2luLngoKSAtIGFic29s dXRlU2xpZGVyQ29udGVudE9yaWdpbi54KCk7CiAgICAgfQogICAgIHBvc2l0aW9uID0gbWF4PExh eW91dFVuaXQ+KDAsIG1pbihwb3NpdGlvbiwgdHJhY2tTaXplKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1lbnQuaCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5oCmluZGV4IDA0ZTQxYzdiZjQ5OWY4 ZjUyODI4NjU0YjJlMmVmODFjMWZlMzI1NjYuLmI4OTEyYzI3MmI1OWVkZTk3ZDk2Y2U4ZWExNTM1 YjhhYjQ3NjFlZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRl clRodW1iRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRo dW1iRWxlbWVudC5oCkBAIC0xMDAsNiArMTAwLDcgQEAgaW5saW5lIFNsaWRlclRodW1iRWxlbWVu dCogdG9TbGlkZXJUaHVtYkVsZW1lbnQoTm9kZSogbm9kZSkKIC8vIFRoaXMgYWx3YXlzIHJldHVy biBhIHZhbGlkIHBvaW50ZXIuCiAvLyBBbiBhc3NlcnRpb24gZmFpbHMgaWYgdGhlIHNwZWNpZmll ZCBub2RlIGlzIG5vdCBhIHJhbmdlIGlucHV0LgogU2xpZGVyVGh1bWJFbGVtZW50KiBzbGlkZXJU aHVtYkVsZW1lbnRPZihOb2RlKik7CitIVE1MRWxlbWVudCogc2xpZGVyVHJhY2tFbGVtZW50T2Yo Tm9kZSopOwogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg OTJlOTMzY2UyM2Y1MjhiZjEwMzdhM2ViZjEyMzFmNjNkNmY5ZjY1Yi4uYzNlOTM1OGQ1ZGJjN2U2 MjRmOTkyNmFjZTY0MGJjOGI1ZDgyMmY3ZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA4 LTIwICBLZWlzaGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgorCisgICAgICAgIENsaWNr aW5nIGlucHV0IHR5cGU9cmFuZ2Ugd2l0aCBwYWRkaW5nIG9yIGJvcmRlciBzZXRzIHdyb25nIHZh bHVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDQ3 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFz dC9mb3Jtcy9yYW5nZS9yYW5nZS1oaXQtdGVzdC13aXRoLXBhZGRpbmctZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBmYXN0L2Zvcm1zL3JhbmdlL3JhbmdlLWhpdC10ZXN0LXdpdGgtcGFk ZGluZy5odG1sOiBBZGRlZC4KKwogMjAxMi0wOC0xOSAgUmlrIENhYmFuaWVyICA8Y2FiYW5pZXJA YWRvYmUuY29tPgogCiAgICAgICAgIHBhcnNlIENTUyBhdHRyaWJ1dGUgLXdlYmtpdC1ibGVuZC1t b2RlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3JhbmdlL3JhbmdlLWhpdC10 ZXN0LXdpdGgtcGFkZGluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3Jh bmdlL3JhbmdlLWhpdC10ZXN0LXdpdGgtcGFkZGluZy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u NjY0YzhiYTk0YjlkNmJhMmViNTUzMjllNTBkOGZlZTcyN2Y4M2YwMQotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvcmFuZ2UvcmFuZ2UtaGl0LXRlc3Qtd2l0aC1wYWRk aW5nLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDcgQEAKK0NsaWNraW5nIG1pZGRsZSBvZiBpbnB1 dCB0eXBlPXJhbmdlIHdpdGggcGFkZGluZyBzaG91bGQgc2V0IHRoZSB2YWx1ZSB0byBtaWRkbGUu CisKK1BBU1MgaW5wdXQudmFsdWUgaXMgIjUwMCIKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlz IHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zv cm1zL3JhbmdlL3JhbmdlLWhpdC10ZXN0LXdpdGgtcGFkZGluZy5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9mb3Jtcy9yYW5nZS9yYW5nZS1oaXQtdGVzdC13aXRoLXBhZGRpbmcuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5iOTg3NjAwNjAwYzI0OTNkMTliMjgxYzhjOTFjZGM4OGZlNDEyNDYwCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9yYW5nZS9yYW5nZS1oaXQtdGVzdC13aXRo LXBhZGRpbmcuaHRtbApAQCAtMCwwICsxLDM0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgor PGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48 L3NjcmlwdD4KKzxzdHlsZT4KK2lucHV0OjpiZWZvcmUgeworICBjb250ZW50OiAibG9yZW0gaXBz dW0iOworICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CisgIGhlaWdodDogMjBweDsKKyAgYmFja2dy b3VuZC1jb2xvcjogcmVkOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPHAgaWQ9ImRl c2NyaXB0aW9uIj5DbGlja2luZyBtaWRkbGUgb2YgaW5wdXQgdHlwZT1yYW5nZSB3aXRoIHBhZGRp bmcgc2hvdWxkIHNldCB0aGUgdmFsdWUgdG8gbWlkZGxlLjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUi PjwvZGl2PgorPGlucHV0IGlkPSJpbnB1dCIgdHlwZT1yYW5nZSBtaW49MCBtYXg9MTAwMCBzdGVw PTEgdmFsdWU9IjAiIHN0eWxlPSJ3aWR0aDogMTAwcHg7IHBhZGRpbmc6IDAgMjBweDsiPgorPHNj cmlwdD4KK3ZhciBpbnB1dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJpbnB1dCIpOworZnVu Y3Rpb24gY2xpY2tTbGlkZXIob2Zmc2V0TGVmdCkgeworICAgIHZhciBjZW50ZXJZID0gaW5wdXQu b2Zmc2V0VG9wICsgaW5wdXQub2Zmc2V0SGVpZ2h0IC8gMjsKKyAgICBldmVudFNlbmRlci5tb3Vz ZU1vdmVUbyhpbnB1dC5vZmZzZXRMZWZ0ICsgb2Zmc2V0TGVmdCwgY2VudGVyWSk7CisgICAgZXZl bnRTZW5kZXIubW91c2VEb3duKCk7CisgICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOworfQorCitj bGlja1NsaWRlcig3MCk7IC8vIGxlZnQgcGFkZGluZyAoMjBweCkgKyBtaWRkbGUgKDUwcHgpCitz aG91bGRCZSgnaW5wdXQudmFsdWUnLCAnIjUwMCInKTsKKworPC9zY3JpcHQ+CisKKzxzY3JpcHQg c3JjPSIuLi8uLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9k eT4KKzwvaHRtbD4K