107550 2013-01-22 05:10:08 -0800 Web Inspector: remove asynchronous behavior from DTE paintLines method 2013-01-22 08:20:44 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 lushnikov lushnikov apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 812942 0 lushnikov 2013-01-22 05:10:08 -0800 Due to the asynchronous nature of paintLines method, it might invalidate DOM couple of times and wait for some period of time before completing its job. During the gap, browser runs a "paint" method to update the image. The "paint" operation is an expensive one - in my experiment, it could last as long as 22ms. That said, remove the asynchronous behavior of paintLines method and estimate how it goes with a synchronous paint. This way we might avoid a lot of unnecessary "repaints". 812948 1 183968 lushnikov 2013-01-22 05:18:29 -0800 Created attachment 183968 Patch 812981 2 183968 pfeldman 2013-01-22 05:57:15 -0800 Comment on attachment 183968 Patch Wouldn't it get stuck on 200 lines 1Mb each? 813052 3 183968 webkit.review.bot 2013-01-22 08:20:40 -0800 Comment on attachment 183968 Patch Clearing flags on attachment: 183968 Committed r140427: <http://trac.webkit.org/changeset/140427> 813053 4 webkit.review.bot 2013-01-22 08:20:44 -0800 All reviewed patches have been landed. Closing bug. 183968 2013-01-22 05:18:29 -0800 2013-01-22 08:20:40 -0800 Patch bug-107550-20130122171523.patch text/plain 9488 lushnikov U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjY1ODg3YTI5N2ZlYzE3 Y2RhNTY3MjEzYzFhZjBkZmZkNmY4NTNhYS4uYzIzYzI2M2MxNWNkMzRhYmIyODI3MGM4MWNiNGJm YWY1YjBjNDkxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAxLTIyICBBbmRy ZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiByZW1vdmUgYXN5bmNocm9ub3VzIGJlaGF2aW9yIGZyb20gRFRFIHBhaW50TGluZXMg bWV0aG9kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDc1NTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS ZW1vdmUgcGFpbnRMaW5lc09wZXJhdGlvbkNyZWRpdCBhbmQgYWxsIGFzeW5jaHJvbm91cyBiZWhh dmlvdXIgZnJvbSBwYWludExpbmVzIG1ldGhvZDsKKyAgICAgICAgYWxzbywgcmVtb3ZlIHBhaW50 TGluZUNodW5rcyBtZXRob2QuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1 bHRUZXh0RWRpdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFu ZWwucHJvdG90eXBlLmV4cGFuZENodW5rcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVk aXRvck1haW5QYW5lbC5wcm90b3R5cGUuX2hpZ2hsaWdodERhdGFSZWFkeSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUuX3BhaW50TGluZXMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLl9yZW5k ZXJSYW5nZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJv dG90eXBlLl9wYWludExpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWlu UGFuZWwucHJvdG90eXBlLl9hcHBseURvbVVwZGF0ZXMpOgorCiAyMDEzLTAxLTIyICBTZXJnZXkg UnlhemFub3YgIDxzZXJ5YUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog U2hvdyByZXF1ZXN0cyBpbiBgY3VybGAgc3ludGF4IGluIERldlRvb2xzIOKGkiBOZXR3b3JrIOKG kiBIZWFkZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RlZmF1bHRUZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9EZWZhdWx0VGV4dEVkaXRvci5qcwppbmRleCBiNjA0MTVmZWJlMTVmMTg3Y2U3MDUzNjI4MzQx Nzc5NDM1Mjc3OWI0Li5jNTNmY2IzODAzNDRjNDBkYzNhNjc4MWY0M2ZjYWI4YWExZjFmZWMyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0 RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVs dFRleHRFZGl0b3IuanMKQEAgLTE3NjgsOSArMTc2OCw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5faGlnaGxpZ2h0ZXIuaGln aGxpZ2h0KGxhc3RWaXNpYmxlTGluZSk7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9tdXRlSGlnaGxp Z2h0TGlzdGVuZXI7CiAKLSAgICAgICAgdGhpcy5fcmVzdG9yZVBhaW50TGluZXNPcGVyYXRpb25z Q3JlZGl0KCk7CiAgICAgICAgIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVsLnBy b3RvdHlwZS5leHBhbmRDaHVua3MuY2FsbCh0aGlzLCBmcm9tSW5kZXgsIHRvSW5kZXgpOwotICAg ICAgICB0aGlzLl9hZGp1c3RQYWludExpbmVzT3BlcmF0aW9uc1JlZnJlc2hWYWx1ZSgpOwogCiAg ICAgICAgIHRoaXMuX3Jlc3RvcmVTZWxlY3Rpb24oc2VsZWN0aW9uKTsKICAgICB9LApAQCAtMTc4 MywxMDEgKzE3ODEsMTYgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90 eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX211dGVIaWdobGlnaHRMaXN0ZW5lcikK ICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdGhpcy5fcmVzdG9yZVBhaW50TGluZXNPcGVy YXRpb25zQ3JlZGl0KCk7CiAgICAgICAgIHRoaXMuX3BhaW50TGluZXMoZnJvbUxpbmUsIHRvTGlu ZSwgdHJ1ZSAvKnJlc3RvcmVTZWxlY3Rpb24qLyk7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAq IEBwYXJhbSB7bnVtYmVyfSBzdGFydExpbmUKLSAgICAgKiBAcGFyYW0ge251bWJlcn0gZW5kTGlu ZQotICAgICAqLwotICAgIF9zY2hlZHVsZVBhaW50TGluZXM6IGZ1bmN0aW9uKHN0YXJ0TGluZSwg ZW5kTGluZSkKLSAgICB7Ci0gICAgICAgIGlmIChzdGFydExpbmUgPj0gZW5kTGluZSkKLSAgICAg ICAgICAgIHJldHVybjsKLQotICAgICAgICBpZiAoIXRoaXMuX3NjaGVkdWxlZFBhaW50TGluZXMp IHsKLSAgICAgICAgICAgIHRoaXMuX3NjaGVkdWxlZFBhaW50TGluZXMgPSBbeyBzdGFydExpbmU6 IHN0YXJ0TGluZSwgZW5kTGluZTogZW5kTGluZSB9XTsKLSAgICAgICAgICAgIHRoaXMuX3BhaW50 U2NoZWR1bGVkTGluZXNUaW1lciA9IHNldFRpbWVvdXQodGhpcy5fcGFpbnRTY2hlZHVsZWRMaW5l cy5iaW5kKHRoaXMpLCAwKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGZvciAodmFy IGkgPSAwOyBpIDwgdGhpcy5fc2NoZWR1bGVkUGFpbnRMaW5lcy5sZW5ndGg7ICsraSkgewotICAg ICAgICAgICAgICAgIHZhciBjaHVuayA9IHRoaXMuX3NjaGVkdWxlZFBhaW50TGluZXNbaV07Ci0g ICAgICAgICAgICAgICAgaWYgKGNodW5rLnN0YXJ0TGluZSA8PSBlbmRMaW5lICYmIGNodW5rLmVu ZExpbmUgPj0gc3RhcnRMaW5lKSB7Ci0gICAgICAgICAgICAgICAgICAgIGNodW5rLnN0YXJ0TGlu ZSA9IE1hdGgubWluKGNodW5rLnN0YXJ0TGluZSwgc3RhcnRMaW5lKTsKLSAgICAgICAgICAgICAg ICAgICAgY2h1bmsuZW5kTGluZSA9IE1hdGgubWF4KGNodW5rLmVuZExpbmUsIGVuZExpbmUpOwot ICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAg ICAgICAgIGlmIChjaHVuay5zdGFydExpbmUgPiBlbmRMaW5lKSB7Ci0gICAgICAgICAgICAgICAg ICAgIHRoaXMuX3NjaGVkdWxlZFBhaW50TGluZXMuc3BsaWNlKGksIDAsIHsgc3RhcnRMaW5lOiBz dGFydExpbmUsIGVuZExpbmU6IGVuZExpbmUgfSk7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICB0aGlzLl9z Y2hlZHVsZWRQYWludExpbmVzLnB1c2goeyBzdGFydExpbmU6IHN0YXJ0TGluZSwgZW5kTGluZTog ZW5kTGluZSB9KTsKLSAgICAgICAgfQotICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0g e2Jvb2xlYW59IHNraXBSZXN0b3JlU2VsZWN0aW9uCi0gICAgICovCi0gICAgX3BhaW50U2NoZWR1 bGVkTGluZXM6IGZ1bmN0aW9uKHNraXBSZXN0b3JlU2VsZWN0aW9uKQotICAgIHsKLSAgICAgICAg aWYgKHRoaXMuX3BhaW50U2NoZWR1bGVkTGluZXNUaW1lcikKLSAgICAgICAgICAgIGNsZWFyVGlt ZW91dCh0aGlzLl9wYWludFNjaGVkdWxlZExpbmVzVGltZXIpOwotICAgICAgICBkZWxldGUgdGhp cy5fcGFpbnRTY2hlZHVsZWRMaW5lc1RpbWVyOwotCi0gICAgICAgIGlmICghdGhpcy5fc2NoZWR1 bGVkUGFpbnRMaW5lcykKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICAvLyBSZXNjaGVk dWxlIHRoZSB0aW1lciBpZiB3ZSBjYW4gbm90IHBhaW50IHRoZSBsaW5lcyB5ZXQsIG9yIHRoZSB1 c2VyIGlzIHNjcm9sbGluZy4KLSAgICAgICAgaWYgKHRoaXMuX3JlcGFpbnRBbGxUaW1lcikgewot ICAgICAgICAgICAgdGhpcy5fcGFpbnRTY2hlZHVsZWRMaW5lc1RpbWVyID0gc2V0VGltZW91dCh0 aGlzLl9wYWludFNjaGVkdWxlZExpbmVzLmJpbmQodGhpcyksIDUwKTsKLSAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIHZhciBzY2hlZHVsZWRQYWludExpbmVzID0gdGhp cy5fc2NoZWR1bGVkUGFpbnRMaW5lczsKLSAgICAgICAgZGVsZXRlIHRoaXMuX3NjaGVkdWxlZFBh aW50TGluZXM7Ci0KLSAgICAgICAgdGhpcy5fcmVzdG9yZVBhaW50TGluZXNPcGVyYXRpb25zQ3Jl ZGl0KCk7Ci0gICAgICAgIHRoaXMuX3BhaW50TGluZUNodW5rcyhzY2hlZHVsZWRQYWludExpbmVz LCAhc2tpcFJlc3RvcmVTZWxlY3Rpb24pOwotICAgICAgICB0aGlzLl9hZGp1c3RQYWludExpbmVz T3BlcmF0aW9uc1JlZnJlc2hWYWx1ZSgpOwotICAgIH0sCi0KLSAgICBfcmVzdG9yZVBhaW50TGlu ZXNPcGVyYXRpb25zQ3JlZGl0OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAoIXRoaXMu X3BhaW50TGluZXNPcGVyYXRpb25zUmVmcmVzaFZhbHVlKQotICAgICAgICAgICAgdGhpcy5fcGFp bnRMaW5lc09wZXJhdGlvbnNSZWZyZXNoVmFsdWUgPSAyNTA7Ci0gICAgICAgIHRoaXMuX3BhaW50 TGluZXNPcGVyYXRpb25zQ3JlZGl0ID0gdGhpcy5fcGFpbnRMaW5lc09wZXJhdGlvbnNSZWZyZXNo VmFsdWU7Ci0gICAgICAgIHRoaXMuX3BhaW50TGluZXNPcGVyYXRpb25zTGFzdFJlZnJlc2ggPSBE YXRlLm5vdygpOwotICAgIH0sCi0KLSAgICBfYWRqdXN0UGFpbnRMaW5lc09wZXJhdGlvbnNSZWZy ZXNoVmFsdWU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHZhciBvcGVyYXRpb25zRG9uZSA9 IHRoaXMuX3BhaW50TGluZXNPcGVyYXRpb25zUmVmcmVzaFZhbHVlIC0gdGhpcy5fcGFpbnRMaW5l c09wZXJhdGlvbnNDcmVkaXQ7Ci0gICAgICAgIGlmIChvcGVyYXRpb25zRG9uZSA8PSAwKQotICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICB2YXIgdGltZVBhc3QgPSBEYXRlLm5vdygpIC0gdGhp cy5fcGFpbnRMaW5lc09wZXJhdGlvbnNMYXN0UmVmcmVzaDsKLSAgICAgICAgaWYgKHRpbWVQYXN0 IDw9IDApCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIC8vIE1ha2UgdGhlIHN5bmNocm9u b3VzIENQVSBjaHVuayBmb3IgcGFpbnRpbmcgdGhlIGxpbmVzIDUwIG1zZWMuCi0gICAgICAgIHZh ciB2YWx1ZSA9IE1hdGguZmxvb3Iob3BlcmF0aW9uc0RvbmUgLyB0aW1lUGFzdCAqIDUwKTsKLSAg ICAgICAgdGhpcy5fcGFpbnRMaW5lc09wZXJhdGlvbnNSZWZyZXNoVmFsdWUgPSBOdW1iZXIuY29u c3RyYWluKHZhbHVlLCAxNTAsIDE1MDApOwotICAgIH0sCi0KLSAgICAvKioKICAgICAgKiBAcGFy YW0ge251bWJlcn0gZnJvbUxpbmUKICAgICAgKiBAcGFyYW0ge251bWJlcn0gdG9MaW5lCiAgICAg ICogQHBhcmFtIHtib29sZWFuPX0gcmVzdG9yZVNlbGVjdGlvbgogICAgICAqLwogICAgIF9wYWlu dExpbmVzOiBmdW5jdGlvbihmcm9tTGluZSwgdG9MaW5lLCByZXN0b3JlU2VsZWN0aW9uKQogICAg IHsKLSAgICAgICAgdGhpcy5fcGFpbnRMaW5lQ2h1bmtzKFt7IHN0YXJ0TGluZTogZnJvbUxpbmUs IGVuZExpbmU6IHRvTGluZSB9XSwgcmVzdG9yZVNlbGVjdGlvbik7Ci0gICAgfSwKLQotICAgIC8q KgotICAgICAqIEBwYXJhbSB7Ym9vbGVhbj19IHJlc3RvcmVTZWxlY3Rpb24KLSAgICAgKi8KLSAg ICBfcGFpbnRMaW5lQ2h1bmtzOiBmdW5jdGlvbihsaW5lQ2h1bmtzLCByZXN0b3JlU2VsZWN0aW9u KQotICAgIHsKICAgICAgICAgLy8gRmlyc3QsIHBhaW50IHZpc2libGUgbGluZXMsIHNvIHRoYXQg aW4gY2FzZSBvZiBsb25nIGxpbmVzIHdlIHNob3VsZCBzdGFydCBoaWdobGlnaHRpbmcKICAgICAg ICAgLy8gdGhlIHZpc2libGUgYXJlYSBpbW1lZGlhdGVseSwgaW5zdGVhZCBvZiB3YWl0aW5nIGZv ciB0aGUgbGluZXMgYWJvdmUgdGhlIHZpc2libGUgYXJlYS4KICAgICAgICAgdmFyIHZpc2libGVG cm9tID0gdGhpcy5zY3JvbGxUb3AoKTsKQEAgLTE4ODYsMzAgKzE3OTksMTkgQEAgV2ViSW5zcGVj dG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB2YXIgY2h1bms7 CiAgICAgICAgIHZhciBzZWxlY3Rpb247CiAgICAgICAgIHZhciBpbnZpc2libGVMaW5lUm93cyA9 IFtdOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxpbmVDaHVua3MubGVuZ3RoOyArK2kp IHsKLSAgICAgICAgICAgIHZhciBsaW5lQ2h1bmsgPSBsaW5lQ2h1bmtzW2ldOwotICAgICAgICAg ICAgaWYgKHRoaXMuX3NjaGVkdWxlZFBhaW50TGluZXMpIHsKLSAgICAgICAgICAgICAgICB0aGlz Ll9zY2hlZHVsZVBhaW50TGluZXMobGluZUNodW5rLnN0YXJ0TGluZSwgbGluZUNodW5rLmVuZExp bmUpOworICAgICAgICBmb3IgKHZhciBsaW5lTnVtYmVyID0gZnJvbUxpbmU7IGxpbmVOdW1iZXIg PCB0b0xpbmU7ICsrbGluZU51bWJlcikgeworICAgICAgICAgICAgaWYgKCFjaHVuayB8fCBsaW5l TnVtYmVyIDwgY2h1bmsuc3RhcnRMaW5lIHx8IGxpbmVOdW1iZXIgPj0gY2h1bmsuc3RhcnRMaW5l ICsgY2h1bmsubGluZXNDb3VudCkKKyAgICAgICAgICAgICAgICBjaHVuayA9IHRoaXMuY2h1bmtG b3JMaW5lKGxpbmVOdW1iZXIpOworICAgICAgICAgICAgdmFyIGxpbmVSb3cgPSBjaHVuay5leHBh bmRlZExpbmVSb3cobGluZU51bWJlcik7CisgICAgICAgICAgICBpZiAoIWxpbmVSb3cpCisgICAg ICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBpZiAobGluZU51bWJlciA8IGZpcnN0 VmlzaWJsZUxpbmVOdW1iZXIpIHsKKyAgICAgICAgICAgICAgICBpbnZpc2libGVMaW5lUm93cy5w dXNoKGxpbmVSb3cpOwogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQot ICAgICAgICAgICAgZm9yICh2YXIgbGluZU51bWJlciA9IGxpbmVDaHVuay5zdGFydExpbmU7IGxp bmVOdW1iZXIgPCBsaW5lQ2h1bmsuZW5kTGluZTsgKytsaW5lTnVtYmVyKSB7Ci0gICAgICAgICAg ICAgICAgaWYgKCFjaHVuayB8fCBsaW5lTnVtYmVyIDwgY2h1bmsuc3RhcnRMaW5lIHx8IGxpbmVO dW1iZXIgPj0gY2h1bmsuc3RhcnRMaW5lICsgY2h1bmsubGluZXNDb3VudCkKLSAgICAgICAgICAg ICAgICAgICAgY2h1bmsgPSB0aGlzLmNodW5rRm9yTGluZShsaW5lTnVtYmVyKTsKLSAgICAgICAg ICAgICAgICB2YXIgbGluZVJvdyA9IGNodW5rLmV4cGFuZGVkTGluZVJvdyhsaW5lTnVtYmVyKTsK LSAgICAgICAgICAgICAgICBpZiAoIWxpbmVSb3cpCi0gICAgICAgICAgICAgICAgICAgIGNvbnRp bnVlOwotICAgICAgICAgICAgICAgIGlmIChsaW5lTnVtYmVyIDwgZmlyc3RWaXNpYmxlTGluZU51 bWJlcikgewotICAgICAgICAgICAgICAgICAgICBpbnZpc2libGVMaW5lUm93cy5wdXNoKGxpbmVS b3cpOwotICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICAgICAgaWYgKHJlc3RvcmVTZWxlY3Rpb24gJiYgIXNlbGVjdGlvbikKLSAgICAg ICAgICAgICAgICAgICAgc2VsZWN0aW9uID0gdGhpcy5zZWxlY3Rpb24oKTsKLSAgICAgICAgICAg ICAgICB0aGlzLl9wYWludExpbmUobGluZVJvdyk7Ci0gICAgICAgICAgICAgICAgaWYgKHRoaXMu X3BhaW50TGluZXNPcGVyYXRpb25zQ3JlZGl0IDwgMCkgewotICAgICAgICAgICAgICAgICAgICB0 aGlzLl9zY2hlZHVsZVBhaW50TGluZXMobGluZU51bWJlciArIDEsIGxpbmVDaHVuay5lbmRMaW5l KTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgfQotICAgICAg ICAgICAgfQorICAgICAgICAgICAgaWYgKHJlc3RvcmVTZWxlY3Rpb24gJiYgIXNlbGVjdGlvbikK KyAgICAgICAgICAgICAgICBzZWxlY3Rpb24gPSB0aGlzLnNlbGVjdGlvbigpOworICAgICAgICAg ICAgdGhpcy5fcGFpbnRMaW5lKGxpbmVSb3cpOwogICAgICAgICB9CiAKICAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCBpbnZpc2libGVMaW5lUm93cy5sZW5ndGg7ICsraSkgewpAQCAtMjAxNywx NSArMTkxOSwxMiBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUg PSB7CiAKICAgICAgICAgICAgIGlmIChwbGFpblRleHRTdGFydCA8IHJhbmdlU3RhcnQpIHsKICAg ICAgICAgICAgICAgICB0aGlzLl9pbnNlcnRUZXh0Tm9kZUJlZm9yZShsaW5lUm93LCBkZWNvcmF0 aW9uc0VsZW1lbnQsIGxpbmUuc3Vic3RyaW5nKHBsYWluVGV4dFN0YXJ0LCByYW5nZVN0YXJ0KSk7 Ci0gICAgICAgICAgICAgICAgLS10aGlzLl9wYWludExpbmVzT3BlcmF0aW9uc0NyZWRpdDsKICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIHRoaXMuX2luc2VydFNwYW5CZWZvcmUobGluZVJvdywg ZGVjb3JhdGlvbnNFbGVtZW50LCBsaW5lLnN1YnN0cmluZyhyYW5nZVN0YXJ0LCByYW5nZUVuZCAr IDEpLCBjc3NDbGFzcyk7Ci0gICAgICAgICAgICAtLXRoaXMuX3BhaW50TGluZXNPcGVyYXRpb25z Q3JlZGl0OwogICAgICAgICAgICAgcGxhaW5UZXh0U3RhcnQgPSByYW5nZUVuZCArIDE7CiAgICAg ICAgIH0KICAgICAgICAgaWYgKHBsYWluVGV4dFN0YXJ0IDwgbGluZS5sZW5ndGgpIHsKICAgICAg ICAgICAgIHRoaXMuX2luc2VydFRleHROb2RlQmVmb3JlKGxpbmVSb3csIGRlY29yYXRpb25zRWxl bWVudCwgbGluZS5zdWJzdHJpbmcocGxhaW5UZXh0U3RhcnQsIGxpbmUubGVuZ3RoKSk7Ci0gICAg ICAgICAgICAtLXRoaXMuX3BhaW50TGluZXNPcGVyYXRpb25zQ3JlZGl0OwogICAgICAgICB9CiAg ICAgfSwKIApAQCAtMjAzOCwxMSArMTkzNyw2IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFp blBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLmJlZ2luRG9tVXBkYXRlcygpOwog ICAgICAgICB0cnkgewotICAgICAgICAgICAgaWYgKHRoaXMuX3NjaGVkdWxlZFBhaW50TGluZXMg fHwgdGhpcy5fcGFpbnRMaW5lc09wZXJhdGlvbnNDcmVkaXQgPCAwKSB7Ci0gICAgICAgICAgICAg ICAgdGhpcy5fc2NoZWR1bGVQYWludExpbmVzKGxpbmVOdW1iZXIsIGxpbmVOdW1iZXIgKyAxKTsK LSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB9Ci0KICAgICAgICAgICAgIHZh ciBoaWdobGlnaHQgPSB0aGlzLl90ZXh0TW9kZWwuZ2V0QXR0cmlidXRlKGxpbmVOdW1iZXIsICJo aWdobGlnaHQiKTsKICAgICAgICAgICAgIGlmICghaGlnaGxpZ2h0KQogICAgICAgICAgICAgICAg IHJldHVybjsKQEAgLTI0NDcsNyArMjM0MSw2IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFp blBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX3RleHRNb2Rl bC5lZGl0UmFuZ2UoZWRpdEluZm8ucmFuZ2UsIGVkaXRJbmZvLnRleHQpOwotICAgICAgICB0aGlz Ll9wYWludFNjaGVkdWxlZExpbmVzKHRydWUpOwogICAgICAgICB0aGlzLl9yZXN0b3JlU2VsZWN0 aW9uKHNlbGVjdGlvbik7CiAgICAgfSwKIAo=