95235 2012-08-28 12:49:26 -0700 [chromium] Do not clip root layer's subtree to viewport 2012-08-29 10:40:26 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 92290 94542 1 shawnsingh shawnsingh cc-bugs danakj enne jamesr webkit.review.bot oldest_to_newest 706648 0 shawnsingh 2012-08-28 12:49:26 -0700 The root layer's renderSurface should be clipped to the viewport's bounds (like it is now), but the root layer should not propagate that clipRect further down the subtree. Advantages of making this change: - root layer becomes less special, and in a separate patch it should be possible to simplify calcDrawTransforms nicely because of this - renderSurfaces can remain more cacheable because they will not change size because of getting clipped. - makes visibleContentRect and drawableContentRect behavior more consistent across all layers, regardless of whether they contribute to root surface or other surface. This patch will slightly change expected results of visibleContentRect and drawableContentRect in 94542 (in a clean positive way). 706834 1 161081 shawnsingh 2012-08-28 16:10:00 -0700 Created attachment 161081 Patch It seemed to me that fixing the unit tests by adding parent->setMasksToBounds(true) was reasonable, since it still retains the real underlying purpose and intent behind the tests. Tested on OSX, manual, layout, and unit tests, no obvious regressions 707449 2 161081 danakj 2012-08-29 07:59:55 -0700 Comment on attachment 161081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161081&action=review > Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp:956 > + parent->setMasksToBounds(true); I think this could just go in createRoot() and then you don't have to edit every test. 707487 3 shawnsingh 2012-08-29 08:40:00 -0700 (In reply to comment #2) > (From update of attachment 161081 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=161081&action=review > > > Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp:956 > > + parent->setMasksToBounds(true); > > I think this could just go in createRoot() and then you don't have to edit every test. I can do that, sure. I felt like it would have been better to only affect the tests that really needed it, though. 707488 4 161081 danakj 2012-08-29 08:40:29 -0700 Comment on attachment 161081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161081&action=review >>> Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp:956 >>> + parent->setMasksToBounds(true); >> >> I think this could just go in createRoot() and then you don't have to edit every test. > > I can do that, sure. I felt like it would have been better to only affect the tests that really needed it, though. oh I see. that's fine too then :) 707549 5 161081 enne 2012-08-29 09:52:09 -0700 Comment on attachment 161081 Patch R=me. 707621 6 shawnsingh 2012-08-29 10:40:26 -0700 Committed r127017: <http://trac.webkit.org/changeset/127017> 161081 2012-08-28 16:10:00 -0700 2012-08-29 09:52:09 -0700 Patch bug-95235-20120828160951.patch text/plain 11537 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2OTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTZmYzJjNjAwMjM3ZjQ5 ZTdlZTY1YzczMGFhMWVlOTFmYWU0MTE5ZS4uZmQzZmFjMDIwYzg1ZjY4MjA5MjM0YjA3NmFjNWE5 YzM0ZmQwNWM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA4LTI4ICBTaGF3 biBTaW5naCAgPHNoYXduc2luZ2hAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g RG8gbm90IGNsaXAgcm9vdCBsYXllcidzIHN1YnRyZWUgdG8gdmlld3BvcnQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1MjM1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHJvb3QgbGF5ZXIncyByZW5k ZXJTdXJmYWNlIGFscmVhZHkgY29ycmVjdGx5IGNsaXBzIGV2ZXJ5dGhpbmcKKyAgICAgICAgdG8g dGhlIHZpZXdwb3J0J3MgYm91bmRzLiAgVGhlcmUgYXJlIHNvbWUgdXNlZnVsIHJlYXNvbnMgdGhh dCB3ZQorICAgICAgICBzaG91bGQgbm90IGNhdXNlIHRoZSByb290IGxheWVyIGl0c2VsZiB0byBj bGlwIHRoZSBzdWJ0cmVlIGFueQorICAgICAgICBmdXJ0aGVyLCBpbiBwYXJ0aWN1bGFyIHNvIHRo YXQgc3VyZmFjZXMgY2FuIHJlbWFpbiBtb3JlIGNhY2hlYWJsZSwKKyAgICAgICAgYW5kIHRvIG1h a2Ugcm9vdCBsYXllciBzZW1hbnRpY3MgbW9yZSBob21vZ2VuZW91cy4KKworICAgICAgICBFeGlz dGluZyB0ZXN0cyB1cGRhdGVkLCBhbmQgb3RoZXJ3aXNlIHRoaXMgY2hhbmdlIGlzIGFscmVhZHkK KyAgICAgICAgY292ZXJlZCBieSBsYXlvdXQgYW5kIHVuaXQgdGVzdHMuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RDb21tb24uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Y2FsY3VsYXRlRHJhd1RyYW5zZm9ybXNJbnRlcm5hbCk6CisKIDIw MTItMDgtMjcgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgogCiAgICAg ICAgIFtDU1MgRmlsdGVyc10gRmlsdGVycyBzaG91bGQgcmVuZGVyIHVzaW5nIHNSR0IgdW50aWwg dGhlIHNwZWNpZmljYXRpb24gc2F5cyBob3cgaXQgd29ya3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKaW5kZXggOGQwOTBkYTViMGY4M2FiYWFmM2RjYmE5YjJkOTg4YmYwNWJhYTVlZC4uMzI0NTFj YjhkZWY5ODMwMjZkNDc0MTYwNjZhZTgxYWI1YjgzMTQ5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMi0wOC0yOCAgU2hhd24gU2luZ2ggIDxzaGF3bnNp bmdoQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIERvIG5vdCBjbGlwIHJvb3Qg bGF5ZXIncyBzdWJ0cmVlIHRvIHZpZXdwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD05NTIzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEV4aXN0aW5nIHRlc3RzIHVwZGF0ZWQsIGFuZCBvdGhlcndpc2Ug dGhpcyBjaGFuZ2UgaXMgYWxyZWFkeQorICAgICAgICBjb3ZlcmVkIGJ5IGxheW91dCBhbmQgdW5p dCB0ZXN0cy4KKworICAgICAgICAqIHRlc3RzL0NDTGF5ZXJUcmVlSG9zdENvbW1vblRlc3QuY3Bw OgorICAgICAgICAqIHRlc3RzL0NDT2NjbHVzaW9uVHJhY2tlclRlc3QuY3BwOgorICAgICAgICAo V2ViS2l0VGVzdHM6OkNDT2NjbHVzaW9uVHJhY2tlclRlc3RDaGlsZEluUm90YXRlZENoaWxkOjpy dW5NeVRlc3QpOgorICAgICAgICAoV2ViS2l0VGVzdHM6OkNDT2NjbHVzaW9uVHJhY2tlclRlc3RW aXNpdFRhcmdldFR3b1RpbWVzOjpydW5NeVRlc3QpOgorICAgICAgICAoV2ViS2l0VGVzdHM6OkND T2NjbHVzaW9uVHJhY2tlclRlc3RTdXJmYWNlV2l0aFR3b09wYXF1ZUNoaWxkcmVuOjpydW5NeVRl c3QpOgorICAgICAgICAoV2ViS2l0VGVzdHM6OkNDT2NjbHVzaW9uVHJhY2tlclRlc3RPdmVybGFw cGluZ1N1cmZhY2VTaWJsaW5nczo6cnVuTXlUZXN0KToKKyAgICAgICAgKFdlYktpdFRlc3RzOjpD Q09jY2x1c2lvblRyYWNrZXJUZXN0T3ZlcmxhcHBpbmdTdXJmYWNlU2libGluZ3NXaXRoVHdvVHJh bnNmb3Jtczo6cnVuTXlUZXN0KToKKyAgICAgICAgKFdlYktpdFRlc3RzOjpDQ09jY2x1c2lvblRy YWNrZXJUZXN0RmlsdGVyczo6cnVuTXlUZXN0KToKKyAgICAgICAgKFdlYktpdFRlc3RzOjpDQ09j Y2x1c2lvblRyYWNrZXJUZXN0UmVwbGljYVdpdGhDbGlwcGluZzo6cnVuTXlUZXN0KToKKyAgICAg ICAgKFdlYktpdFRlc3RzOjpDQ09jY2x1c2lvblRyYWNrZXJUZXN0TGFyZ2VQaXhlbHNPY2NsdWRl SW5zaWRlQ2xpcFJlY3Q6OnJ1bk15VGVzdCk6CisgICAgICAgIChXZWJLaXRUZXN0czo6Q0NPY2Ns dXNpb25UcmFja2VyVGVzdFN1cmZhY2VPY2NsdXNpb25UcmFuc2xhdGVzV2l0aENsaXBwaW5nOjpy dW5NeVRlc3QpOgorICAgICAgICAoV2ViS2l0VGVzdHM6OkNDT2NjbHVzaW9uVHJhY2tlclRlc3RT dXJmYWNlQ2hpbGRPZkNsaXBwaW5nU3VyZmFjZTo6cnVuTXlUZXN0KToKKwogMjAxMi0wOC0yOCAg U2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEyNjM0NC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJl ZUhvc3RDb21tb24uY3BwCmluZGV4IDY4OThjOTc3OThmZjUwMzZjMWFjZDgxZDE2NWJiMTU4N2Q5 OTBiN2EuLjIxNDBkZjA1NmE0Y2UzYTAwMWE4ZDJjNzQ1MTg3NmUyM2JmOTYxMDYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJU cmVlSG9zdENvbW1vbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcApAQCAtNjEzLDE1ICs2MTMsMTIg QEAgc3RhdGljIHZvaWQgY2FsY3VsYXRlRHJhd1RyYW5zZm9ybXNJbnRlcm5hbChMYXllclR5cGUq IGxheWVyLCBMYXllclR5cGUqIHJvb3RMYXkKICAgICAgICAgICAgIC8vIExheWVycyB0aGF0IGFy ZSBub3QgdGhlaXIgb3duIHJlbmRlclRhcmdldCB3aWxsIHJlbmRlciBpbnRvIHRoZSB0YXJnZXQg b2YgdGhlaXIgbmVhcmVzdCBhbmNlc3Rvci4KICAgICAgICAgICAgIGxheWVyLT5zZXRSZW5kZXJU YXJnZXQobGF5ZXItPnBhcmVudCgpLT5yZW5kZXJUYXJnZXQoKSk7CiAgICAgICAgIH0gZWxzZSB7 Ci0gICAgICAgICAgICAvLyBGSVhNRTogVGhpcyByb290IGxheWVyIHNwZWNpYWwgY2FzZSBjb2Rl IHNob3VsZCBldmVudHVhbGx5IGdvIGF3YXkuIEJ1dCBiZWZvcmUgdGhhdCBpcyB0cnVseSBwb3Nz aWJsZSwKLSAgICAgICAgICAgIC8vICAgICAgICB0ZXN0cyAob3IgY29kZSkgcmVsYXRlZCB0byBD Q09jY2x1c2lvblRyYWNrZXIgbmVlZCB0byBiZSBhZGp1c3RlZCBzbyB0aGF0IHRoZXkgZG8gbm90 IHJlcXVpcmUKLSAgICAgICAgICAgIC8vICAgICAgICB0aGUgcm9vdExheWVyIHRvIGNsaXA7IHRo ZSByb290IGxheWVyJ3MgUmVuZGVyU3VyZmFjZSB3b3VsZCBhbHJlYWR5IGNsaXAgYW5kIHNob3Vs ZCBiZSBlbm91Z2guCisgICAgICAgICAgICAvLyBGSVhNRTogVGhpcyByb290IGxheWVyIHNwZWNp YWwgY2FzZSBjb2RlIHNob3VsZCBldmVudHVhbGx5IGdvIGF3YXkuIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjI5MAogICAgICAgICAgICAgQVNTRVJUKCFsYXllci0+ cGFyZW50KCkpOwogICAgICAgICAgICAgQVNTRVJUKGxheWVyLT5yZW5kZXJTdXJmYWNlKCkpOwog ICAgICAgICAgICAgQVNTRVJUKGFuY2VzdG9yQ2xpcHNTdWJ0cmVlKTsKICAgICAgICAgICAgIGxh eWVyLT5yZW5kZXJTdXJmYWNlKCktPnNldENsaXBSZWN0KGNsaXBSZWN0RnJvbUFuY2VzdG9yKTsK LSAgICAgICAgICAgIHN1YnRyZWVTaG91bGRCZUNsaXBwZWQgPSB0cnVlOwotICAgICAgICAgICAg Y2xpcFJlY3RGb3JTdWJ0cmVlID0gY2xpcFJlY3RGcm9tQW5jZXN0b3I7CisgICAgICAgICAgICBz dWJ0cmVlU2hvdWxkQmVDbGlwcGVkID0gZmFsc2U7CiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0Q29tbW9u VGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdENv bW1vblRlc3QuY3BwCmluZGV4IDBiNWFhNmJlNjRhNWY4NzU4OTI5NzFmNzM4ZWYwZjJhNTQ5ZmIx ZmEuLmM4ZDcwNWVhYzE1YWRjMzIzNjhkMDMyNmFiZjJiZWE1MTgyZWYwMzIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0Q29tbW9uVGVzdC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RDb21t b25UZXN0LmNwcApAQCAtNjcyLDYgKzY3Miw3IEBAIFRFU1QoQ0NMYXllclRyZWVIb3N0Q29tbW9u VGVzdCwgdmVyaWZ5UmVuZGVyU3VyZmFjZUxpc3RGb3JSZW5kZXJTdXJmYWNlV2l0aENsaXBwCiAg ICAgc2V0TGF5ZXJQcm9wZXJ0aWVzRm9yVGVzdGluZyhjaGlsZC5nZXQoKSwgaWRlbnRpdHlNYXRy aXgsIGlkZW50aXR5TWF0cml4LCBGbG9hdFBvaW50Ojp6ZXJvKCksIEZsb2F0UG9pbnQoMzAsIDMw KSwgSW50U2l6ZSgxMCwgMTApLCBmYWxzZSk7CiAKICAgICBwYXJlbnQtPmFkZENoaWxkKHJlbmRl clN1cmZhY2UxKTsKKyAgICBwYXJlbnQtPnNldE1hc2tzVG9Cb3VuZHModHJ1ZSk7CiAgICAgcmVu ZGVyU3VyZmFjZTEtPmFkZENoaWxkKGNoaWxkKTsKICAgICByZW5kZXJTdXJmYWNlMS0+c2V0Rm9y Y2VSZW5kZXJTdXJmYWNlKHRydWUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3Rlc3RzL0NDT2NjbHVzaW9uVHJhY2tlclRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS90ZXN0cy9DQ09jY2x1c2lvblRyYWNrZXJUZXN0LmNwcAppbmRleCA0ZTVmOWRjODhmM2Y4 MTQ5OTA1ZDY4ZmE0NzNkMjY3NDg0NGRiYzE5Li4xNzE2NzZmNDVkNDQ2MGI2ZjBiYTAzY2FhODZk ZjBmZDkzZDY1YjY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0ND T2NjbHVzaW9uVHJhY2tlclRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvQ0NPY2NsdXNpb25UcmFja2VyVGVzdC5jcHAKQEAgLTYwNiw2ICs2MDYsNyBAQCBwcm90ZWN0 ZWQ6CiAgICAgICAgIGNoaWxkVHJhbnNmb3JtLnRyYW5zbGF0ZSgtMjUwLCAtMjUwKTsKIAogICAg ICAgICB0eXBlbmFtZSBUeXBlczo6Q29udGVudExheWVyVHlwZSogcGFyZW50ID0gdGhpcy0+Y3Jl YXRlUm9vdCh0aGlzLT5pZGVudGl0eU1hdHJpeCwgRmxvYXRQb2ludCgwLCAwKSwgSW50U2l6ZSgx MDAsIDEwMCkpOworICAgICAgICBwYXJlbnQtPnNldE1hc2tzVG9Cb3VuZHModHJ1ZSk7CiAgICAg ICAgIHR5cGVuYW1lIFR5cGVzOjpMYXllclR5cGUqIGNoaWxkID0gdGhpcy0+Y3JlYXRlTGF5ZXIo cGFyZW50LCBjaGlsZFRyYW5zZm9ybSwgRmxvYXRQb2ludCgzMCwgMzApLCBJbnRTaXplKDUwMCwg NTAwKSk7CiAgICAgICAgIGNoaWxkLT5zZXRNYXNrc1RvQm91bmRzKHRydWUpOwogICAgICAgICB0 eXBlbmFtZSBUeXBlczo6Q29udGVudExheWVyVHlwZSogbGF5ZXIgPSB0aGlzLT5jcmVhdGVEcmF3 aW5nTGF5ZXIoY2hpbGQsIHRoaXMtPmlkZW50aXR5TWF0cml4LCBGbG9hdFBvaW50KDEwLCAxMCks IEludFNpemUoNTAwLCA1MDApLCB0cnVlKTsKQEAgLTY4NSw2ICs2ODYsNyBAQCBwcm90ZWN0ZWQ6 CiAgICAgICAgIGNoaWxkVHJhbnNmb3JtLnRyYW5zbGF0ZSgtMjUwLCAtMjUwKTsKIAogICAgICAg ICB0eXBlbmFtZSBUeXBlczo6Q29udGVudExheWVyVHlwZSogcGFyZW50ID0gdGhpcy0+Y3JlYXRl Um9vdCh0aGlzLT5pZGVudGl0eU1hdHJpeCwgRmxvYXRQb2ludCgwLCAwKSwgSW50U2l6ZSgxMDAs IDEwMCkpOworICAgICAgICBwYXJlbnQtPnNldE1hc2tzVG9Cb3VuZHModHJ1ZSk7CiAgICAgICAg IHR5cGVuYW1lIFR5cGVzOjpMYXllclR5cGUqIGNoaWxkID0gdGhpcy0+Y3JlYXRlTGF5ZXIocGFy ZW50LCBjaGlsZFRyYW5zZm9ybSwgRmxvYXRQb2ludCgzMCwgMzApLCBJbnRTaXplKDUwMCwgNTAw KSk7CiAgICAgICAgIGNoaWxkLT5zZXRNYXNrc1RvQm91bmRzKHRydWUpOwogICAgICAgICB0eXBl bmFtZSBUeXBlczo6Q29udGVudExheWVyVHlwZSogbGF5ZXIgPSB0aGlzLT5jcmVhdGVEcmF3aW5n TGF5ZXIoY2hpbGQsIHRoaXMtPmlkZW50aXR5TWF0cml4LCBGbG9hdFBvaW50KDEwLCAxMCksIElu dFNpemUoNTAwLCA1MDApLCB0cnVlKTsKQEAgLTg2Miw2ICs4NjQsNyBAQCBwcm90ZWN0ZWQ6CiAg ICAgICAgIGNoaWxkVHJhbnNmb3JtLnRyYW5zbGF0ZSgtMjUwLCAtMjUwKTsKIAogICAgICAgICB0 eXBlbmFtZSBUeXBlczo6Q29udGVudExheWVyVHlwZSogcGFyZW50ID0gdGhpcy0+Y3JlYXRlUm9v dCh0aGlzLT5pZGVudGl0eU1hdHJpeCwgRmxvYXRQb2ludCgwLCAwKSwgSW50U2l6ZSgxMDAsIDEw MCkpOworICAgICAgICBwYXJlbnQtPnNldE1hc2tzVG9Cb3VuZHModHJ1ZSk7CiAgICAgICAgIHR5 cGVuYW1lIFR5cGVzOjpMYXllclR5cGUqIGNoaWxkID0gdGhpcy0+Y3JlYXRlTGF5ZXIocGFyZW50 LCBjaGlsZFRyYW5zZm9ybSwgRmxvYXRQb2ludCgzMCwgMzApLCBJbnRTaXplKDUwMCwgNTAwKSk7 CiAgICAgICAgIGNoaWxkLT5zZXRNYXNrc1RvQm91bmRzKHRydWUpOwogICAgICAgICB0eXBlbmFt ZSBUeXBlczo6Q29udGVudExheWVyVHlwZSogbGF5ZXIxID0gdGhpcy0+Y3JlYXRlRHJhd2luZ0xh eWVyKGNoaWxkLCB0aGlzLT5pZGVudGl0eU1hdHJpeCwgRmxvYXRQb2ludCgxMCwgMTApLCBJbnRT aXplKDUwMCwgNTAwKSwgdHJ1ZSk7CkBAIC05NTAsNiArOTUzLDcgQEAgcHJvdGVjdGVkOgogICAg ICAgICBjaGlsZFRyYW5zZm9ybS50cmFuc2xhdGUoLTI1MCwgLTI1MCk7CiAKICAgICAgICAgdHlw ZW5hbWUgVHlwZXM6OkNvbnRlbnRMYXllclR5cGUqIHBhcmVudCA9IHRoaXMtPmNyZWF0ZVJvb3Qo dGhpcy0+aWRlbnRpdHlNYXRyaXgsIEZsb2F0UG9pbnQoMCwgMCksIEludFNpemUoMTAwLCAxMDAp KTsKKyAgICAgICAgcGFyZW50LT5zZXRNYXNrc1RvQm91bmRzKHRydWUpOwogICAgICAgICB0eXBl bmFtZSBUeXBlczo6TGF5ZXJUeXBlKiBjaGlsZDEgPSB0aGlzLT5jcmVhdGVTdXJmYWNlKHBhcmVu dCwgY2hpbGRUcmFuc2Zvcm0sIEZsb2F0UG9pbnQoMzAsIDMwKSwgSW50U2l6ZSgxMCwgMTApKTsK ICAgICAgICAgdHlwZW5hbWUgVHlwZXM6OkxheWVyVHlwZSogY2hpbGQyID0gdGhpcy0+Y3JlYXRl U3VyZmFjZShwYXJlbnQsIGNoaWxkVHJhbnNmb3JtLCBGbG9hdFBvaW50KDIwLCA0MCksIEludFNp emUoMTAsIDEwKSk7CiAgICAgICAgIHR5cGVuYW1lIFR5cGVzOjpDb250ZW50TGF5ZXJUeXBlKiBs YXllcjEgPSB0aGlzLT5jcmVhdGVEcmF3aW5nTGF5ZXIoY2hpbGQxLCB0aGlzLT5pZGVudGl0eU1h dHJpeCwgRmxvYXRQb2ludCgtMTAsIC0xMCksIEludFNpemUoNTEwLCA1MTApLCB0cnVlKTsKQEAg LTEwNjQsNiArMTA2OCw3IEBAIHByb3RlY3RlZDoKICAgICAgICAgY2hpbGQyVHJhbnNmb3JtLnRy YW5zbGF0ZSgtMjUwLCAtMjUwKTsKIAogICAgICAgICB0eXBlbmFtZSBUeXBlczo6Q29udGVudExh eWVyVHlwZSogcGFyZW50ID0gdGhpcy0+Y3JlYXRlUm9vdCh0aGlzLT5pZGVudGl0eU1hdHJpeCwg RmxvYXRQb2ludCgwLCAwKSwgSW50U2l6ZSgxMDAsIDEwMCkpOworICAgICAgICBwYXJlbnQtPnNl dE1hc2tzVG9Cb3VuZHModHJ1ZSk7CiAgICAgICAgIHR5cGVuYW1lIFR5cGVzOjpMYXllclR5cGUq IGNoaWxkMSA9IHRoaXMtPmNyZWF0ZVN1cmZhY2UocGFyZW50LCBjaGlsZDFUcmFuc2Zvcm0sIEZs b2F0UG9pbnQoMzAsIDIwKSwgSW50U2l6ZSgxMCwgMTApKTsKICAgICAgICAgdHlwZW5hbWUgVHlw ZXM6OkxheWVyVHlwZSogY2hpbGQyID0gdGhpcy0+Y3JlYXRlRHJhd2luZ1N1cmZhY2UocGFyZW50 LCBjaGlsZDJUcmFuc2Zvcm0sIEZsb2F0UG9pbnQoMjAsIDQwKSwgSW50U2l6ZSgxMCwgMTApLCBm YWxzZSk7CiAgICAgICAgIHR5cGVuYW1lIFR5cGVzOjpDb250ZW50TGF5ZXJUeXBlKiBsYXllcjEg PSB0aGlzLT5jcmVhdGVEcmF3aW5nTGF5ZXIoY2hpbGQxLCB0aGlzLT5pZGVudGl0eU1hdHJpeCwg RmxvYXRQb2ludCgtMTAsIC0yMCksIEludFNpemUoNTEwLCA1MTApLCB0cnVlKTsKQEAgLTExNjYs NiArMTE3MSw3IEBAIHByb3RlY3RlZDoKICAgICAgICAgbGF5ZXJUcmFuc2Zvcm0udHJhbnNsYXRl KC0yNTAsIC0yNTApOwogCiAgICAgICAgIHR5cGVuYW1lIFR5cGVzOjpDb250ZW50TGF5ZXJUeXBl KiBwYXJlbnQgPSB0aGlzLT5jcmVhdGVSb290KHRoaXMtPmlkZW50aXR5TWF0cml4LCBGbG9hdFBv aW50KDAsIDApLCBJbnRTaXplKDEwMCwgMTAwKSk7CisgICAgICAgIHBhcmVudC0+c2V0TWFza3NU b0JvdW5kcyh0cnVlKTsKICAgICAgICAgdHlwZW5hbWUgVHlwZXM6OkNvbnRlbnRMYXllclR5cGUq IGJsdXJMYXllciA9IHRoaXMtPmNyZWF0ZURyYXdpbmdMYXllcihwYXJlbnQsIGxheWVyVHJhbnNm b3JtLCBGbG9hdFBvaW50KDMwLCAzMCksIEludFNpemUoNTAwLCA1MDApLCB0cnVlKTsKICAgICAg ICAgdHlwZW5hbWUgVHlwZXM6OkNvbnRlbnRMYXllclR5cGUqIG9wYXF1ZUxheWVyID0gdGhpcy0+ Y3JlYXRlRHJhd2luZ0xheWVyKHBhcmVudCwgbGF5ZXJUcmFuc2Zvcm0sIEZsb2F0UG9pbnQoMzAs IDMwKSwgSW50U2l6ZSg1MDAsIDUwMCksIHRydWUpOwogICAgICAgICB0eXBlbmFtZSBUeXBlczo6 Q29udGVudExheWVyVHlwZSogb3BhY2l0eUxheWVyID0gdGhpcy0+Y3JlYXRlRHJhd2luZ0xheWVy KHBhcmVudCwgbGF5ZXJUcmFuc2Zvcm0sIEZsb2F0UG9pbnQoMzAsIDMwKSwgSW50U2l6ZSg1MDAs IDUwMCksIHRydWUpOwpAQCAtMTI3NSw2ICsxMjgxLDcgQEAgcHJvdGVjdGVkOgogICAgIHZvaWQg cnVuTXlUZXN0KCkKICAgICB7CiAgICAgICAgIHR5cGVuYW1lIFR5cGVzOjpDb250ZW50TGF5ZXJU eXBlKiBwYXJlbnQgPSB0aGlzLT5jcmVhdGVSb290KHRoaXMtPmlkZW50aXR5TWF0cml4LCBGbG9h dFBvaW50KDAsIDApLCBJbnRTaXplKDEwMCwgMTcwKSk7CisgICAgICAgIHBhcmVudC0+c2V0TWFz a3NUb0JvdW5kcyh0cnVlKTsKICAgICAgICAgdHlwZW5hbWUgVHlwZXM6OkxheWVyVHlwZSogc3Vy ZmFjZSA9IHRoaXMtPmNyZWF0ZURyYXdpbmdTdXJmYWNlKHBhcmVudCwgdGhpcy0+aWRlbnRpdHlN YXRyaXgsIEZsb2F0UG9pbnQoMCwgMTAwKSwgSW50U2l6ZSg1MCwgNTApLCB0cnVlKTsKICAgICAg ICAgdGhpcy0+Y3JlYXRlUmVwbGljYUxheWVyKHN1cmZhY2UsIHRoaXMtPmlkZW50aXR5TWF0cml4 LCBGbG9hdFBvaW50KDUwLCA1MCksIEludFNpemUoKSk7CiAgICAgICAgIHRoaXMtPmNhbGNEcmF3 RXRjKHBhcmVudCk7CkBAIC0xOTU1LDYgKzE5NjIsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIHRy YW5zZm9ybS50cmFuc2xhdGUoLTUwLCAtNTApOwogCiAgICAgICAgIHR5cGVuYW1lIFR5cGVzOjpD b250ZW50TGF5ZXJUeXBlKiBwYXJlbnQgPSB0aGlzLT5jcmVhdGVSb290KHRoaXMtPmlkZW50aXR5 TWF0cml4LCBGbG9hdFBvaW50KDAsIDApLCBJbnRTaXplKDEwMCwgMTAwKSk7CisgICAgICAgIHBh cmVudC0+c2V0TWFza3NUb0JvdW5kcyh0cnVlKTsKICAgICAgICAgdHlwZW5hbWUgVHlwZXM6OkNv bnRlbnRMYXllclR5cGUqIGxheWVyID0gdGhpcy0+Y3JlYXRlRHJhd2luZ0xheWVyKHBhcmVudCwg dHJhbnNmb3JtLCBGbG9hdFBvaW50KDAsIDApLCBJbnRTaXplKDEwMCwgMTAwKSwgdHJ1ZSk7CiAg ICAgICAgIHBhcmVudC0+c2V0UHJlc2VydmVzM0QodHJ1ZSk7CiAgICAgICAgIGxheWVyLT5zZXRQ cmVzZXJ2ZXMzRCh0cnVlKTsKQEAgLTIyMjEsNiArMjIyOSw3IEBAIHByb3RlY3RlZDoKICAgICB2 b2lkIHJ1bk15VGVzdCgpCiAgICAgewogICAgICAgICB0eXBlbmFtZSBUeXBlczo6Q29udGVudExh eWVyVHlwZSogcGFyZW50ID0gdGhpcy0+Y3JlYXRlUm9vdCh0aGlzLT5pZGVudGl0eU1hdHJpeCwg RmxvYXRQb2ludCgwLCAwKSwgSW50U2l6ZSgzMDAsIDMwMCkpOworICAgICAgICBwYXJlbnQtPnNl dE1hc2tzVG9Cb3VuZHModHJ1ZSk7CiAgICAgICAgIHR5cGVuYW1lIFR5cGVzOjpDb250ZW50TGF5 ZXJUeXBlKiBzdXJmYWNlID0gdGhpcy0+Y3JlYXRlRHJhd2luZ1N1cmZhY2UocGFyZW50LCB0aGlz LT5pZGVudGl0eU1hdHJpeCwgRmxvYXRQb2ludCgwLCAwKSwgSW50U2l6ZSg1MDAsIDMwMCksIGZh bHNlKTsKICAgICAgICAgc3VyZmFjZS0+c2V0T3BhcXVlQ29udGVudHNSZWN0KEludFJlY3QoMCwg MCwgNDAwLCAyMDApKTsKICAgICAgICAgdGhpcy0+Y2FsY0RyYXdFdGMocGFyZW50KTsKQEAgLTI0 NjIsNiArMjQ3MSw3IEBAIHByb3RlY3RlZDoKICAgICAgICAgLy8gVGhpcyB0ZXN0IHZlcmlmaWVz IHRoYXQgdGhlIHN1cmZhY2UgY2xpcHJlY3QgZG9lcyBub3QgZW5kIHVwIGVtcHR5IGFuZCBjbGlw IGF3YXkgdGhlIGVudGlyZSB1bm9jY2x1ZGVkIHJlY3QuCiAKICAgICAgICAgdHlwZW5hbWUgVHlw ZXM6OkNvbnRlbnRMYXllclR5cGUqIHBhcmVudCA9IHRoaXMtPmNyZWF0ZVJvb3QodGhpcy0+aWRl bnRpdHlNYXRyaXgsIEZsb2F0UG9pbnQoMCwgMCksIEludFNpemUoODAsIDIwMCkpOworICAgICAg ICBwYXJlbnQtPnNldE1hc2tzVG9Cb3VuZHModHJ1ZSk7CiAgICAgICAgIHR5cGVuYW1lIFR5cGVz OjpMYXllclR5cGUqIHN1cmZhY2UgPSB0aGlzLT5jcmVhdGVEcmF3aW5nU3VyZmFjZShwYXJlbnQs IHRoaXMtPmlkZW50aXR5TWF0cml4LCBGbG9hdFBvaW50KDAsIDApLCBJbnRTaXplKDEwMCwgMTAw KSwgdHJ1ZSk7CiAgICAgICAgIHR5cGVuYW1lIFR5cGVzOjpMYXllclR5cGUqIHN1cmZhY2VDaGls ZCA9IHRoaXMtPmNyZWF0ZURyYXdpbmdTdXJmYWNlKHN1cmZhY2UsIHRoaXMtPmlkZW50aXR5TWF0 cml4LCBGbG9hdFBvaW50KDAsIDApLCBJbnRTaXplKDEwMCwgMTAwKSwgZmFsc2UpOwogICAgICAg ICB0eXBlbmFtZSBUeXBlczo6TGF5ZXJUeXBlKiB0b3Btb3N0ID0gdGhpcy0+Y3JlYXRlRHJhd2lu Z0xheWVyKHBhcmVudCwgdGhpcy0+aWRlbnRpdHlNYXRyaXgsIEZsb2F0UG9pbnQoMCwgMCksIElu dFNpemUoMTAwLCA1MCksIHRydWUpOwo=