112465 2013-03-15 13:35:58 -0700 [chromium] Remove code that relies on boundsContainsPageScale(). 2013-03-18 15:45:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 wjmaclean wjmaclean abarth aelias cc-bugs dglazkov enne fishd jamesr tkent+wkapi webkit.review.bot oldest_to_newest 856251 0 wjmaclean 2013-03-15 13:35:58 -0700 [chromium] Remove NCCH code that relies on boundsContainsPageScale(). 856269 1 193371 wjmaclean 2013-03-15 14:06:29 -0700 Created attachment 193371 Patch 856270 2 wjmaclean 2013-03-15 14:07:41 -0700 aelias@ asked if I could remove this (soon to be) dead code. 856459 3 enne 2013-03-15 18:21:38 -0700 What about boundsContainPageScale and setBoundsContainPageScale in WebContentLayer? What about the boundsContainPageScale calls in GraphicsLayerChromium? 856516 4 wjmaclean 2013-03-15 22:51:17 -0700 (In reply to comment #3) > What about boundsContainPageScale and setBoundsContainPageScale in WebContentLayer? > > What about the boundsContainPageScale calls in GraphicsLayerChromium? Ahh, ok. I had thought aelias@ was just concerned about the stuff in NCCH. I'll track down all the occurences then and do them in a single CL. 857047 5 193545 wjmaclean 2013-03-18 06:15:48 -0700 Created attachment 193545 Patch 857049 6 webkit.review.bot 2013-03-18 06:17:32 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 857100 7 wjmaclean 2013-03-18 07:32:36 -0700 Renaming issue to reflect we're no longer just modifying NCCH. 857647 8 193545 webkit.review.bot 2013-03-18 15:45:41 -0700 Comment on attachment 193545 Patch Clearing flags on attachment: 193545 Committed r146135: <http://trac.webkit.org/changeset/146135> 857648 9 webkit.review.bot 2013-03-18 15:45:45 -0700 All reviewed patches have been landed. Closing bug. 193371 2013-03-15 14:06:29 -0700 2013-03-18 06:15:46 -0700 Patch bug-112465-20130315170223.patch text/plain 3175 wjmaclean U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1OTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDQ4NWJkMjE0MjZlNjkzYzZmMWVjZDRlYTc4YjJmYzAzNjc2MGIwZTYuLmI4Njk4MzI2NjdkYTA2 NmFlOGIxZmE4NTA4N2EyYmZkMjE1ZTQ1MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTMtMDMtMTUgIFcuIEphbWVzIE1hY0xlYW4gIDx3am1hY2xlYW5A Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gUmVtb3ZlIE5DQ0ggY29kZSB0aGF0 IHJlbGllcyBvbiBib3VuZHNDb250YWluc1BhZ2VTY2FsZSgpLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyNDY1CisKKyAgICAgICAgVGhlIGJvdW5k Q29udGFpbnNQYWdlU2NhbGUgQVBJIGlzIGdvaW5nIGF3YXksIHJlbW92ZSBjb2RlIHRoYXQgcmVs aWVzCisgICAgICAgIG9uIGl0LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogc3JjL05vbkNvbXBvc2l0ZWRDb250ZW50SG9zdC5jcHA6CisgICAgICAg IChXZWJLaXQ6Ok5vbkNvbXBvc2l0ZWRDb250ZW50SG9zdDo6c2V0Vmlld3BvcnQpOgorCiAyMDEz LTAzLTE1ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkLiAgUm9sbGVkIENocm9taXVtIERFUFMgdG8gcjE4ODQxOC4gIFJlcXVl c3RlZCBieQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvTm9uQ29tcG9z aXRlZENvbnRlbnRIb3N0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL05vbkNvbXBv c2l0ZWRDb250ZW50SG9zdC5jcHAKaW5kZXggOWQwN2I0NDI3OGFjNTg0NWEyNThkOTZiOThiMzBh MjY3YjMyY2Y0NS4uY2U2YTIzYWM3YTRmZTRlZjI4MTI1MzM2OGNkOTYwMTU0ODEwMjNhOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvTm9uQ29tcG9zaXRlZENvbnRlbnRI b3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Ob25Db21wb3NpdGVkQ29u dGVudEhvc3QuY3BwCkBAIC00OCw3ICs0OCw2IEBAIE5vbkNvbXBvc2l0ZWRDb250ZW50SG9zdDo6 Tm9uQ29tcG9zaXRlZENvbnRlbnRIb3N0KFdlYlZpZXdJbXBsKiB3ZWJWaWV3LCBXZWJDb3JlCiAg ICAgbV9ncmFwaGljc0xheWVyLT5zZXROYW1lKCJub24tY29tcG9zaXRlZCBjb250ZW50Iik7CiAj ZW5kaWYKICAgICBtX2dyYXBoaWNzTGF5ZXItPnNldERyYXdzQ29udGVudCh0cnVlKTsKLSAgICBt X2dyYXBoaWNzTGF5ZXItPnNldEFwcGxpZXNQYWdlU2NhbGUoIW1fd2ViVmlldy0+cGFnZSgpLT5z ZXR0aW5ncygpLT5hcHBseVBhZ2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcigpKTsKICAgICBtX2dy YXBoaWNzTGF5ZXItPnNldENvbnRlbnRzT3BhcXVlKHRydWUpOwogICAgIC8vIEZJWE1FOiBSZW1v dmUgTENEIHRleHQgc2V0dGluZyBhZnRlciBpdCBpcyBpbXBsZW1lbnRlZCBpbiBjaHJvbWl1bS4K ICAgICBXZWJDb250ZW50TGF5ZXIqIGxheWVyID0gc3RhdGljX2Nhc3Q8V2ViQ29yZTo6R3JhcGhp Y3NMYXllckNocm9taXVtKj4obV9ncmFwaGljc0xheWVyLmdldCgpKS0+Y29udGVudExheWVyKCk7 CkBAIC04OCwyMCArODcsNiBAQCB2b2lkIE5vbkNvbXBvc2l0ZWRDb250ZW50SG9zdDo6c2V0U2Ny b2xsTGF5ZXIoV2ViQ29yZTo6R3JhcGhpY3NMYXllciogbGF5ZXIpCiAgICAgQVNTRVJUKGhhdmVT Y3JvbGxMYXllcigpKTsKIH0KIAotc3RhdGljIHZvaWQgc2V0U2Nyb2xsYmFyQm91bmRzQ29udGFp blBhZ2VTY2FsZShXZWJDb3JlOjpHcmFwaGljc0xheWVyKiBsYXllciwgV2ViQ29yZTo6R3JhcGhp Y3NMYXllciogY2xpcExheWVyKQotewotICAgIC8vIFNjcm9sbGJhcnMgYXJlIGF0dGFjaGVkIG91 dHNpZGUgdGhlIHJvb3QgY2xpcCByZWN0LCBzbyBza2lwIHRoZQotICAgIC8vIGNsaXBMYXllciBz dWJ0cmVlLgotICAgIGlmIChsYXllciA9PSBjbGlwTGF5ZXIpCi0gICAgICAgIHJldHVybjsKLQot ICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGF5ZXItPmNoaWxkcmVuKCkuc2l6ZSgpOyArK2kp Ci0gICAgICAgIHNldFNjcm9sbGJhckJvdW5kc0NvbnRhaW5QYWdlU2NhbGUobGF5ZXItPmNoaWxk cmVuKClbaV0sIGNsaXBMYXllcik7Ci0KLSAgICBpZiAobGF5ZXItPmNoaWxkcmVuKCkuaXNFbXB0 eSgpKQotICAgICAgICBsYXllci0+c2V0QXBwbGllc1BhZ2VTY2FsZSh0cnVlKTsKLX0KLQogdm9p ZCBOb25Db21wb3NpdGVkQ29udGVudEhvc3Q6OnNldFZpZXdwb3J0KGNvbnN0IFdlYkNvcmU6Oklu dFNpemUmIHZpZXdwb3J0U2l6ZSwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgY29udGVudHNTaXpl LCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgc2Nyb2xsUG9zaXRpb24sIGNvbnN0IFdlYkNvcmU6 OkludFBvaW50JiBzY3JvbGxPcmlnaW4pCiB7CiAgICAgaWYgKCFoYXZlU2Nyb2xsTGF5ZXIoKSkK QEAgLTEzMywxMiArMTE4LDYgQEAgdm9pZCBOb25Db21wb3NpdGVkQ29udGVudEhvc3Q6OnNldFZp ZXdwb3J0KGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHZpZXdwb3J0U2l6ZSwKICAgICAgICAgbV9n cmFwaGljc0xheWVyLT5zZXROZWVkc0Rpc3BsYXkoKTsKICAgICB9IGVsc2UgaWYgKHZpc2libGVS ZWN0Q2hhbmdlZCkKICAgICAgICAgbV9ncmFwaGljc0xheWVyLT5zZXROZWVkc0Rpc3BsYXkoKTsK LQotICAgIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqIGNsaXBMYXllciA9IG1fZ3JhcGhpY3NMYXll ci0+cGFyZW50KCktPnBhcmVudCgpOwotICAgIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqIHJvb3RM YXllciA9IGNsaXBMYXllcjsKLSAgICB3aGlsZSAocm9vdExheWVyLT5wYXJlbnQoKSkKLSAgICAg ICAgcm9vdExheWVyID0gcm9vdExheWVyLT5wYXJlbnQoKTsKLSAgICBzZXRTY3JvbGxiYXJCb3Vu ZHNDb250YWluUGFnZVNjYWxlKHJvb3RMYXllciwgY2xpcExheWVyKTsKIH0KIAogYm9vbCBOb25D b21wb3NpdGVkQ29udGVudEhvc3Q6OmhhdmVTY3JvbGxMYXllcigpCg== 193545 2013-03-18 06:15:48 -0700 2013-03-18 15:45:41 -0700 Patch bug-112465-20130318091140.patch text/plain 6536 wjmaclean U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1OTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA5ZjVmYzAwZDUyMzA3 ZGZlYTYzOTc5ZTY3MWE3YzY4YTRhZThmOGFiLi40NzUxYjY1ZmQ1MzU1YTIwMmQ1Mzg0Yzc5YWVl MDc0Y2EyYmQ0NzVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMy0wMy0xOCAg Vy4gSmFtZXMgTWFjTGVhbiAgPHdqbWFjbGVhbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2No cm9taXVtXSBSZW1vdmUgY29kZSB0aGF0IHJlbGllcyBvbiBib3VuZHNDb250YWluc1BhZ2VTY2Fs ZSgpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEy NDY1CisKKyAgICAgICAgVGhlIGJvdW5kc0NvbnRhaW5zUGFnZVNjYWxlKCkgQVBJIGlzIGdvaW5n IGF3YXksIHJlbW92ZSBjb2RlIHRoYXQKKyAgICAgICAgZGVwZW5kcyBvbiBpdC4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNocm9taXVtL3B1Ymxp Yy9XZWJDb250ZW50TGF5ZXIuaDoKKyAgICAgICAgKFdlYkNvbnRlbnRMYXllcik6CisKIDIwMTMt MDMtMTQgIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2No cm9taXVtXSBNYWtlIHpvb20gZmlsdGVyIGluZGVwZW5kZW50IG9mIHRoZSBsYXllciBzaXplLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDVhMDZlZDNlZTMzOTkxYTQ0MzNhYWMyZjk2ZGY3Mjk4MWFkMDcwOTEuLmZk NTg1MDcwZTJkZGZmNGE2Y2Y5NzdlMzMwYWI3ZjI0ODBhNTg0ODkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxMy0wMy0xOCAgVy4gSmFtZXMgTWFjTGVhbiAgPHdqbWFjbGVhbkBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBSZW1vdmUgTkNDSCBjb2RlIHRoYXQgcmVs aWVzIG9uIGJvdW5kc0NvbnRhaW5zUGFnZVNjYWxlKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI0NjUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYm91bmRzQ29udGFpbnNQYWdlU2NhbGUoKSBB UEkgaXMgZ29pbmcgYXdheSwgcmVtb3ZlIGNvZGUgdGhhdAorICAgICAgICBkZXBlbmRzIG9uIGl0 LiBVc2VzIGV4aXN0aW5nIHRlc3RzIGFzIG5vIGJlaGF2aW91ciBjaGFuZ2UuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRBcHBsaWVzUGFnZVNj YWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6YXBwbGllc1Bh Z2VTY2FsZSk6CisKIDIwMTMtMDMtMTUgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5j b20+CiAKICAgICAgICAgTWlub3IgY2xlYW51cCBpbiB3b3JrZXIgY29kZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZwppbmRleCA0ODViZDIxNDI2ZTY5M2M2ZjFlY2Q0ZWE3OGIyZmMwMzY3NjBiMGU2 Li5iZTgwZDlhYTdjMmUyZDc4YTAyYTNiMDAzMWQ1OGYzZWJiNTA0NDBjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAzLTE4ICBXLiBKYW1lcyBNYWNM ZWFuICA8d2ptYWNsZWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFJlbW92 ZSBOQ0NIIGNvZGUgdGhhdCByZWxpZXMgb24gYm91bmRzQ29udGFpbnNQYWdlU2NhbGUoKS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjQ2NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBib3VuZENv bnRhaW5zUGFnZVNjYWxlIEFQSSBpcyBnb2luZyBhd2F5LCByZW1vdmUgY29kZSB0aGF0IHJlbGll cworICAgICAgICBvbiBpdC4KKworICAgICAgICAqIHNyYy9Ob25Db21wb3NpdGVkQ29udGVudEhv c3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpOb25Db21wb3NpdGVkQ29udGVudEhvc3Q6Ok5vbkNv bXBvc2l0ZWRDb250ZW50SG9zdCk6CisgICAgICAgIChXZWJLaXQ6Ok5vbkNvbXBvc2l0ZWRDb250 ZW50SG9zdDo6c2V0Vmlld3BvcnQpOgorCiAyMDEzLTAzLTE1ICBTaGVyaWZmIEJvdCAgPHdlYmtp dC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiAgUm9sbGVkIENo cm9taXVtIERFUFMgdG8gcjE4ODQxOC4gIFJlcXVlc3RlZCBieQpkaWZmIC0tZ2l0IGEvU291cmNl L1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJDb250ZW50TGF5ZXIuaCBiL1NvdXJjZS9QbGF0 Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViQ29udGVudExheWVyLmgKaW5kZXggNGZlZDJmZDgyYjg5 ZGE5MGIzMGJmNmUyOTNmNzQ1MGM4ZjVkNWRkNC4uMzZhMjNmYzhlZDhhNzI5ZjE0MzJlZjZhOTJj NTllYzFkODliZWU3NiAxMDA2NDQKLS0tIGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1Ymxp Yy9XZWJDb250ZW50TGF5ZXIuaAorKysgYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGlj L1dlYkNvbnRlbnRMYXllci5oCkBAIC00Myw5ICs0Myw2IEBAIHB1YmxpYzoKICAgICAvLyBEZWZh dWx0cyB0byBmYWxzZS4KICAgICB2aXJ0dWFsIHZvaWQgc2V0RG91YmxlU2lkZWQoYm9vbCkgPSAw OwogCi0gICAgdmlydHVhbCB2b2lkIHNldEJvdW5kc0NvbnRhaW5QYWdlU2NhbGUoYm9vbCkgPSAw OwotICAgIHZpcnR1YWwgYm9vbCBib3VuZHNDb250YWluUGFnZVNjYWxlKCkgY29uc3QgPSAwOwot CiAgICAgLy8gQWxsb3cgdGhlIGNvbXBvc2l0b3IgdG8gZGV0ZXJtaW5lIHRoZSBzY2FsZSBhdCB3 aGljaCB0aGUgbGF5ZXIgc2hvdWxkCiAgICAgLy8gYmUgcmFzdGVyaXplZCBiYXNlZCBvbiB0aGUg bGF5ZXIncyBoaWVyYXJjaHkgYW5kIHRyYW5zZm9ybS4gVGhpcyBkZWZhdWx0cwogICAgIC8vIHRv IGZhbHNlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggNWYzNWYw OTQ3NDhhZDRkODdmZDFlMDM1NTViNjI5NjM4ZjkzMWZhNy4uZGJjNGMwYjlmZThlMTU3YjQwNTA2 YmU1ODE2OGZlMTY1MDc2NDgzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0u Y3BwCkBAIC04MzEsMTQgKzgzMSwxMyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0 dXBDb250ZW50c0xheWVyKFdlYkxheWVyKiBjb250ZW50c0xheWVyKQogICAgIHVwZGF0ZU5hbWVz KCk7CiB9CiAKLXZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRBcHBsaWVzUGFnZVNjYWxl KGJvb2wgYXBwbGllc1NjYWxlKQordm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldEFwcGxp ZXNQYWdlU2NhbGUoYm9vbCkKIHsKLSAgICBtX2xheWVyLT5zZXRCb3VuZHNDb250YWluUGFnZVNj YWxlKGFwcGxpZXNTY2FsZSk7CiB9CiAKIGJvb2wgR3JhcGhpY3NMYXllckNocm9taXVtOjphcHBs aWVzUGFnZVNjYWxlKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9sYXllci0+Ym91bmRzQ29udGFp blBhZ2VTY2FsZSgpOworICAgIHJldHVybiBmYWxzZTsKIH0KIAogdm9pZCBHcmFwaGljc0xheWVy Q2hyb21pdW06OnBhaW50KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgSW50UmVjdCYg Y2xpcCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL05vbkNvbXBvc2l0 ZWRDb250ZW50SG9zdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Ob25Db21wb3Np dGVkQ29udGVudEhvc3QuY3BwCmluZGV4IDlkMDdiNDQyNzhhYzU4NDVhMjU4ZDk2Yjk4YjMwYTI2 N2IzMmNmNDUuLmNlNmEyM2FjN2E0ZmU0ZWYyODEyNTMzNjhjZDk2MDE1NDgxMDIzYTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL05vbkNvbXBvc2l0ZWRDb250ZW50SG9z dC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvTm9uQ29tcG9zaXRlZENvbnRl bnRIb3N0LmNwcApAQCAtNDgsNyArNDgsNiBAQCBOb25Db21wb3NpdGVkQ29udGVudEhvc3Q6Ok5v bkNvbXBvc2l0ZWRDb250ZW50SG9zdChXZWJWaWV3SW1wbCogd2ViVmlldywgV2ViQ29yZQogICAg IG1fZ3JhcGhpY3NMYXllci0+c2V0TmFtZSgibm9uLWNvbXBvc2l0ZWQgY29udGVudCIpOwogI2Vu ZGlmCiAgICAgbV9ncmFwaGljc0xheWVyLT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7Ci0gICAgbV9n cmFwaGljc0xheWVyLT5zZXRBcHBsaWVzUGFnZVNjYWxlKCFtX3dlYlZpZXctPnBhZ2UoKS0+c2V0 dGluZ3MoKS0+YXBwbHlQYWdlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IoKSk7CiAgICAgbV9ncmFw aGljc0xheWVyLT5zZXRDb250ZW50c09wYXF1ZSh0cnVlKTsKICAgICAvLyBGSVhNRTogUmVtb3Zl IExDRCB0ZXh0IHNldHRpbmcgYWZ0ZXIgaXQgaXMgaW1wbGVtZW50ZWQgaW4gY2hyb21pdW0uCiAg ICAgV2ViQ29udGVudExheWVyKiBsYXllciA9IHN0YXRpY19jYXN0PFdlYkNvcmU6OkdyYXBoaWNz TGF5ZXJDaHJvbWl1bSo+KG1fZ3JhcGhpY3NMYXllci5nZXQoKSktPmNvbnRlbnRMYXllcigpOwpA QCAtODgsMjAgKzg3LDYgQEAgdm9pZCBOb25Db21wb3NpdGVkQ29udGVudEhvc3Q6OnNldFNjcm9s bExheWVyKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqIGxheWVyKQogICAgIEFTU0VSVChoYXZlU2Ny b2xsTGF5ZXIoKSk7CiB9CiAKLXN0YXRpYyB2b2lkIHNldFNjcm9sbGJhckJvdW5kc0NvbnRhaW5Q YWdlU2NhbGUoV2ViQ29yZTo6R3JhcGhpY3NMYXllciogbGF5ZXIsIFdlYkNvcmU6OkdyYXBoaWNz TGF5ZXIqIGNsaXBMYXllcikKLXsKLSAgICAvLyBTY3JvbGxiYXJzIGFyZSBhdHRhY2hlZCBvdXRz aWRlIHRoZSByb290IGNsaXAgcmVjdCwgc28gc2tpcCB0aGUKLSAgICAvLyBjbGlwTGF5ZXIgc3Vi dHJlZS4KLSAgICBpZiAobGF5ZXIgPT0gY2xpcExheWVyKQotICAgICAgICByZXR1cm47Ci0KLSAg ICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxheWVyLT5jaGlsZHJlbigpLnNpemUoKTsgKytpKQot ICAgICAgICBzZXRTY3JvbGxiYXJCb3VuZHNDb250YWluUGFnZVNjYWxlKGxheWVyLT5jaGlsZHJl bigpW2ldLCBjbGlwTGF5ZXIpOwotCi0gICAgaWYgKGxheWVyLT5jaGlsZHJlbigpLmlzRW1wdHko KSkKLSAgICAgICAgbGF5ZXItPnNldEFwcGxpZXNQYWdlU2NhbGUodHJ1ZSk7Ci19Ci0KIHZvaWQg Tm9uQ29tcG9zaXRlZENvbnRlbnRIb3N0OjpzZXRWaWV3cG9ydChjb25zdCBXZWJDb3JlOjpJbnRT aXplJiB2aWV3cG9ydFNpemUsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIGNvbnRlbnRzU2l6ZSwg Y29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpJ bnRQb2ludCYgc2Nyb2xsT3JpZ2luKQogewogICAgIGlmICghaGF2ZVNjcm9sbExheWVyKCkpCkBA IC0xMzMsMTIgKzExOCw2IEBAIHZvaWQgTm9uQ29tcG9zaXRlZENvbnRlbnRIb3N0OjpzZXRWaWV3 cG9ydChjb25zdCBXZWJDb3JlOjpJbnRTaXplJiB2aWV3cG9ydFNpemUsCiAgICAgICAgIG1fZ3Jh cGhpY3NMYXllci0+c2V0TmVlZHNEaXNwbGF5KCk7CiAgICAgfSBlbHNlIGlmICh2aXNpYmxlUmVj dENoYW5nZWQpCiAgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0TmVlZHNEaXNwbGF5KCk7Ci0K LSAgICBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiBjbGlwTGF5ZXIgPSBtX2dyYXBoaWNzTGF5ZXIt PnBhcmVudCgpLT5wYXJlbnQoKTsKLSAgICBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiByb290TGF5 ZXIgPSBjbGlwTGF5ZXI7Ci0gICAgd2hpbGUgKHJvb3RMYXllci0+cGFyZW50KCkpCi0gICAgICAg IHJvb3RMYXllciA9IHJvb3RMYXllci0+cGFyZW50KCk7Ci0gICAgc2V0U2Nyb2xsYmFyQm91bmRz Q29udGFpblBhZ2VTY2FsZShyb290TGF5ZXIsIGNsaXBMYXllcik7CiB9CiAKIGJvb2wgTm9uQ29t cG9zaXRlZENvbnRlbnRIb3N0OjpoYXZlU2Nyb2xsTGF5ZXIoKQo=