117270 2013-06-05 12:30:56 -0700 [CSS Regions] Layers inside the RenderFlowThread should be collected by the layer of RenderView 2013-06-10 11:39:50 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 117404 84900 1 achicu achicu commit-queue esprehn+autocc glenn hyatt mihnea ossy sam simon.fraser WebkitBugTracker oldest_to_newest 897513 0 achicu 2013-06-05 12:30:56 -0700 In order to enable compositing we need to enable the collection of RenderLayers from the RenderFlowThread. Right now the RenderLayer::collectLayers would skip any RenderFlowThreads, leaving the RenderFlowThread outside of the layers tree. Any other traversals would skip the RenderFlowThreads leaving the layers inside in inconsistent states. This patch would change the RenderLayer::collectLayers and update other functions to ignore RenderFlowThreads when calculating bounds of, paint or hit-test the RenderView. 897577 1 203888 achicu 2013-06-05 15:28:23 -0700 Created attachment 203888 Patch V1 898211 2 203888 hyatt 2013-06-07 09:41:44 -0700 Comment on attachment 203888 Patch V1 View in context: https://bugs.webkit.org/attachment.cgi?id=203888&action=review r=me > Source/WebCore/ChangeLog:9 > + and hit-tested through their regions. The easies way to prevent the RenderView "easiest" 898220 3 204051 achicu 2013-06-07 10:08:41 -0700 Created attachment 204051 Patch for landing 898221 4 204051 commit-queue 2013-06-07 10:09:49 -0700 Comment on attachment 204051 Patch for landing Rejecting attachment 204051 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 204051, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Dave Hyatt found in /Volumes/Data/EWS/WebKit/Source/WebCore/ChangeLog does not appear to be a valid reviewer according to committers.py. /Volumes/Data/EWS/WebKit/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://webkit-queues.appspot.com/results/788004 898307 5 204069 achicu 2013-06-07 15:08:21 -0700 Created attachment 204069 Patch for landing Fixed reviewer's name :) 898313 6 204069 commit-queue 2013-06-07 15:36:24 -0700 Comment on attachment 204069 Patch for landing Clearing flags on attachment: 204069 Committed r151339: <http://trac.webkit.org/changeset/151339> 898314 7 commit-queue 2013-06-07 15:36:28 -0700 All reviewed patches have been landed. Closing bug. 898545 8 simon.fraser 2013-06-09 21:02:11 -0700 This caused 4 new assertions in layout tests: http://build.webkit.org/results/Apple%20MountainLion%20Debug%20WK2%20(Tests)/r151339%20(10463)/results.html 898611 9 ossy 2013-06-10 04:33:25 -0700 See https://bugs.webkit.org/show_bug.cgi?id=117404 for the details. 898690 10 achicu 2013-06-10 11:39:50 -0700 (In reply to comment #9) > See https://bugs.webkit.org/show_bug.cgi?id=117404 for the details. The assert was fixed in https://bugs.webkit.org/show_bug.cgi?id=117395 . 203888 2013-06-05 15:28:23 -0700 2013-06-07 10:08:41 -0700 Patch V1 bug117270.patch text/plain 5821 achicu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkOGM0NDBhLi45MTYzMTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTMtMDYtMDUgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgor CisgICAgICAgIFtDU1MgUmVnaW9uc10gTGF5ZXJzIGluc2lkZSB0aGUgUmVuZGVyRmxvd1RocmVh ZCBzaG91bGQgYmUgY29sbGVjdGVkIGJ5IHRoZSBsYXllciBvZiBSZW5kZXJWaWV3CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTcyNzAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5kZXJOYW1lZEZsb3dU aHJlYWRzIGFyZSBhdHRhY2hlZCB0byB0aGUgUmVuZGVyVmlldywgYnV0IHRoZXkgYXJlIHBhaW50 ZWQgCisgICAgICAgIGFuZCBoaXQtdGVzdGVkIHRocm91Z2ggdGhlaXIgcmVnaW9ucy4gVGhlIGVh c2llcyB3YXkgdG8gcHJldmVudCB0aGUgUmVuZGVyVmlldyAKKyAgICAgICAgZnJvbSBzZWVpbmcg dGhlIFJlbmRlck5hbWVkRmxvd1RocmVhZHMgYXMgaXRzIG93biBjaGlsZHJlbiB3YXMgdG8gYXZv aWQgY29sbGVjdGluZworICAgICAgICB0aGUgbGF5ZXJzIG9mIHRoZSBSZW5kZXJOYW1lZEZsb3dU aHJlYWRzIGFzIGNoaWxkcmVuIGxheWVycyBvZiB0aGUgUmVuZGVyVmlldy4KKworICAgICAgICBI b3dldmVyLCBtb3N0IG9mIHRoZSBjb2RlIGlzIGFuYWx5emluZyB0aGUgbGF5ZXJzIHRyZWUgc3Rh cnRpbmcgZnJvbSB0aGUgcm9vdCwKKyAgICAgICAgc28gaGF2aW5nIHRoZSBSZW5kZXJOYW1lZEZs b3dUaHJlYWQgcGFydGljaXBhdGUgaW4gdGhlIGxheWVyIHRyZWUgaXMgbmVlZGVkCisgICAgICAg IGluIG9yZGVyIHRvIGVuYWJsZSBjb21wb3NpdGluZyBmb3IgbGF5ZXJzIGluc2lkZSB0aGUgZmxv dyB0aHJlYWQuCisKKyAgICAgICAgVGhpcyBwYXRjaCBtYWtlcyB0aGUgUmVuZGVyTmFtZWRGbG93 VGhyZWFkIHZpc2libGUgdG8gdGhlIFJlbmRlclZpZXcsIGJ1dAorICAgICAgICBpZ25vcmVzIGl0 IHdoZW4gaXRlcmF0ZXMgdGhlIGNoaWxkcmVuIG9mIHRoZSBSZW5kZXJWaWV3IGluIHBhaW50IGFu ZCBoaXQtdGVzdCBtZXRob2RzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gdmlzaWJsZSBj aGFuZ2VzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWludExpc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXI6OmhpdFRlc3RMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpj YWxjdWxhdGVMYXllckJvdW5kcyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y29s bGVjdExheWVycyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6d3JpdGVMYXllcnMpOgorCiAyMDEzLTA2LTA1ICBLb25kYXBhbGx5 IEthbHlhbiAgPGthbHlhbi5rb25kYXBhbGx5QGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXSBC dWlsZCBmaXggd2l0aCBFR0wgYW5kIEdMRVMyIGJhY2tlbmQuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcAppbmRleCA5ZjA0YjlmLi44NjYwYzE0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTQwMjEsNiArNDAyMSw4IEBAIHZvaWQg UmVuZGVyTGF5ZXI6OnBhaW50TGlzdChWZWN0b3I8UmVuZGVyTGF5ZXIqPiogbGlzdCwgR3JhcGhp Y3NDb250ZXh0KiBjb250ZXh0CiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxpc3QtPnNp emUoKTsgKytpKSB7CiAgICAgICAgIFJlbmRlckxheWVyKiBjaGlsZExheWVyID0gbGlzdC0+YXQo aSk7CisgICAgICAgIGlmIChjaGlsZExheWVyLT5pc091dE9mRmxvd1JlbmRlckZsb3dUaHJlYWQo KSkKKyAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBpZiAoIWNoaWxkTGF5ZXItPmlzUGFn aW5hdGVkKCkpCiAgICAgICAgICAgICBjaGlsZExheWVyLT5wYWludExheWVyKGNvbnRleHQsIHBh aW50aW5nSW5mbywgcGFpbnRGbGFncyk7CiAgICAgICAgIGVsc2UKQEAgLTQ4NTgsNiArNDg2MCw4 IEBAIFJlbmRlckxheWVyKiBSZW5kZXJMYXllcjo6aGl0VGVzdExpc3QoVmVjdG9yPFJlbmRlckxh eWVyKj4qIGxpc3QsIFJlbmRlckxheWVyKiByCiAgICAgUmVuZGVyTGF5ZXIqIHJlc3VsdExheWVy ID0gMDsKICAgICBmb3IgKGludCBpID0gbGlzdC0+c2l6ZSgpIC0gMTsgaSA+PSAwOyAtLWkpIHsK ICAgICAgICAgUmVuZGVyTGF5ZXIqIGNoaWxkTGF5ZXIgPSBsaXN0LT5hdChpKTsKKyAgICAgICAg aWYgKGNoaWxkTGF5ZXItPmlzT3V0T2ZGbG93UmVuZGVyRmxvd1RocmVhZCgpKQorICAgICAgICAg ICAgY29udGludWU7CiAgICAgICAgIFJlbmRlckxheWVyKiBoaXRMYXllciA9IDA7CiAgICAgICAg IEhpdFRlc3RSZXN1bHQgdGVtcFJlc3VsdChyZXN1bHQuaGl0VGVzdExvY2F0aW9uKCkpOwogICAg ICAgICBpZiAoY2hpbGRMYXllci0+aXNQYWdpbmF0ZWQoKSkKQEAgLTU1MDcsNiArNTUxMSw5IEBA IEludFJlY3QgUmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUxheWVyQm91bmRzKGNvbnN0IFJlbmRlckxh eWVyKiBhbmNlc3RvckxheWVyLCBjb25zCiAgICAgICAgIHNpemVfdCBsaXN0U2l6ZSA9IG5vcm1h bEZsb3dMaXN0LT5zaXplKCk7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGlzdFNp emU7ICsraSkgewogICAgICAgICAgICAgUmVuZGVyTGF5ZXIqIGN1ckxheWVyID0gbm9ybWFsRmxv d0xpc3QtPmF0KGkpOworICAgICAgICAgICAgLy8gUmVuZGVyVmlldyB3aWxsIGFsd2F5cyByZXR1 cm4gdGhlIHNpemUgb2YgdGhlIGRvY3VtZW50LCBiZWZvcmUgcmVhY2hpbmcgdGhpcyBwb2ludCwK KyAgICAgICAgICAgIC8vIHNvIHRoZXJlJ3Mgbm8gd2F5IHdlIGNvdWxkIGhpdCBhIFJlbmRlck5h bWVkRmxvd1RocmVhZCBoZXJlLgorICAgICAgICAgICAgQVNTRVJUKCFjdXJMYXllci0+aXNPdXRP ZkZsb3dSZW5kZXJGbG93VGhyZWFkKCkpOwogICAgICAgICAgICAgaWYgKGZsYWdzICYgSW5jbHVk ZUNvbXBvc2l0ZWREZXNjZW5kYW50cyB8fCAhY3VyTGF5ZXItPmlzQ29tcG9zaXRlZCgpKSB7CiAg ICAgICAgICAgICAgICAgSW50UmVjdCBjdXJBYnNCb3VuZHMgPSBjdXJMYXllci0+Y2FsY3VsYXRl TGF5ZXJCb3VuZHModGhpcywgMCwgZGVzY2VuZGFudEZsYWdzKTsKICAgICAgICAgICAgICAgICB1 bmlvbkJvdW5kcy51bml0ZShjdXJBYnNCb3VuZHMpOwpAQCAtNTgzOCw3ICs1ODQ1LDcgQEAgdm9p ZCBSZW5kZXJMYXllcjo6Y29sbGVjdExheWVycyhib29sIGluY2x1ZGVIaWRkZW5MYXllcnMsIENv bGxlY3RMYXllcnNCZWhhdmlvcgogICAgIGJvb2wgaXNTdGFja2luZyA9IGJlaGF2aW9yID09IFN0 b3BBdFN0YWNraW5nQ29udGV4dHMgPyBpc1N0YWNraW5nQ29udGV4dCgpIDogaXNTdGFja2luZ0Nv bnRhaW5lcigpOwogICAgIC8vIE92ZXJmbG93IGxheWVycyBhcmUganVzdCBwYWludGVkIGJ5IHRo ZWlyIGVuY2xvc2luZyBsYXllcnMsIHNvIHRoZXkgZG9uJ3QgZ2V0IHB1dCBpbiB6b3JkZXIgbGlz dHMuCiAgICAgYm9vbCBpbmNsdWRlSGlkZGVuTGF5ZXIgPSBpbmNsdWRlSGlkZGVuTGF5ZXJzIHx8 IChtX2hhc1Zpc2libGVDb250ZW50IHx8IChtX2hhc1Zpc2libGVEZXNjZW5kYW50ICYmIGlzU3Rh Y2tpbmcpKTsKLSAgICBpZiAoaW5jbHVkZUhpZGRlbkxheWVyICYmICFpc05vcm1hbEZsb3dPbmx5 KCkgJiYgIWlzT3V0T2ZGbG93UmVuZGVyRmxvd1RocmVhZCgpKSB7CisgICAgaWYgKGluY2x1ZGVI aWRkZW5MYXllciAmJiAhaXNOb3JtYWxGbG93T25seSgpKSB7CiAgICAgICAgIC8vIERldGVybWlu ZSB3aGljaCBidWZmZXIgdGhlIGNoaWxkIHNob3VsZCBiZSBpbi4KICAgICAgICAgT3duUHRyPFZl Y3RvcjxSZW5kZXJMYXllcio+ID4mIGJ1ZmZlciA9ICh6SW5kZXgoKSA+PSAwKSA/IHBvc0J1ZmZl ciA6IG5lZ0J1ZmZlcjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRyZWVBc1RleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRyZWVB c1RleHQuY3BwCmluZGV4IGZiYjgwN2MuLmRhNjdlZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5jcHAKQEAgLTc3MCwxNCArNzcwLDIyIEBAIHN0YXRp YyB2b2lkIHdyaXRlTGF5ZXJzKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJMYXllciogcm9v dExheWVyLCBSZW5kZXJMYXllCiAgICAgfQogCiAgICAgaWYgKFZlY3RvcjxSZW5kZXJMYXllcio+ KiBwb3NMaXN0ID0gbC0+cG9zWk9yZGVyTGlzdCgpKSB7Ci0gICAgICAgIGludCBjdXJySW5kZW50 ID0gaW5kZW50OwotICAgICAgICBpZiAoYmVoYXZpb3IgJiBSZW5kZXJBc1RleHRTaG93TGF5ZXJO ZXN0aW5nKSB7Ci0gICAgICAgICAgICB3cml0ZUluZGVudCh0cywgaW5kZW50KTsKLSAgICAgICAg ICAgIHRzIDw8ICIgcG9zaXRpdmUgei1vcmRlciBsaXN0KCIgPDwgcG9zTGlzdC0+c2l6ZSgpIDw8 ICIpXG4iOwotICAgICAgICAgICAgKytjdXJySW5kZW50OwotICAgICAgICB9CisgICAgICAgIHNp emVfdCBsYXllckNvdW50ID0gMDsKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSAhPSBw b3NMaXN0LT5zaXplKCk7ICsraSkKLSAgICAgICAgICAgIHdyaXRlTGF5ZXJzKHRzLCByb290TGF5 ZXIsIHBvc0xpc3QtPmF0KGkpLCBwYWludERpcnR5UmVjdCwgY3VyckluZGVudCwgYmVoYXZpb3Ip OworICAgICAgICAgICAgaWYgKCFwb3NMaXN0LT5hdChpKS0+aXNPdXRPZkZsb3dSZW5kZXJGbG93 VGhyZWFkKCkpCisgICAgICAgICAgICAgICAgKytsYXllckNvdW50OworICAgICAgICBpZiAobGF5 ZXJDb3VudCkgeworICAgICAgICAgICAgaW50IGN1cnJJbmRlbnQgPSBpbmRlbnQ7CisgICAgICAg ICAgICBpZiAoYmVoYXZpb3IgJiBSZW5kZXJBc1RleHRTaG93TGF5ZXJOZXN0aW5nKSB7CisgICAg ICAgICAgICAgICAgd3JpdGVJbmRlbnQodHMsIGluZGVudCk7CisgICAgICAgICAgICAgICAgdHMg PDwgIiBwb3NpdGl2ZSB6LW9yZGVyIGxpc3QoIiA8PCBsYXllckNvdW50IDw8ICIpXG4iOworICAg ICAgICAgICAgICAgICsrY3VyckluZGVudDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgIT0gcG9zTGlzdC0+c2l6ZSgpOyArK2kpIHsKKyAgICAgICAg ICAgICAgICBpZiAoIXBvc0xpc3QtPmF0KGkpLT5pc091dE9mRmxvd1JlbmRlckZsb3dUaHJlYWQo KSkKKyAgICAgICAgICAgICAgICAgICAgd3JpdGVMYXllcnModHMsIHJvb3RMYXllciwgcG9zTGlz dC0+YXQoaSksIHBhaW50RGlydHlSZWN0LCBjdXJySW5kZW50LCBiZWhhdmlvcik7CisgICAgICAg ICAgICB9CisgICAgICAgIH0KICAgICB9CiAgICAgCiAgICAgLy8gQWx0b3VnaCB0aGUgUmVuZGVy Rmxvd1RocmVhZCByZXF1aXJlcyBhIGxheWVyLCBpdCBpcyBub3QgY29sbGVjdGVkIGJ5IGl0cyBw YXJlbnQsCg== 204051 2013-06-07 10:08:41 -0700 2013-06-07 15:08:21 -0700 Patch for landing bug117270_1.patch text/plain 5818 achicu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkOGM0NDBhLi45MjJhNDdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTMtMDYtMDUgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgor CisgICAgICAgIFtDU1MgUmVnaW9uc10gTGF5ZXJzIGluc2lkZSB0aGUgUmVuZGVyRmxvd1RocmVh ZCBzaG91bGQgYmUgY29sbGVjdGVkIGJ5IHRoZSBsYXllciBvZiBSZW5kZXJWaWV3CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTcyNzAKKworICAgICAg ICBSZXZpZXdlZCBieSBEYXZlIEh5YXR0LgorCisgICAgICAgIFJlbmRlck5hbWVkRmxvd1RocmVh ZHMgYXJlIGF0dGFjaGVkIHRvIHRoZSBSZW5kZXJWaWV3LCBidXQgdGhleSBhcmUgcGFpbnRlZCAK KyAgICAgICAgYW5kIGhpdC10ZXN0ZWQgdGhyb3VnaCB0aGVpciByZWdpb25zLiBUaGUgZWFzaWVz dCB3YXkgdG8gcHJldmVudCB0aGUgUmVuZGVyVmlldyAKKyAgICAgICAgZnJvbSBzZWVpbmcgdGhl IFJlbmRlck5hbWVkRmxvd1RocmVhZHMgYXMgaXRzIG93biBjaGlsZHJlbiB3YXMgdG8gYXZvaWQg Y29sbGVjdGluZworICAgICAgICB0aGUgbGF5ZXJzIG9mIHRoZSBSZW5kZXJOYW1lZEZsb3dUaHJl YWRzIGFzIGNoaWxkcmVuIGxheWVycyBvZiB0aGUgUmVuZGVyVmlldy4KKworICAgICAgICBIb3dl dmVyLCBtb3N0IG9mIHRoZSBjb2RlIGlzIGFuYWx5emluZyB0aGUgbGF5ZXJzIHRyZWUgc3RhcnRp bmcgZnJvbSB0aGUgcm9vdCwKKyAgICAgICAgc28gaGF2aW5nIHRoZSBSZW5kZXJOYW1lZEZsb3dU aHJlYWQgcGFydGljaXBhdGUgaW4gdGhlIGxheWVyIHRyZWUgaXMgbmVlZGVkCisgICAgICAgIGlu IG9yZGVyIHRvIGVuYWJsZSBjb21wb3NpdGluZyBmb3IgbGF5ZXJzIGluc2lkZSB0aGUgZmxvdyB0 aHJlYWQuCisKKyAgICAgICAgVGhpcyBwYXRjaCBtYWtlcyB0aGUgUmVuZGVyTmFtZWRGbG93VGhy ZWFkIHZpc2libGUgdG8gdGhlIFJlbmRlclZpZXcsIGJ1dAorICAgICAgICBpZ25vcmVzIGl0IHdo ZW4gaXRlcmF0ZXMgdGhlIGNoaWxkcmVuIG9mIHRoZSBSZW5kZXJWaWV3IGluIHBhaW50IGFuZCBo aXQtdGVzdCBtZXRob2RzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gdmlzaWJsZSBjaGFu Z2VzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyOjpwYWludExpc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXI6OmhpdFRlc3RMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjYWxj dWxhdGVMYXllckJvdW5kcyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y29sbGVj dExheWVycyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6d3JpdGVMYXllcnMpOgorCiAyMDEzLTA2LTA1ICBLb25kYXBhbGx5IEth bHlhbiAgPGthbHlhbi5rb25kYXBhbGx5QGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXSBCdWls ZCBmaXggd2l0aCBFR0wgYW5kIEdMRVMyIGJhY2tlbmQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcAppbmRleCA5ZjA0YjlmLi44NjYwYzE0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTQwMjEsNiArNDAyMSw4IEBAIHZvaWQgUmVu ZGVyTGF5ZXI6OnBhaW50TGlzdChWZWN0b3I8UmVuZGVyTGF5ZXIqPiogbGlzdCwgR3JhcGhpY3ND b250ZXh0KiBjb250ZXh0CiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxpc3QtPnNpemUo KTsgKytpKSB7CiAgICAgICAgIFJlbmRlckxheWVyKiBjaGlsZExheWVyID0gbGlzdC0+YXQoaSk7 CisgICAgICAgIGlmIChjaGlsZExheWVyLT5pc091dE9mRmxvd1JlbmRlckZsb3dUaHJlYWQoKSkK KyAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBpZiAoIWNoaWxkTGF5ZXItPmlzUGFnaW5h dGVkKCkpCiAgICAgICAgICAgICBjaGlsZExheWVyLT5wYWludExheWVyKGNvbnRleHQsIHBhaW50 aW5nSW5mbywgcGFpbnRGbGFncyk7CiAgICAgICAgIGVsc2UKQEAgLTQ4NTgsNiArNDg2MCw4IEBA IFJlbmRlckxheWVyKiBSZW5kZXJMYXllcjo6aGl0VGVzdExpc3QoVmVjdG9yPFJlbmRlckxheWVy Kj4qIGxpc3QsIFJlbmRlckxheWVyKiByCiAgICAgUmVuZGVyTGF5ZXIqIHJlc3VsdExheWVyID0g MDsKICAgICBmb3IgKGludCBpID0gbGlzdC0+c2l6ZSgpIC0gMTsgaSA+PSAwOyAtLWkpIHsKICAg ICAgICAgUmVuZGVyTGF5ZXIqIGNoaWxkTGF5ZXIgPSBsaXN0LT5hdChpKTsKKyAgICAgICAgaWYg KGNoaWxkTGF5ZXItPmlzT3V0T2ZGbG93UmVuZGVyRmxvd1RocmVhZCgpKQorICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgIFJlbmRlckxheWVyKiBoaXRMYXllciA9IDA7CiAgICAgICAgIEhp dFRlc3RSZXN1bHQgdGVtcFJlc3VsdChyZXN1bHQuaGl0VGVzdExvY2F0aW9uKCkpOwogICAgICAg ICBpZiAoY2hpbGRMYXllci0+aXNQYWdpbmF0ZWQoKSkKQEAgLTU1MDcsNiArNTUxMSw5IEBAIElu dFJlY3QgUmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUxheWVyQm91bmRzKGNvbnN0IFJlbmRlckxheWVy KiBhbmNlc3RvckxheWVyLCBjb25zCiAgICAgICAgIHNpemVfdCBsaXN0U2l6ZSA9IG5vcm1hbEZs b3dMaXN0LT5zaXplKCk7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGlzdFNpemU7 ICsraSkgewogICAgICAgICAgICAgUmVuZGVyTGF5ZXIqIGN1ckxheWVyID0gbm9ybWFsRmxvd0xp c3QtPmF0KGkpOworICAgICAgICAgICAgLy8gUmVuZGVyVmlldyB3aWxsIGFsd2F5cyByZXR1cm4g dGhlIHNpemUgb2YgdGhlIGRvY3VtZW50LCBiZWZvcmUgcmVhY2hpbmcgdGhpcyBwb2ludCwKKyAg ICAgICAgICAgIC8vIHNvIHRoZXJlJ3Mgbm8gd2F5IHdlIGNvdWxkIGhpdCBhIFJlbmRlck5hbWVk Rmxvd1RocmVhZCBoZXJlLgorICAgICAgICAgICAgQVNTRVJUKCFjdXJMYXllci0+aXNPdXRPZkZs b3dSZW5kZXJGbG93VGhyZWFkKCkpOwogICAgICAgICAgICAgaWYgKGZsYWdzICYgSW5jbHVkZUNv bXBvc2l0ZWREZXNjZW5kYW50cyB8fCAhY3VyTGF5ZXItPmlzQ29tcG9zaXRlZCgpKSB7CiAgICAg ICAgICAgICAgICAgSW50UmVjdCBjdXJBYnNCb3VuZHMgPSBjdXJMYXllci0+Y2FsY3VsYXRlTGF5 ZXJCb3VuZHModGhpcywgMCwgZGVzY2VuZGFudEZsYWdzKTsKICAgICAgICAgICAgICAgICB1bmlv bkJvdW5kcy51bml0ZShjdXJBYnNCb3VuZHMpOwpAQCAtNTgzOCw3ICs1ODQ1LDcgQEAgdm9pZCBS ZW5kZXJMYXllcjo6Y29sbGVjdExheWVycyhib29sIGluY2x1ZGVIaWRkZW5MYXllcnMsIENvbGxl Y3RMYXllcnNCZWhhdmlvcgogICAgIGJvb2wgaXNTdGFja2luZyA9IGJlaGF2aW9yID09IFN0b3BB dFN0YWNraW5nQ29udGV4dHMgPyBpc1N0YWNraW5nQ29udGV4dCgpIDogaXNTdGFja2luZ0NvbnRh aW5lcigpOwogICAgIC8vIE92ZXJmbG93IGxheWVycyBhcmUganVzdCBwYWludGVkIGJ5IHRoZWly IGVuY2xvc2luZyBsYXllcnMsIHNvIHRoZXkgZG9uJ3QgZ2V0IHB1dCBpbiB6b3JkZXIgbGlzdHMu CiAgICAgYm9vbCBpbmNsdWRlSGlkZGVuTGF5ZXIgPSBpbmNsdWRlSGlkZGVuTGF5ZXJzIHx8ICht X2hhc1Zpc2libGVDb250ZW50IHx8IChtX2hhc1Zpc2libGVEZXNjZW5kYW50ICYmIGlzU3RhY2tp bmcpKTsKLSAgICBpZiAoaW5jbHVkZUhpZGRlbkxheWVyICYmICFpc05vcm1hbEZsb3dPbmx5KCkg JiYgIWlzT3V0T2ZGbG93UmVuZGVyRmxvd1RocmVhZCgpKSB7CisgICAgaWYgKGluY2x1ZGVIaWRk ZW5MYXllciAmJiAhaXNOb3JtYWxGbG93T25seSgpKSB7CiAgICAgICAgIC8vIERldGVybWluZSB3 aGljaCBidWZmZXIgdGhlIGNoaWxkIHNob3VsZCBiZSBpbi4KICAgICAgICAgT3duUHRyPFZlY3Rv cjxSZW5kZXJMYXllcio+ID4mIGJ1ZmZlciA9ICh6SW5kZXgoKSA+PSAwKSA/IHBvc0J1ZmZlciA6 IG5lZ0J1ZmZlcjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRyZWVBc1RleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRyZWVBc1Rl eHQuY3BwCmluZGV4IGZiYjgwN2MuLmRhNjdlZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5jcHAKQEAgLTc3MCwxNCArNzcwLDIyIEBAIHN0YXRpYyB2 b2lkIHdyaXRlTGF5ZXJzKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJMYXllciogcm9vdExh eWVyLCBSZW5kZXJMYXllCiAgICAgfQogCiAgICAgaWYgKFZlY3RvcjxSZW5kZXJMYXllcio+KiBw b3NMaXN0ID0gbC0+cG9zWk9yZGVyTGlzdCgpKSB7Ci0gICAgICAgIGludCBjdXJySW5kZW50ID0g aW5kZW50OwotICAgICAgICBpZiAoYmVoYXZpb3IgJiBSZW5kZXJBc1RleHRTaG93TGF5ZXJOZXN0 aW5nKSB7Ci0gICAgICAgICAgICB3cml0ZUluZGVudCh0cywgaW5kZW50KTsKLSAgICAgICAgICAg IHRzIDw8ICIgcG9zaXRpdmUgei1vcmRlciBsaXN0KCIgPDwgcG9zTGlzdC0+c2l6ZSgpIDw8ICIp XG4iOwotICAgICAgICAgICAgKytjdXJySW5kZW50OwotICAgICAgICB9CisgICAgICAgIHNpemVf dCBsYXllckNvdW50ID0gMDsKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSAhPSBwb3NM aXN0LT5zaXplKCk7ICsraSkKLSAgICAgICAgICAgIHdyaXRlTGF5ZXJzKHRzLCByb290TGF5ZXIs IHBvc0xpc3QtPmF0KGkpLCBwYWludERpcnR5UmVjdCwgY3VyckluZGVudCwgYmVoYXZpb3IpOwor ICAgICAgICAgICAgaWYgKCFwb3NMaXN0LT5hdChpKS0+aXNPdXRPZkZsb3dSZW5kZXJGbG93VGhy ZWFkKCkpCisgICAgICAgICAgICAgICAgKytsYXllckNvdW50OworICAgICAgICBpZiAobGF5ZXJD b3VudCkgeworICAgICAgICAgICAgaW50IGN1cnJJbmRlbnQgPSBpbmRlbnQ7CisgICAgICAgICAg ICBpZiAoYmVoYXZpb3IgJiBSZW5kZXJBc1RleHRTaG93TGF5ZXJOZXN0aW5nKSB7CisgICAgICAg ICAgICAgICAgd3JpdGVJbmRlbnQodHMsIGluZGVudCk7CisgICAgICAgICAgICAgICAgdHMgPDwg IiBwb3NpdGl2ZSB6LW9yZGVyIGxpc3QoIiA8PCBsYXllckNvdW50IDw8ICIpXG4iOworICAgICAg ICAgICAgICAgICsrY3VyckluZGVudDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgIT0gcG9zTGlzdC0+c2l6ZSgpOyArK2kpIHsKKyAgICAgICAgICAg ICAgICBpZiAoIXBvc0xpc3QtPmF0KGkpLT5pc091dE9mRmxvd1JlbmRlckZsb3dUaHJlYWQoKSkK KyAgICAgICAgICAgICAgICAgICAgd3JpdGVMYXllcnModHMsIHJvb3RMYXllciwgcG9zTGlzdC0+ YXQoaSksIHBhaW50RGlydHlSZWN0LCBjdXJySW5kZW50LCBiZWhhdmlvcik7CisgICAgICAgICAg ICB9CisgICAgICAgIH0KICAgICB9CiAgICAgCiAgICAgLy8gQWx0b3VnaCB0aGUgUmVuZGVyRmxv d1RocmVhZCByZXF1aXJlcyBhIGxheWVyLCBpdCBpcyBub3QgY29sbGVjdGVkIGJ5IGl0cyBwYXJl bnQsCg== 204069 2013-06-07 15:08:21 -0700 2013-06-07 15:36:24 -0700 Patch for landing bug117270_2.patch text/plain 5819 achicu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkOGM0NDBhLi5lOTQzMWU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTMtMDYtMDUgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgor CisgICAgICAgIFtDU1MgUmVnaW9uc10gTGF5ZXJzIGluc2lkZSB0aGUgUmVuZGVyRmxvd1RocmVh ZCBzaG91bGQgYmUgY29sbGVjdGVkIGJ5IHRoZSBsYXllciBvZiBSZW5kZXJWaWV3CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTcyNzAKKworICAgICAg ICBSZXZpZXdlZCBieSBEYXZpZCBIeWF0dC4KKworICAgICAgICBSZW5kZXJOYW1lZEZsb3dUaHJl YWRzIGFyZSBhdHRhY2hlZCB0byB0aGUgUmVuZGVyVmlldywgYnV0IHRoZXkgYXJlIHBhaW50ZWQg CisgICAgICAgIGFuZCBoaXQtdGVzdGVkIHRocm91Z2ggdGhlaXIgcmVnaW9ucy4gVGhlIGVhc2ll c3Qgd2F5IHRvIHByZXZlbnQgdGhlIFJlbmRlclZpZXcgCisgICAgICAgIGZyb20gc2VlaW5nIHRo ZSBSZW5kZXJOYW1lZEZsb3dUaHJlYWRzIGFzIGl0cyBvd24gY2hpbGRyZW4gd2FzIHRvIGF2b2lk IGNvbGxlY3RpbmcKKyAgICAgICAgdGhlIGxheWVycyBvZiB0aGUgUmVuZGVyTmFtZWRGbG93VGhy ZWFkcyBhcyBjaGlsZHJlbiBsYXllcnMgb2YgdGhlIFJlbmRlclZpZXcuCisKKyAgICAgICAgSG93 ZXZlciwgbW9zdCBvZiB0aGUgY29kZSBpcyBhbmFseXppbmcgdGhlIGxheWVycyB0cmVlIHN0YXJ0 aW5nIGZyb20gdGhlIHJvb3QsCisgICAgICAgIHNvIGhhdmluZyB0aGUgUmVuZGVyTmFtZWRGbG93 VGhyZWFkIHBhcnRpY2lwYXRlIGluIHRoZSBsYXllciB0cmVlIGlzIG5lZWRlZAorICAgICAgICBp biBvcmRlciB0byBlbmFibGUgY29tcG9zaXRpbmcgZm9yIGxheWVycyBpbnNpZGUgdGhlIGZsb3cg dGhyZWFkLgorCisgICAgICAgIFRoaXMgcGF0Y2ggbWFrZXMgdGhlIFJlbmRlck5hbWVkRmxvd1Ro cmVhZCB2aXNpYmxlIHRvIHRoZSBSZW5kZXJWaWV3LCBidXQKKyAgICAgICAgaWdub3JlcyBpdCB3 aGVuIGl0ZXJhdGVzIHRoZSBjaGlsZHJlbiBvZiB0aGUgUmVuZGVyVmlldyBpbiBwYWludCBhbmQg aGl0LXRlc3QgbWV0aG9kcy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIHZpc2libGUgY2hh bmdlcy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllcjo6cGFpbnRMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyOjpoaXRUZXN0TGlzdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2Fs Y3VsYXRlTGF5ZXJCb3VuZHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNvbGxl Y3RMYXllcnMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OndyaXRlTGF5ZXJzKToKKwogMjAxMy0wNi0wNSAgS29uZGFwYWxseSBL YWx5YW4gIDxrYWx5YW4ua29uZGFwYWxseUBpbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF0gQnVp bGQgZml4IHdpdGggRUdMIGFuZCBHTEVTMiBiYWNrZW5kLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHAKaW5kZXggOWYwNGI5Zi4uODY2MGMxNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC00MDIxLDYgKzQwMjEsOCBAQCB2b2lkIFJl bmRlckxheWVyOjpwYWludExpc3QoVmVjdG9yPFJlbmRlckxheWVyKj4qIGxpc3QsIEdyYXBoaWNz Q29udGV4dCogY29udGV4dAogCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0LT5zaXpl KCk7ICsraSkgewogICAgICAgICBSZW5kZXJMYXllciogY2hpbGRMYXllciA9IGxpc3QtPmF0KGkp OworICAgICAgICBpZiAoY2hpbGRMYXllci0+aXNPdXRPZkZsb3dSZW5kZXJGbG93VGhyZWFkKCkp CisgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgaWYgKCFjaGlsZExheWVyLT5pc1BhZ2lu YXRlZCgpKQogICAgICAgICAgICAgY2hpbGRMYXllci0+cGFpbnRMYXllcihjb250ZXh0LCBwYWlu dGluZ0luZm8sIHBhaW50RmxhZ3MpOwogICAgICAgICBlbHNlCkBAIC00ODU4LDYgKzQ4NjAsOCBA QCBSZW5kZXJMYXllciogUmVuZGVyTGF5ZXI6OmhpdFRlc3RMaXN0KFZlY3RvcjxSZW5kZXJMYXll cio+KiBsaXN0LCBSZW5kZXJMYXllciogcgogICAgIFJlbmRlckxheWVyKiByZXN1bHRMYXllciA9 IDA7CiAgICAgZm9yIChpbnQgaSA9IGxpc3QtPnNpemUoKSAtIDE7IGkgPj0gMDsgLS1pKSB7CiAg ICAgICAgIFJlbmRlckxheWVyKiBjaGlsZExheWVyID0gbGlzdC0+YXQoaSk7CisgICAgICAgIGlm IChjaGlsZExheWVyLT5pc091dE9mRmxvd1JlbmRlckZsb3dUaHJlYWQoKSkKKyAgICAgICAgICAg IGNvbnRpbnVlOwogICAgICAgICBSZW5kZXJMYXllciogaGl0TGF5ZXIgPSAwOwogICAgICAgICBI aXRUZXN0UmVzdWx0IHRlbXBSZXN1bHQocmVzdWx0LmhpdFRlc3RMb2NhdGlvbigpKTsKICAgICAg ICAgaWYgKGNoaWxkTGF5ZXItPmlzUGFnaW5hdGVkKCkpCkBAIC01NTA3LDYgKzU1MTEsOSBAQCBJ bnRSZWN0IFJlbmRlckxheWVyOjpjYWxjdWxhdGVMYXllckJvdW5kcyhjb25zdCBSZW5kZXJMYXll ciogYW5jZXN0b3JMYXllciwgY29ucwogICAgICAgICBzaXplX3QgbGlzdFNpemUgPSBub3JtYWxG bG93TGlzdC0+c2l6ZSgpOwogICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxpc3RTaXpl OyArK2kpIHsKICAgICAgICAgICAgIFJlbmRlckxheWVyKiBjdXJMYXllciA9IG5vcm1hbEZsb3dM aXN0LT5hdChpKTsKKyAgICAgICAgICAgIC8vIFJlbmRlclZpZXcgd2lsbCBhbHdheXMgcmV0dXJu IHRoZSBzaXplIG9mIHRoZSBkb2N1bWVudCwgYmVmb3JlIHJlYWNoaW5nIHRoaXMgcG9pbnQsCisg ICAgICAgICAgICAvLyBzbyB0aGVyZSdzIG5vIHdheSB3ZSBjb3VsZCBoaXQgYSBSZW5kZXJOYW1l ZEZsb3dUaHJlYWQgaGVyZS4KKyAgICAgICAgICAgIEFTU0VSVCghY3VyTGF5ZXItPmlzT3V0T2ZG bG93UmVuZGVyRmxvd1RocmVhZCgpKTsKICAgICAgICAgICAgIGlmIChmbGFncyAmIEluY2x1ZGVD b21wb3NpdGVkRGVzY2VuZGFudHMgfHwgIWN1ckxheWVyLT5pc0NvbXBvc2l0ZWQoKSkgewogICAg ICAgICAgICAgICAgIEludFJlY3QgY3VyQWJzQm91bmRzID0gY3VyTGF5ZXItPmNhbGN1bGF0ZUxh eWVyQm91bmRzKHRoaXMsIDAsIGRlc2NlbmRhbnRGbGFncyk7CiAgICAgICAgICAgICAgICAgdW5p b25Cb3VuZHMudW5pdGUoY3VyQWJzQm91bmRzKTsKQEAgLTU4MzgsNyArNTg0NSw3IEBAIHZvaWQg UmVuZGVyTGF5ZXI6OmNvbGxlY3RMYXllcnMoYm9vbCBpbmNsdWRlSGlkZGVuTGF5ZXJzLCBDb2xs ZWN0TGF5ZXJzQmVoYXZpb3IKICAgICBib29sIGlzU3RhY2tpbmcgPSBiZWhhdmlvciA9PSBTdG9w QXRTdGFja2luZ0NvbnRleHRzID8gaXNTdGFja2luZ0NvbnRleHQoKSA6IGlzU3RhY2tpbmdDb250 YWluZXIoKTsKICAgICAvLyBPdmVyZmxvdyBsYXllcnMgYXJlIGp1c3QgcGFpbnRlZCBieSB0aGVp ciBlbmNsb3NpbmcgbGF5ZXJzLCBzbyB0aGV5IGRvbid0IGdldCBwdXQgaW4gem9yZGVyIGxpc3Rz LgogICAgIGJvb2wgaW5jbHVkZUhpZGRlbkxheWVyID0gaW5jbHVkZUhpZGRlbkxheWVycyB8fCAo bV9oYXNWaXNpYmxlQ29udGVudCB8fCAobV9oYXNWaXNpYmxlRGVzY2VuZGFudCAmJiBpc1N0YWNr aW5nKSk7Ci0gICAgaWYgKGluY2x1ZGVIaWRkZW5MYXllciAmJiAhaXNOb3JtYWxGbG93T25seSgp ICYmICFpc091dE9mRmxvd1JlbmRlckZsb3dUaHJlYWQoKSkgeworICAgIGlmIChpbmNsdWRlSGlk ZGVuTGF5ZXIgJiYgIWlzTm9ybWFsRmxvd09ubHkoKSkgewogICAgICAgICAvLyBEZXRlcm1pbmUg d2hpY2ggYnVmZmVyIHRoZSBjaGlsZCBzaG91bGQgYmUgaW4uCiAgICAgICAgIE93blB0cjxWZWN0 b3I8UmVuZGVyTGF5ZXIqPiA+JiBidWZmZXIgPSAoekluZGV4KCkgPj0gMCkgPyBwb3NCdWZmZXIg OiBuZWdCdWZmZXI7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUcmVlQXNUZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNU ZXh0LmNwcAppbmRleCBmYmI4MDdjLi5kYTY3ZWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwCkBAIC03NzAsMTQgKzc3MCwyMiBAQCBzdGF0aWMg dm9pZCB3cml0ZUxheWVycyhUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyTGF5ZXIqIHJvb3RM YXllciwgUmVuZGVyTGF5ZQogICAgIH0KIAogICAgIGlmIChWZWN0b3I8UmVuZGVyTGF5ZXIqPiog cG9zTGlzdCA9IGwtPnBvc1pPcmRlckxpc3QoKSkgewotICAgICAgICBpbnQgY3VyckluZGVudCA9 IGluZGVudDsKLSAgICAgICAgaWYgKGJlaGF2aW9yICYgUmVuZGVyQXNUZXh0U2hvd0xheWVyTmVz dGluZykgewotICAgICAgICAgICAgd3JpdGVJbmRlbnQodHMsIGluZGVudCk7Ci0gICAgICAgICAg ICB0cyA8PCAiIHBvc2l0aXZlIHotb3JkZXIgbGlzdCgiIDw8IHBvc0xpc3QtPnNpemUoKSA8PCAi KVxuIjsKLSAgICAgICAgICAgICsrY3VyckluZGVudDsKLSAgICAgICAgfQorICAgICAgICBzaXpl X3QgbGF5ZXJDb3VudCA9IDA7CiAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgIT0gcG9z TGlzdC0+c2l6ZSgpOyArK2kpCi0gICAgICAgICAgICB3cml0ZUxheWVycyh0cywgcm9vdExheWVy LCBwb3NMaXN0LT5hdChpKSwgcGFpbnREaXJ0eVJlY3QsIGN1cnJJbmRlbnQsIGJlaGF2aW9yKTsK KyAgICAgICAgICAgIGlmICghcG9zTGlzdC0+YXQoaSktPmlzT3V0T2ZGbG93UmVuZGVyRmxvd1Ro cmVhZCgpKQorICAgICAgICAgICAgICAgICsrbGF5ZXJDb3VudDsKKyAgICAgICAgaWYgKGxheWVy Q291bnQpIHsKKyAgICAgICAgICAgIGludCBjdXJySW5kZW50ID0gaW5kZW50OworICAgICAgICAg ICAgaWYgKGJlaGF2aW9yICYgUmVuZGVyQXNUZXh0U2hvd0xheWVyTmVzdGluZykgeworICAgICAg ICAgICAgICAgIHdyaXRlSW5kZW50KHRzLCBpbmRlbnQpOworICAgICAgICAgICAgICAgIHRzIDw8 ICIgcG9zaXRpdmUgei1vcmRlciBsaXN0KCIgPDwgbGF5ZXJDb3VudCA8PCAiKVxuIjsKKyAgICAg ICAgICAgICAgICArK2N1cnJJbmRlbnQ7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpICE9IHBvc0xpc3QtPnNpemUoKTsgKytpKSB7CisgICAgICAgICAg ICAgICAgaWYgKCFwb3NMaXN0LT5hdChpKS0+aXNPdXRPZkZsb3dSZW5kZXJGbG93VGhyZWFkKCkp CisgICAgICAgICAgICAgICAgICAgIHdyaXRlTGF5ZXJzKHRzLCByb290TGF5ZXIsIHBvc0xpc3Qt PmF0KGkpLCBwYWludERpcnR5UmVjdCwgY3VyckluZGVudCwgYmVoYXZpb3IpOworICAgICAgICAg ICAgfQorICAgICAgICB9CiAgICAgfQogICAgIAogICAgIC8vIEFsdG91Z2ggdGhlIFJlbmRlckZs b3dUaHJlYWQgcmVxdWlyZXMgYSBsYXllciwgaXQgaXMgbm90IGNvbGxlY3RlZCBieSBpdHMgcGFy ZW50LAo=