120480 2013-08-29 10:50:43 -0700 Fix slider thumb event handling to use local, not absolute coordinates 2013-08-29 12:15:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bdakin jonlee simon.fraser webkit-ews oldest_to_newest 922550 0 simon.fraser 2013-08-29 10:50:43 -0700 Fix slider thumb event handling to use local, not absolute coordinates 922552 1 210002 simon.fraser 2013-08-29 10:52:51 -0700 Created attachment 210002 Patch 922559 2 210002 webkit-ews 2013-08-29 11:01:35 -0700 Comment on attachment 210002 Patch Attachment 210002 did not pass qt-ews (qt): Output: http://webkit-queues.appspot.com/results/1625625 922560 3 210002 webkit-ews 2013-08-29 11:03:10 -0700 Comment on attachment 210002 Patch Attachment 210002 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1624681 922564 4 210004 simon.fraser 2013-08-29 11:20:10 -0700 Created attachment 210004 Patch 922586 5 210004 darin 2013-08-29 11:59:09 -0700 Comment on attachment 210004 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=210004&action=review > Source/WebCore/ChangeLog:16 > + No behavior change. Is there any test coverage for this? > Source/WebCore/html/shadow/SliderThumbElement.cpp:271 > + RenderBox* inputRenderer = toRenderBox(input->renderer()); > + RenderBox* trackRenderer = trackElement->renderBox(); In modern code we like to use references for things that can’t be null. I would use references for these two local variables. 922598 6 simon.fraser 2013-08-29 12:15:04 -0700 https://trac.webkit.org/r154832 210002 2013-08-29 10:52:51 -0700 2013-08-29 11:20:08 -0700 Patch bug-120480-20130829105250.patch text/plain 5167 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0Nzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjE1OGRkNTNlNjQwMWJh NjdmMTBiZGIwNzZiZTM3OTY0MDI1NDdmZi4uMWE3YjMyYjU1OTRkYzg1YzFkOWFmMWI2YTQ2MWM3 MzM1NjhhOWE3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA4LTI5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBzbGlkZXIg dGh1bWIgZXZlbnQgaGFuZGxpbmcgdG8gdXNlIGxvY2FsLCBub3QgYWJzb2x1dGUgY29vcmRpbmF0 ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMDQ4 MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAg ICAgU2xpZGVyVGh1bWJFbGVtZW50OjpzZXRQb3NpdGlvbkZyb21Qb2ludCgpIGRpZCBhbGwgb2Yg aXRzIGNvb3JkaW5hdGUKKyAgICAgICAgbWF0aCBieSBtYXBwaW5nIHJlbmRlcmVyIHJlY3RzIGlu dG8gYWJzb2x1dGUgY29vcmRpbmF0ZXMsIHdoaWNoIHdhcworICAgICAgICB1bm5lY2Vzc2FyeSBh bmQgZXhwZW5zaXZlLgorICAgICAgICAKKyAgICAgICAgRml4IGJ5IGRvaW5nIGFsbCB0aGUgbWF0 aCBpbiB0aGUgY29vcmRpbmF0ZSBzcGFjZSBvZiB0aGUgaW5wdXQncworICAgICAgICByZW5kZXJl ci4gVGhpcyBzaW1wbGlmaWVkIHRoZSBjb2RlLiBBbHNvLCBjdXJyZW50UG9zaXRpb24KKyAgICAg ICAgd2FzIGNvbXB1dGVkIGJ1dCB1bnVzZWQsIHNvIHdhcyByZW1vdmVkLgorCisgICAgICAgIE5v IGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGh0bWwvc2hhZG93L1NsaWRlclRodW1iRWxl bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTbGlkZXJUaHVtYkVsZW1lbnQ6OnNldFBvc2l0 aW9uRnJvbVBvaW50KToKKwogMjAxMy0wOC0yOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2Vy QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggY29tcG9zaXRpbmcgbGF5ZXJzIGluIGNvbHVtbnMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1lbnQuY3Bw CmluZGV4IDJkMGE3ZTE4MTkxZjQ5ZGE3YzlmYzI0MTczMjQ5ODYwMWRmOWM3MTMuLmJiMjRmMWI4 OTQ4ZGY2YThhOWYwOGZkNjU5N2U3MjNmNTc2MjlmOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmNwcApAQCAtMjU2LDcgKzI1Niw3IEBA IHZvaWQgU2xpZGVyVGh1bWJFbGVtZW50OjpkcmFnRnJvbShjb25zdCBMYXlvdXRQb2ludCYgcG9p bnQpCiAgICAgc3RhcnREcmFnZ2luZygpOwogfQogCi12b2lkIFNsaWRlclRodW1iRWxlbWVudDo6 c2V0UG9zaXRpb25Gcm9tUG9pbnQoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KQordm9pZCBTbGlk ZXJUaHVtYkVsZW1lbnQ6OnNldFBvc2l0aW9uRnJvbVBvaW50KGNvbnN0IExheW91dFBvaW50JiBh YnNvbHV0ZVBvaW50KQogewogICAgIFJlZlB0cjxIVE1MSW5wdXRFbGVtZW50PiBpbnB1dChob3N0 SW5wdXQoKSk7CiAgICAgSFRNTEVsZW1lbnQqIHRyYWNrRWxlbWVudCA9IHNsaWRlclRyYWNrRWxl bWVudE9mKGlucHV0LmdldCgpKTsKQEAgLTI2NSwzMiArMjY1LDMwIEBAIHZvaWQgU2xpZGVyVGh1 bWJFbGVtZW50OjpzZXRQb3NpdGlvbkZyb21Qb2ludChjb25zdCBMYXlvdXRQb2ludCYgcG9pbnQp CiAgICAgICAgIHJldHVybjsKIAogICAgIGlucHV0LT5zZXRUZXh0QXNPZkxhc3RGb3JtQ29udHJv bENoYW5nZUV2ZW50KGlucHV0LT52YWx1ZSgpKTsKLSAgICBMYXlvdXRQb2ludCBvZmZzZXQgPSBy b3VuZGVkTGF5b3V0UG9pbnQoaW5wdXQtPnJlbmRlcmVyKCktPmFic29sdXRlVG9Mb2NhbChwb2lu dCwgVXNlVHJhbnNmb3JtcykpOworCisgICAgLy8gRG8gYWxsIHRoZSB0cmFja2luZyBtYXRoIHJl bGF0aXZlIHRvIHRoZSBpbnB1dCdzIHJlbmRlcmVyJ3MgYm94LgorICAgIFJlbmRlckJveCogaW5w dXRSZW5kZXJlciA9IHRvUmVuZGVyQm94KGlucHV0LT5yZW5kZXJlcigpKTsKKyAgICBSZW5kZXJC b3gqIHRyYWNrUmVuZGVyZXIgPSB0cmFja0VsZW1lbnQtPnJlbmRlckJveCgpOworCiAgICAgYm9v bCBpc1ZlcnRpY2FsID0gaGFzVmVydGljYWxBcHBlYXJhbmNlKGlucHV0LmdldCgpKTsKICAgICBi b29sIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPSByZW5kZXJCb3goKS0+c3R5bGUoKS0+aXNMZWZ0 VG9SaWdodERpcmVjdGlvbigpOwotICAgIExheW91dFVuaXQgdHJhY2tTaXplOworICAgIAorICAg IExheW91dFBvaW50IG9mZnNldCA9IHJvdW5kZWRMYXlvdXRQb2ludChpbnB1dFJlbmRlcmVyLT5h YnNvbHV0ZVRvTG9jYWwoYWJzb2x1dGVQb2ludCwgVXNlVHJhbnNmb3JtcykpOworICAgIEZsb2F0 UmVjdCB0cmFja0JvdW5kaW5nQm94ID0gdHJhY2tSZW5kZXJlci0+bG9jYWxUb0NvbnRhaW5lclF1 YWQoRmxvYXRSZWN0KDAsIDAsIHRyYWNrUmVuZGVyZXItPndpZHRoKCksIHRyYWNrUmVuZGVyZXIt PmhlaWdodCgpKSwgaW5wdXRSZW5kZXJlcikuZW5jbG9zaW5nQm91bmRpbmdCb3goKTsKKworICAg IExheW91dFVuaXQgdHJhY2tMZW5ndGg7CiAgICAgTGF5b3V0VW5pdCBwb3NpdGlvbjsKLSAgICBM YXlvdXRVbml0IGN1cnJlbnRQb3NpdGlvbjsKLSAgICAvLyBXZSBuZWVkIHRvIGNhbGN1bGF0ZSBj dXJyZW50UG9zaXRpb24gZnJvbSBhYnNvbHV0ZSBwb2ludHMgYmVjYXVlIHRoZQotICAgIC8vIHJl bmRlcmVyIGZvciB0aGlzIG5vZGUgaXMgdXN1YWxseSBvbiBhIGxheWVyIGFuZCByZW5kZXJCb3go KS0+eCgpIGFuZAotICAgIC8vIHkoKSBhcmUgdW51c2FibGUuCi0gICAgLy8gRklYTUU6IFRoaXMg c2hvdWxkIHByb2JhYmx5IHJlc3BlY3QgdHJhbnNmb3Jtcy4KLSAgICBMYXlvdXRQb2ludCBhYnNv bHV0ZVRodW1iT3JpZ2luID0gcmVuZGVyQm94KCktPmFic29sdXRlQm91bmRpbmdCb3hSZWN0SWdu b3JpbmdUcmFuc2Zvcm1zKCkubG9jYXRpb24oKTsKLSAgICBMYXlvdXRQb2ludCBhYnNvbHV0ZVNs aWRlckNvbnRlbnRPcmlnaW4gPSByb3VuZGVkTGF5b3V0UG9pbnQoaW5wdXQtPnJlbmRlcmVyKCkt PmxvY2FsVG9BYnNvbHV0ZSgpKTsKLSAgICBJbnRSZWN0IHRyYWNrQm91bmRpbmdCb3ggPSB0cmFj a0VsZW1lbnQtPnJlbmRlcmVyKCktPmFic29sdXRlQm91bmRpbmdCb3hSZWN0SWdub3JpbmdUcmFu c2Zvcm1zKCk7Ci0gICAgSW50UmVjdCBpbnB1dEJvdW5kaW5nQm94ID0gaW5wdXQtPnJlbmRlcmVy KCktPmFic29sdXRlQm91bmRpbmdCb3hSZWN0SWdub3JpbmdUcmFuc2Zvcm1zKCk7CiAgICAgaWYg KGlzVmVydGljYWwpIHsKLSAgICAgICAgdHJhY2tTaXplID0gdHJhY2tFbGVtZW50LT5yZW5kZXJC b3goKS0+Y29udGVudEhlaWdodCgpIC0gcmVuZGVyQm94KCktPmhlaWdodCgpOwotICAgICAgICBw b3NpdGlvbiA9IG9mZnNldC55KCkgLSByZW5kZXJCb3goKS0+aGVpZ2h0KCkgLyAyIC0gdHJhY2tC b3VuZGluZ0JveC55KCkgKyBpbnB1dEJvdW5kaW5nQm94LnkoKSAtIHJlbmRlckJveCgpLT5tYXJn aW5Cb3R0b20oKTsKLSAgICAgICAgY3VycmVudFBvc2l0aW9uID0gYWJzb2x1dGVUaHVtYk9yaWdp bi55KCkgLSBhYnNvbHV0ZVNsaWRlckNvbnRlbnRPcmlnaW4ueSgpOworICAgICAgICB0cmFja0xl bmd0aCA9IHRyYWNrUmVuZGVyZXItPmNvbnRlbnRIZWlnaHQoKSAtIHJlbmRlckJveCgpLT5oZWln aHQoKTsKKyAgICAgICAgcG9zaXRpb24gPSBvZmZzZXQueSgpIC0gcmVuZGVyQm94KCktPmhlaWdo dCgpIC8gMiAtIHRyYWNrQm91bmRpbmdCb3gueSgpIC0gcmVuZGVyQm94KCktPm1hcmdpbkJvdHRv bSgpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIHRyYWNrU2l6ZSA9IHRyYWNrRWxlbWVudC0+cmVu ZGVyQm94KCktPmNvbnRlbnRXaWR0aCgpIC0gcmVuZGVyQm94KCktPndpZHRoKCk7Ci0gICAgICAg IHBvc2l0aW9uID0gb2Zmc2V0LngoKSAtIHJlbmRlckJveCgpLT53aWR0aCgpIC8gMiAtIHRyYWNr Qm91bmRpbmdCb3gueCgpICsgaW5wdXRCb3VuZGluZ0JveC54KCk7CisgICAgICAgIHRyYWNrTGVu Z3RoID0gdHJhY2tSZW5kZXJlci0+Y29udGVudFdpZHRoKCkgLSByZW5kZXJCb3goKS0+d2lkdGgo KTsKKyAgICAgICAgcG9zaXRpb24gPSBvZmZzZXQueCgpIC0gcmVuZGVyQm94KCktPndpZHRoKCkg LyAyIC0gdHJhY2tCb3VuZGluZ0JveC54KCk7CiAgICAgICAgIHBvc2l0aW9uIC09IGlzTGVmdFRv UmlnaHREaXJlY3Rpb24gPyByZW5kZXJCb3goKS0+bWFyZ2luTGVmdCgpIDogcmVuZGVyQm94KCkt Pm1hcmdpblJpZ2h0KCk7Ci0gICAgICAgIGN1cnJlbnRQb3NpdGlvbiA9IGFic29sdXRlVGh1bWJP cmlnaW4ueCgpIC0gYWJzb2x1dGVTbGlkZXJDb250ZW50T3JpZ2luLngoKTsKICAgICB9Ci0gICAg cG9zaXRpb24gPSBtYXg8TGF5b3V0VW5pdD4oMCwgbWluKHBvc2l0aW9uLCB0cmFja1NpemUpKTsK LSAgICBjb25zdCBEZWNpbWFsIHJhdGlvID0gRGVjaW1hbDo6ZnJvbURvdWJsZShzdGF0aWNfY2Fz dDxkb3VibGU+KHBvc2l0aW9uKSAvIHRyYWNrU2l6ZSk7CisKKyAgICBwb3NpdGlvbiA9IG1heDxM YXlvdXRVbml0PigwLCBtaW4ocG9zaXRpb24sIHRyYWNrTGVuZ3RoKSk7CisgICAgY29uc3QgRGVj aW1hbCByYXRpbyA9IERlY2ltYWw6OmZyb21Eb3VibGUoc3RhdGljX2Nhc3Q8ZG91YmxlPihwb3Np dGlvbikgLyB0cmFja0xlbmd0aCk7CiAgICAgY29uc3QgRGVjaW1hbCBmcmFjdGlvbiA9IGlzVmVy dGljYWwgfHwgIWlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPyBEZWNpbWFsKDEpIC0gcmF0aW8gOiBy YXRpbzsKICAgICBTdGVwUmFuZ2Ugc3RlcFJhbmdlKGlucHV0LT5jcmVhdGVTdGVwUmFuZ2UoUmVq ZWN0QW55KSk7CiAgICAgRGVjaW1hbCB2YWx1ZSA9IHN0ZXBSYW5nZS5jbGFtcFZhbHVlKHN0ZXBS YW5nZS52YWx1ZUZyb21Qcm9wb3J0aW9uKGZyYWN0aW9uKSk7Cg== 210004 2013-08-29 11:20:10 -0700 2013-08-29 11:59:09 -0700 Patch bug-120480-20130829112009.patch text/plain 5756 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0Nzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjE1OGRkNTNlNjQwMWJh NjdmMTBiZGIwNzZiZTM3OTY0MDI1NDdmZi4uMWE3YjMyYjU1OTRkYzg1YzFkOWFmMWI2YTQ2MWM3 MzM1NjhhOWE3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA4LTI5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBzbGlkZXIg dGh1bWIgZXZlbnQgaGFuZGxpbmcgdG8gdXNlIGxvY2FsLCBub3QgYWJzb2x1dGUgY29vcmRpbmF0 ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMDQ4 MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAg ICAgU2xpZGVyVGh1bWJFbGVtZW50OjpzZXRQb3NpdGlvbkZyb21Qb2ludCgpIGRpZCBhbGwgb2Yg aXRzIGNvb3JkaW5hdGUKKyAgICAgICAgbWF0aCBieSBtYXBwaW5nIHJlbmRlcmVyIHJlY3RzIGlu dG8gYWJzb2x1dGUgY29vcmRpbmF0ZXMsIHdoaWNoIHdhcworICAgICAgICB1bm5lY2Vzc2FyeSBh bmQgZXhwZW5zaXZlLgorICAgICAgICAKKyAgICAgICAgRml4IGJ5IGRvaW5nIGFsbCB0aGUgbWF0 aCBpbiB0aGUgY29vcmRpbmF0ZSBzcGFjZSBvZiB0aGUgaW5wdXQncworICAgICAgICByZW5kZXJl ci4gVGhpcyBzaW1wbGlmaWVkIHRoZSBjb2RlLiBBbHNvLCBjdXJyZW50UG9zaXRpb24KKyAgICAg ICAgd2FzIGNvbXB1dGVkIGJ1dCB1bnVzZWQsIHNvIHdhcyByZW1vdmVkLgorCisgICAgICAgIE5v IGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGh0bWwvc2hhZG93L1NsaWRlclRodW1iRWxl bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTbGlkZXJUaHVtYkVsZW1lbnQ6OnNldFBvc2l0 aW9uRnJvbVBvaW50KToKKwogMjAxMy0wOC0yOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2Vy QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggY29tcG9zaXRpbmcgbGF5ZXJzIGluIGNvbHVtbnMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1lbnQuY3Bw CmluZGV4IDJkMGE3ZTE4MTkxZjQ5ZGE3YzlmYzI0MTczMjQ5ODYwMWRmOWM3MTMuLjVhNWY1NmI4 ZjAxNmUxMjFhYjliZTcwZmIwYzY3NTE0MWMwY2FkZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmNwcApAQCAtMjU2LDcgKzI1Niw3IEBA IHZvaWQgU2xpZGVyVGh1bWJFbGVtZW50OjpkcmFnRnJvbShjb25zdCBMYXlvdXRQb2ludCYgcG9p bnQpCiAgICAgc3RhcnREcmFnZ2luZygpOwogfQogCi12b2lkIFNsaWRlclRodW1iRWxlbWVudDo6 c2V0UG9zaXRpb25Gcm9tUG9pbnQoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KQordm9pZCBTbGlk ZXJUaHVtYkVsZW1lbnQ6OnNldFBvc2l0aW9uRnJvbVBvaW50KGNvbnN0IExheW91dFBvaW50JiBh YnNvbHV0ZVBvaW50KQogewogICAgIFJlZlB0cjxIVE1MSW5wdXRFbGVtZW50PiBpbnB1dChob3N0 SW5wdXQoKSk7CiAgICAgSFRNTEVsZW1lbnQqIHRyYWNrRWxlbWVudCA9IHNsaWRlclRyYWNrRWxl bWVudE9mKGlucHV0LmdldCgpKTsKQEAgLTI2NSwzMiArMjY1LDMwIEBAIHZvaWQgU2xpZGVyVGh1 bWJFbGVtZW50OjpzZXRQb3NpdGlvbkZyb21Qb2ludChjb25zdCBMYXlvdXRQb2ludCYgcG9pbnQp CiAgICAgICAgIHJldHVybjsKIAogICAgIGlucHV0LT5zZXRUZXh0QXNPZkxhc3RGb3JtQ29udHJv bENoYW5nZUV2ZW50KGlucHV0LT52YWx1ZSgpKTsKLSAgICBMYXlvdXRQb2ludCBvZmZzZXQgPSBy b3VuZGVkTGF5b3V0UG9pbnQoaW5wdXQtPnJlbmRlcmVyKCktPmFic29sdXRlVG9Mb2NhbChwb2lu dCwgVXNlVHJhbnNmb3JtcykpOworCisgICAgLy8gRG8gYWxsIHRoZSB0cmFja2luZyBtYXRoIHJl bGF0aXZlIHRvIHRoZSBpbnB1dCdzIHJlbmRlcmVyJ3MgYm94LgorICAgIFJlbmRlckJveCogaW5w dXRSZW5kZXJlciA9IHRvUmVuZGVyQm94KGlucHV0LT5yZW5kZXJlcigpKTsKKyAgICBSZW5kZXJC b3gqIHRyYWNrUmVuZGVyZXIgPSB0cmFja0VsZW1lbnQtPnJlbmRlckJveCgpOworCiAgICAgYm9v bCBpc1ZlcnRpY2FsID0gaGFzVmVydGljYWxBcHBlYXJhbmNlKGlucHV0LmdldCgpKTsKICAgICBi b29sIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPSByZW5kZXJCb3goKS0+c3R5bGUoKS0+aXNMZWZ0 VG9SaWdodERpcmVjdGlvbigpOwotICAgIExheW91dFVuaXQgdHJhY2tTaXplOworICAgIAorICAg IExheW91dFBvaW50IG9mZnNldCA9IHJvdW5kZWRMYXlvdXRQb2ludChpbnB1dFJlbmRlcmVyLT5h YnNvbHV0ZVRvTG9jYWwoYWJzb2x1dGVQb2ludCwgVXNlVHJhbnNmb3JtcykpOworICAgIEZsb2F0 UmVjdCB0cmFja0JvdW5kaW5nQm94ID0gdHJhY2tSZW5kZXJlci0+bG9jYWxUb0NvbnRhaW5lclF1 YWQoRmxvYXRSZWN0KDAsIDAsIHRyYWNrUmVuZGVyZXItPndpZHRoKCksIHRyYWNrUmVuZGVyZXIt PmhlaWdodCgpKSwgaW5wdXRSZW5kZXJlcikuZW5jbG9zaW5nQm91bmRpbmdCb3goKTsKKworICAg IExheW91dFVuaXQgdHJhY2tMZW5ndGg7CiAgICAgTGF5b3V0VW5pdCBwb3NpdGlvbjsKLSAgICBM YXlvdXRVbml0IGN1cnJlbnRQb3NpdGlvbjsKLSAgICAvLyBXZSBuZWVkIHRvIGNhbGN1bGF0ZSBj dXJyZW50UG9zaXRpb24gZnJvbSBhYnNvbHV0ZSBwb2ludHMgYmVjYXVlIHRoZQotICAgIC8vIHJl bmRlcmVyIGZvciB0aGlzIG5vZGUgaXMgdXN1YWxseSBvbiBhIGxheWVyIGFuZCByZW5kZXJCb3go KS0+eCgpIGFuZAotICAgIC8vIHkoKSBhcmUgdW51c2FibGUuCi0gICAgLy8gRklYTUU6IFRoaXMg c2hvdWxkIHByb2JhYmx5IHJlc3BlY3QgdHJhbnNmb3Jtcy4KLSAgICBMYXlvdXRQb2ludCBhYnNv bHV0ZVRodW1iT3JpZ2luID0gcmVuZGVyQm94KCktPmFic29sdXRlQm91bmRpbmdCb3hSZWN0SWdu b3JpbmdUcmFuc2Zvcm1zKCkubG9jYXRpb24oKTsKLSAgICBMYXlvdXRQb2ludCBhYnNvbHV0ZVNs aWRlckNvbnRlbnRPcmlnaW4gPSByb3VuZGVkTGF5b3V0UG9pbnQoaW5wdXQtPnJlbmRlcmVyKCkt PmxvY2FsVG9BYnNvbHV0ZSgpKTsKLSAgICBJbnRSZWN0IHRyYWNrQm91bmRpbmdCb3ggPSB0cmFj a0VsZW1lbnQtPnJlbmRlcmVyKCktPmFic29sdXRlQm91bmRpbmdCb3hSZWN0SWdub3JpbmdUcmFu c2Zvcm1zKCk7Ci0gICAgSW50UmVjdCBpbnB1dEJvdW5kaW5nQm94ID0gaW5wdXQtPnJlbmRlcmVy KCktPmFic29sdXRlQm91bmRpbmdCb3hSZWN0SWdub3JpbmdUcmFuc2Zvcm1zKCk7CiAgICAgaWYg KGlzVmVydGljYWwpIHsKLSAgICAgICAgdHJhY2tTaXplID0gdHJhY2tFbGVtZW50LT5yZW5kZXJC b3goKS0+Y29udGVudEhlaWdodCgpIC0gcmVuZGVyQm94KCktPmhlaWdodCgpOwotICAgICAgICBw b3NpdGlvbiA9IG9mZnNldC55KCkgLSByZW5kZXJCb3goKS0+aGVpZ2h0KCkgLyAyIC0gdHJhY2tC b3VuZGluZ0JveC55KCkgKyBpbnB1dEJvdW5kaW5nQm94LnkoKSAtIHJlbmRlckJveCgpLT5tYXJn aW5Cb3R0b20oKTsKLSAgICAgICAgY3VycmVudFBvc2l0aW9uID0gYWJzb2x1dGVUaHVtYk9yaWdp bi55KCkgLSBhYnNvbHV0ZVNsaWRlckNvbnRlbnRPcmlnaW4ueSgpOworICAgICAgICB0cmFja0xl bmd0aCA9IHRyYWNrUmVuZGVyZXItPmNvbnRlbnRIZWlnaHQoKSAtIHJlbmRlckJveCgpLT5oZWln aHQoKTsKKyAgICAgICAgcG9zaXRpb24gPSBvZmZzZXQueSgpIC0gcmVuZGVyQm94KCktPmhlaWdo dCgpIC8gMiAtIHRyYWNrQm91bmRpbmdCb3gueSgpIC0gcmVuZGVyQm94KCktPm1hcmdpbkJvdHRv bSgpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIHRyYWNrU2l6ZSA9IHRyYWNrRWxlbWVudC0+cmVu ZGVyQm94KCktPmNvbnRlbnRXaWR0aCgpIC0gcmVuZGVyQm94KCktPndpZHRoKCk7Ci0gICAgICAg IHBvc2l0aW9uID0gb2Zmc2V0LngoKSAtIHJlbmRlckJveCgpLT53aWR0aCgpIC8gMiAtIHRyYWNr Qm91bmRpbmdCb3gueCgpICsgaW5wdXRCb3VuZGluZ0JveC54KCk7CisgICAgICAgIHRyYWNrTGVu Z3RoID0gdHJhY2tSZW5kZXJlci0+Y29udGVudFdpZHRoKCkgLSByZW5kZXJCb3goKS0+d2lkdGgo KTsKKyAgICAgICAgcG9zaXRpb24gPSBvZmZzZXQueCgpIC0gcmVuZGVyQm94KCktPndpZHRoKCkg LyAyIC0gdHJhY2tCb3VuZGluZ0JveC54KCk7CiAgICAgICAgIHBvc2l0aW9uIC09IGlzTGVmdFRv UmlnaHREaXJlY3Rpb24gPyByZW5kZXJCb3goKS0+bWFyZ2luTGVmdCgpIDogcmVuZGVyQm94KCkt Pm1hcmdpblJpZ2h0KCk7Ci0gICAgICAgIGN1cnJlbnRQb3NpdGlvbiA9IGFic29sdXRlVGh1bWJP cmlnaW4ueCgpIC0gYWJzb2x1dGVTbGlkZXJDb250ZW50T3JpZ2luLngoKTsKICAgICB9Ci0gICAg cG9zaXRpb24gPSBtYXg8TGF5b3V0VW5pdD4oMCwgbWluKHBvc2l0aW9uLCB0cmFja1NpemUpKTsK LSAgICBjb25zdCBEZWNpbWFsIHJhdGlvID0gRGVjaW1hbDo6ZnJvbURvdWJsZShzdGF0aWNfY2Fz dDxkb3VibGU+KHBvc2l0aW9uKSAvIHRyYWNrU2l6ZSk7CisKKyAgICBwb3NpdGlvbiA9IG1heDxM YXlvdXRVbml0PigwLCBtaW4ocG9zaXRpb24sIHRyYWNrTGVuZ3RoKSk7CisgICAgY29uc3QgRGVj aW1hbCByYXRpbyA9IERlY2ltYWw6OmZyb21Eb3VibGUoc3RhdGljX2Nhc3Q8ZG91YmxlPihwb3Np dGlvbikgLyB0cmFja0xlbmd0aCk7CiAgICAgY29uc3QgRGVjaW1hbCBmcmFjdGlvbiA9IGlzVmVy dGljYWwgfHwgIWlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPyBEZWNpbWFsKDEpIC0gcmF0aW8gOiBy YXRpbzsKICAgICBTdGVwUmFuZ2Ugc3RlcFJhbmdlKGlucHV0LT5jcmVhdGVTdGVwUmFuZ2UoUmVq ZWN0QW55KSk7CiAgICAgRGVjaW1hbCB2YWx1ZSA9IHN0ZXBSYW5nZS5jbGFtcFZhbHVlKHN0ZXBS YW5nZS52YWx1ZUZyb21Qcm9wb3J0aW9uKGZyYWN0aW9uKSk7CkBAIC0zMDIsNyArMzAwLDcgQEAg dm9pZCBTbGlkZXJUaHVtYkVsZW1lbnQ6OnNldFBvc2l0aW9uRnJvbVBvaW50KGNvbnN0IExheW91 dFBvaW50JiBwb2ludCkKICAgICAgICAgaWYgKGNsb3Nlc3QuaXNGaW5pdGUoKSkgewogICAgICAg ICAgICAgZG91YmxlIGNsb3Nlc3RGcmFjdGlvbiA9IHN0ZXBSYW5nZS5wcm9wb3J0aW9uRnJvbVZh bHVlKGNsb3Nlc3QpLnRvRG91YmxlKCk7CiAgICAgICAgICAgICBkb3VibGUgY2xvc2VzdFJhdGlv ID0gaXNWZXJ0aWNhbCB8fCAhaXNMZWZ0VG9SaWdodERpcmVjdGlvbiA/IDEuMCAtIGNsb3Nlc3RG cmFjdGlvbiA6IGNsb3Nlc3RGcmFjdGlvbjsKLSAgICAgICAgICAgIExheW91dFVuaXQgY2xvc2Vz dFBvc2l0aW9uID0gdHJhY2tTaXplICogY2xvc2VzdFJhdGlvOworICAgICAgICAgICAgTGF5b3V0 VW5pdCBjbG9zZXN0UG9zaXRpb24gPSB0cmFja0xlbmd0aCAqIGNsb3Nlc3RSYXRpbzsKICAgICAg ICAgICAgIGlmICgoY2xvc2VzdFBvc2l0aW9uIC0gcG9zaXRpb24pLmFicygpIDw9IHNuYXBwaW5n VGhyZXNob2xkKQogICAgICAgICAgICAgICAgIHZhbHVlID0gY2xvc2VzdDsKICAgICAgICAgfQo=