61493 2011-05-25 18:08:07 -0700 Switch positionOverflowControls to IntPoint 2011-05-26 15:07:03 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw darin eae eric simon.fraser oldest_to_newest 410093 0 leviw 2011-05-25 18:08:07 -0700 More tx/ty removal. 410141 1 94908 leviw 2011-05-25 20:03:58 -0700 Created attachment 94908 Patch 410393 2 94908 eric 2011-05-26 06:28:35 -0700 Comment on attachment 94908 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=94908&action=review > Source/WebCore/rendering/RenderLayer.cpp:2030 > + IntRect absBounds(borderBox.x() + offsetFromLayer.x(), borderBox.y() + offsetFromLayer.y(), borderBox.width(), borderBox.height()); And here... :) Definitely a size. (I've yet to see the true appeal of the size vs. point dichotomy. Mostly it's just a pain to work with.) > Source/WebCore/rendering/RenderLayer.cpp:2046 > + layer->setPosition(IntPoint(m_hBar->frameRect().x() - offsetFromLayer.y(), m_hBar->frameRect().y() - offsetFromLayer.y())); Seems this wants to be a size, cause then you would just do point math there. > Source/WebCore/rendering/RenderLayer.cpp:2053 > + layer->setPosition(IntPoint(m_vBar->frameRect().x() - offsetFromLayer.x(), m_vBar->frameRect().y() - offsetFromLayer.y())); And here. 410791 3 95031 leviw 2011-05-26 13:49:52 -0700 Created attachment 95031 Patch 410867 4 95031 eric 2011-05-26 14:54:48 -0700 Comment on attachment 95031 Patch LGTM. 410891 5 95031 leviw 2011-05-26 15:06:58 -0700 Comment on attachment 95031 Patch Clearing flags on attachment: 95031 Committed r87437: <http://trac.webkit.org/changeset/87437> 410892 6 leviw 2011-05-26 15:07:03 -0700 All reviewed patches have been landed. Closing bug. 94908 2011-05-25 20:03:58 -0700 2011-05-26 13:49:48 -0700 Patch bug-61493-20110525200356.patch text/plain 4521 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3MzUxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDUtMjUgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwb3NpdGlvbk92ZXJmbG93Q29udHJvbHMgdG8g SW50UG9pbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTYxNDkzCisKKyAgICAgICAgU3dpdGNoaW5nIHBvc2l0aW9uT3ZlcmZsb3dDb250cm9scyB0byB0 YWtlIGEgbGF5ZXJPZmZzZXQgSW50UG9pbnQKKyAgICAgICAgYXMgb3Bwb3NlZCB0byBhIHBhaXIg b2YgaW50cy4KKworICAgICAgICBObyBuZXcgdGVzdHMgc2luY2UgdGhpcyBpcyBqdXN0IHJlZmFj dG9yaW5nLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9ucyk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllcjo6cG9zaXRpb25PdmVyZmxvd0NvbnRyb2xzKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWludE92ZXJmbG93Q29udHJvbHMpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorCiAyMDExLTA1LTI0ICBNT1JJVEEgSGFqaW1lICA8 bW9ycml0YUBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtv di4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAkocmV2aXNp b24gODczMzQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yOTcsNyArMjk3LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRl TGF5ZXJQb3NpdGlvbnMoVQogI2VuZGlmCiAgICAgfSBlbHNlCiAgICAgICAgIGNvbnZlcnRUb0xh eWVyQ29vcmRzKHJvb3QoKSwgeCwgeSk7Ci0gICAgcG9zaXRpb25PdmVyZmxvd0NvbnRyb2xzKHgs IHkpOworICAgIHBvc2l0aW9uT3ZlcmZsb3dDb250cm9scyhJbnRQb2ludCh4LCB5KSk7CiAKICAg ICB1cGRhdGVWaXNpYmlsaXR5U3RhdHVzKCk7CiAKQEAgLTIwMTYsNyArMjAxNiw3IEBAIGJvb2wg UmVuZGVyTGF5ZXI6Omhhc092ZXJmbG93Q29udHJvbHMoKSAKICAgICByZXR1cm4gbV9oQmFyIHx8 IG1fdkJhciB8fCBtX3Njcm9sbENvcm5lciB8fCByZW5kZXJlcigpLT5zdHlsZSgpLT5yZXNpemUo KSAhPSBSRVNJWkVfTk9ORTsKIH0KIAotdm9pZCBSZW5kZXJMYXllcjo6cG9zaXRpb25PdmVyZmxv d0NvbnRyb2xzKGludCB0eCwgaW50IHR5KQordm9pZCBSZW5kZXJMYXllcjo6cG9zaXRpb25PdmVy Zmxvd0NvbnRyb2xzKGNvbnN0IEludFBvaW50JiBvZmZzZXRGcm9tTGF5ZXIpCiB7CiAgICAgaWYg KCFtX2hCYXIgJiYgIW1fdkJhciAmJiAoIXJlbmRlcmVyKCktPmhhc092ZXJmbG93Q2xpcCgpIHx8 IHJlbmRlcmVyKCktPnN0eWxlKCktPnJlc2l6ZSgpID09IFJFU0laRV9OT05FKSkKICAgICAgICAg cmV0dXJuOwpAQCAtMjAyNyw3ICsyMDI3LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cG9zaXRpb25P dmVyZmxvd0NvbnRybwogCiAgICAgY29uc3QgSW50UmVjdCYgYm9yZGVyQm94ID0gYm94LT5ib3Jk ZXJCb3hSZWN0KCk7CiAgICAgY29uc3QgSW50UmVjdCYgc2Nyb2xsQ29ybmVyID0gc2Nyb2xsQ29y bmVyUmVjdCgpOwotICAgIEludFJlY3QgYWJzQm91bmRzKGJvcmRlckJveC54KCkgKyB0eCwgYm9y ZGVyQm94LnkoKSArIHR5LCBib3JkZXJCb3gud2lkdGgoKSwgYm9yZGVyQm94LmhlaWdodCgpKTsK KyAgICBJbnRSZWN0IGFic0JvdW5kcyhib3JkZXJCb3gueCgpICsgb2Zmc2V0RnJvbUxheWVyLngo KSwgYm9yZGVyQm94LnkoKSArIG9mZnNldEZyb21MYXllci55KCksIGJvcmRlckJveC53aWR0aCgp LCBib3JkZXJCb3guaGVpZ2h0KCkpOwogICAgIGlmIChtX3ZCYXIpCiAgICAgICAgIG1fdkJhci0+ c2V0RnJhbWVSZWN0KEludFJlY3QoYWJzQm91bmRzLm1heFgoKSAtIGJveC0+Ym9yZGVyUmlnaHQo KSAtIG1fdkJhci0+d2lkdGgoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBhYnNCb3VuZHMueSgpICsgYm94LT5ib3JkZXJUb3AoKSwKQEAgLTIwNDMsMTQgKzIwNDMsMTQg QEAgdm9pZCBSZW5kZXJMYXllcjo6cG9zaXRpb25PdmVyZmxvd0NvbnRybwogI2lmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKICAgICBpZiAoR3JhcGhpY3NMYXllciogbGF5ZXIgPSBsYXll ckZvckhvcml6b250YWxTY3JvbGxiYXIoKSkgewogICAgICAgICBpZiAobV9oQmFyKSB7Ci0gICAg ICAgICAgICBsYXllci0+c2V0UG9zaXRpb24oSW50UG9pbnQobV9oQmFyLT5mcmFtZVJlY3QoKS54 KCkgLSB0eCwgbV9oQmFyLT5mcmFtZVJlY3QoKS55KCkgLSB0eSkpOworICAgICAgICAgICAgbGF5 ZXItPnNldFBvc2l0aW9uKEludFBvaW50KG1faEJhci0+ZnJhbWVSZWN0KCkueCgpIC0gb2Zmc2V0 RnJvbUxheWVyLnkoKSwgbV9oQmFyLT5mcmFtZVJlY3QoKS55KCkgLSBvZmZzZXRGcm9tTGF5ZXIu eSgpKSk7CiAgICAgICAgICAgICBsYXllci0+c2V0U2l6ZShtX2hCYXItPmZyYW1lUmVjdCgpLnNp emUoKSk7CiAgICAgICAgIH0KICAgICAgICAgbGF5ZXItPnNldERyYXdzQ29udGVudChtX2hCYXIp OwogICAgIH0KICAgICBpZiAoR3JhcGhpY3NMYXllciogbGF5ZXIgPSBsYXllckZvclZlcnRpY2Fs U2Nyb2xsYmFyKCkpIHsKICAgICAgICAgaWYgKG1fdkJhcikgewotICAgICAgICAgICAgbGF5ZXIt PnNldFBvc2l0aW9uKEludFBvaW50KG1fdkJhci0+ZnJhbWVSZWN0KCkueCgpIC0gdHgsIG1fdkJh ci0+ZnJhbWVSZWN0KCkueSgpIC0gdHkpKTsKKyAgICAgICAgICAgIGxheWVyLT5zZXRQb3NpdGlv bihJbnRQb2ludChtX3ZCYXItPmZyYW1lUmVjdCgpLngoKSAtIG9mZnNldEZyb21MYXllci54KCks IG1fdkJhci0+ZnJhbWVSZWN0KCkueSgpIC0gb2Zmc2V0RnJvbUxheWVyLnkoKSkpOwogICAgICAg ICAgICAgbGF5ZXItPnNldFNpemUobV92QmFyLT5mcmFtZVJlY3QoKS5zaXplKCkpOwogICAgICAg ICB9CiAgICAgICAgIGxheWVyLT5zZXREcmF3c0NvbnRlbnQobV92QmFyKTsKQEAgLTIzMDEsNyAr MjMwMSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50T3ZlcmZsb3dDb250cm9scygKICAgICAv LyBNb3ZlIHRoZSBzY3JvbGxiYXIgd2lkZ2V0cyBpZiBuZWNlc3NhcnkuICBXZSBub3JtYWxseSBt b3ZlIGFuZCByZXNpemUgd2lkZ2V0cyBkdXJpbmcgbGF5b3V0LCBidXQgc29tZXRpbWVzCiAgICAg Ly8gd2lkZ2V0cyBjYW4gbW92ZSB3aXRob3V0IGxheW91dCBvY2N1cnJpbmcgKG1vc3Qgbm90YWJs eSB3aGVuIHlvdSBzY3JvbGwgYSBkb2N1bWVudCB0aGF0CiAgICAgLy8gY29udGFpbnMgZml4ZWQg cG9zaXRpb25lZCBlbGVtZW50cykuCi0gICAgcG9zaXRpb25PdmVyZmxvd0NvbnRyb2xzKG9mZnNl dFgsIG9mZnNldFkpOworICAgIHBvc2l0aW9uT3ZlcmZsb3dDb250cm9scyhJbnRQb2ludChvZmZz ZXRYLCBvZmZzZXRZKSk7CiAKICAgICAvLyBOb3cgdGhhdCB3ZSdyZSBzdXJlIHRoZSBzY3JvbGxi YXJzIGFyZSBpbiB0aGUgcmlnaHQgcGxhY2UsIHBhaW50IHRoZW0uCiAgICAgaWYgKG1faEJhcgpJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgJKHJldmlzaW9uIDg3MzM0 KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgJKHdvcmtpbmcgY29w eSkKQEAgLTU5MCw3ICs1OTAsNyBAQCBwcml2YXRlOgogICAgIC8vIENvbnZlcnQgYSBwb2ludCBp biBhYnNvbHV0ZSBjb29yZHMgaW50byBsYXllciBjb29yZHMsIHRha2luZyB0cmFuc2Zvcm1zIGlu dG8gYWNjb3VudAogICAgIEludFBvaW50IGFic29sdXRlVG9Db250ZW50cyhjb25zdCBJbnRQb2lu dCYpIGNvbnN0OwogCi0gICAgdm9pZCBwb3NpdGlvbk92ZXJmbG93Q29udHJvbHMoaW50IHR4LCBp bnQgdHkpOworICAgIHZvaWQgcG9zaXRpb25PdmVyZmxvd0NvbnRyb2xzKGNvbnN0IEludFBvaW50 Jik7CiAgICAgdm9pZCB1cGRhdGVTY3JvbGxDb3JuZXJTdHlsZSgpOwogICAgIHZvaWQgdXBkYXRl UmVzaXplclN0eWxlKCk7CiAK 95031 2011-05-26 13:49:52 -0700 2011-05-26 15:06:58 -0700 Patch bug-61493-20110526134951.patch text/plain 4351 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3NDE3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDUtMjYgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwb3NpdGlvbk92ZXJmbG93Q29udHJvbHMgdG8g SW50U2l6ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjE0OTMKKworICAgICAgICBTd2l0Y2hpbmcgcG9zaXRpb25PdmVyZmxvd0NvbnRyb2xzIHRvIHRh a2UgYSBsYXllck9mZnNldCBJbnRTaXplCisgICAgICAgIGFzIG9wcG9zZWQgdG8gYSBwYWlyIG9m IGludHMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIHRoaXMgaXMganVzdCByZWZhY3Rv cmluZy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3NpdGlvbnMpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXI6OnBvc2l0aW9uT3ZlcmZsb3dDb250cm9scyk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllcjo6cGFpbnRPdmVyZmxvd0NvbnRyb2xzKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKwogMjAxMS0wNS0yNSAgSmVyIE5vYmxlICA8amVyLm5v YmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAkocmV2aXNpb24g ODc0MTcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yOTcsNyArMjk3LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlTGF5 ZXJQb3NpdGlvbnMoVQogI2VuZGlmCiAgICAgfSBlbHNlCiAgICAgICAgIGNvbnZlcnRUb0xheWVy Q29vcmRzKHJvb3QoKSwgeCwgeSk7Ci0gICAgcG9zaXRpb25PdmVyZmxvd0NvbnRyb2xzKHgsIHkp OworICAgIHBvc2l0aW9uT3ZlcmZsb3dDb250cm9scyhJbnRTaXplKHgsIHkpKTsKIAogICAgIHVw ZGF0ZVZpc2liaWxpdHlTdGF0dXMoKTsKIApAQCAtMjAxNiw3ICsyMDE2LDcgQEAgYm9vbCBSZW5k ZXJMYXllcjo6aGFzT3ZlcmZsb3dDb250cm9scygpIAogICAgIHJldHVybiBtX2hCYXIgfHwgbV92 QmFyIHx8IG1fc2Nyb2xsQ29ybmVyIHx8IHJlbmRlcmVyKCktPnN0eWxlKCktPnJlc2l6ZSgpICE9 IFJFU0laRV9OT05FOwogfQogCi12b2lkIFJlbmRlckxheWVyOjpwb3NpdGlvbk92ZXJmbG93Q29u dHJvbHMoaW50IHR4LCBpbnQgdHkpCit2b2lkIFJlbmRlckxheWVyOjpwb3NpdGlvbk92ZXJmbG93 Q29udHJvbHMoY29uc3QgSW50U2l6ZSYgb2Zmc2V0RnJvbUxheWVyKQogewogICAgIGlmICghbV9o QmFyICYmICFtX3ZCYXIgJiYgKCFyZW5kZXJlcigpLT5oYXNPdmVyZmxvd0NsaXAoKSB8fCByZW5k ZXJlcigpLT5zdHlsZSgpLT5yZXNpemUoKSA9PSBSRVNJWkVfTk9ORSkpCiAgICAgICAgIHJldHVy bjsKQEAgLTIwMjcsNyArMjAyNyw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBvc2l0aW9uT3ZlcmZs b3dDb250cm8KIAogICAgIGNvbnN0IEludFJlY3QmIGJvcmRlckJveCA9IGJveC0+Ym9yZGVyQm94 UmVjdCgpOwogICAgIGNvbnN0IEludFJlY3QmIHNjcm9sbENvcm5lciA9IHNjcm9sbENvcm5lclJl Y3QoKTsKLSAgICBJbnRSZWN0IGFic0JvdW5kcyhib3JkZXJCb3gueCgpICsgdHgsIGJvcmRlckJv eC55KCkgKyB0eSwgYm9yZGVyQm94LndpZHRoKCksIGJvcmRlckJveC5oZWlnaHQoKSk7CisgICAg SW50UmVjdCBhYnNCb3VuZHMoYm9yZGVyQm94LmxvY2F0aW9uKCkgKyBvZmZzZXRGcm9tTGF5ZXIs IGJvcmRlckJveC5zaXplKCkpOwogICAgIGlmIChtX3ZCYXIpCiAgICAgICAgIG1fdkJhci0+c2V0 RnJhbWVSZWN0KEludFJlY3QoYWJzQm91bmRzLm1heFgoKSAtIGJveC0+Ym9yZGVyUmlnaHQoKSAt IG1fdkJhci0+d2lkdGgoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBh YnNCb3VuZHMueSgpICsgYm94LT5ib3JkZXJUb3AoKSwKQEAgLTIwNDMsMTQgKzIwNDMsMTQgQEAg dm9pZCBSZW5kZXJMYXllcjo6cG9zaXRpb25PdmVyZmxvd0NvbnRybwogI2lmIFVTRShBQ0NFTEVS QVRFRF9DT01QT1NJVElORykKICAgICBpZiAoR3JhcGhpY3NMYXllciogbGF5ZXIgPSBsYXllckZv ckhvcml6b250YWxTY3JvbGxiYXIoKSkgewogICAgICAgICBpZiAobV9oQmFyKSB7Ci0gICAgICAg ICAgICBsYXllci0+c2V0UG9zaXRpb24oSW50UG9pbnQobV9oQmFyLT5mcmFtZVJlY3QoKS54KCkg LSB0eCwgbV9oQmFyLT5mcmFtZVJlY3QoKS55KCkgLSB0eSkpOworICAgICAgICAgICAgbGF5ZXIt PnNldFBvc2l0aW9uKG1faEJhci0+ZnJhbWVSZWN0KCkubG9jYXRpb24oKSAtIG9mZnNldEZyb21M YXllcik7CiAgICAgICAgICAgICBsYXllci0+c2V0U2l6ZShtX2hCYXItPmZyYW1lUmVjdCgpLnNp emUoKSk7CiAgICAgICAgIH0KICAgICAgICAgbGF5ZXItPnNldERyYXdzQ29udGVudChtX2hCYXIp OwogICAgIH0KICAgICBpZiAoR3JhcGhpY3NMYXllciogbGF5ZXIgPSBsYXllckZvclZlcnRpY2Fs U2Nyb2xsYmFyKCkpIHsKICAgICAgICAgaWYgKG1fdkJhcikgewotICAgICAgICAgICAgbGF5ZXIt PnNldFBvc2l0aW9uKEludFBvaW50KG1fdkJhci0+ZnJhbWVSZWN0KCkueCgpIC0gdHgsIG1fdkJh ci0+ZnJhbWVSZWN0KCkueSgpIC0gdHkpKTsKKyAgICAgICAgICAgIGxheWVyLT5zZXRQb3NpdGlv bihtX3ZCYXItPmZyYW1lUmVjdCgpLmxvY2F0aW9uKCkgLSBvZmZzZXRGcm9tTGF5ZXIpOwogICAg ICAgICAgICAgbGF5ZXItPnNldFNpemUobV92QmFyLT5mcmFtZVJlY3QoKS5zaXplKCkpOwogICAg ICAgICB9CiAgICAgICAgIGxheWVyLT5zZXREcmF3c0NvbnRlbnQobV92QmFyKTsKQEAgLTIzMDEs NyArMjMwMSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50T3ZlcmZsb3dDb250cm9scygKICAg ICAvLyBNb3ZlIHRoZSBzY3JvbGxiYXIgd2lkZ2V0cyBpZiBuZWNlc3NhcnkuICBXZSBub3JtYWxs eSBtb3ZlIGFuZCByZXNpemUgd2lkZ2V0cyBkdXJpbmcgbGF5b3V0LCBidXQgc29tZXRpbWVzCiAg ICAgLy8gd2lkZ2V0cyBjYW4gbW92ZSB3aXRob3V0IGxheW91dCBvY2N1cnJpbmcgKG1vc3Qgbm90 YWJseSB3aGVuIHlvdSBzY3JvbGwgYSBkb2N1bWVudCB0aGF0CiAgICAgLy8gY29udGFpbnMgZml4 ZWQgcG9zaXRpb25lZCBlbGVtZW50cykuCi0gICAgcG9zaXRpb25PdmVyZmxvd0NvbnRyb2xzKG9m ZnNldFgsIG9mZnNldFkpOworICAgIHBvc2l0aW9uT3ZlcmZsb3dDb250cm9scyhJbnRTaXplKG9m ZnNldFgsIG9mZnNldFkpKTsKIAogICAgIC8vIE5vdyB0aGF0IHdlJ3JlIHN1cmUgdGhlIHNjcm9s bGJhcnMgYXJlIGluIHRoZSByaWdodCBwbGFjZSwgcGFpbnQgdGhlbS4KICAgICBpZiAobV9oQmFy CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAkocmV2aXNpb24gODc0 MTcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAkod29ya2luZyBj b3B5KQpAQCAtNTkwLDcgKzU5MCw3IEBAIHByaXZhdGU6CiAgICAgLy8gQ29udmVydCBhIHBvaW50 IGluIGFic29sdXRlIGNvb3JkcyBpbnRvIGxheWVyIGNvb3JkcywgdGFraW5nIHRyYW5zZm9ybXMg aW50byBhY2NvdW50CiAgICAgSW50UG9pbnQgYWJzb2x1dGVUb0NvbnRlbnRzKGNvbnN0IEludFBv aW50JikgY29uc3Q7CiAKLSAgICB2b2lkIHBvc2l0aW9uT3ZlcmZsb3dDb250cm9scyhpbnQgdHgs IGludCB0eSk7CisgICAgdm9pZCBwb3NpdGlvbk92ZXJmbG93Q29udHJvbHMoY29uc3QgSW50U2l6 ZSYpOwogICAgIHZvaWQgdXBkYXRlU2Nyb2xsQ29ybmVyU3R5bGUoKTsKICAgICB2b2lkIHVwZGF0 ZVJlc2l6ZXJTdHlsZSgpOwogCg==