132038 2014-04-22 21:57:05 -0700 Cursor doesn't change back to pointer when leaving Mail 2015-03-26 14:44:03 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar, Regression P2 Normal --- 132142 1 rniwa rniwa ap commit-queue darin enrica mitz sam oldest_to_newest 1003178 0 rniwa 2014-04-22 21:57:05 -0700 Reproduction steps: 1. Visit simple-rte.rniwa.com 2. Focus the textarea in the bottom. Observe that the cursor is now I-beam. 3. Move the cursor towards the right edge of the Safari window (but keep it inside the window). 4. Rapidly move the mouse cursor out of the window. Expected result: The cursor changes to pointer Actual result: The cursor remains I-beam. <rdar://problem/15345851> 1003179 1 rniwa 2014-04-22 21:57:31 -0700 This bug is partially caused by http://trac.webkit.org/changeset/147739. 1003182 2 229955 rniwa 2014-04-22 22:08:35 -0700 Created attachment 229955 Fixes the bug 1003184 3 229955 ap 2014-04-22 22:15:26 -0700 Comment on attachment 229955 Fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=229955&action=review > Source/WebCore/page/EventHandler.cpp:1386 > + bool editable = node ? node->hasEditableStyle() : false; I think that "node && node->hasEditableStyle()" would be more readable than a ternary. 1003189 4 rniwa 2014-04-22 22:35:26 -0700 (In reply to comment #3) > (From update of attachment 229955 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=229955&action=review > > > Source/WebCore/page/EventHandler.cpp:1386 > > + bool editable = node ? node->hasEditableStyle() : false; > > I think that "node && node->hasEditableStyle()" would be more readable than a ternary. Will fix. Thanks for the review! 1003190 5 229957 rniwa 2014-04-22 22:35:48 -0700 Created attachment 229957 Patch for landing 1003202 6 229957 commit-queue 2014-04-22 23:11:50 -0700 Comment on attachment 229957 Patch for landing Clearing flags on attachment: 229957 Committed r167700: <http://trac.webkit.org/changeset/167700> 1003203 7 commit-queue 2014-04-22 23:11:54 -0700 All reviewed patches have been landed. Closing bug. 1003639 8 229955 darin 2014-04-24 08:50:09 -0700 Comment on attachment 229955 Fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=229955&action=review > Source/WebKit/mac/ChangeLog:14 > + Instead, check whether the NSWindow of the WebView is the key window or not since > + key window appears to control the cursor style in Cocoa as far as I've tested: > + https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/WinPanel/Concepts/ChangingMainKeyWindow.html Did you retest the problems described in <rdar://problem/14619911> to see if it’s still fixed? 1003760 9 commit-queue 2014-04-24 13:55:36 -0700 Re-opened since this is blocked by bug 132142 1080146 10 249459 rniwa 2015-03-25 18:27:18 -0700 Created attachment 249459 Fixes the bug 1080382 11 249508 rniwa 2015-03-26 12:47:25 -0700 Created attachment 249508 Patch 1080383 12 249509 rniwa 2015-03-26 12:48:41 -0700 Created attachment 249509 Fixed change logs 1080409 13 249513 rniwa 2015-03-26 14:41:42 -0700 Created attachment 249513 Reverted the refactroing per Andres' request 1080412 14 rniwa 2015-03-26 14:44:03 -0700 Committed r182026: <http://trac.webkit.org/changeset/182026> 229955 2014-04-22 22:08:35 -0700 2014-04-24 08:50:09 -0700 Fixes the bug bug-132038-20140422220814.patch text/plain 5812 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzY5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE0LTA0LTIyICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEN1cnNvciBkb2Vzbid0IGNoYW5n ZSBiYWNrIHRvIHBvaW50ZXIgd2hlbiBsZWF2aW5nIHRoZSBTYWZhcmkgd2luZG93CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzIwMzgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICByMTQ3NzM5IGluY29ycmVj dGx5IGFkZGVkIGFuIGVhcmx5IGV4aXQgaW4gRXZlbnRIYW5kbGVyOjpzZWxlY3RDdXJzb3Igd2hl biBoaXQgdGVzdCByZXN1bHQgZGlkbid0IGhhdmUKKyAgICAgICAgYW55IG5vZGUgYXNzb2NpYXRl ZCB3aXRoIGl0LiBTaW5jZSB3ZSB3aWxsIGhpdCB0aGlzIGNvZGUgd2hlbiB0aGUgY3Vyc29yIGlz IG91dHNpZGUgb2YgdGhlIFdlYlZpZXcsCisgICAgICAgIHdlIHN0aWxsIG5lZWQgdG8gdGFrZSB0 aGUgQ1VSU09SX0FVVE8gcGF0aCBhcyBkaWQgdGhlIGNvZGUgYmVmb3JlIHIxNDc3MzkuCisKKyAg ICAgICAgTm8gbmV3IHRlc3QgaXMgYWRkZWQgc2luY2UgdGhpcyBiZWhhdmlvciBjYW4ndCBiZSB0 ZXN0ZWQgaW4gRFJUIG9yIFdUUi4KKworICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6c2VsZWN0Q3Vyc29yKToKKwogMjAxNC0w NC0yMiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIERvIG5vdCBw YWludCBib3JkZXIgaW1hZ2Ugd2hlbiB0aGUgYm9yZGVyIHJlY3QgaXMgZW1wdHkuCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCShyZXZpc2lvbiAxNjc2ODgpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMTEs MTAgKzEzMTEsNyBAQCBPcHRpb25hbEN1cnNvciBFdmVudEhhbmRsZXI6OnNlbGVjdEN1cnNvCiAj ZW5kaWYKIAogICAgIE5vZGUqIG5vZGUgPSByZXN1bHQudGFyZ2V0Tm9kZSgpOwotICAgIGlmICgh bm9kZSkKLSAgICAgICAgcmV0dXJuIE5vQ3Vyc29yQ2hhbmdlOwotCi0gICAgYXV0byByZW5kZXJl ciA9IG5vZGUtPnJlbmRlcmVyKCk7CisgICAgYXV0byByZW5kZXJlciA9IG5vZGUgPyBub2RlLT5y ZW5kZXJlcigpIDogMDsKICAgICBSZW5kZXJTdHlsZSogc3R5bGUgPSByZW5kZXJlciA/ICZyZW5k ZXJlci0+c3R5bGUoKSA6IG51bGxwdHI7CiAgICAgYm9vbCBob3Jpem9udGFsVGV4dCA9ICFzdHls ZSB8fCBzdHlsZS0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKTsKICAgICBjb25zdCBDdXJzb3Im IGlCZWFtID0gaG9yaXpvbnRhbFRleHQgPyBpQmVhbUN1cnNvcigpIDogdmVydGljYWxUZXh0Q3Vy c29yKCk7CkBAIC0xMzg2LDcgKzEzODMsNyBAQCBPcHRpb25hbEN1cnNvciBFdmVudEhhbmRsZXI6 OnNlbGVjdEN1cnNvCiAKICAgICBzd2l0Y2ggKHN0eWxlID8gc3R5bGUtPmN1cnNvcigpIDogQ1VS U09SX0FVVE8pIHsKICAgICBjYXNlIENVUlNPUl9BVVRPOiB7Ci0gICAgICAgIGJvb2wgZWRpdGFi bGUgPSBub2RlLT5oYXNFZGl0YWJsZVN0eWxlKCk7CisgICAgICAgIGJvb2wgZWRpdGFibGUgPSBu b2RlID8gbm9kZS0+aGFzRWRpdGFibGVTdHlsZSgpIDogZmFsc2U7CiAKICAgICAgICAgaWYgKHVz ZUhhbmRDdXJzb3Iobm9kZSwgcmVzdWx0LmlzT3ZlckxpbmsoKSwgc2hpZnRLZXkpKQogICAgICAg ICAgICAgcmV0dXJuIGhhbmRDdXJzb3IoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzY5 NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDIxIEBACisyMDE0LTA0LTIyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisg ICAgICAgIEN1cnNvciBkb2Vzbid0IGNoYW5nZSBiYWNrIHRvIHBvaW50ZXIgd2hlbiBsZWF2aW5n IHRoZSBTYWZhcmkgd2luZG93CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzIwMzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBTaW5jZSB0aGUgY3Vyc29yIHR5cGUgaXMgbm93IHVwZGF0ZWQgYXN5bmNocm9u b3VzbHkgYWZ0ZXIgcjE0NzczOSwKKyAgICAgICAgW3dpbmRvdyB3aW5kb3dOdW1iZXJdICE9IFtO U1dpbmRvdyB3aW5kb3dOdW1iZXJBdFBvaW50OltOU0V2ZW50IG1vdXNlTG9jYXRpb25dIGJlbG93 V2luZG93V2l0aFdpbmRvd051bWJlcjowXQorICAgICAgICBldmFsdXRlcyB0byBmYWxzZSBkZXBl bmRpbmcgb24gaG93IGZhc3QgY3Vyc29yIGlzIG1vdmluZy4KKworICAgICAgICBJbnN0ZWFkLCBj aGVjayB3aGV0aGVyIHRoZSBOU1dpbmRvdyBvZiB0aGUgV2ViVmlldyBpcyB0aGUga2V5IHdpbmRv dyBvciBub3Qgc2luY2UKKyAgICAgICAga2V5IHdpbmRvdyBhcHBlYXJzIHRvIGNvbnRyb2wgdGhl IGN1cnNvciBzdHlsZSBpbiBDb2NvYSBhcyBmYXIgYXMgSSd2ZSB0ZXN0ZWQ6CisgICAgICAgIGh0 dHBzOi8vZGV2ZWxvcGVyLmFwcGxlLmNvbS9saWJyYXJ5L21hYy9kb2N1bWVudGF0aW9uL0NvY29h L0NvbmNlcHR1YWwvV2luUGFuZWwvQ29uY2VwdHMvQ2hhbmdpbmdNYWluS2V5V2luZG93Lmh0bWwK KworICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW06CisgICAgICAgIChX ZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpzZXRDdXJzb3IpOgorCiAyMDE0LTA0LTIyICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IGlPUyBoaXQtdGVz dGluZyBkb2VzIG5vdCB3b3JrIHdoZW4gcGFnZSBpcyB6b29tZWQKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQkocmV2aXNpb24gMTY3Njg4 KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQkod29y a2luZyBjb3B5KQpAQCAtMzI0LDEwICszMjQsNyBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjpzZXRD dXJzb3IoY29uc3QgV2ViCiAgICAgICAgIHJldHVybjsKIAogICAgIE5TV2luZG93ICp3aW5kb3cg PSBbbV93a1ZpZXcgd2luZG93XTsKLSAgICBpZiAoIXdpbmRvdykKLSAgICAgICAgcmV0dXJuOwot Ci0gICAgaWYgKFt3aW5kb3cgd2luZG93TnVtYmVyXSAhPSBbTlNXaW5kb3cgd2luZG93TnVtYmVy QXRQb2ludDpbTlNFdmVudCBtb3VzZUxvY2F0aW9uXSBiZWxvd1dpbmRvd1dpdGhXaW5kb3dOdW1i ZXI6MF0pCisgICAgaWYgKCF3aW5kb3cgfHwgIVt3aW5kb3cgaXNLZXlXaW5kb3ddKQogICAgICAg ICByZXR1cm47CiAKICAgICBOU0N1cnNvciAqcGxhdGZvcm1DdXJzb3IgPSBjdXJzb3IucGxhdGZv cm1DdXJzb3IoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzY5NSkKKysrIFNv dXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDE0LTA0LTIyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAg IEN1cnNvciBkb2Vzbid0IGNoYW5nZSBiYWNrIHRvIHBvaW50ZXIgd2hlbiBsZWF2aW5nIHRoZSBT YWZhcmkgd2luZG93CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzIwMzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBTaW5jZSB0aGUgY3Vyc29yIHR5cGUgaXMgbm93IHVwZGF0ZWQgYXN5bmNocm9ub3VzbHkg YWZ0ZXIgcjE0NzczOSwKKyAgICAgICAgW3dpbmRvdyB3aW5kb3dOdW1iZXJdICE9IFtOU1dpbmRv dyB3aW5kb3dOdW1iZXJBdFBvaW50OltOU0V2ZW50IG1vdXNlTG9jYXRpb25dIGJlbG93V2luZG93 V2l0aFdpbmRvd051bWJlcjowXQorICAgICAgICBldmFsdXRlcyB0byBmYWxzZSBkZXBlbmRpbmcg b24gaG93IGZhc3QgY3Vyc29yIGlzIG1vdmluZy4KKworICAgICAgICBJbnN0ZWFkLCBjaGVjayB3 aGV0aGVyIHRoZSBOU1dpbmRvdyBvZiB0aGUgV2ViVmlldyBpcyB0aGUga2V5IHdpbmRvdyBvciBu b3Qgc2luY2UKKyAgICAgICAga2V5IHdpbmRvdyBhcHBlYXJzIHRvIGNvbnRyb2wgdGhlIGN1cnNv ciBzdHlsZSBpbiBDb2NvYSBhcyBmYXIgYXMgSSd2ZSB0ZXN0ZWQ6CisgICAgICAgIGh0dHBzOi8v ZGV2ZWxvcGVyLmFwcGxlLmNvbS9saWJyYXJ5L21hYy9kb2N1bWVudGF0aW9uL0NvY29hL0NvbmNl cHR1YWwvV2luUGFuZWwvQ29uY2VwdHMvQ2hhbmdpbmdNYWluS2V5V2luZG93Lmh0bWwKKworICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5tbToKKyAgICAgICAgKFdlYkNo cm9tZUNsaWVudDo6c2V0Q3Vyc29yKToKKwogMjAxNC0wNC0yMiAgQ29tbWl0IFF1ZXVlICA8Y29t bWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQg cjE2NzY3NC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9y dC9XZWJDaHJvbWVDbGllbnQubW0JKHJldmlzaW9uIDE2NzY4OCkKKysrIFNvdXJjZS9XZWJLaXQv bWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5tbQkod29ya2luZyBjb3B5KQpAQCAt NzczLDEwICs3NzMsNyBAQCB2b2lkIFdlYkNocm9tZUNsaWVudDo6c2V0Q3Vyc29yKGNvbnN0IFdl CiAgICAgICAgIHJldHVybjsKIAogICAgIE5TV2luZG93ICp3aW5kb3cgPSBbbV93ZWJWaWV3IHdp bmRvd107Ci0gICAgaWYgKCF3aW5kb3cpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlmIChbd2lu ZG93IHdpbmRvd051bWJlcl0gIT0gW05TV2luZG93IHdpbmRvd051bWJlckF0UG9pbnQ6W05TRXZl bnQgbW91c2VMb2NhdGlvbl0gYmVsb3dXaW5kb3dXaXRoV2luZG93TnVtYmVyOjBdKQorICAgIGlm ICghd2luZG93IHx8ICFbd2luZG93IGlzS2V5V2luZG93XSkKICAgICAgICAgcmV0dXJuOwogCiAg ICAgTlNDdXJzb3IgKnBsYXRmb3JtQ3Vyc29yID0gY3Vyc29yLnBsYXRmb3JtQ3Vyc29yKCk7Cg== 229957 2014-04-22 22:35:48 -0700 2015-03-25 18:27:15 -0700 Patch for landing bug-132038-20140422223527.patch text/plain 5820 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzY5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE0LTA0LTIyICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEN1cnNvciBkb2Vzbid0IGNoYW5n ZSBiYWNrIHRvIHBvaW50ZXIgd2hlbiBsZWF2aW5nIHRoZSBTYWZhcmkgd2luZG93CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzIwMzgKKworICAgICAg ICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgorCisgICAgICAgIHIxNDc3MzkgaW5j b3JyZWN0bHkgYWRkZWQgYW4gZWFybHkgZXhpdCBpbiBFdmVudEhhbmRsZXI6OnNlbGVjdEN1cnNv ciB3aGVuIGhpdCB0ZXN0IHJlc3VsdCBkaWRuJ3QgaGF2ZQorICAgICAgICBhbnkgbm9kZSBhc3Nv Y2lhdGVkIHdpdGggaXQuIFNpbmNlIHdlIHdpbGwgaGl0IHRoaXMgY29kZSB3aGVuIHRoZSBjdXJz b3IgaXMgb3V0c2lkZSBvZiB0aGUgV2ViVmlldywKKyAgICAgICAgd2Ugc3RpbGwgbmVlZCB0byB0 YWtlIHRoZSBDVVJTT1JfQVVUTyBwYXRoIGFzIGRpZCB0aGUgY29kZSBiZWZvcmUgcjE0NzczOS4K KworICAgICAgICBObyBuZXcgdGVzdCBpcyBhZGRlZCBzaW5jZSB0aGlzIGJlaGF2aW9yIGNhbid0 IGJlIHRlc3RlZCBpbiBEUlQgb3IgV1RSLgorCisgICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpzZWxlY3RDdXJzb3IpOgorCiAy MDE0LTA0LTIyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgRG8g bm90IHBhaW50IGJvcmRlciBpbWFnZSB3aGVuIHRoZSBib3JkZXIgcmVjdCBpcyBlbXB0eS4KSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAJKHJldmlzaW9uIDE2NzY4OCkKKysr IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTMxMSwxMCArMTMxMSw3IEBAIE9wdGlvbmFsQ3Vyc29yIEV2ZW50SGFuZGxlcjo6c2VsZWN0Q3Vy c28KICNlbmRpZgogCiAgICAgTm9kZSogbm9kZSA9IHJlc3VsdC50YXJnZXROb2RlKCk7Ci0gICAg aWYgKCFub2RlKQotICAgICAgICByZXR1cm4gTm9DdXJzb3JDaGFuZ2U7Ci0KLSAgICBhdXRvIHJl bmRlcmVyID0gbm9kZS0+cmVuZGVyZXIoKTsKKyAgICBhdXRvIHJlbmRlcmVyID0gbm9kZSA/IG5v ZGUtPnJlbmRlcmVyKCkgOiAwOwogICAgIFJlbmRlclN0eWxlKiBzdHlsZSA9IHJlbmRlcmVyID8g JnJlbmRlcmVyLT5zdHlsZSgpIDogbnVsbHB0cjsKICAgICBib29sIGhvcml6b250YWxUZXh0ID0g IXN0eWxlIHx8IHN0eWxlLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpOwogICAgIGNvbnN0IEN1 cnNvciYgaUJlYW0gPSBob3Jpem9udGFsVGV4dCA/IGlCZWFtQ3Vyc29yKCkgOiB2ZXJ0aWNhbFRl eHRDdXJzb3IoKTsKQEAgLTEzODYsNyArMTM4Myw3IEBAIE9wdGlvbmFsQ3Vyc29yIEV2ZW50SGFu ZGxlcjo6c2VsZWN0Q3Vyc28KIAogICAgIHN3aXRjaCAoc3R5bGUgPyBzdHlsZS0+Y3Vyc29yKCkg OiBDVVJTT1JfQVVUTykgewogICAgIGNhc2UgQ1VSU09SX0FVVE86IHsKLSAgICAgICAgYm9vbCBl ZGl0YWJsZSA9IG5vZGUtPmhhc0VkaXRhYmxlU3R5bGUoKTsKKyAgICAgICAgYm9vbCBlZGl0YWJs ZSA9IG5vZGUgJiYgbm9kZS0+aGFzRWRpdGFibGVTdHlsZSgpOwogCiAgICAgICAgIGlmICh1c2VI YW5kQ3Vyc29yKG5vZGUsIHJlc3VsdC5pc092ZXJMaW5rKCksIHNoaWZ0S2V5KSkKICAgICAgICAg ICAgIHJldHVybiBoYW5kQ3Vyc29yKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjc2OTUp CisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwy MSBAQAorMjAxNC0wNC0yMiAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAg ICAgICBDdXJzb3IgZG9lc24ndCBjaGFuZ2UgYmFjayB0byBwb2ludGVyIHdoZW4gbGVhdmluZyB0 aGUgU2FmYXJpIHdpbmRvdworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTMyMDM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtv di4KKworICAgICAgICBTaW5jZSB0aGUgY3Vyc29yIHR5cGUgaXMgbm93IHVwZGF0ZWQgYXN5bmNo cm9ub3VzbHkgYWZ0ZXIgcjE0NzczOSwKKyAgICAgICAgW3dpbmRvdyB3aW5kb3dOdW1iZXJdICE9 IFtOU1dpbmRvdyB3aW5kb3dOdW1iZXJBdFBvaW50OltOU0V2ZW50IG1vdXNlTG9jYXRpb25dIGJl bG93V2luZG93V2l0aFdpbmRvd051bWJlcjowXQorICAgICAgICBldmFsdXRlcyB0byBmYWxzZSBk ZXBlbmRpbmcgb24gaG93IGZhc3QgY3Vyc29yIGlzIG1vdmluZy4KKworICAgICAgICBJbnN0ZWFk LCBjaGVjayB3aGV0aGVyIHRoZSBOU1dpbmRvdyBvZiB0aGUgV2ViVmlldyBpcyB0aGUga2V5IHdp bmRvdyBvciBub3Qgc2luY2UKKyAgICAgICAga2V5IHdpbmRvdyBhcHBlYXJzIHRvIGNvbnRyb2wg dGhlIGN1cnNvciBzdHlsZSBpbiBDb2NvYSBhcyBmYXIgYXMgSSd2ZSB0ZXN0ZWQ6CisgICAgICAg IGh0dHBzOi8vZGV2ZWxvcGVyLmFwcGxlLmNvbS9saWJyYXJ5L21hYy9kb2N1bWVudGF0aW9uL0Nv Y29hL0NvbmNlcHR1YWwvV2luUGFuZWwvQ29uY2VwdHMvQ2hhbmdpbmdNYWluS2V5V2luZG93Lmh0 bWwKKworICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW06CisgICAgICAg IChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpzZXRDdXJzb3IpOgorCiAyMDE0LTA0LTIyICBDaHJp cyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IGlPUyBoaXQt dGVzdGluZyBkb2VzIG5vdCB3b3JrIHdoZW4gcGFnZSBpcyB6b29tZWQKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQkocmV2aXNpb24gMTY3 Njg4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQko d29ya2luZyBjb3B5KQpAQCAtMzI0LDEwICszMjQsNyBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjpz ZXRDdXJzb3IoY29uc3QgV2ViCiAgICAgICAgIHJldHVybjsKIAogICAgIE5TV2luZG93ICp3aW5k b3cgPSBbbV93a1ZpZXcgd2luZG93XTsKLSAgICBpZiAoIXdpbmRvdykKLSAgICAgICAgcmV0dXJu OwotCi0gICAgaWYgKFt3aW5kb3cgd2luZG93TnVtYmVyXSAhPSBbTlNXaW5kb3cgd2luZG93TnVt YmVyQXRQb2ludDpbTlNFdmVudCBtb3VzZUxvY2F0aW9uXSBiZWxvd1dpbmRvd1dpdGhXaW5kb3dO dW1iZXI6MF0pCisgICAgaWYgKCF3aW5kb3cgfHwgIVt3aW5kb3cgaXNLZXlXaW5kb3ddKQogICAg ICAgICByZXR1cm47CiAKICAgICBOU0N1cnNvciAqcGxhdGZvcm1DdXJzb3IgPSBjdXJzb3IucGxh dGZvcm1DdXJzb3IoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzY5NSkKKysr IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIx IEBACisyMDE0LTA0LTIyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAg ICAgIEN1cnNvciBkb2Vzbid0IGNoYW5nZSBiYWNrIHRvIHBvaW50ZXIgd2hlbiBsZWF2aW5nIHRo ZSBTYWZhcmkgd2luZG93CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzIwMzgKKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292 LgorCisgICAgICAgIFNpbmNlIHRoZSBjdXJzb3IgdHlwZSBpcyBub3cgdXBkYXRlZCBhc3luY2hy b25vdXNseSBhZnRlciByMTQ3NzM5LAorICAgICAgICBbd2luZG93IHdpbmRvd051bWJlcl0gIT0g W05TV2luZG93IHdpbmRvd051bWJlckF0UG9pbnQ6W05TRXZlbnQgbW91c2VMb2NhdGlvbl0gYmVs b3dXaW5kb3dXaXRoV2luZG93TnVtYmVyOjBdCisgICAgICAgIGV2YWx1dGVzIHRvIGZhbHNlIGRl cGVuZGluZyBvbiBob3cgZmFzdCBjdXJzb3IgaXMgbW92aW5nLgorCisgICAgICAgIEluc3RlYWQs IGNoZWNrIHdoZXRoZXIgdGhlIE5TV2luZG93IG9mIHRoZSBXZWJWaWV3IGlzIHRoZSBrZXkgd2lu ZG93IG9yIG5vdCBzaW5jZQorICAgICAgICBrZXkgd2luZG93IGFwcGVhcnMgdG8gY29udHJvbCB0 aGUgY3Vyc29yIHN0eWxlIGluIENvY29hIGFzIGZhciBhcyBJJ3ZlIHRlc3RlZDoKKyAgICAgICAg aHR0cHM6Ly9kZXZlbG9wZXIuYXBwbGUuY29tL2xpYnJhcnkvbWFjL2RvY3VtZW50YXRpb24vQ29j b2EvQ29uY2VwdHVhbC9XaW5QYW5lbC9Db25jZXB0cy9DaGFuZ2luZ01haW5LZXlXaW5kb3cuaHRt bAorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50Lm1tOgorICAgICAg ICAoV2ViQ2hyb21lQ2xpZW50OjpzZXRDdXJzb3IpOgorCiAyMDE0LTA0LTIyICBDb21taXQgUXVl dWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByMTY3Njc0LgpJbmRleDogU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQv V2ViQ2hyb21lQ2xpZW50Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNv cmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5tbQkocmV2aXNpb24gMTY3Njg4KQorKysgU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50Lm1tCSh3b3JraW5nIGNv cHkpCkBAIC03NzMsMTAgKzc3Myw3IEBAIHZvaWQgV2ViQ2hyb21lQ2xpZW50OjpzZXRDdXJzb3Io Y29uc3QgV2UKICAgICAgICAgcmV0dXJuOwogCiAgICAgTlNXaW5kb3cgKndpbmRvdyA9IFttX3dl YlZpZXcgd2luZG93XTsKLSAgICBpZiAoIXdpbmRvdykKLSAgICAgICAgcmV0dXJuOwotCi0gICAg aWYgKFt3aW5kb3cgd2luZG93TnVtYmVyXSAhPSBbTlNXaW5kb3cgd2luZG93TnVtYmVyQXRQb2lu dDpbTlNFdmVudCBtb3VzZUxvY2F0aW9uXSBiZWxvd1dpbmRvd1dpdGhXaW5kb3dOdW1iZXI6MF0p CisgICAgaWYgKCF3aW5kb3cgfHwgIVt3aW5kb3cgaXNLZXlXaW5kb3ddKQogICAgICAgICByZXR1 cm47CiAKICAgICBOU0N1cnNvciAqcGxhdGZvcm1DdXJzb3IgPSBjdXJzb3IucGxhdGZvcm1DdXJz b3IoKTsK 249459 2015-03-25 18:27:18 -0700 2015-03-26 12:47:21 -0700 Fixes the bug bug-132038-20150325182641.patch text/plain 2621 rniwa SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTk4OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE1LTAzLTI1ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEN1cnNvciBkb2Vzbid0IGNoYW5n ZSBiYWNrIHRvIHBvaW50ZXIgd2hlbiBsZWF2aW5nIE1haWwKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjAzOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIHRoZSBidWcgYnkgYWRkaW5nIGEgY3Vy c29yIHJlY3Qgc28gdGhhdCBBcHBLaXQgd2lsbCByZXNldCB0aGUgY3Vyc29yIGFzIGl0IGxlYXZl cyB0aGUgV2ViVmlldy4KKyAgICAgICAgV2UgdXNlIG5pbCBjdXJzb3IgaGVyZSBzaW5jZSB3ZSBt YW51YWxseSB1cGRhdGUgdGhlIGN1cnNvciBieSBjYWxsaW5nIFtOU0N1cnNvciBzZXRdLgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcg cmVzZXRDdXJzb3JSZWN0c10pOgorCiAyMDE1LTAzLTI1ICBUaW0gSG9ydG9uICA8dGltb3RoeV9o b3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIHByZWZlcmVuY2UgdG8gcHJldmVudCAi dXNlci1zY2FsYWJsZT1ubyIgZnJvbSBoYXZpbmcgYW55IGVmZmVjdApJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkocmV2aXNpb24gMTgxOTcyKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCSh3b3JraW5nIGNvcHkp CkBAIC00ODcsNiArNDg3LDExIEBAIC0gKEJPT0wpcmVzaWduRmlyc3RSZXNwb25kZXIKICAgICBy ZXR1cm4gWUVTOwogfQogCistICh2b2lkKXJlc2V0Q3Vyc29yUmVjdHMKK3sKKyAgICBbc2VsZiBh ZGRDdXJzb3JSZWN0OltzZWxmIHZpc2libGVSZWN0XSBjdXJzb3I6bmlsXTsKK30KKwogLSAodm9p ZCl2aWV3V2lsbFN0YXJ0TGl2ZVJlc2l6ZQogewogICAgIF9kYXRhLT5fcGFnZS0+dmlld1dpbGxT dGFydExpdmVSZXNpemUoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTk4OSkK KysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE2IEBACisyMDE1LTAzLTI1ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisg ICAgICAgIEN1cnNvciBkb2Vzbid0IGNoYW5nZSBiYWNrIHRvIHBvaW50ZXIgd2hlbiBsZWF2aW5n IE1haWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz MjAzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZp eGVkIHRoZSBidWcgYnkgYWRkaW5nIGEgY3Vyc29yIHJlY3Qgc28gdGhhdCBBcHBLaXQgd2lsbCBy ZXNldCB0aGUgY3Vyc29yIGFzIGl0IGxlYXZlcyB0aGUgV2ViVmlldy4KKyAgICAgICAgV2UgdXNl IG5pbCBjdXJzb3IgaGVyZSBzaW5jZSB3ZSBtYW51YWxseSB1cGRhdGUgdGhlIGN1cnNvciBieSBj YWxsaW5nIFtOU0N1cnNvciBzZXRdLgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgor ICAgICAgICAoLVtXZWJWaWV3IHJlc2V0Q3Vyc29yUmVjdHNdKToKKwogMjAxNS0wMy0yNCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBkZXNpZ25h dGVkIGluaXRpYWxpemVyIHZpb2xhdGlvbnMKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlZpZXcubW0JKHJldmlzaW9uIDE4MTk3MSkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzgyNyw2ICszODI3LDExIEBAICsgKE5TQ3Vy c29yICopX3BvaW50aW5nSGFuZEN1cnNvcgogewogICAgIHJldHVybiBoYW5kQ3Vyc29yKCkucGxh dGZvcm1DdXJzb3IoKTsKIH0KKworLSAodm9pZClyZXNldEN1cnNvclJlY3RzCit7CisgICAgW3Nl bGYgYWRkQ3Vyc29yUmVjdDpbc2VsZiB2aXNpYmxlUmVjdF0gY3Vyc29yOm5pbF07Cit9CiAjZW5k aWYKIAogLSAoQk9PTClfcG9zdHNBY2NlbGVyYXRlZENvbXBvc2l0aW5nTm90aWZpY2F0aW9ucwo= 249508 2015-03-26 12:47:25 -0700 2015-03-26 12:48:37 -0700 Patch bug-132038-20150326124648.patch text/plain 9098 rniwa SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjAyMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE1LTAzLTI2ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEN1cnNvciBkb2Vzbid0IGNoYW5n ZSBiYWNrIHRvIHBvaW50ZXIgd2hlbiBsZWF2aW5nIE1haWwKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjAzOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIHRoZSBidWcgYnkgYWRkaW5nIGEgY3Vy c29yIHJlY3QgYW5kIG1ha2luZyB0aGUgcHJpbWFyeSB0cmFja2luZyBhcmVhIHVwZGF0ZSB0aGUg Y3Vyc29yIHNvIHRoYXQKKyAgICAgICAgQXBwS2l0IHdpbGwgcmVzZXQgdGhlIGN1cnNvciBhcyBp dCBsZWF2ZXMgdGhlIFdlYlZpZXcuCisKKyAgICAgICAgV2UgdXNlIG5pbCBjdXJzb3IgaGVyZSBz aW5jZSB3ZSBtYW51YWxseSB1cGRhdGUgdGhlIGN1cnNvciBieSBjYWxsaW5nIFtOU0N1cnNvciBz ZXRdLgorCisgICAgICAgIEFsc28gY29uc29saWRhdGVkIHRoZSBjb2RlIHRvIGNyZWF0ZSB0aGUg cHJpbWFyeSB0cmFja2luZyBhcmVhIGludG8gX3VwZGF0ZVByaW1hcnlUcmFja2luZ0FyZWEgcmF0 aGVyCisgICAgICAgIHRoYW4gcHJvdmlkaW5nIGEgZ2VuZXJpYyBzZXR0ZXIgYW5kIHVwZGF0aW5n IGl0IGluIHJlY29tbWVuZGVkU2Nyb2xsYmFyU3R5bGVEaWRDaGFuZ2UuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyByZXNldEN1cnNv clJlY3RzXSk6IEFkZGVkLgorICAgICAgICAoLVtXS1ZpZXcgX3VwZGF0ZVByaW1hcnlUcmFja2lu Z0FyZWE6XSk6IEV4dHJhY3RlZCBmcm9tIGluaXRXaXRoRnJhbWUuCisgICAgICAgICgtW1dLVmll dyBpbml0V2l0aEZyYW1lOnByb2Nlc3NQb29sOmNvbmZpZ3VyYXRpb246d2ViVmlldzpdKToKKyAg ICAgICAgKC1bV0tWaWV3IF9wcmltYXJ5VHJhY2tpbmdBcmVhXSk6IERlbGV0ZWQuCisgICAgICAg ICgtW1dLVmlldyBfc2V0UHJpbWFyeVRyYWNraW5nQXJlYTpdKTogRGVsZXRlZC4KKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oOiBSZXBsYWNlZCBfcHJpbWFyeVRy YWNraW5nQXJlYSBieSBfdXBkYXRlUHJpbWFyeVRyYWNraW5nQXJlYS4KKyAgICAgICAgKiBVSVBy b2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50 SW1wbDo6cmVjb21tZW5kZWRTY3JvbGxiYXJTdHlsZURpZENoYW5nZSk6CisKIDIwMTUtMDMtMjYg IE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtM aW51eF0gU2VjY29tcEZpbHRlcnM6IGltcHJvdmUgdGhlIHBvcnQtYWdub3N0aWMgd2hpdGVsaXN0 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCShyZXZp c2lvbiAxODE5OTApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcu bW0JKHdvcmtpbmcgY29weSkKQEAgLTQ4Nyw2ICs0ODcsMTEgQEAgLSAoQk9PTClyZXNpZ25GaXJz dFJlc3BvbmRlcgogICAgIHJldHVybiBZRVM7CiB9CiAKKy0gKHZvaWQpcmVzZXRDdXJzb3JSZWN0 cworeworICAgIFtzZWxmIGFkZEN1cnNvclJlY3Q6W3NlbGYgdmlzaWJsZVJlY3RdIGN1cnNvcjpu aWxdOworfQorCiAtICh2b2lkKXZpZXdXaWxsU3RhcnRMaXZlUmVzaXplCiB7CiAgICAgX2RhdGEt Pl9wYWdlLT52aWV3V2lsbFN0YXJ0TGl2ZVJlc2l6ZSgpOwpAQCAtMzcwMCwxNiArMzcwNSwyMSBA QCAtIChCT09MKV9zdXBwcmVzc1Zpc2liaWxpdHlVcGRhdGVzCiAgICAgcmV0dXJuIF9kYXRhLT5f cGFnZS0+c3VwcHJlc3NWaXNpYmlsaXR5VXBkYXRlcygpOwogfQogCi0tIChOU1RyYWNraW5nQXJl YSAqKV9wcmltYXJ5VHJhY2tpbmdBcmVhCistICh2b2lkKV91cGRhdGVQcmltYXJ5VHJhY2tpbmdB cmVhOihCT09MKWFsd2F5c0FjdGl2ZQogewotICAgIHJldHVybiBfZGF0YS0+X3ByaW1hcnlUcmFj a2luZ0FyZWEuZ2V0KCk7Ci19CisgICAgLy8gTGVnYWN5IHN0eWxlIHNjcm9sbGJhcnMgaGF2ZSBk ZXNpZ24gZGV0YWlscyB0aGF0IHJlbHkgb24gdHJhY2tpbmcgdGhlIG1vdXNlIGFsbCB0aGUgdGlt ZS4KKyAgICBOU1RyYWNraW5nQXJlYU9wdGlvbnMgb3B0aW9ucyA9IE5TVHJhY2tpbmdNb3VzZU1v dmVkIHwgTlNUcmFja2luZ01vdXNlRW50ZXJlZEFuZEV4aXRlZCB8IE5TVHJhY2tpbmdJblZpc2li bGVSZWN0IHwgTlNUcmFja2luZ0N1cnNvclVwZGF0ZTsKKyAgICBpZiAoYWx3YXlzQWN0aXZlKQor ICAgICAgICBvcHRpb25zIHw9IE5TVHJhY2tpbmdBY3RpdmVBbHdheXM7CisgICAgZWxzZQorICAg ICAgICBvcHRpb25zIHw9IE5TVHJhY2tpbmdBY3RpdmVJbktleVdpbmRvdzsKIAotLSAodm9pZClf c2V0UHJpbWFyeVRyYWNraW5nQXJlYTooTlNUcmFja2luZ0FyZWEgKil0cmFja2luZ0FyZWEKLXsK LSAgICBbc2VsZiByZW1vdmVUcmFja2luZ0FyZWE6X2RhdGEtPl9wcmltYXJ5VHJhY2tpbmdBcmVh LmdldCgpXTsKLSAgICBfZGF0YS0+X3ByaW1hcnlUcmFja2luZ0FyZWEgPSB0cmFja2luZ0FyZWE7 Ci0gICAgW3NlbGYgYWRkVHJhY2tpbmdBcmVhOnRyYWNraW5nQXJlYV07CisgICAgaWYgKF9kYXRh LT5fcHJpbWFyeVRyYWNraW5nQXJlYSkKKyAgICAgICAgW3NlbGYgcmVtb3ZlVHJhY2tpbmdBcmVh Ol9kYXRhLT5fcHJpbWFyeVRyYWNraW5nQXJlYS5nZXQoKV07CisKKyAgICBfZGF0YS0+X3ByaW1h cnlUcmFja2luZ0FyZWEgPSBhZG9wdE5TKFtbTlNUcmFja2luZ0FyZWEgYWxsb2NdIGluaXRXaXRo UmVjdDpfZnJhbWUgb3B0aW9uczpvcHRpb25zIG93bmVyOnNlbGYgdXNlckluZm86bmlsXSk7CisK KyAgICBbc2VsZiBhZGRUcmFja2luZ0FyZWE6X2RhdGEtPl9wcmltYXJ5VHJhY2tpbmdBcmVhLmdl dCgpXTsKIH0KIAogLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoRnJhbWU6KE5TUmVjdClmcmFtZSBw cm9jZXNzUG9vbDooV2ViUHJvY2Vzc1Bvb2wmKXByb2Nlc3NQb29sIGNvbmZpZ3VyYXRpb246KFdl YlBhZ2VDb25maWd1cmF0aW9uKXdlYlBhZ2VDb25maWd1cmF0aW9uIHdlYlZpZXc6KFdLV2ViVmll dyAqKXdlYlZpZXcKQEAgLTM3MjIsMTYgKzM3MzIsOCBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdFdp dGhGcmFtZTooTlNSZWN0KWZyCiAKICAgICBJbml0aWFsaXplV2ViS2l0MigpOwogCi0gICAgLy8g TGVnYWN5IHN0eWxlIHNjcm9sbGJhcnMgaGF2ZSBkZXNpZ24gZGV0YWlscyB0aGF0IHJlbHkgb24g dHJhY2tpbmcgdGhlIG1vdXNlIGFsbCB0aGUgdGltZS4KLSAgICBOU1RyYWNraW5nQXJlYU9wdGlv bnMgb3B0aW9ucyA9IE5TVHJhY2tpbmdNb3VzZU1vdmVkIHwgTlNUcmFja2luZ01vdXNlRW50ZXJl ZEFuZEV4aXRlZCB8IE5TVHJhY2tpbmdJblZpc2libGVSZWN0OwotICAgIGlmIChXS1JlY29tbWVu ZGVkU2Nyb2xsZXJTdHlsZSgpID09IE5TU2Nyb2xsZXJTdHlsZUxlZ2FjeSkKLSAgICAgICAgb3B0 aW9ucyB8PSBOU1RyYWNraW5nQWN0aXZlQWx3YXlzOwotICAgIGVsc2UKLSAgICAgICAgb3B0aW9u cyB8PSBOU1RyYWNraW5nQWN0aXZlSW5LZXlXaW5kb3c7Ci0KICAgICBfZGF0YSA9IFtbV0tWaWV3 RGF0YSBhbGxvY10gaW5pdF07Ci0gICAgX2RhdGEtPl9wcmltYXJ5VHJhY2tpbmdBcmVhID0gYWRv cHROUyhbW05TVHJhY2tpbmdBcmVhIGFsbG9jXSBpbml0V2l0aFJlY3Q6ZnJhbWUgb3B0aW9uczpv cHRpb25zIG93bmVyOnNlbGYgdXNlckluZm86bmlsXSk7Ci0gICAgW3NlbGYgYWRkVHJhY2tpbmdB cmVhOl9kYXRhLT5fcHJpbWFyeVRyYWNraW5nQXJlYS5nZXQoKV07CisgICAgW3NlbGYgX3VwZGF0 ZVByaW1hcnlUcmFja2luZ0FyZWE6V0tSZWNvbW1lbmRlZFNjcm9sbGVyU3R5bGUoKSA9PSBOU1Nj cm9sbGVyU3R5bGVMZWdhY3ldOwogCiAgICAgX2RhdGEtPl9wYWdlQ2xpZW50ID0gc3RkOjptYWtl X3VuaXF1ZTxQYWdlQ2xpZW50SW1wbD4oc2VsZiwgd2ViVmlldyk7CiAgICAgX2RhdGEtPl9wYWdl ID0gcHJvY2Vzc1Bvb2wuY3JlYXRlV2ViUGFnZSgqX2RhdGEtPl9wYWdlQ2xpZW50LCBXVEY6Om1v dmUod2ViUGFnZUNvbmZpZ3VyYXRpb24pKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaAkocmV2aXNpb24gMTgxOTkwKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTQyLDcgKzE0Miw3IEBAIEBpbnRlcmZhY2UgV0tWaWV3ICgpCiAtICh2b2lk KV9kaWRQZXJmb3JtQWN0aW9uTWVudUhpdFRlc3Q6KGNvbnN0IFdlYktpdDo6QWN0aW9uTWVudUhp dFRlc3RSZXN1bHQmKWhpdFRlc3RSZXN1bHQgZm9ySW1tZWRpYXRlQWN0aW9uOihCT09MKWZvcklt bWVkaWF0ZUFjdGlvbiB1c2VyRGF0YTooQVBJOjpPYmplY3QqKXVzZXJEYXRhOwogI2VuZGlmCiAK LUBwcm9wZXJ0eSAobm9uYXRvbWljLCByZXRhaW4sIHNldHRlcj1fc2V0UHJpbWFyeVRyYWNraW5n QXJlYTopIE5TVHJhY2tpbmdBcmVhICpfcHJpbWFyeVRyYWNraW5nQXJlYTsKKy0gKHZvaWQpX3Vw ZGF0ZVByaW1hcnlUcmFja2luZ0FyZWE6KEJPT0wpYWx3YXlzQWN0aXZlOwogCiBAcHJvcGVydHkg KHJlYWRvbmx5KSBOU1dpbmRvdyAqX3RhcmdldFdpbmRvd0Zvck1vdmVQcmVwYXJhdGlvbjsKIApJ bmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1t CShyZXZpc2lvbiAxODE5OTApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VD bGllbnRJbXBsLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02MjYsMTUgKzYyNiw3IEBAIHZvaWQgUGFn ZUNsaWVudEltcGw6OnJlY29yZEF1dG9jb3JyZWN0aW8KIAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6 cmVjb21tZW5kZWRTY3JvbGxiYXJTdHlsZURpZENoYW5nZShTY3JvbGxiYXJTdHlsZSBuZXdTdHls ZSkKIHsKLSAgICAvLyBOb3cgcmUtY3JlYXRlIGEgdHJhY2tpbmcgYXJlYSB3aXRoIHRoZSBhcHBy b3ByaWF0ZSBvcHRpb25zIGdpdmVuIHRoZSBuZXcgc2Nyb2xsYmFyIHN0eWxlCi0gICAgTlNUcmFj a2luZ0FyZWFPcHRpb25zIG9wdGlvbnMgPSBOU1RyYWNraW5nTW91c2VNb3ZlZCB8IE5TVHJhY2tp bmdNb3VzZUVudGVyZWRBbmRFeGl0ZWQgfCBOU1RyYWNraW5nSW5WaXNpYmxlUmVjdDsKLSAgICBp ZiAobmV3U3R5bGUgPT0gU2Nyb2xsYmFyU3R5bGU6OkFsd2F5c1Zpc2libGUpCi0gICAgICAgIG9w dGlvbnMgfD0gTlNUcmFja2luZ0FjdGl2ZUFsd2F5czsKLSAgICBlbHNlCi0gICAgICAgIG9wdGlv bnMgfD0gTlNUcmFja2luZ0FjdGl2ZUluS2V5V2luZG93OwotCi0gICAgUmV0YWluUHRyPE5TVHJh Y2tpbmdBcmVhPiB0cmFja2luZ0FyZWEgPSBhZG9wdE5TKFtbTlNUcmFja2luZ0FyZWEgYWxsb2Nd IGluaXRXaXRoUmVjdDpbbV93a1ZpZXcgZnJhbWVdIG9wdGlvbnM6b3B0aW9ucyBvd25lcjptX3dr VmlldyB1c2VySW5mbzpuaWxdKTsKLSAgICBbbV93a1ZpZXcgX3NldFByaW1hcnlUcmFja2luZ0Fy ZWE6dHJhY2tpbmdBcmVhLmdldCgpXTsKKyAgICBbbV93a1ZpZXcgX3VwZGF0ZVByaW1hcnlUcmFj a2luZ0FyZWE6bmV3U3R5bGUgPT0gU2Nyb2xsYmFyU3R5bGU6OkFsd2F5c1Zpc2libGVdOwogfQog CiB2b2lkIFBhZ2VDbGllbnRJbXBsOjppbnRyaW5zaWNDb250ZW50U2l6ZURpZENoYW5nZShjb25z dCBJbnRTaXplJiBpbnRyaW5zaWNDb250ZW50U2l6ZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4MjAyMikKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE1LTAzLTI2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgorCisgICAgICAgIEN1cnNvciBkb2Vzbid0IGNoYW5nZSBiYWNrIHRvIHBvaW50 ZXIgd2hlbiBsZWF2aW5nIE1haWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzMjAzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEZpeGVkIHRoZSBidWcgYnkgYWRkaW5nIGEgY3Vyc29yIHJlY3QgYW5kIG1h a2luZyB0aGUgcHJpbWFyeSB0cmFja2luZyBhcmVhIHVwZGF0ZSB0aGUgY3Vyc29yIHNvIHRoYXQK KyAgICAgICAgQXBwS2l0IHdpbGwgcmVzZXQgdGhlIGN1cnNvciBhcyBpdCBsZWF2ZXMgdGhlIFdl YlZpZXcuCisKKyAgICAgICAgV2UgdXNlIG5pbCBjdXJzb3IgaGVyZSBzaW5jZSB3ZSBtYW51YWxs eSB1cGRhdGUgdGhlIGN1cnNvciBieSBjYWxsaW5nIFtOU0N1cnNvciBzZXRdLgorCisgICAgICAg ICogV2ViVmlldy9XZWJIVE1MVmlldy5tbToKKyAgICAgICAgKC1bV2ViSFRNTFZpZXcgc2V0RGF0 YVNvdXJjZTpdKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dl YlZpZXcgcmVzZXRDdXJzb3JSZWN0c10pOgorCisyMDE1LTAzLTI1ICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEN1cnNvciBkb2Vzbid0IGNoYW5nZSBiYWNrIHRv IHBvaW50ZXIgd2hlbiBsZWF2aW5nIE1haWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzMjAzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEZpeGVkIHRoZSBidWcgYnkgYWRkaW5nIGEgY3Vyc29yIHJlY3Qg c28gdGhhdCBBcHBLaXQgd2lsbCByZXNldCB0aGUgY3Vyc29yIGFzIGl0IGxlYXZlcyB0aGUgV2Vi Vmlldy4KKyAgICAgICAgV2UgdXNlIG5pbCBjdXJzb3IgaGVyZSBzaW5jZSB3ZSBtYW51YWxseSB1 cGRhdGUgdGhlIGN1cnNvciBieSBjYWxsaW5nIFtOU0N1cnNvciBzZXRdLgorCisgICAgICAgICog V2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IHJlc2V0Q3Vyc29yUmVjdHNd KToKKwogMjAxNS0wMy0yNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgog CiAgICAgICAgIEZpeCBkZXNpZ25hdGVkIGluaXRpYWxpemVyIHZpb2xhdGlvbnMKSW5kZXg6IFNv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQkocmV2aXNpb24gMTgxOTkwKQor KysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQkod29ya2luZyBjb3B5 KQpAQCAtNDIyNiw3ICs0MjI2LDcgQEAgLSAodm9pZClzZXREYXRhU291cmNlOihXZWJEYXRhU291 cmNlICopZAogCiAjaWYgIVBMQVRGT1JNKElPUykKICAgICBpZiAoIV9wcml2YXRlLT5pbnN0YWxs ZWRUcmFja2luZ0FyZWEpIHsKLSAgICAgICAgTlNUcmFja2luZ0FyZWFPcHRpb25zIG9wdGlvbnMg PSBOU1RyYWNraW5nTW91c2VNb3ZlZCB8IE5TVHJhY2tpbmdNb3VzZUVudGVyZWRBbmRFeGl0ZWQg fCBOU1RyYWNraW5nSW5WaXNpYmxlUmVjdDsKKyAgICAgICAgTlNUcmFja2luZ0FyZWFPcHRpb25z IG9wdGlvbnMgPSBOU1RyYWNraW5nTW91c2VNb3ZlZCB8IE5TVHJhY2tpbmdNb3VzZUVudGVyZWRB bmRFeGl0ZWQgfCBOU1RyYWNraW5nSW5WaXNpYmxlUmVjdCB8IE5TVHJhY2tpbmdDdXJzb3JVcGRh dGU7CiAgICAgICAgIGlmIChXS1JlY29tbWVuZGVkU2Nyb2xsZXJTdHlsZSgpID09IE5TU2Nyb2xs ZXJTdHlsZUxlZ2FjeQogI2lmIEVOQUJMRShEQVNIQk9BUkRfU1VQUE9SVCkKICAgICAgICAgICAg IHx8IFtbc2VsZiBfd2ViVmlld10gX2Rhc2hib2FyZEJlaGF2aW9yOldlYkRhc2hib2FyZEJlaGF2 aW9yQWx3YXlzU2VuZE1vdXNlRXZlbnRzVG9BbGxXaW5kb3dzXQpJbmRleDogU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gMTgxOTkwKQorKysgU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zODI3LDYgKzM4MjcsMTIg QEAgKyAoTlNDdXJzb3IgKilfcG9pbnRpbmdIYW5kQ3Vyc29yCiB7CiAgICAgcmV0dXJuIGhhbmRD dXJzb3IoKS5wbGF0Zm9ybUN1cnNvcigpOwogfQorCistICh2b2lkKXJlc2V0Q3Vyc29yUmVjdHMK K3sKKyAgICBOU1JlY3QgcmVjdCA9IFtzZWxmIHZpc2libGVSZWN0XTsKKyAgICBbc2VsZiBhZGRD dXJzb3JSZWN0OnJlY3QgY3Vyc29yOm5pbF07Cit9CiAjZW5kaWYKIAogLSAoQk9PTClfcG9zdHNB Y2NlbGVyYXRlZENvbXBvc2l0aW5nTm90aWZpY2F0aW9ucwo= 249509 2015-03-26 12:48:41 -0700 2015-03-26 14:41:34 -0700 Fixed change logs bug-132038-20150326124804.patch text/plain 8688 rniwa SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjAyMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE1LTAzLTI2ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEN1cnNvciBkb2Vzbid0IGNoYW5n ZSBiYWNrIHRvIHBvaW50ZXIgd2hlbiBsZWF2aW5nIE1haWwKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjAzOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIHRoZSBidWcgYnkgYWRkaW5nIGEgY3Vy c29yIHJlY3QgYW5kIG1ha2luZyB0aGUgcHJpbWFyeSB0cmFja2luZyBhcmVhIHVwZGF0ZSB0aGUg Y3Vyc29yIHNvIHRoYXQKKyAgICAgICAgQXBwS2l0IHdpbGwgcmVzZXQgdGhlIGN1cnNvciBhcyBp dCBsZWF2ZXMgdGhlIFdlYlZpZXcuCisKKyAgICAgICAgV2UgdXNlIG5pbCBjdXJzb3IgaGVyZSBz aW5jZSB3ZSBtYW51YWxseSB1cGRhdGUgdGhlIGN1cnNvciBieSBjYWxsaW5nIFtOU0N1cnNvciBz ZXRdLgorCisgICAgICAgIEFsc28gY29uc29saWRhdGVkIHRoZSBjb2RlIHRvIGNyZWF0ZSB0aGUg cHJpbWFyeSB0cmFja2luZyBhcmVhIGludG8gX3VwZGF0ZVByaW1hcnlUcmFja2luZ0FyZWEgcmF0 aGVyCisgICAgICAgIHRoYW4gcHJvdmlkaW5nIGEgZ2VuZXJpYyBzZXR0ZXIgYW5kIHVwZGF0aW5n IGl0IGluIHJlY29tbWVuZGVkU2Nyb2xsYmFyU3R5bGVEaWRDaGFuZ2UuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyByZXNldEN1cnNv clJlY3RzXSk6IEFkZGVkLgorICAgICAgICAoLVtXS1ZpZXcgX3VwZGF0ZVByaW1hcnlUcmFja2lu Z0FyZWE6XSk6IEV4dHJhY3RlZCBmcm9tIGluaXRXaXRoRnJhbWUuCisgICAgICAgICgtW1dLVmll dyBpbml0V2l0aEZyYW1lOnByb2Nlc3NQb29sOmNvbmZpZ3VyYXRpb246d2ViVmlldzpdKToKKyAg ICAgICAgKC1bV0tWaWV3IF9wcmltYXJ5VHJhY2tpbmdBcmVhXSk6IERlbGV0ZWQuCisgICAgICAg ICgtW1dLVmlldyBfc2V0UHJpbWFyeVRyYWNraW5nQXJlYTpdKTogRGVsZXRlZC4KKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oOiBSZXBsYWNlZCBfcHJpbWFyeVRy YWNraW5nQXJlYSBieSBfdXBkYXRlUHJpbWFyeVRyYWNraW5nQXJlYS4KKyAgICAgICAgKiBVSVBy b2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50 SW1wbDo6cmVjb21tZW5kZWRTY3JvbGxiYXJTdHlsZURpZENoYW5nZSk6CisKIDIwMTUtMDMtMjYg IE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtM aW51eF0gU2VjY29tcEZpbHRlcnM6IGltcHJvdmUgdGhlIHBvcnQtYWdub3N0aWMgd2hpdGVsaXN0 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCShyZXZp c2lvbiAxODE5OTApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcu bW0JKHdvcmtpbmcgY29weSkKQEAgLTQ4Nyw2ICs0ODcsMTEgQEAgLSAoQk9PTClyZXNpZ25GaXJz dFJlc3BvbmRlcgogICAgIHJldHVybiBZRVM7CiB9CiAKKy0gKHZvaWQpcmVzZXRDdXJzb3JSZWN0 cworeworICAgIFtzZWxmIGFkZEN1cnNvclJlY3Q6W3NlbGYgdmlzaWJsZVJlY3RdIGN1cnNvcjpu aWxdOworfQorCiAtICh2b2lkKXZpZXdXaWxsU3RhcnRMaXZlUmVzaXplCiB7CiAgICAgX2RhdGEt Pl9wYWdlLT52aWV3V2lsbFN0YXJ0TGl2ZVJlc2l6ZSgpOwpAQCAtMzcwMCwxNiArMzcwNSwyMSBA QCAtIChCT09MKV9zdXBwcmVzc1Zpc2liaWxpdHlVcGRhdGVzCiAgICAgcmV0dXJuIF9kYXRhLT5f cGFnZS0+c3VwcHJlc3NWaXNpYmlsaXR5VXBkYXRlcygpOwogfQogCi0tIChOU1RyYWNraW5nQXJl YSAqKV9wcmltYXJ5VHJhY2tpbmdBcmVhCistICh2b2lkKV91cGRhdGVQcmltYXJ5VHJhY2tpbmdB cmVhOihCT09MKWFsd2F5c0FjdGl2ZQogewotICAgIHJldHVybiBfZGF0YS0+X3ByaW1hcnlUcmFj a2luZ0FyZWEuZ2V0KCk7Ci19CisgICAgLy8gTGVnYWN5IHN0eWxlIHNjcm9sbGJhcnMgaGF2ZSBk ZXNpZ24gZGV0YWlscyB0aGF0IHJlbHkgb24gdHJhY2tpbmcgdGhlIG1vdXNlIGFsbCB0aGUgdGlt ZS4KKyAgICBOU1RyYWNraW5nQXJlYU9wdGlvbnMgb3B0aW9ucyA9IE5TVHJhY2tpbmdNb3VzZU1v dmVkIHwgTlNUcmFja2luZ01vdXNlRW50ZXJlZEFuZEV4aXRlZCB8IE5TVHJhY2tpbmdJblZpc2li bGVSZWN0IHwgTlNUcmFja2luZ0N1cnNvclVwZGF0ZTsKKyAgICBpZiAoYWx3YXlzQWN0aXZlKQor ICAgICAgICBvcHRpb25zIHw9IE5TVHJhY2tpbmdBY3RpdmVBbHdheXM7CisgICAgZWxzZQorICAg ICAgICBvcHRpb25zIHw9IE5TVHJhY2tpbmdBY3RpdmVJbktleVdpbmRvdzsKIAotLSAodm9pZClf c2V0UHJpbWFyeVRyYWNraW5nQXJlYTooTlNUcmFja2luZ0FyZWEgKil0cmFja2luZ0FyZWEKLXsK LSAgICBbc2VsZiByZW1vdmVUcmFja2luZ0FyZWE6X2RhdGEtPl9wcmltYXJ5VHJhY2tpbmdBcmVh LmdldCgpXTsKLSAgICBfZGF0YS0+X3ByaW1hcnlUcmFja2luZ0FyZWEgPSB0cmFja2luZ0FyZWE7 Ci0gICAgW3NlbGYgYWRkVHJhY2tpbmdBcmVhOnRyYWNraW5nQXJlYV07CisgICAgaWYgKF9kYXRh LT5fcHJpbWFyeVRyYWNraW5nQXJlYSkKKyAgICAgICAgW3NlbGYgcmVtb3ZlVHJhY2tpbmdBcmVh Ol9kYXRhLT5fcHJpbWFyeVRyYWNraW5nQXJlYS5nZXQoKV07CisKKyAgICBfZGF0YS0+X3ByaW1h cnlUcmFja2luZ0FyZWEgPSBhZG9wdE5TKFtbTlNUcmFja2luZ0FyZWEgYWxsb2NdIGluaXRXaXRo UmVjdDpfZnJhbWUgb3B0aW9uczpvcHRpb25zIG93bmVyOnNlbGYgdXNlckluZm86bmlsXSk7CisK KyAgICBbc2VsZiBhZGRUcmFja2luZ0FyZWE6X2RhdGEtPl9wcmltYXJ5VHJhY2tpbmdBcmVhLmdl dCgpXTsKIH0KIAogLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoRnJhbWU6KE5TUmVjdClmcmFtZSBw cm9jZXNzUG9vbDooV2ViUHJvY2Vzc1Bvb2wmKXByb2Nlc3NQb29sIGNvbmZpZ3VyYXRpb246KFdl YlBhZ2VDb25maWd1cmF0aW9uKXdlYlBhZ2VDb25maWd1cmF0aW9uIHdlYlZpZXc6KFdLV2ViVmll dyAqKXdlYlZpZXcKQEAgLTM3MjIsMTYgKzM3MzIsOCBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdFdp dGhGcmFtZTooTlNSZWN0KWZyCiAKICAgICBJbml0aWFsaXplV2ViS2l0MigpOwogCi0gICAgLy8g TGVnYWN5IHN0eWxlIHNjcm9sbGJhcnMgaGF2ZSBkZXNpZ24gZGV0YWlscyB0aGF0IHJlbHkgb24g dHJhY2tpbmcgdGhlIG1vdXNlIGFsbCB0aGUgdGltZS4KLSAgICBOU1RyYWNraW5nQXJlYU9wdGlv bnMgb3B0aW9ucyA9IE5TVHJhY2tpbmdNb3VzZU1vdmVkIHwgTlNUcmFja2luZ01vdXNlRW50ZXJl ZEFuZEV4aXRlZCB8IE5TVHJhY2tpbmdJblZpc2libGVSZWN0OwotICAgIGlmIChXS1JlY29tbWVu ZGVkU2Nyb2xsZXJTdHlsZSgpID09IE5TU2Nyb2xsZXJTdHlsZUxlZ2FjeSkKLSAgICAgICAgb3B0 aW9ucyB8PSBOU1RyYWNraW5nQWN0aXZlQWx3YXlzOwotICAgIGVsc2UKLSAgICAgICAgb3B0aW9u cyB8PSBOU1RyYWNraW5nQWN0aXZlSW5LZXlXaW5kb3c7Ci0KICAgICBfZGF0YSA9IFtbV0tWaWV3 RGF0YSBhbGxvY10gaW5pdF07Ci0gICAgX2RhdGEtPl9wcmltYXJ5VHJhY2tpbmdBcmVhID0gYWRv cHROUyhbW05TVHJhY2tpbmdBcmVhIGFsbG9jXSBpbml0V2l0aFJlY3Q6ZnJhbWUgb3B0aW9uczpv cHRpb25zIG93bmVyOnNlbGYgdXNlckluZm86bmlsXSk7Ci0gICAgW3NlbGYgYWRkVHJhY2tpbmdB cmVhOl9kYXRhLT5fcHJpbWFyeVRyYWNraW5nQXJlYS5nZXQoKV07CisgICAgW3NlbGYgX3VwZGF0 ZVByaW1hcnlUcmFja2luZ0FyZWE6V0tSZWNvbW1lbmRlZFNjcm9sbGVyU3R5bGUoKSA9PSBOU1Nj cm9sbGVyU3R5bGVMZWdhY3ldOwogCiAgICAgX2RhdGEtPl9wYWdlQ2xpZW50ID0gc3RkOjptYWtl X3VuaXF1ZTxQYWdlQ2xpZW50SW1wbD4oc2VsZiwgd2ViVmlldyk7CiAgICAgX2RhdGEtPl9wYWdl ID0gcHJvY2Vzc1Bvb2wuY3JlYXRlV2ViUGFnZSgqX2RhdGEtPl9wYWdlQ2xpZW50LCBXVEY6Om1v dmUod2ViUGFnZUNvbmZpZ3VyYXRpb24pKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaAkocmV2aXNpb24gMTgxOTkwKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTQyLDcgKzE0Miw3IEBAIEBpbnRlcmZhY2UgV0tWaWV3ICgpCiAtICh2b2lk KV9kaWRQZXJmb3JtQWN0aW9uTWVudUhpdFRlc3Q6KGNvbnN0IFdlYktpdDo6QWN0aW9uTWVudUhp dFRlc3RSZXN1bHQmKWhpdFRlc3RSZXN1bHQgZm9ySW1tZWRpYXRlQWN0aW9uOihCT09MKWZvcklt bWVkaWF0ZUFjdGlvbiB1c2VyRGF0YTooQVBJOjpPYmplY3QqKXVzZXJEYXRhOwogI2VuZGlmCiAK LUBwcm9wZXJ0eSAobm9uYXRvbWljLCByZXRhaW4sIHNldHRlcj1fc2V0UHJpbWFyeVRyYWNraW5n QXJlYTopIE5TVHJhY2tpbmdBcmVhICpfcHJpbWFyeVRyYWNraW5nQXJlYTsKKy0gKHZvaWQpX3Vw ZGF0ZVByaW1hcnlUcmFja2luZ0FyZWE6KEJPT0wpYWx3YXlzQWN0aXZlOwogCiBAcHJvcGVydHkg KHJlYWRvbmx5KSBOU1dpbmRvdyAqX3RhcmdldFdpbmRvd0Zvck1vdmVQcmVwYXJhdGlvbjsKIApJ bmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1t CShyZXZpc2lvbiAxODE5OTApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VD bGllbnRJbXBsLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02MjYsMTUgKzYyNiw3IEBAIHZvaWQgUGFn ZUNsaWVudEltcGw6OnJlY29yZEF1dG9jb3JyZWN0aW8KIAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6 cmVjb21tZW5kZWRTY3JvbGxiYXJTdHlsZURpZENoYW5nZShTY3JvbGxiYXJTdHlsZSBuZXdTdHls ZSkKIHsKLSAgICAvLyBOb3cgcmUtY3JlYXRlIGEgdHJhY2tpbmcgYXJlYSB3aXRoIHRoZSBhcHBy b3ByaWF0ZSBvcHRpb25zIGdpdmVuIHRoZSBuZXcgc2Nyb2xsYmFyIHN0eWxlCi0gICAgTlNUcmFj a2luZ0FyZWFPcHRpb25zIG9wdGlvbnMgPSBOU1RyYWNraW5nTW91c2VNb3ZlZCB8IE5TVHJhY2tp bmdNb3VzZUVudGVyZWRBbmRFeGl0ZWQgfCBOU1RyYWNraW5nSW5WaXNpYmxlUmVjdDsKLSAgICBp ZiAobmV3U3R5bGUgPT0gU2Nyb2xsYmFyU3R5bGU6OkFsd2F5c1Zpc2libGUpCi0gICAgICAgIG9w dGlvbnMgfD0gTlNUcmFja2luZ0FjdGl2ZUFsd2F5czsKLSAgICBlbHNlCi0gICAgICAgIG9wdGlv bnMgfD0gTlNUcmFja2luZ0FjdGl2ZUluS2V5V2luZG93OwotCi0gICAgUmV0YWluUHRyPE5TVHJh Y2tpbmdBcmVhPiB0cmFja2luZ0FyZWEgPSBhZG9wdE5TKFtbTlNUcmFja2luZ0FyZWEgYWxsb2Nd IGluaXRXaXRoUmVjdDpbbV93a1ZpZXcgZnJhbWVdIG9wdGlvbnM6b3B0aW9ucyBvd25lcjptX3dr VmlldyB1c2VySW5mbzpuaWxdKTsKLSAgICBbbV93a1ZpZXcgX3NldFByaW1hcnlUcmFja2luZ0Fy ZWE6dHJhY2tpbmdBcmVhLmdldCgpXTsKKyAgICBbbV93a1ZpZXcgX3VwZGF0ZVByaW1hcnlUcmFj a2luZ0FyZWE6bmV3U3R5bGUgPT0gU2Nyb2xsYmFyU3R5bGU6OkFsd2F5c1Zpc2libGVdOwogfQog CiB2b2lkIFBhZ2VDbGllbnRJbXBsOjppbnRyaW5zaWNDb250ZW50U2l6ZURpZENoYW5nZShjb25z dCBJbnRTaXplJiBpbnRyaW5zaWNDb250ZW50U2l6ZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4MjAyMikKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE1LTAzLTI2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgorCisgICAgICAgIEN1cnNvciBkb2Vzbid0IGNoYW5nZSBiYWNrIHRvIHBvaW50 ZXIgd2hlbiBsZWF2aW5nIE1haWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzMjAzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEZpeGVkIHRoZSBidWcgYnkgYWRkaW5nIGEgY3Vyc29yIHJlY3QgYW5kIG1h a2luZyB0aGUgcHJpbWFyeSB0cmFja2luZyBhcmVhIHVwZGF0ZSB0aGUgY3Vyc29yIHNvIHRoYXQK KyAgICAgICAgQXBwS2l0IHdpbGwgcmVzZXQgdGhlIGN1cnNvciBhcyBpdCBsZWF2ZXMgdGhlIFdl YlZpZXcuCisKKyAgICAgICAgV2UgdXNlIG5pbCBjdXJzb3IgaGVyZSBzaW5jZSB3ZSBtYW51YWxs eSB1cGRhdGUgdGhlIGN1cnNvciBieSBjYWxsaW5nIFtOU0N1cnNvciBzZXRdLgorCisgICAgICAg ICogV2ViVmlldy9XZWJIVE1MVmlldy5tbToKKyAgICAgICAgKC1bV2ViSFRNTFZpZXcgc2V0RGF0 YVNvdXJjZTpdKTogVXNlIE5TVHJhY2tpbmdDdXJzb3JVcGRhdGUgb3B0aW9uIGluIGNyZWF0aW5n IHRoZSBwcmltYXJ5IHRyYWNraW5nIGFyZWEuCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1t OgorICAgICAgICAoLVtXZWJWaWV3IHJlc2V0Q3Vyc29yUmVjdHNdKTogQWRkZWQuCisKIDIwMTUt MDMtMjQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBG aXggZGVzaWduYXRlZCBpbml0aWFsaXplciB2aW9sYXRpb25zCkluZGV4OiBTb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0JKHJldmlzaW9uIDE4MTk5MCkKKysrIFNvdXJjZS9X ZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTQyMjYs NyArNDIyNiw3IEBAIC0gKHZvaWQpc2V0RGF0YVNvdXJjZTooV2ViRGF0YVNvdXJjZSAqKWQKIAog I2lmICFQTEFURk9STShJT1MpCiAgICAgaWYgKCFfcHJpdmF0ZS0+aW5zdGFsbGVkVHJhY2tpbmdB cmVhKSB7Ci0gICAgICAgIE5TVHJhY2tpbmdBcmVhT3B0aW9ucyBvcHRpb25zID0gTlNUcmFja2lu Z01vdXNlTW92ZWQgfCBOU1RyYWNraW5nTW91c2VFbnRlcmVkQW5kRXhpdGVkIHwgTlNUcmFja2lu Z0luVmlzaWJsZVJlY3Q7CisgICAgICAgIE5TVHJhY2tpbmdBcmVhT3B0aW9ucyBvcHRpb25zID0g TlNUcmFja2luZ01vdXNlTW92ZWQgfCBOU1RyYWNraW5nTW91c2VFbnRlcmVkQW5kRXhpdGVkIHwg TlNUcmFja2luZ0luVmlzaWJsZVJlY3QgfCBOU1RyYWNraW5nQ3Vyc29yVXBkYXRlOwogICAgICAg ICBpZiAoV0tSZWNvbW1lbmRlZFNjcm9sbGVyU3R5bGUoKSA9PSBOU1Njcm9sbGVyU3R5bGVMZWdh Y3kKICNpZiBFTkFCTEUoREFTSEJPQVJEX1NVUFBPUlQpCiAgICAgICAgICAgICB8fCBbW3NlbGYg X3dlYlZpZXddIF9kYXNoYm9hcmRCZWhhdmlvcjpXZWJEYXNoYm9hcmRCZWhhdmlvckFsd2F5c1Nl bmRNb3VzZUV2ZW50c1RvQWxsV2luZG93c10KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlZpZXcubW0JKHJldmlzaW9uIDE4MTk5MCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzgyNyw2ICszODI3LDEyIEBAICsgKE5TQ3Vy c29yICopX3BvaW50aW5nSGFuZEN1cnNvcgogewogICAgIHJldHVybiBoYW5kQ3Vyc29yKCkucGxh dGZvcm1DdXJzb3IoKTsKIH0KKworLSAodm9pZClyZXNldEN1cnNvclJlY3RzCit7CisgICAgTlNS ZWN0IHJlY3QgPSBbc2VsZiB2aXNpYmxlUmVjdF07CisgICAgW3NlbGYgYWRkQ3Vyc29yUmVjdDpy ZWN0IGN1cnNvcjpuaWxdOworfQogI2VuZGlmCiAKIC0gKEJPT0wpX3Bvc3RzQWNjZWxlcmF0ZWRD b21wb3NpdGluZ05vdGlmaWNhdGlvbnMK 249513 2015-03-26 14:41:42 -0700 2015-03-26 14:42:20 -0700 Reverted the refactroing per Andres' request bug-132038-20150326144103.patch text/plain 4527 rniwa SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjAyNSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE1LTAzLTI2ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEN1cnNvciBkb2Vzbid0IGNoYW5n ZSBiYWNrIHRvIHBvaW50ZXIgd2hlbiBsZWF2aW5nIE1haWwKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjAzOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIHRoZSBidWcgYnkgYWRkaW5nIGEgY3Vy c29yIHJlY3QgYW5kIG1ha2luZyB0aGUgcHJpbWFyeSB0cmFja2luZyBhcmVhIHVwZGF0ZSB0aGUg Y3Vyc29yIHNvIHRoYXQKKyAgICAgICAgQXBwS2l0IHdpbGwgcmVzZXQgdGhlIGN1cnNvciBhcyBp dCBsZWF2ZXMgdGhlIFdlYlZpZXcuCisKKyAgICAgICAgV2UgdXNlIG5pbCBjdXJzb3IgaGVyZSBz aW5jZSB3ZSBtYW51YWxseSB1cGRhdGUgdGhlIGN1cnNvciBieSBjYWxsaW5nIFtOU0N1cnNvciBz ZXRdLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAo LVtXS1ZpZXcgaW5pdFdpdGhGcmFtZTpwcm9jZXNzUG9vbDpjb25maWd1cmF0aW9uOndlYlZpZXc6 XSk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbToKKyAgICAgICAg KFdlYktpdDo6UGFnZUNsaWVudEltcGw6OnJlY29tbWVuZGVkU2Nyb2xsYmFyU3R5bGVEaWRDaGFu Z2UpOgorCiAyMDE1LTAzLTI2ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlh LmNvbT4KIAogICAgICAgICBbTGludXhdIFNlY2NvbXBGaWx0ZXJzOiBpbXByb3ZlIHRoZSBwb3J0 LWFnbm9zdGljIHdoaXRlbGlzdApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9t YWMvV0tWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv bWFjL1dLVmlldy5tbQkocmV2aXNpb24gMTgxOTkwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNzIzLDcgKzM3MjMsNyBA QCAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhGcmFtZTooTlNSZWN0KWZyCiAgICAgSW5pdGlhbGl6 ZVdlYktpdDIoKTsKIAogICAgIC8vIExlZ2FjeSBzdHlsZSBzY3JvbGxiYXJzIGhhdmUgZGVzaWdu IGRldGFpbHMgdGhhdCByZWx5IG9uIHRyYWNraW5nIHRoZSBtb3VzZSBhbGwgdGhlIHRpbWUuCi0g ICAgTlNUcmFja2luZ0FyZWFPcHRpb25zIG9wdGlvbnMgPSBOU1RyYWNraW5nTW91c2VNb3ZlZCB8 IE5TVHJhY2tpbmdNb3VzZUVudGVyZWRBbmRFeGl0ZWQgfCBOU1RyYWNraW5nSW5WaXNpYmxlUmVj dDsKKyAgICBOU1RyYWNraW5nQXJlYU9wdGlvbnMgb3B0aW9ucyA9IE5TVHJhY2tpbmdNb3VzZU1v dmVkIHwgTlNUcmFja2luZ01vdXNlRW50ZXJlZEFuZEV4aXRlZCB8IE5TVHJhY2tpbmdJblZpc2li bGVSZWN0IHwgTlNUcmFja2luZ0N1cnNvclVwZGF0ZTsKICAgICBpZiAoV0tSZWNvbW1lbmRlZFNj cm9sbGVyU3R5bGUoKSA9PSBOU1Njcm9sbGVyU3R5bGVMZWdhY3kpCiAgICAgICAgIG9wdGlvbnMg fD0gTlNUcmFja2luZ0FjdGl2ZUFsd2F5czsKICAgICBlbHNlCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0JKHJldmlzaW9uIDE4MTk5MCkK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0JKHdvcmtp bmcgY29weSkKQEAgLTYyNyw3ICs2MjcsNyBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjpyZWNvcmRB dXRvY29ycmVjdGlvCiB2b2lkIFBhZ2VDbGllbnRJbXBsOjpyZWNvbW1lbmRlZFNjcm9sbGJhclN0 eWxlRGlkQ2hhbmdlKFNjcm9sbGJhclN0eWxlIG5ld1N0eWxlKQogewogICAgIC8vIE5vdyByZS1j cmVhdGUgYSB0cmFja2luZyBhcmVhIHdpdGggdGhlIGFwcHJvcHJpYXRlIG9wdGlvbnMgZ2l2ZW4g dGhlIG5ldyBzY3JvbGxiYXIgc3R5bGUKLSAgICBOU1RyYWNraW5nQXJlYU9wdGlvbnMgb3B0aW9u cyA9IE5TVHJhY2tpbmdNb3VzZU1vdmVkIHwgTlNUcmFja2luZ01vdXNlRW50ZXJlZEFuZEV4aXRl ZCB8IE5TVHJhY2tpbmdJblZpc2libGVSZWN0OworICAgIE5TVHJhY2tpbmdBcmVhT3B0aW9ucyBv cHRpb25zID0gTlNUcmFja2luZ01vdXNlTW92ZWQgfCBOU1RyYWNraW5nTW91c2VFbnRlcmVkQW5k RXhpdGVkIHwgTlNUcmFja2luZ0luVmlzaWJsZVJlY3QgfCBOU1RyYWNraW5nQ3Vyc29yVXBkYXRl OwogICAgIGlmIChuZXdTdHlsZSA9PSBTY3JvbGxiYXJTdHlsZTo6QWx3YXlzVmlzaWJsZSkKICAg ICAgICAgb3B0aW9ucyB8PSBOU1RyYWNraW5nQWN0aXZlQWx3YXlzOwogICAgIGVsc2UKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjAyMikKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTAzLTI2ICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEN1cnNvciBkb2Vzbid0IGNo YW5nZSBiYWNrIHRvIHBvaW50ZXIgd2hlbiBsZWF2aW5nIE1haWwKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjAzOAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIHRoZSBidWcgYnkgYWRkaW5nIGEg Y3Vyc29yIHJlY3QgYW5kIG1ha2luZyB0aGUgcHJpbWFyeSB0cmFja2luZyBhcmVhIHVwZGF0ZSB0 aGUgY3Vyc29yIHNvIHRoYXQKKyAgICAgICAgQXBwS2l0IHdpbGwgcmVzZXQgdGhlIGN1cnNvciBh cyBpdCBsZWF2ZXMgdGhlIFdlYlZpZXcuCisKKyAgICAgICAgV2UgdXNlIG5pbCBjdXJzb3IgaGVy ZSBzaW5jZSB3ZSBtYW51YWxseSB1cGRhdGUgdGhlIGN1cnNvciBieSBjYWxsaW5nIFtOU0N1cnNv ciBzZXRdLgorCisgICAgICAgICogV2ViVmlldy9XZWJIVE1MVmlldy5tbToKKyAgICAgICAgKC1b V2ViSFRNTFZpZXcgc2V0RGF0YVNvdXJjZTpdKTogVXNlIE5TVHJhY2tpbmdDdXJzb3JVcGRhdGUg b3B0aW9uIGluIGNyZWF0aW5nIHRoZSBwcmltYXJ5IHRyYWNraW5nIGFyZWEuCisKIDIwMTUtMDMt MjQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXgg ZGVzaWduYXRlZCBpbml0aWFsaXplciB2aW9sYXRpb25zCkluZGV4OiBTb3VyY2UvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViSFRNTFZpZXcubW0JKHJldmlzaW9uIDE4MTk5MCkKKysrIFNvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTQyMjYsNyAr NDIyNiw3IEBAIC0gKHZvaWQpc2V0RGF0YVNvdXJjZTooV2ViRGF0YVNvdXJjZSAqKWQKIAogI2lm ICFQTEFURk9STShJT1MpCiAgICAgaWYgKCFfcHJpdmF0ZS0+aW5zdGFsbGVkVHJhY2tpbmdBcmVh KSB7Ci0gICAgICAgIE5TVHJhY2tpbmdBcmVhT3B0aW9ucyBvcHRpb25zID0gTlNUcmFja2luZ01v dXNlTW92ZWQgfCBOU1RyYWNraW5nTW91c2VFbnRlcmVkQW5kRXhpdGVkIHwgTlNUcmFja2luZ0lu VmlzaWJsZVJlY3Q7CisgICAgICAgIE5TVHJhY2tpbmdBcmVhT3B0aW9ucyBvcHRpb25zID0gTlNU cmFja2luZ01vdXNlTW92ZWQgfCBOU1RyYWNraW5nTW91c2VFbnRlcmVkQW5kRXhpdGVkIHwgTlNU cmFja2luZ0luVmlzaWJsZVJlY3QgfCBOU1RyYWNraW5nQ3Vyc29yVXBkYXRlOwogICAgICAgICBp ZiAoV0tSZWNvbW1lbmRlZFNjcm9sbGVyU3R5bGUoKSA9PSBOU1Njcm9sbGVyU3R5bGVMZWdhY3kK ICNpZiBFTkFCTEUoREFTSEJPQVJEX1NVUFBPUlQpCiAgICAgICAgICAgICB8fCBbW3NlbGYgX3dl YlZpZXddIF9kYXNoYm9hcmRCZWhhdmlvcjpXZWJEYXNoYm9hcmRCZWhhdmlvckFsd2F5c1NlbmRN b3VzZUV2ZW50c1RvQWxsV2luZG93c10K