106209 2013-01-06 21:37:19 -0800 Use explicit constructor to convert from Int/FloatSize to Int/FloatPoint 2013-01-07 22:09:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 steveblock steveblock eric haraken ojan.autocc simon.fraser steveblock webkit.review.bot oldest_to_newest 801158 0 steveblock 2013-01-06 21:37:19 -0800 Use explicit constructor to convert from Int/FloatSize to Int/FloatPoint 801159 1 181477 steveblock 2013-01-06 21:38:39 -0800 Created attachment 181477 Patch 801160 2 steveblock 2013-01-06 21:41:30 -0800 This is easier to read than using operator+ with a zero Int/FloatPoint. 801190 3 181477 haraken 2013-01-07 00:54:51 -0800 Comment on attachment 181477 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=181477&action=review > Source/WebCore/rendering/RenderLayerBacking.cpp:623 > + m_ancestorClippingLayer->setPosition(IntPoint(parentClipRect.location() - graphicsLayerParentLocation)); Nit: How about using FloatPoint() instead of IntPoint(), since GraphicLayers::setPosition() expects a FloatPoint? > Source/WebCore/rendering/RenderLayerBacking.cpp:633 > + m_graphicsLayer->setPosition(IntPoint(relativeCompositingBounds.location() - graphicsLayerParentLocation)); Ditto. > Source/WebCore/rendering/RenderLayerBacking.cpp:651 > + clipLayer->setPosition(IntPoint(clippingBox.location() - localCompositingBounds.location())); Ditto. > Source/WebCore/rendering/RenderLayerBacking.cpp:736 > + m_scrollingLayer->setPosition(IntPoint(paddingBox.location() - localCompositingBounds.location())); Ditto. 801936 4 181623 steveblock 2013-01-07 19:30:22 -0800 Created attachment 181623 Patch 801938 5 steveblock 2013-01-07 19:35:02 -0800 I thought that it was good to make clear that the arguments to setPosition() were integer types, rather than floating types, but I don't feel strongly. Done. 802022 6 181623 webkit.review.bot 2013-01-07 22:09:16 -0800 Comment on attachment 181623 Patch Clearing flags on attachment: 181623 Committed r139032: <http://trac.webkit.org/changeset/139032> 802023 7 webkit.review.bot 2013-01-07 22:09:20 -0800 All reviewed patches have been landed. Closing bug. 181477 2013-01-06 21:38:39 -0800 2013-01-07 19:30:18 -0800 Patch bug-106209-20130107163544.patch text/plain 4452 steveblock U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4ODAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWE4ZWI5OTkxMjNhOWQy NzFmYmQ3NTc4YTBlY2ZiMmY1ZjMwZjE2NS4uNjI4Y2MzMmJiNzc4NjJmYzY1NzQ4MmVmZTYzOTQ2 ZjQ4MzAxMTIyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAxLTA2ICBTdGV2 ZSBCbG9jayAgPHN0ZXZlYmxvY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVzZSBleHBsaWNp dCBjb25zdHJ1Y3RvciB0byBjb252ZXJ0IGZyb20gSW50L0Zsb2F0U2l6ZSB0byBJbnQvRmxvYXRQ b2ludAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2 MjA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVm YWN0b3Jpbmcgb25seSwgbm8gZnVuY3Rpb25hbCBjaGFuZ2UuCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy QmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KToKKwogMjAxMy0wMS0wNCAgU3Rl dmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgJ2Zsb2F0 IEZsb2F0UG9pbnQ6OnNsb3BlQW5nbGVSYWRpYW5zKCknCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IGIyMWZmYzFkYzA0Y2U4MzI1NzIx ZTg5OTYyZjAzY2EwYTY2ZDQ0NGMuLjc3YTgyYjkyNjkzZWU4YzQ0MzcxMGUxOWUwNTM0MjhhMTJh MGIzZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tp bmcuY3BwCkBAIC02MjAsNyArNjIwLDcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0 ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpCiAgICAgICAgIFJlbmRlckxheWVyOjpDbGlwUmVjdHND b250ZXh0IGNsaXBSZWN0c0NvbnRleHQoY29tcEFuY2VzdG9yLCAwLCBUZW1wb3JhcnlDbGlwUmVj dHMsIElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplLCBSZW5kZXJMYXllcjo6SWdub3JlT3ZlcmZs b3dDbGlwKTsKICAgICAgICAgSW50UmVjdCBwYXJlbnRDbGlwUmVjdCA9IHBpeGVsU25hcHBlZElu dFJlY3QobV9vd25pbmdMYXllci0+YmFja2dyb3VuZENsaXBSZWN0KGNsaXBSZWN0c0NvbnRleHQp LnJlY3QoKSk7IC8vIEZJWE1FOiBJbmNvcnJlY3QgZm9yIENTUyByZWdpb25zLgogICAgICAgICBB U1NFUlQocGFyZW50Q2xpcFJlY3QgIT0gUGFpbnRJbmZvOjppbmZpbml0ZVJlY3QoKSk7Ci0gICAg ICAgIG1fYW5jZXN0b3JDbGlwcGluZ0xheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KCkgKyAo cGFyZW50Q2xpcFJlY3QubG9jYXRpb24oKSAtIGdyYXBoaWNzTGF5ZXJQYXJlbnRMb2NhdGlvbikp OworICAgICAgICBtX2FuY2VzdG9yQ2xpcHBpbmdMYXllci0+c2V0UG9zaXRpb24oSW50UG9pbnQo cGFyZW50Q2xpcFJlY3QubG9jYXRpb24oKSAtIGdyYXBoaWNzTGF5ZXJQYXJlbnRMb2NhdGlvbikp OwogICAgICAgICBtX2FuY2VzdG9yQ2xpcHBpbmdMYXllci0+c2V0U2l6ZShwYXJlbnRDbGlwUmVj dC5zaXplKCkpOwogCiAgICAgICAgIC8vIGJhY2tncm91bmRSZWN0IGlzIHJlbGF0aXZlIHRvIGNv bXBBbmNlc3Rvciwgc28gc3VidHJhY3QgZGVsdGFYL2RlbHRhWSB0byBnZXQgYmFjayB0byBsb2Nh bCBjb29yZHMuCkBAIC02MzAsNyArNjMwLDcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVw ZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpCiAgICAgICAgIGdyYXBoaWNzTGF5ZXJQYXJlbnRM b2NhdGlvbiA9IHBhcmVudENsaXBSZWN0LmxvY2F0aW9uKCk7CiAgICAgfQogCi0gICAgbV9ncmFw aGljc0xheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KCkgKyAocmVsYXRpdmVDb21wb3NpdGlu Z0JvdW5kcy5sb2NhdGlvbigpIC0gZ3JhcGhpY3NMYXllclBhcmVudExvY2F0aW9uKSk7CisgICAg bV9ncmFwaGljc0xheWVyLT5zZXRQb3NpdGlvbihJbnRQb2ludChyZWxhdGl2ZUNvbXBvc2l0aW5n Qm91bmRzLmxvY2F0aW9uKCkgLSBncmFwaGljc0xheWVyUGFyZW50TG9jYXRpb24pKTsKICAgICBt X2dyYXBoaWNzTGF5ZXItPnNldE9mZnNldEZyb21SZW5kZXJlcihsb2NhbENvbXBvc2l0aW5nQm91 bmRzLmxvY2F0aW9uKCkgLSBJbnRQb2ludCgpKTsKICAgICAKICAgICBGbG9hdFNpemUgb2xkU2l6 ZSA9IG1fZ3JhcGhpY3NMYXllci0+c2l6ZSgpOwpAQCAtNjQ4LDcgKzY0OCw3IEBAIHZvaWQgUmVu ZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVyR2VvbWV0cnkoKQogICAgIEludFJl Y3QgY2xpcHBpbmdCb3g7CiAgICAgaWYgKEdyYXBoaWNzTGF5ZXIqIGNsaXBMYXllciA9IGNsaXBw aW5nTGF5ZXIoKSkgewogICAgICAgICBjbGlwcGluZ0JveCA9IGNsaXBCb3godG9SZW5kZXJCb3go cmVuZGVyZXIoKSkpOwotICAgICAgICBjbGlwTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQo KSArIChjbGlwcGluZ0JveC5sb2NhdGlvbigpIC0gbG9jYWxDb21wb3NpdGluZ0JvdW5kcy5sb2Nh dGlvbigpKSk7CisgICAgICAgIGNsaXBMYXllci0+c2V0UG9zaXRpb24oSW50UG9pbnQoY2xpcHBp bmdCb3gubG9jYXRpb24oKSAtIGxvY2FsQ29tcG9zaXRpbmdCb3VuZHMubG9jYXRpb24oKSkpOwog ICAgICAgICBjbGlwTGF5ZXItPnNldFNpemUoY2xpcHBpbmdCb3guc2l6ZSgpKTsKICAgICAgICAg Y2xpcExheWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIoY2xpcHBpbmdCb3gubG9jYXRpb24oKSAt IEludFBvaW50KCkpOwogICAgIH0KQEAgLTcyNCw3ICs3MjQsNyBAQCB2b2lkIFJlbmRlckxheWVy QmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KCkKICAgICAgICAgLy8gYnV0IHRo ZSByZWZsZWN0ZWQgbGF5ZXIgaXMgdGhlIGJvdW5kcyBvZiB0aGlzIGxheWVyLCBzbyB3ZSBuZWVk IHRvIHBvc2l0aW9uIGl0IGFwcHJvcHJpYXRlbHkuCiAgICAgICAgIEZsb2F0UmVjdCBsYXllckJv dW5kcyA9IGNvbXBvc2l0ZWRCb3VuZHMoKTsKICAgICAgICAgRmxvYXRSZWN0IHJlZmxlY3Rpb25M YXllckJvdW5kcyA9IHJlZmxlY3Rpb25CYWNraW5nLT5jb21wb3NpdGVkQm91bmRzKCk7Ci0gICAg ICAgIHJlZmxlY3Rpb25CYWNraW5nLT5ncmFwaGljc0xheWVyKCktPnNldFJlcGxpY2F0ZWRMYXll clBvc2l0aW9uKEZsb2F0UG9pbnQoKSArIChsYXllckJvdW5kcy5sb2NhdGlvbigpIC0gcmVmbGVj dGlvbkxheWVyQm91bmRzLmxvY2F0aW9uKCkpKTsKKyAgICAgICAgcmVmbGVjdGlvbkJhY2tpbmct PmdyYXBoaWNzTGF5ZXIoKS0+c2V0UmVwbGljYXRlZExheWVyUG9zaXRpb24oRmxvYXRQb2ludChs YXllckJvdW5kcy5sb2NhdGlvbigpIC0gcmVmbGVjdGlvbkxheWVyQm91bmRzLmxvY2F0aW9uKCkp KTsKICAgICB9CiAKICAgICBpZiAobV9zY3JvbGxpbmdMYXllcikgewpAQCAtNzMzLDcgKzczMyw3 IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVyR2VvbWV0cnko KQogICAgICAgICBJbnRSZWN0IHBhZGRpbmdCb3gocmVuZGVyQm94LT5ib3JkZXJMZWZ0KCksIHJl bmRlckJveC0+Ym9yZGVyVG9wKCksIHJlbmRlckJveC0+d2lkdGgoKSAtIHJlbmRlckJveC0+Ym9y ZGVyTGVmdCgpIC0gcmVuZGVyQm94LT5ib3JkZXJSaWdodCgpLCByZW5kZXJCb3gtPmhlaWdodCgp IC0gcmVuZGVyQm94LT5ib3JkZXJUb3AoKSAtIHJlbmRlckJveC0+Ym9yZGVyQm90dG9tKCkpOwog ICAgICAgICBJbnRTaXplIHNjcm9sbE9mZnNldCA9IG1fb3duaW5nTGF5ZXItPnNjcm9sbGVkQ29u dGVudE9mZnNldCgpOwogCi0gICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXItPnNldFBvc2l0aW9uKEZs b2F0UG9pbnQoKSArIChwYWRkaW5nQm94LmxvY2F0aW9uKCkgLSBsb2NhbENvbXBvc2l0aW5nQm91 bmRzLmxvY2F0aW9uKCkpKTsKKyAgICAgICAgbV9zY3JvbGxpbmdMYXllci0+c2V0UG9zaXRpb24o SW50UG9pbnQocGFkZGluZ0JveC5sb2NhdGlvbigpIC0gbG9jYWxDb21wb3NpdGluZ0JvdW5kcy5s b2NhdGlvbigpKSk7CiAKICAgICAgICAgbV9zY3JvbGxpbmdMYXllci0+c2V0U2l6ZShwYWRkaW5n Qm94LnNpemUoKSk7CiAgICAgICAgIG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci0+c2V0UG9zaXRp b24oRmxvYXRQb2ludCgtc2Nyb2xsT2Zmc2V0LndpZHRoKCksIC1zY3JvbGxPZmZzZXQuaGVpZ2h0 KCkpKTsK 181623 2013-01-07 19:30:22 -0800 2013-01-07 22:09:16 -0800 Patch bug-106209-20130108142726.patch text/plain 4460 steveblock U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4ODAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWE4ZWI5OTkxMjNhOWQy NzFmYmQ3NTc4YTBlY2ZiMmY1ZjMwZjE2NS4uNjI4Y2MzMmJiNzc4NjJmYzY1NzQ4MmVmZTYzOTQ2 ZjQ4MzAxMTIyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAxLTA2ICBTdGV2 ZSBCbG9jayAgPHN0ZXZlYmxvY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVzZSBleHBsaWNp dCBjb25zdHJ1Y3RvciB0byBjb252ZXJ0IGZyb20gSW50L0Zsb2F0U2l6ZSB0byBJbnQvRmxvYXRQ b2ludAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2 MjA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVm YWN0b3Jpbmcgb25seSwgbm8gZnVuY3Rpb25hbCBjaGFuZ2UuCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy QmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KToKKwogMjAxMy0wMS0wNCAgU3Rl dmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgJ2Zsb2F0 IEZsb2F0UG9pbnQ6OnNsb3BlQW5nbGVSYWRpYW5zKCknCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IGIyMWZmYzFkYzA0Y2U4MzI1NzIx ZTg5OTYyZjAzY2EwYTY2ZDQ0NGMuLjBkZmMyZThiMGU4ZjVjNzcxN2FmY2NiYjU2NGY1ZmU3OGI5 NjIyYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tp bmcuY3BwCkBAIC02MjAsNyArNjIwLDcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0 ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpCiAgICAgICAgIFJlbmRlckxheWVyOjpDbGlwUmVjdHND b250ZXh0IGNsaXBSZWN0c0NvbnRleHQoY29tcEFuY2VzdG9yLCAwLCBUZW1wb3JhcnlDbGlwUmVj dHMsIElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplLCBSZW5kZXJMYXllcjo6SWdub3JlT3ZlcmZs b3dDbGlwKTsKICAgICAgICAgSW50UmVjdCBwYXJlbnRDbGlwUmVjdCA9IHBpeGVsU25hcHBlZElu dFJlY3QobV9vd25pbmdMYXllci0+YmFja2dyb3VuZENsaXBSZWN0KGNsaXBSZWN0c0NvbnRleHQp LnJlY3QoKSk7IC8vIEZJWE1FOiBJbmNvcnJlY3QgZm9yIENTUyByZWdpb25zLgogICAgICAgICBB U1NFUlQocGFyZW50Q2xpcFJlY3QgIT0gUGFpbnRJbmZvOjppbmZpbml0ZVJlY3QoKSk7Ci0gICAg ICAgIG1fYW5jZXN0b3JDbGlwcGluZ0xheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KCkgKyAo cGFyZW50Q2xpcFJlY3QubG9jYXRpb24oKSAtIGdyYXBoaWNzTGF5ZXJQYXJlbnRMb2NhdGlvbikp OworICAgICAgICBtX2FuY2VzdG9yQ2xpcHBpbmdMYXllci0+c2V0UG9zaXRpb24oRmxvYXRQb2lu dChwYXJlbnRDbGlwUmVjdC5sb2NhdGlvbigpIC0gZ3JhcGhpY3NMYXllclBhcmVudExvY2F0aW9u KSk7CiAgICAgICAgIG1fYW5jZXN0b3JDbGlwcGluZ0xheWVyLT5zZXRTaXplKHBhcmVudENsaXBS ZWN0LnNpemUoKSk7CiAKICAgICAgICAgLy8gYmFja2dyb3VuZFJlY3QgaXMgcmVsYXRpdmUgdG8g Y29tcEFuY2VzdG9yLCBzbyBzdWJ0cmFjdCBkZWx0YVgvZGVsdGFZIHRvIGdldCBiYWNrIHRvIGxv Y2FsIGNvb3Jkcy4KQEAgLTYzMCw3ICs2MzAsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6 dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KCkKICAgICAgICAgZ3JhcGhpY3NMYXllclBhcmVu dExvY2F0aW9uID0gcGFyZW50Q2xpcFJlY3QubG9jYXRpb24oKTsKICAgICB9CiAKLSAgICBtX2dy YXBoaWNzTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoKSArIChyZWxhdGl2ZUNvbXBvc2l0 aW5nQm91bmRzLmxvY2F0aW9uKCkgLSBncmFwaGljc0xheWVyUGFyZW50TG9jYXRpb24pKTsKKyAg ICBtX2dyYXBoaWNzTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQocmVsYXRpdmVDb21wb3Np dGluZ0JvdW5kcy5sb2NhdGlvbigpIC0gZ3JhcGhpY3NMYXllclBhcmVudExvY2F0aW9uKSk7CiAg ICAgbV9ncmFwaGljc0xheWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIobG9jYWxDb21wb3NpdGlu Z0JvdW5kcy5sb2NhdGlvbigpIC0gSW50UG9pbnQoKSk7CiAgICAgCiAgICAgRmxvYXRTaXplIG9s ZFNpemUgPSBtX2dyYXBoaWNzTGF5ZXItPnNpemUoKTsKQEAgLTY0OCw3ICs2NDgsNyBAQCB2b2lk IFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KCkKICAgICBJ bnRSZWN0IGNsaXBwaW5nQm94OwogICAgIGlmIChHcmFwaGljc0xheWVyKiBjbGlwTGF5ZXIgPSBj bGlwcGluZ0xheWVyKCkpIHsKICAgICAgICAgY2xpcHBpbmdCb3ggPSBjbGlwQm94KHRvUmVuZGVy Qm94KHJlbmRlcmVyKCkpKTsKLSAgICAgICAgY2xpcExheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBv aW50KCkgKyAoY2xpcHBpbmdCb3gubG9jYXRpb24oKSAtIGxvY2FsQ29tcG9zaXRpbmdCb3VuZHMu bG9jYXRpb24oKSkpOworICAgICAgICBjbGlwTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQo Y2xpcHBpbmdCb3gubG9jYXRpb24oKSAtIGxvY2FsQ29tcG9zaXRpbmdCb3VuZHMubG9jYXRpb24o KSkpOwogICAgICAgICBjbGlwTGF5ZXItPnNldFNpemUoY2xpcHBpbmdCb3guc2l6ZSgpKTsKICAg ICAgICAgY2xpcExheWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIoY2xpcHBpbmdCb3gubG9jYXRp b24oKSAtIEludFBvaW50KCkpOwogICAgIH0KQEAgLTcyNCw3ICs3MjQsNyBAQCB2b2lkIFJlbmRl ckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KCkKICAgICAgICAgLy8g YnV0IHRoZSByZWZsZWN0ZWQgbGF5ZXIgaXMgdGhlIGJvdW5kcyBvZiB0aGlzIGxheWVyLCBzbyB3 ZSBuZWVkIHRvIHBvc2l0aW9uIGl0IGFwcHJvcHJpYXRlbHkuCiAgICAgICAgIEZsb2F0UmVjdCBs YXllckJvdW5kcyA9IGNvbXBvc2l0ZWRCb3VuZHMoKTsKICAgICAgICAgRmxvYXRSZWN0IHJlZmxl Y3Rpb25MYXllckJvdW5kcyA9IHJlZmxlY3Rpb25CYWNraW5nLT5jb21wb3NpdGVkQm91bmRzKCk7 Ci0gICAgICAgIHJlZmxlY3Rpb25CYWNraW5nLT5ncmFwaGljc0xheWVyKCktPnNldFJlcGxpY2F0 ZWRMYXllclBvc2l0aW9uKEZsb2F0UG9pbnQoKSArIChsYXllckJvdW5kcy5sb2NhdGlvbigpIC0g cmVmbGVjdGlvbkxheWVyQm91bmRzLmxvY2F0aW9uKCkpKTsKKyAgICAgICAgcmVmbGVjdGlvbkJh Y2tpbmctPmdyYXBoaWNzTGF5ZXIoKS0+c2V0UmVwbGljYXRlZExheWVyUG9zaXRpb24oRmxvYXRQ b2ludChsYXllckJvdW5kcy5sb2NhdGlvbigpIC0gcmVmbGVjdGlvbkxheWVyQm91bmRzLmxvY2F0 aW9uKCkpKTsKICAgICB9CiAKICAgICBpZiAobV9zY3JvbGxpbmdMYXllcikgewpAQCAtNzMzLDcg KzczMyw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVyR2Vv bWV0cnkoKQogICAgICAgICBJbnRSZWN0IHBhZGRpbmdCb3gocmVuZGVyQm94LT5ib3JkZXJMZWZ0 KCksIHJlbmRlckJveC0+Ym9yZGVyVG9wKCksIHJlbmRlckJveC0+d2lkdGgoKSAtIHJlbmRlckJv eC0+Ym9yZGVyTGVmdCgpIC0gcmVuZGVyQm94LT5ib3JkZXJSaWdodCgpLCByZW5kZXJCb3gtPmhl aWdodCgpIC0gcmVuZGVyQm94LT5ib3JkZXJUb3AoKSAtIHJlbmRlckJveC0+Ym9yZGVyQm90dG9t KCkpOwogICAgICAgICBJbnRTaXplIHNjcm9sbE9mZnNldCA9IG1fb3duaW5nTGF5ZXItPnNjcm9s bGVkQ29udGVudE9mZnNldCgpOwogCi0gICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXItPnNldFBvc2l0 aW9uKEZsb2F0UG9pbnQoKSArIChwYWRkaW5nQm94LmxvY2F0aW9uKCkgLSBsb2NhbENvbXBvc2l0 aW5nQm91bmRzLmxvY2F0aW9uKCkpKTsKKyAgICAgICAgbV9zY3JvbGxpbmdMYXllci0+c2V0UG9z aXRpb24oRmxvYXRQb2ludChwYWRkaW5nQm94LmxvY2F0aW9uKCkgLSBsb2NhbENvbXBvc2l0aW5n Qm91bmRzLmxvY2F0aW9uKCkpKTsKIAogICAgICAgICBtX3Njcm9sbGluZ0xheWVyLT5zZXRTaXpl KHBhZGRpbmdCb3guc2l6ZSgpKTsKICAgICAgICAgbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLT5z ZXRQb3NpdGlvbihGbG9hdFBvaW50KC1zY3JvbGxPZmZzZXQud2lkdGgoKSwgLXNjcm9sbE9mZnNl dC5oZWlnaHQoKSkpOwo=