46199 2010-09-21 10:26:10 -0700 [chromium] LayerRendererChromium::prepareToDrawLayers logic needs cleanup 2010-09-21 13:53:13 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vangelis vangelis abarth eric jamesr nduca webkit.review.bot oldest_to_newest 282399 0 vangelis 2010-09-21 10:26:10 -0700 There are a couple of issues here: 1. When the window size changes the entire root layer texture must be updated. There's no reason to perform scrolling operations there. 2. When the scroll offset is larger than the size of the page we shouldn't be doing the glCopyPixels as there's no useful pixels to copy from 3. It shouldn't call updateLayersRecursive as that method is actually called right before the layers are drawn in the drawLayers() method. 282472 1 68272 vangelis 2010-09-21 12:10:01 -0700 Created attachment 68272 proposed patch 282476 2 68274 vangelis 2010-09-21 12:20:18 -0700 Created attachment 68274 proposed patch - fixed some comments 282484 3 68274 jamesr 2010-09-21 12:40:09 -0700 Comment on attachment 68274 proposed patch - fixed some comments Looks good 282489 4 vangelis 2010-09-21 12:49:18 -0700 Committed r67977: <http://trac.webkit.org/changeset/67977> 282540 5 webkit.review.bot 2010-09-21 13:53:13 -0700 http://trac.webkit.org/changeset/67977 might have broken Qt Windows 32-bit Debug The following changes are on the blame list: http://trac.webkit.org/changeset/67973 http://trac.webkit.org/changeset/67974 http://trac.webkit.org/changeset/67975 http://trac.webkit.org/changeset/67976 http://trac.webkit.org/changeset/67977 http://trac.webkit.org/changeset/67978 http://trac.webkit.org/changeset/67979 68272 2010-09-21 12:10:01 -0700 2010-09-21 12:20:18 -0700 proposed patch cleanupPrepareToDraw_46199.txt text/plain 5232 vangelis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Nzk3MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDktMjEgIFZhbmdlbGlzIEtva2tldmlzICA8dmFuZ2VsaXNA Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtjaHJvbWl1bV0gQ2xlYW5lZCB1cCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnByZXBh cmVUb0RyYXdMYXllcnMKKyAgICAgICAgbG9naWMgdG8gYXZvaWQgdW5uZWNlc3NhcnkgY29weSBv cGVyYXRpb25zIGlmIHRoZSBleGlzdGluZyByb290IGxheWVyCisgICAgICAgIGNvbnRlbnRzIGFy ZW4ndCB1c2VmdWwgZm9yIHNjcm9sbGluZy4gQWxzbyByZW1vdmVkIGNhbGwgdG8gdXBkYXRlTGF5 ZXJzUmVjdXJzaXZlKCkKKyAgICAgICAgYXMgdGhlIGNvbXBvc2l0ZWQgbGF5ZXIgdXBkYXRlIGlz IGFjdHVhbGx5IGhhcHBlbmluZyBpbiB0aGUgZHJhd0xheWVycygpIG1ldGhvZC4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MTk5CisKKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OnByZXBhcmVUb0RyYXdM YXllcnMpOgorCiAyMDEwLTA5LTIxICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRvbnkgQ2hhbmcuCkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hy b21pdW0uY3BwCShyZXZpc2lvbiA2Nzk2NikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU5 LDggKzE1OSw5IEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjp1c2VTaGFkZXIodW4KICAg ICB9CiB9CiAKLS8vIFVwZGF0ZXMgdGhlIGNvbnRlbnRzIG9mIHRoZSByb290IGxheWVyIHRleHR1 cmUgdGhhdCBmYWxsIGluc2lkZSB0aGUgdXBkYXRlUmVjdAotLy8gYW5kIHJlLWNvbXBvc2l0cyBh bGwgc3VibGF5ZXJzLgorLy8gVGhpcyBtZXRob2Qgc2hvdWxkIGJlIGNhbGxlZCBiZWZvcmUgYW55 IG90aGVyIHVwZGF0ZXMgaGFwcGVuIHRvIHRoZSByb290IGxheWVyIHRleHR1cmUuIEl0IHdpbGwg cmVzaXplCisvLyB0aGUgcm9vdCBsYXllciB0ZXh0dXJlIGFuZCBzY3JvbGwgaXRzIGNvbnRlbnRz IGFzIG5lZWRlZC4gSXQgYWxzbyBzZXRzIHVwIGNvbW1vbiBHTCBzdGF0ZSB1c2VkIGJ5IHRoZSBy ZXN0CisvLyBvZiB0aGUgbGF5ZXIgZHJhd2luZyBjb2RlLgogdm9pZCBMYXllclJlbmRlcmVyQ2hy b21pdW06OnByZXBhcmVUb0RyYXdMYXllcnMoY29uc3QgSW50UmVjdCYgdmlzaWJsZVJlY3QsIGNv bnN0IEludFJlY3QmIGNvbnRlbnRSZWN0LCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IEludFBvaW50JiBzY3JvbGxQb3NpdGlvbikKIHsKQEAg LTE3Miw2ICsxNzMsOCBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6cHJlcGFyZVRvRHJh CiAgICAgbWFrZUNvbnRleHRDdXJyZW50KCk7CiAKICAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRl eHQtPmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBtX3Jvb3RMYXll clRleHR1cmVJZCkpOworICAgIAorICAgIGJvb2wgc2tpcFNjcm9sbCA9IGZhbHNlOwogCiAgICAg Ly8gSWYgdGhlIHNpemUgb2YgdGhlIHZpc2libGUgYXJlYSBoYXMgY2hhbmdlZCB0aGVuIGFsbG9j YXRlIGEgbmV3IHRleHR1cmUKICAgICAvLyB0byBzdG9yZSB0aGUgY29udGVudHMgb2YgdGhlIHJv b3QgbGF5ZXIgYW5kIGFkanVzdCB0aGUgcHJvamVjdGlvbiBtYXRyaXgKQEAgLTE4NCw2ICsxODcs OSBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6cHJlcGFyZVRvRHJhCiAKICAgICAgICAg bV9wcm9qZWN0aW9uTWF0cml4ID0gb3J0aG9NYXRyaXgoMCwgdmlzaWJsZVJlY3RXaWR0aCwgdmlz aWJsZVJlY3RIZWlnaHQsIDAsIC0xMDAwLCAxMDAwKTsKICAgICAgICAgR0xDKG1fY29udGV4dCwg bV9jb250ZXh0LT50ZXhJbWFnZTJEKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCAwLCBH cmFwaGljc0NvbnRleHQzRDo6UkdCQSwgbV9yb290TGF5ZXJUZXh0dXJlV2lkdGgsIG1fcm9vdExh eWVyVGV4dHVyZUhlaWdodCwgMCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkEsIEdyYXBoaWNzQ29u dGV4dDNEOjpVTlNJR05FRF9CWVRFLCAwKSk7CisKKyAgICAgICAgLy8gVGhlIHJvb3QgbGF5ZXIg dGV4dHVyZSB3YXMganVzdCByZXNpemVkIHNvIGl0IGNhbm5vdCBiZSB1c2VkIGZvciBzY3JvbGxp bmcuCisgICAgICAgIHNraXBTY3JvbGwgPSB0cnVlOwogICAgIH0KIAogICAgIC8vIFRoZSBHTCB2 aWV3cG9ydCBjb3ZlcnMgdGhlIGVudGlyZSB2aXNpYmxlIGFyZWEsIGluY2x1ZGluZyB0aGUgc2Ny b2xsYmFycy4KQEAgLTE5OCwxMiArMjA0LDIwIEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVt OjpwcmVwYXJlVG9EcmEKICAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRleHQtPmRlcHRoRnVuYyhH cmFwaGljc0NvbnRleHQzRDo6TEVRVUFMKSk7CiAgICAgR0xDKG1fY29udGV4dCwgbV9jb250ZXh0 LT5jbGVhclN0ZW5jaWwoMCkpOwogCi0gICAgaWYgKG1fc2Nyb2xsUG9zaXRpb24gPT0gSW50UG9p bnQoLTEsIC0xKSkKKyAgICBpZiAobV9zY3JvbGxQb3NpdGlvbiA9PSBJbnRQb2ludCgtMSwgLTEp KSB7CiAgICAgICAgIG1fc2Nyb2xsUG9zaXRpb24gPSBzY3JvbGxQb3NpdGlvbjsKKyAgICAgICAg c2tpcFNjcm9sbCA9IHRydWU7CisgICAgfQogCiAgICAgSW50UG9pbnQgc2Nyb2xsRGVsdGEgPSB0 b1BvaW50KHNjcm9sbFBvc2l0aW9uIC0gbV9zY3JvbGxQb3NpdGlvbik7CisKKyAgICAvLyBTY3Jv bGxpbmcgbGFyZ2VyIHRoYW4gdGhlIGNvbnRlbnRSZWN0IHNpemUgZG9lcyBub3QgcHJlc2VydmUg YW55IG9mIHRoZSBwaXhlbHMsIHNvIHRoZXJlIGlzCisgICAgLy8gbm8gbmVlZCB0byBjb3B5IGZy YW1lYnVmZmVyIHBpeGVscyBiYWNrIGludG8gdGhlIHRleHR1cmUuCisgICAgaWYgKGFicyhzY3Jv bGxEZWx0YS55KCkpID4gY29udGVudFJlY3QuaGVpZ2h0KCkgfHwgYWJzKHNjcm9sbERlbHRhLngo KSkgPiBjb250ZW50UmVjdC53aWR0aCgpKQorICAgICAgICBza2lwU2Nyb2xsID0gdHJ1ZTsKKwog ICAgIC8vIFNjcm9sbCB0aGUgYmFja2J1ZmZlcgotICAgIGlmIChzY3JvbGxEZWx0YS54KCkgfHwg c2Nyb2xsRGVsdGEueSgpKSB7CisgICAgaWYgKCFza2lwU2Nyb2xsICYmIChzY3JvbGxEZWx0YS54 KCkgfHwgc2Nyb2xsRGVsdGEueSgpKSkgewogICAgICAgICAvLyBTY3JvbGxpbmcgd29ya3MgYXMg Zm9sbG93czogV2UgcmVuZGVyIGEgcXVhZCB3aXRoIHRoZSBjdXJyZW50IHJvb3QgbGF5ZXIgY29u dGVudHMKICAgICAgICAgLy8gdHJhbnNsYXRlZCBieSB0aGUgYW1vdW50IHRoZSBwYWdlIGhhcyBz Y3JvbGxlZCBzaW5jZSB0aGUgbGFzdCB1cGRhdGUgYW5kIHRoZW4gcmVhZCB0aGUKICAgICAgICAg Ly8gcGl4ZWxzIG9mIHRoZSBjb250ZW50IGFyZWEgKHZpc2libGUgYXJlYSBleGNsdWRpbmcgdGhl IHNjcm9sbCBiYXJzKSBiYWNrIGludG8gdGhlCkBAIC0yMjEsMjMgKzIzNSw5IEBAIHZvaWQgTGF5 ZXJSZW5kZXJlckNocm9taXVtOjpwcmVwYXJlVG9EcmEKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBtX3Njcm9sbFNoYWRlck1hdHJpeExvY2F0aW9uLCAtMSk7CiAKICAg ICAgICAgR0xDKG1fY29udGV4dCwgbV9jb250ZXh0LT5jb3B5VGV4U3ViSW1hZ2UyRChHcmFwaGlj c0NvbnRleHQzRDo6VEVYVFVSRV8yRCwgMCwgMCwgMCwgMCwgMCwgY29udGVudFJlY3Qud2lkdGgo KSwgY29udGVudFJlY3QuaGVpZ2h0KCkpKTsKLSAgICAgICAgbV9zY3JvbGxQb3NpdGlvbiA9IHNj cm9sbFBvc2l0aW9uOwotICAgIH0gZWxzZSBpZiAoYWJzKHNjcm9sbERlbHRhLnkoKSkgPiBjb250 ZW50UmVjdC5oZWlnaHQoKSB8fCBhYnMoc2Nyb2xsRGVsdGEueCgpKSA+IGNvbnRlbnRSZWN0Lndp ZHRoKCkpIHsKLSAgICAgICAgLy8gU2Nyb2xsaW5nIGxhcmdlciB0aGFuIHRoZSBjb250ZW50UmVj dCBzaXplIGRvZXMgbm90IHByZXNlcnZlIGFueSBvZiB0aGUgcGl4ZWxzLCBzbyB0aGVyZSBpcwot ICAgICAgICAvLyBubyBuZWVkIHRvIGNvcHkgZnJhbWVidWZmZXIgcGl4ZWxzIGJhY2sgaW50byB0 aGUgdGV4dHVyZS4KLSAgICAgICAgbV9zY3JvbGxQb3NpdGlvbiA9IHNjcm9sbFBvc2l0aW9uOwog ICAgIH0KIAotICAgIC8vIFRyYW5zbGF0ZSBhbGwgdGhlIGNvbXBvc2l0ZWQgbGF5ZXJzIGJ5IHRo ZSBzY3JvbGwgcG9zaXRpb24uCi0gICAgVHJhbnNmb3JtYXRpb25NYXRyaXggbWF0cml4OwotICAg IG1hdHJpeC50cmFuc2xhdGUzZCgtbV9zY3JvbGxQb3NpdGlvbi54KCksIC1tX3Njcm9sbFBvc2l0 aW9uLnkoKSwgMCk7Ci0KLSAgICAvLyBUcmF2ZXJzZSB0aGUgbGF5ZXIgdHJlZSBhbmQgdXBkYXRl IHRoZSBsYXllciB0cmFuc2Zvcm1zLgotICAgIGZsb2F0IG9wYWNpdHkgPSAxOwotICAgIGNvbnN0 IFZlY3RvcjxSZWZQdHI8TGF5ZXJDaHJvbWl1bT4gPiYgc3VibGF5ZXJzID0gbV9yb290TGF5ZXIt PmdldFN1YmxheWVycygpOwotICAgIHNpemVfdCBpOwotICAgIGZvciAoaSA9IDA7IGkgPCBzdWJs YXllcnMuc2l6ZSgpOyBpKyspCi0gICAgICAgIHVwZGF0ZUxheWVyc1JlY3Vyc2l2ZShzdWJsYXll cnNbaV0uZ2V0KCksIG1hdHJpeCwgb3BhY2l0eSk7CisgICAgbV9zY3JvbGxQb3NpdGlvbiA9IHNj cm9sbFBvc2l0aW9uOwogfQogCiB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBkYXRlUm9v dExheWVyVGV4dHVyZVJlY3QoY29uc3QgSW50UmVjdCYgdXBkYXRlUmVjdCkK 68274 2010-09-21 12:20:18 -0700 2010-09-21 12:40:09 -0700 proposed patch - fixed some comments cleanupPrepareToDraw_46199_2.txt text/plain 5257 vangelis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Nzk3MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDktMjEgIFZhbmdlbGlzIEtva2tldmlzICA8dmFuZ2VsaXNA Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtjaHJvbWl1bV0gQ2xlYW5lZCB1cCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnByZXBh cmVUb0RyYXdMYXllcnMKKyAgICAgICAgbG9naWMgdG8gYXZvaWQgdW5uZWNlc3NhcnkgY29weSBv cGVyYXRpb25zIGlmIHRoZSBleGlzdGluZyByb290IGxheWVyCisgICAgICAgIGNvbnRlbnRzIGFy ZW4ndCB1c2VmdWwgZm9yIHNjcm9sbGluZy4gQWxzbyByZW1vdmVkIGNhbGwgdG8gdXBkYXRlTGF5 ZXJzUmVjdXJzaXZlKCkKKyAgICAgICAgYXMgdGhlIGNvbXBvc2l0ZWQgbGF5ZXIgdXBkYXRlIGlz IGFjdHVhbGx5IGhhcHBlbmluZyBpbiB0aGUgZHJhd0xheWVycygpIG1ldGhvZC4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MTk5CisKKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OnByZXBhcmVUb0RyYXdM YXllcnMpOgorCiAyMDEwLTA5LTIxICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRvbnkgQ2hhbmcuCkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hy b21pdW0uY3BwCShyZXZpc2lvbiA2Nzk2NikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU5 LDggKzE1OSwxMCBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXNlU2hhZGVyKHVuCiAg ICAgfQogfQogCi0vLyBVcGRhdGVzIHRoZSBjb250ZW50cyBvZiB0aGUgcm9vdCBsYXllciB0ZXh0 dXJlIHRoYXQgZmFsbCBpbnNpZGUgdGhlIHVwZGF0ZVJlY3QKLS8vIGFuZCByZS1jb21wb3NpdHMg YWxsIHN1YmxheWVycy4KKy8vIFRoaXMgbWV0aG9kIG11c3QgYmUgY2FsbGVkIGJlZm9yZSBhbnkg b3RoZXIgdXBkYXRlcyBhcmUgbWFkZSB0byB0aGUKKy8vIHJvb3QgbGF5ZXIgdGV4dHVyZS4gSXQg cmVzaXplcyB0aGUgcm9vdCBsYXllciB0ZXh0dXJlIGFuZCBzY3JvbGxzIGl0cworLy8gY29udGVu dHMgYXMgbmVlZGVkLiBJdCBhbHNvIHNldHMgdXAgY29tbW9uIEdMIHN0YXRlIHVzZWQgYnkgdGhl IHJlc3QKKy8vIG9mIHRoZSBsYXllciBkcmF3aW5nIGNvZGUuCiB2b2lkIExheWVyUmVuZGVyZXJD aHJvbWl1bTo6cHJlcGFyZVRvRHJhd0xheWVycyhjb25zdCBJbnRSZWN0JiB2aXNpYmxlUmVjdCwg Y29uc3QgSW50UmVjdCYgY29udGVudFJlY3QsIAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgSW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uKQogewpA QCAtMTcyLDYgKzE3NCw4IEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpwcmVwYXJlVG9E cmEKICAgICBtYWtlQ29udGV4dEN1cnJlbnQoKTsKIAogICAgIEdMQyhtX2NvbnRleHQsIG1fY29u dGV4dC0+YmluZFRleHR1cmUoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIG1fcm9vdExh eWVyVGV4dHVyZUlkKSk7CisgICAgCisgICAgYm9vbCBza2lwU2Nyb2xsID0gZmFsc2U7CiAKICAg ICAvLyBJZiB0aGUgc2l6ZSBvZiB0aGUgdmlzaWJsZSBhcmVhIGhhcyBjaGFuZ2VkIHRoZW4gYWxs b2NhdGUgYSBuZXcgdGV4dHVyZQogICAgIC8vIHRvIHN0b3JlIHRoZSBjb250ZW50cyBvZiB0aGUg cm9vdCBsYXllciBhbmQgYWRqdXN0IHRoZSBwcm9qZWN0aW9uIG1hdHJpeApAQCAtMTg0LDYgKzE4 OCwxMCBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6cHJlcGFyZVRvRHJhCiAKICAgICAg ICAgbV9wcm9qZWN0aW9uTWF0cml4ID0gb3J0aG9NYXRyaXgoMCwgdmlzaWJsZVJlY3RXaWR0aCwg dmlzaWJsZVJlY3RIZWlnaHQsIDAsIC0xMDAwLCAxMDAwKTsKICAgICAgICAgR0xDKG1fY29udGV4 dCwgbV9jb250ZXh0LT50ZXhJbWFnZTJEKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCAw LCBHcmFwaGljc0NvbnRleHQzRDo6UkdCQSwgbV9yb290TGF5ZXJUZXh0dXJlV2lkdGgsIG1fcm9v dExheWVyVGV4dHVyZUhlaWdodCwgMCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkEsIEdyYXBoaWNz Q29udGV4dDNEOjpVTlNJR05FRF9CWVRFLCAwKSk7CisKKyAgICAgICAgLy8gVGhlIHJvb3QgbGF5 ZXIgdGV4dHVyZSB3YXMganVzdCByZXNpemVkIHNvIGl0cyBjb250ZW50cyBhcmUgbm90CisgICAg ICAgIC8vIHVzZWZ1bCBmb3Igc2Nyb2xsaW5nLgorICAgICAgICBza2lwU2Nyb2xsID0gdHJ1ZTsK ICAgICB9CiAKICAgICAvLyBUaGUgR0wgdmlld3BvcnQgY292ZXJzIHRoZSBlbnRpcmUgdmlzaWJs ZSBhcmVhLCBpbmNsdWRpbmcgdGhlIHNjcm9sbGJhcnMuCkBAIC0xOTgsMTIgKzIwNiwyMCBAQCB2 b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6cHJlcGFyZVRvRHJhCiAgICAgR0xDKG1fY29udGV4 dCwgbV9jb250ZXh0LT5kZXB0aEZ1bmMoR3JhcGhpY3NDb250ZXh0M0Q6OkxFUVVBTCkpOwogICAg IEdMQyhtX2NvbnRleHQsIG1fY29udGV4dC0+Y2xlYXJTdGVuY2lsKDApKTsKIAotICAgIGlmICht X3Njcm9sbFBvc2l0aW9uID09IEludFBvaW50KC0xLCAtMSkpCisgICAgaWYgKG1fc2Nyb2xsUG9z aXRpb24gPT0gSW50UG9pbnQoLTEsIC0xKSkgewogICAgICAgICBtX3Njcm9sbFBvc2l0aW9uID0g c2Nyb2xsUG9zaXRpb247CisgICAgICAgIHNraXBTY3JvbGwgPSB0cnVlOworICAgIH0KIAogICAg IEludFBvaW50IHNjcm9sbERlbHRhID0gdG9Qb2ludChzY3JvbGxQb3NpdGlvbiAtIG1fc2Nyb2xs UG9zaXRpb24pOworCisgICAgLy8gU2Nyb2xsaW5nIGxhcmdlciB0aGFuIHRoZSBjb250ZW50UmVj dCBzaXplIGRvZXMgbm90IHByZXNlcnZlIGFueSBvZiB0aGUgcGl4ZWxzLCBzbyB0aGVyZSBpcwor ICAgIC8vIG5vIG5lZWQgdG8gY29weSBmcmFtZWJ1ZmZlciBwaXhlbHMgYmFjayBpbnRvIHRoZSB0 ZXh0dXJlLgorICAgIGlmIChhYnMoc2Nyb2xsRGVsdGEueSgpKSA+IGNvbnRlbnRSZWN0LmhlaWdo dCgpIHx8IGFicyhzY3JvbGxEZWx0YS54KCkpID4gY29udGVudFJlY3Qud2lkdGgoKSkKKyAgICAg ICAgc2tpcFNjcm9sbCA9IHRydWU7CisKICAgICAvLyBTY3JvbGwgdGhlIGJhY2tidWZmZXIKLSAg ICBpZiAoc2Nyb2xsRGVsdGEueCgpIHx8IHNjcm9sbERlbHRhLnkoKSkgeworICAgIGlmICghc2tp cFNjcm9sbCAmJiAoc2Nyb2xsRGVsdGEueCgpIHx8IHNjcm9sbERlbHRhLnkoKSkpIHsKICAgICAg ICAgLy8gU2Nyb2xsaW5nIHdvcmtzIGFzIGZvbGxvd3M6IFdlIHJlbmRlciBhIHF1YWQgd2l0aCB0 aGUgY3VycmVudCByb290IGxheWVyIGNvbnRlbnRzCiAgICAgICAgIC8vIHRyYW5zbGF0ZWQgYnkg dGhlIGFtb3VudCB0aGUgcGFnZSBoYXMgc2Nyb2xsZWQgc2luY2UgdGhlIGxhc3QgdXBkYXRlIGFu ZCB0aGVuIHJlYWQgdGhlCiAgICAgICAgIC8vIHBpeGVscyBvZiB0aGUgY29udGVudCBhcmVhICh2 aXNpYmxlIGFyZWEgZXhjbHVkaW5nIHRoZSBzY3JvbGwgYmFycykgYmFjayBpbnRvIHRoZQpAQCAt MjIxLDIzICsyMzcsOSBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6cHJlcGFyZVRvRHJh CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9zY3JvbGxTaGFkZXJN YXRyaXhMb2NhdGlvbiwgLTEpOwogCiAgICAgICAgIEdMQyhtX2NvbnRleHQsIG1fY29udGV4dC0+ Y29weVRleFN1YkltYWdlMkQoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIDAsIDAs IDAsIDAsIGNvbnRlbnRSZWN0LndpZHRoKCksIGNvbnRlbnRSZWN0LmhlaWdodCgpKSk7Ci0gICAg ICAgIG1fc2Nyb2xsUG9zaXRpb24gPSBzY3JvbGxQb3NpdGlvbjsKLSAgICB9IGVsc2UgaWYgKGFi cyhzY3JvbGxEZWx0YS55KCkpID4gY29udGVudFJlY3QuaGVpZ2h0KCkgfHwgYWJzKHNjcm9sbERl bHRhLngoKSkgPiBjb250ZW50UmVjdC53aWR0aCgpKSB7Ci0gICAgICAgIC8vIFNjcm9sbGluZyBs YXJnZXIgdGhhbiB0aGUgY29udGVudFJlY3Qgc2l6ZSBkb2VzIG5vdCBwcmVzZXJ2ZSBhbnkgb2Yg dGhlIHBpeGVscywgc28gdGhlcmUgaXMKLSAgICAgICAgLy8gbm8gbmVlZCB0byBjb3B5IGZyYW1l YnVmZmVyIHBpeGVscyBiYWNrIGludG8gdGhlIHRleHR1cmUuCi0gICAgICAgIG1fc2Nyb2xsUG9z aXRpb24gPSBzY3JvbGxQb3NpdGlvbjsKICAgICB9CiAKLSAgICAvLyBUcmFuc2xhdGUgYWxsIHRo ZSBjb21wb3NpdGVkIGxheWVycyBieSB0aGUgc2Nyb2xsIHBvc2l0aW9uLgotICAgIFRyYW5zZm9y bWF0aW9uTWF0cml4IG1hdHJpeDsKLSAgICBtYXRyaXgudHJhbnNsYXRlM2QoLW1fc2Nyb2xsUG9z aXRpb24ueCgpLCAtbV9zY3JvbGxQb3NpdGlvbi55KCksIDApOwotCi0gICAgLy8gVHJhdmVyc2Ug dGhlIGxheWVyIHRyZWUgYW5kIHVwZGF0ZSB0aGUgbGF5ZXIgdHJhbnNmb3Jtcy4KLSAgICBmbG9h dCBvcGFjaXR5ID0gMTsKLSAgICBjb25zdCBWZWN0b3I8UmVmUHRyPExheWVyQ2hyb21pdW0+ID4m IHN1YmxheWVycyA9IG1fcm9vdExheWVyLT5nZXRTdWJsYXllcnMoKTsKLSAgICBzaXplX3QgaTsK LSAgICBmb3IgKGkgPSAwOyBpIDwgc3VibGF5ZXJzLnNpemUoKTsgaSsrKQotICAgICAgICB1cGRh dGVMYXllcnNSZWN1cnNpdmUoc3VibGF5ZXJzW2ldLmdldCgpLCBtYXRyaXgsIG9wYWNpdHkpOwor ICAgIG1fc2Nyb2xsUG9zaXRpb24gPSBzY3JvbGxQb3NpdGlvbjsKIH0KIAogdm9pZCBMYXllclJl bmRlcmVyQ2hyb21pdW06OnVwZGF0ZVJvb3RMYXllclRleHR1cmVSZWN0KGNvbnN0IEludFJlY3Qm IHVwZGF0ZVJlY3QpCg==