74214 2011-12-09 14:15:10 -0800 [chromium] Add worldId parameter to allowScriptExtension() 2011-12-18 16:38:15 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koz koz abarth fishd japhet webkit.review.bot oldest_to_newest 518501 0 koz 2011-12-09 14:15:10 -0800 [chromium] Add worldId parameter to allowScriptExtension() 518513 1 118640 koz 2011-12-09 14:23:08 -0800 Created attachment 118640 Patch 518518 2 webkit.review.bot 2011-12-09 14:25:48 -0800 Please wait for approval from fishd@chromium.org before submitting because this patch contains changes to the Chromium public API. 518522 3 koz 2011-12-09 14:29:37 -0800 The chromium side of this patch is here: http://codereview.chromium.org/8872053/ 518641 4 118640 fishd 2011-12-09 16:53:41 -0800 Comment on attachment 118640 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=118640&action=review > Source/WebKit/chromium/public/WebPermissionClient.h:77 > + virtual bool allowScriptExtension(WebFrame*, const WebString& extensionName, int extensionGroup, int worldId) { return true; } usually we make the default implementation of the new method call the old method. that helps us keep the system working while we transition chrome over to impl the new method. 522537 5 119568 koz 2011-12-15 22:12:53 -0800 Created attachment 119568 Patch 522539 6 koz 2011-12-15 22:17:19 -0800 (In reply to comment #4) > (From update of attachment 118640 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=118640&action=review > > > Source/WebKit/chromium/public/WebPermissionClient.h:77 > > + virtual bool allowScriptExtension(WebFrame*, const WebString& extensionName, int extensionGroup, int worldId) { return true; } > > usually we make the default implementation of the new method call the old method. > that helps us keep the system working while we transition chrome over to impl > the new method. Cool, done. 522691 7 119568 webkit.review.bot 2011-12-16 05:07:52 -0800 Comment on attachment 119568 Patch Rejecting attachment 119568 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: webkit-commit-queue/Source/WebKit/chromium/webkit --revision 114686 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 47>At revision 114686. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/10914668 523545 8 119781 koz 2011-12-18 14:33:01 -0800 Created attachment 119781 Patch for landing 523572 9 119781 webkit.review.bot 2011-12-18 16:38:11 -0800 Comment on attachment 119781 Patch for landing Clearing flags on attachment: 119781 Committed r103195: <http://trac.webkit.org/changeset/103195> 523573 10 webkit.review.bot 2011-12-18 16:38:15 -0800 All reviewed patches have been landed. Closing bug. 118640 2011-12-09 14:23:08 -0800 2011-12-15 22:12:46 -0800 Patch bug-74214-20111209142306.patch text/plain 9788 koz U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzUwYzRlMDkyNzM3NzM0 OWJlZTg5MmM4YTBkZjc1MTNkN2JhMmE2Mi4uZjg1YTliMDg4NGNjNzc4ZTYxODczNzUwOTA3OTcx ZTVjODA3MzI4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDExLTEyLTA5ICBKYW1l cyBLb3ppYW5za2kgIDxzb3VscGxhbnRAZ21haWwuY29tPgorCisgICAgICAgIFtjaHJvbWl1bV0g QWRkIHdvcmxkSWQgcGFyYW1ldGVyIHRvIGFsbG93U2NyaXB0RXh0ZW5zaW9uKCkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0MjE0CisKKyAgICAgICAg Q2hyb21pdW0gdXNlcyB0aGUgd29ybGRJZCB0byBkZXRlcm1pbmUgd2hhdCBleHRlbnNpb24gaXMg cnVubmluZyBpbiBhCisgICAgICAgIHY4IGNvbnRleHQgYW5kIGtub3dpbmcgdGhhdCBhdCB0aGUg dGltZSBhbGxvd1NjcmlwdEV4dGVuc2lvbigpIGlzCisgICAgICAgIGNhbGxlZCBhbGxvd3MgdXMg dG8gY29uZGl0aW9uYWxseSBpbmplY3QgZXh0ZW5zaW9uIEFQSXMuCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisK KyAgICAgICAgKiBiaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlY4RE9NV2luZG93U2hlbGw6OmluaXRDb250ZXh0SWZOZWVkZWQpOgorICAgICAgICAo V2ViQ29yZTo6VjhET01XaW5kb3dTaGVsbDo6Y3JlYXRlTmV3Q29udGV4dCk6CisgICAgICAgICog YmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5oOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4 SXNvbGF0ZWRDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4SXNvbGF0ZWRDb250ZXh0 OjpWOElzb2xhdGVkQ29udGV4dCk6CisgICAgICAgICogbG9hZGVyL0VtcHR5Q2xpZW50cy5oOgor ICAgICAgICAoV2ViQ29yZTo6RW1wdHlGcmFtZUxvYWRlckNsaWVudDo6YWxsb3dTY3JpcHRFeHRl bnNpb24pOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oOgorCiAyMDExLTEy LTA5ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjEwMjQxNi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggZWQ1 ZWM2NmMwMzdjM2E1MjA5OWJlMTMzYzE3NTEwMDg1YTM5NDg3Zi4uNGE1MzZkYzI2NTZiMGNhMjAy ZTYxYTgzYzE4NmNlMTNhYjQxNWE5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxMS0xMi0wOSAgSmFtZXMgS296aWFuc2tpICA8c291bHBsYW50QGdtYWls LmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCB3b3JsZElkIHBhcmFtZXRlciB0byBhbGxv d1NjcmlwdEV4dGVuc2lvbigpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03NDIxNAorCisgICAgICAgIENocm9taXVtIHVzZXMgdGhlIHdvcmxkSWQgdG8g ZGV0ZXJtaW5lIHdoYXQgZXh0ZW5zaW9uIGlzIHJ1bm5pbmcgaW4gYQorICAgICAgICB2OCBjb250 ZXh0IGFuZCBrbm93aW5nIHRoYXQgYXQgdGhlIHRpbWUgYWxsb3dTY3JpcHRFeHRlbnNpb24oKSBp cworICAgICAgICBjYWxsZWQgYWxsb3dzIHVzIHRvIGNvbmRpdGlvbmFsbHkgaW5qZWN0IGV4dGVu c2lvbiBBUElzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogcHVibGljL1dlYlBlcm1pc3Npb25DbGllbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UGVybWlzc2lvbkNsaWVudDo6YWxsb3dTY3JpcHRFeHRlbnNpb24pOgorICAgICAgICAqIHNyYy9G cmFtZUxvYWRlckNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNs aWVudEltcGw6OmFsbG93U2NyaXB0RXh0ZW5zaW9uKToKKyAgICAgICAgKiBzcmMvRnJhbWVMb2Fk ZXJDbGllbnRJbXBsLmg6CisKIDIwMTEtMTItMDkgIENhcnkgQ2xhcmsgIDxjYXJ5Y2xhcmtAZ29v Z2xlLmNvbT4KIAogICAgICAgICBDaHJvbWl1bSBERVBTIHJvbGwgdG8gcGljayB1cCBuZXcgdXNl X3NraWE9MSBkZWZhdWx0IG9uIENocm9taXVtLU1hYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcAppbmRleCAxOTczYzBhN2M1NjBiZjZlZjIyZjI3 MDE3ZjRiZWEzMDkxN2ZlYTg5Li5kZjVmNjExNDBjYmNiYzMwZTFjNTQzMDU0M2QzYzY5OGE2OGQz ZWI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1No ZWxsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxs LmNwcApAQCAtMzA1LDcgKzMwNSw3IEBAIGJvb2wgVjhET01XaW5kb3dTaGVsbDo6aW5pdENvbnRl eHRJZk5lZWRlZCgpCiAgICAgICAgIGlzVjhJbml0aWFsaXplZCA9IHRydWU7CiAgICAgfQogCi0g ICAgbV9jb250ZXh0ID0gY3JlYXRlTmV3Q29udGV4dChtX2dsb2JhbCwgMCk7CisgICAgbV9jb250 ZXh0ID0gY3JlYXRlTmV3Q29udGV4dChtX2dsb2JhbCwgMCwgMCk7CiAgICAgaWYgKG1fY29udGV4 dC5Jc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtMzQ4LDcgKzM0OCw3IEBA IGJvb2wgVjhET01XaW5kb3dTaGVsbDo6aW5pdENvbnRleHRJZk5lZWRlZCgpCiAgICAgcmV0dXJu IHRydWU7CiB9CiAKLXY4OjpQZXJzaXN0ZW50PHY4OjpDb250ZXh0PiBWOERPTVdpbmRvd1NoZWxs OjpjcmVhdGVOZXdDb250ZXh0KHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2xvYmFsLCBpbnQgZXh0 ZW5zaW9uR3JvdXApCit2ODo6UGVyc2lzdGVudDx2ODo6Q29udGV4dD4gVjhET01XaW5kb3dTaGVs bDo6Y3JlYXRlTmV3Q29udGV4dCh2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGdsb2JhbCwgaW50IGV4 dGVuc2lvbkdyb3VwLCBpbnQgd29ybGRJZCkKIHsKICAgICB2ODo6UGVyc2lzdGVudDx2ODo6Q29u dGV4dD4gcmVzdWx0OwogCkBAIC0zNzksNyArMzc5LDcgQEAgdjg6OlBlcnNpc3RlbnQ8djg6OkNv bnRleHQ+IFY4RE9NV2luZG93U2hlbGw6OmNyZWF0ZU5ld0NvbnRleHQodjg6OkhhbmRsZTx2ODo6 T2IKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGV4dGVuc2lvbnMuc2l6ZSgpOyArK2kpIHsK ICAgICAgICAgLy8gRW5zdXJlIG91ciBkYXRlIGV4dGVuc2lvbiBpcyBhbHdheXMgYWxsb3dlZC4K ICAgICAgICAgaWYgKGV4dGVuc2lvbnNbaV0gIT0gRGF0ZUV4dGVuc2lvbjo6Z2V0KCkKLSAgICAg ICAgICAgICYmICFtX2ZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCktPmFsbG93U2NyaXB0RXh0ZW5z aW9uKGV4dGVuc2lvbnNbaV0tPm5hbWUoKSwgZXh0ZW5zaW9uR3JvdXApKQorICAgICAgICAgICAg JiYgIW1fZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKS0+YWxsb3dTY3JpcHRFeHRlbnNpb24oZXh0 ZW5zaW9uc1tpXS0+bmFtZSgpLCBleHRlbnNpb25Hcm91cCwgd29ybGRJZCkpCiAgICAgICAgICAg ICBjb250aW51ZTsKIAogICAgICAgICBleHRlbnNpb25OYW1lc1tpbmRleCsrXSA9IGV4dGVuc2lv bnNbaV0tPm5hbWUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 RE9NV2luZG93U2hlbGwuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV2luZG93 U2hlbGwuaAppbmRleCA3NmMyN2FmMzYxZThkN2U5NWI3NjkzOThlYjU4MzZlMDUwNWRkNGNkLi41 OTc3NDk5YmQyMDgwODg1NmJhOTlmMzIwMWU3OGYzMmUxZTVjNGFmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmgKKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5oCkBAIC02NSw3ICs2NSw3IEBAIHB1 YmxpYzoKIAogICAgIGJvb2wgaXNDb250ZXh0SW5pdGlhbGl6ZWQoKTsKIAotICAgIHY4OjpQZXJz aXN0ZW50PHY4OjpDb250ZXh0PiBjcmVhdGVOZXdDb250ZXh0KHY4OjpIYW5kbGU8djg6Ok9iamVj dD4gZ2xvYmFsLCBpbnQgZXh0ZW5zaW9uR3JvdXApOworICAgIHY4OjpQZXJzaXN0ZW50PHY4OjpD b250ZXh0PiBjcmVhdGVOZXdDb250ZXh0KHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2xvYmFsLCBp bnQgZXh0ZW5zaW9uR3JvdXAsIGludCB3b3JsZElkKTsKICAgICB2b2lkIHNldENvbnRleHQodjg6 OkhhbmRsZTx2ODo6Q29udGV4dD4pOwogICAgIHN0YXRpYyBib29sIGluc3RhbGxET01XaW5kb3co djg6OkhhbmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCwgRE9NV2luZG93Kik7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4SXNvbGF0ZWRDb250ZXh0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4SXNvbGF0ZWRDb250ZXh0LmNwcAppbmRleCAyMTIy ZDM3YmYyZDhjZWZkMjk1M2Y0M2YyNzU3NjA5ZjFiMGU4Y2QwLi45ZTU3ZGQ1YjY2MjVmMTExYmJh MTQ1ZDdlYzE4M2IzNDMyZGM5NTgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9WOElzb2xhdGVkQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvVjhJc29sYXRlZENvbnRleHQuY3BwCkBAIC01NCw3ICs1NCw3IEBAIFY4SXNvbGF0ZWRDb250 ZXh0OjpWOElzb2xhdGVkQ29udGV4dChWOFByb3h5KiBwcm94eSwgaW50IGV4dGVuc2lvbkdyb3Vw LCBpbnQgd29yCiB7CiAgICAgdjg6OkhhbmRsZVNjb3BlIHNjb3BlOwogICAgIC8vIEZJWE1FOiBX ZSBzaG91bGQgYmUgY3JlYXRpbmcgYSBuZXcgVjhET01XaW5kb3dTaGVsbCBoZXJlIGluc3RlYWQg b2YgcmlwaW5nIG91dCB0aGUgY29udGV4dC4KLSAgICBtX2NvbnRleHQgPSBTaGFyZWRQZXJzaXN0 ZW50PHY4OjpDb250ZXh0Pjo6Y3JlYXRlKHByb3h5LT53aW5kb3dTaGVsbCgpLT5jcmVhdGVOZXdD b250ZXh0KHY4OjpIYW5kbGU8djg6Ok9iamVjdD4oKSwgZXh0ZW5zaW9uR3JvdXApKTsKKyAgICBt X2NvbnRleHQgPSBTaGFyZWRQZXJzaXN0ZW50PHY4OjpDb250ZXh0Pjo6Y3JlYXRlKHByb3h5LT53 aW5kb3dTaGVsbCgpLT5jcmVhdGVOZXdDb250ZXh0KHY4OjpIYW5kbGU8djg6Ok9iamVjdD4oKSwg ZXh0ZW5zaW9uR3JvdXAsIG1fd29ybGQtPmlkKCkpKTsKICAgICBpZiAobV9jb250ZXh0LT5nZXQo KS5Jc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xp ZW50cy5oCmluZGV4IDIwMzI0ODE5ZmQxNTVmMWFmNjQ4YWEyYTEzZDA5YWZmNTc2MTMxMGIuLmYz NWFjMzE4YzVmMjcyMDE3OTFkMmQ1N2I3MjczNzQ3NzhiNTI1N2MgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRW1wdHlDbGllbnRzLmgKQEAgLTM5MSw3ICszOTEsNyBAQCBwdWJsaWM6CiAjaWYgVVNFKFY4 KQogICAgIHZpcnR1YWwgdm9pZCBkaWRDcmVhdGVTY3JpcHRDb250ZXh0KHY4OjpIYW5kbGU8djg6 OkNvbnRleHQ+LCBpbnQgd29ybGRJZCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHdpbGxSZWxlYXNl U2NyaXB0Q29udGV4dCh2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiwgaW50IHdvcmxkSWQpIHsgfQot ICAgIHZpcnR1YWwgYm9vbCBhbGxvd1NjcmlwdEV4dGVuc2lvbihjb25zdCBTdHJpbmcmIGV4dGVu c2lvbk5hbWUsIGludCBleHRlbnNpb25Hcm91cCkgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0 dWFsIGJvb2wgYWxsb3dTY3JpcHRFeHRlbnNpb24oY29uc3QgU3RyaW5nJiBleHRlbnNpb25OYW1l LCBpbnQgZXh0ZW5zaW9uR3JvdXAsIGludCB3b3JsZElkKSB7IHJldHVybiBmYWxzZTsgfQogI2Vu ZGlmCiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ckNsaWVudC5oCmluZGV4IGJlNzRiN2MzMmExZTdiMWRkZWQ5YTMyMmIwZThmMjM3NjBlZDJmZWYu LjQ1MTdiMzY0OGUyMjM4ZjQxM2ZlZGNkMDJhMTJmNzdjNTQ1MDJkOTcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCkBAIC0yNzcsNyArMjc3LDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogI2lmIFVTRShWOCkKICAgICAgICAgdmlydHVhbCB2b2lkIGRpZENyZWF0 ZVNjcmlwdENvbnRleHQodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4sIGludCB3b3JsZElkKSA9IDA7 CiAgICAgICAgIHZpcnR1YWwgdm9pZCB3aWxsUmVsZWFzZVNjcmlwdENvbnRleHQodjg6OkhhbmRs ZTx2ODo6Q29udGV4dD4sIGludCB3b3JsZElkKSA9IDA7Ci0gICAgICAgIHZpcnR1YWwgYm9vbCBh bGxvd1NjcmlwdEV4dGVuc2lvbihjb25zdCBTdHJpbmcmIGV4dGVuc2lvbk5hbWUsIGludCBleHRl bnNpb25Hcm91cCkgPSAwOworICAgICAgICB2aXJ0dWFsIGJvb2wgYWxsb3dTY3JpcHRFeHRlbnNp b24oY29uc3QgU3RyaW5nJiBleHRlbnNpb25OYW1lLCBpbnQgZXh0ZW5zaW9uR3JvdXAsIGludCB3 b3JsZElkKSA9IDA7CiAjZW5kaWYKIAogICAgICAgICB2aXJ0dWFsIHZvaWQgcmVnaXN0ZXJGb3JJ Y29uTm90aWZpY2F0aW9uKGJvb2wgbGlzdGVuID0gdHJ1ZSkgPSAwOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGVybWlzc2lvbkNsaWVudC5oIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGVybWlzc2lvbkNsaWVudC5oCmluZGV4IGZiZTA5 NTcyYmU4YmIxZGQ1NmU0YjZkYTRjZDNhYTI1YjcxZDNlNWIuLjJiN2RkYzNhZjliY2IxNThhZThl MjRlM2M4OTQzY2NiZjEyNmIyODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYlBlcm1pc3Npb25DbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJQZXJtaXNzaW9uQ2xpZW50LmgKQEAgLTc0LDYgKzc0LDggQEAgcHVibGljOgog ICAgIC8vIHZhbHVlLgogICAgIHZpcnR1YWwgYm9vbCBhbGxvd1NjcmlwdEV4dGVuc2lvbihXZWJG cmFtZSosIGNvbnN0IFdlYlN0cmluZyYgZXh0ZW5zaW9uTmFtZSwgaW50IGV4dGVuc2lvbkdyb3Vw KSB7IHJldHVybiB0cnVlOyB9CiAKKyAgICB2aXJ0dWFsIGJvb2wgYWxsb3dTY3JpcHRFeHRlbnNp b24oV2ViRnJhbWUqLCBjb25zdCBXZWJTdHJpbmcmIGV4dGVuc2lvbk5hbWUsIGludCBleHRlbnNp b25Hcm91cCwgaW50IHdvcmxkSWQpIHsgcmV0dXJuIHRydWU7IH0KKwogICAgIC8vIENvbnRyb2xz IHdoZXRoZXIgSFRNTDUgV2ViIFN0b3JhZ2UgaXMgYWxsb3dlZCBmb3IgdGhpcyBmcmFtZS4KICAg ICAvLyBJZiBsb2NhbCBpcyB0cnVlLCB0aGVuIHRoaXMgaXMgZm9yIGxvY2FsIHN0b3JhZ2UsIG90 aGVyd2lzZSBpdCdzIGZvciBzZXNzaW9uIHN0b3JhZ2UuCiAgICAgdmlydHVhbCBib29sIGFsbG93 U3RvcmFnZShXZWJGcmFtZSosIGJvb2wgbG9jYWwpIHsgcmV0dXJuIHRydWU7IH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCmlu ZGV4IDBkZDFkYjhjN2FkYmQxMDk1ZTU0MTRhNWZkOGI2ZWFhYTA2MDdmYjkuLjkwNWEzNzc3MjI1 OWFiZTMwYjcxYWE0YzE3ZDRlNTZlZWJmMTRmNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcApAQCAtMTU1LDExICsxNTUs MTIgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEltcGw6OndpbGxSZWxlYXNlU2NyaXB0Q29udGV4 dCh2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb24KICNlbmRpZgogCiBib29sIEZyYW1lTG9hZGVy Q2xpZW50SW1wbDo6YWxsb3dTY3JpcHRFeHRlbnNpb24oY29uc3QgU3RyaW5nJiBleHRlbnNpb25O YW1lLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlu dCBleHRlbnNpb25Hcm91cCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBpbnQgZXh0ZW5zaW9uR3JvdXAsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgaW50IHdvcmxkSWQpCiB7CiAgICAgV2ViVmlld0ltcGwq IHdlYnZpZXcgPSBtX3dlYkZyYW1lLT52aWV3SW1wbCgpOwogICAgIGlmICh3ZWJ2aWV3ICYmIHdl YnZpZXctPnBlcm1pc3Npb25DbGllbnQoKSkKLSAgICAgICAgcmV0dXJuIHdlYnZpZXctPnBlcm1p c3Npb25DbGllbnQoKS0+YWxsb3dTY3JpcHRFeHRlbnNpb24obV93ZWJGcmFtZSwgZXh0ZW5zaW9u TmFtZSwgZXh0ZW5zaW9uR3JvdXApOworICAgICAgICByZXR1cm4gd2Vidmlldy0+cGVybWlzc2lv bkNsaWVudCgpLT5hbGxvd1NjcmlwdEV4dGVuc2lvbihtX3dlYkZyYW1lLCBleHRlbnNpb25OYW1l LCBleHRlbnNpb25Hcm91cCwgd29ybGRJZCk7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5o IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmgKaW5k ZXggMjIyOTRmOTBjMzNhNjgzZTg5OTM2NWQ4OTBhZWQyMTMzZDViNDQ4OC4uNTk2YjVmNGEwNzli MDMwY2EzODExY2ZmMzcwMzE3NDk0MjA1ZmFiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmgKQEAgLTY4LDcgKzY4LDcgQEAgcHVi bGljOgogCiAgICAgLy8gUmV0dXJucyB0cnVlIGlmIHdlIHNob3VsZCBhbGxvdyB0aGUgZ2l2ZW4g VjggZXh0ZW5zaW9uIHRvIGJlIGFkZGVkIHRvCiAgICAgLy8gdGhlIHNjcmlwdCBjb250ZXh0IGF0 IHRoZSBjdXJyZW50bHkgbG9hZGluZyBwYWdlIGFuZCBnaXZlbiBleHRlbnNpb24gZ3JvdXAuCi0g ICAgdmlydHVhbCBib29sIGFsbG93U2NyaXB0RXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgZXh0ZW5z aW9uTmFtZSwgaW50IGV4dGVuc2lvbkdyb3VwKTsKKyAgICB2aXJ0dWFsIGJvb2wgYWxsb3dTY3Jp cHRFeHRlbnNpb24oY29uc3QgU3RyaW5nJiBleHRlbnNpb25OYW1lLCBpbnQgZXh0ZW5zaW9uR3Jv dXAsIGludCB3b3JsZElkKTsKIAogICAgIHZpcnR1YWwgYm9vbCBoYXNXZWJWaWV3KCkgY29uc3Q7 CiAgICAgdmlydHVhbCBib29sIGhhc0ZyYW1lVmlldygpIGNvbnN0Owo= 119568 2011-12-15 22:12:53 -0800 2011-12-18 14:32:52 -0800 Patch bug-74214-20111216171250.patch text/plain 9898 koz U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyOTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWNkMTI3NjgyZTA1Yjkz MDFiZTljY2I5YjJkNmZhMjJmMDllNDg0Yy4uMTNiMGExMWQ2NWJjYjA3ZTljYTQyNTIwMjQyMTc0 YzBmMTAyZGMzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDExLTEyLTE1ICBKYW1l cyBLb3ppYW5za2kgIDxrb3pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRk IHdvcmxkSWQgcGFyYW1ldGVyIHRvIGFsbG93U2NyaXB0RXh0ZW5zaW9uKCkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0MjE0CisKKyAgICAgICAgQ2hy b21pdW0gdXNlcyB0aGUgd29ybGRJZCB0byBkZXRlcm1pbmUgd2hhdCBleHRlbnNpb24gaXMgcnVu bmluZyBpbiBhCisgICAgICAgIHY4IGNvbnRleHQgYW5kIGtub3dpbmcgdGhhdCBhdCB0aGUgdGlt ZSBhbGxvd1NjcmlwdEV4dGVuc2lvbigpIGlzCisgICAgICAgIGNhbGxlZCBhbGxvd3MgdXMgdG8g Y29uZGl0aW9uYWxseSBpbmplY3QgZXh0ZW5zaW9uIEFQSXMuCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAg ICAgICAgKiBiaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlY4RE9NV2luZG93U2hlbGw6OmluaXRDb250ZXh0SWZOZWVkZWQpOgorICAgICAgICAoV2Vi Q29yZTo6VjhET01XaW5kb3dTaGVsbDo6Y3JlYXRlTmV3Q29udGV4dCk6CisgICAgICAgICogYmlu ZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5oOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4SXNv bGF0ZWRDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4SXNvbGF0ZWRDb250ZXh0OjpW OElzb2xhdGVkQ29udGV4dCk6CisgICAgICAgICogbG9hZGVyL0VtcHR5Q2xpZW50cy5oOgorICAg ICAgICAoV2ViQ29yZTo6RW1wdHlGcmFtZUxvYWRlckNsaWVudDo6YWxsb3dTY3JpcHRFeHRlbnNp b24pOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oOgorCiAyMDExLTEyLTE1 ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSRUdSRVNT SU9OKHIxMDI2NjMpOiBnZW5lcmF0ZS1iaW5kaW5ncy5wbCBydW5zIGV2ZXJ5IHRpbWUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNGVjMTJmYzg2Y2UyZjYwMjUwOTk4YmI2MDIwMTI0ZWU0 MDdmMzZjZC4uZTBhYjZiZTRlMzljMTgyMjc5YjdhYTczZDZkMmUzNDM2YmFiMWZlZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0xMi0xNSAgSmFtZXMg S296aWFuc2tpICA8a296QGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCB3 b3JsZElkIHBhcmFtZXRlciB0byBhbGxvd1NjcmlwdEV4dGVuc2lvbigpCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDIxNAorCisgICAgICAgIENocm9t aXVtIHVzZXMgdGhlIHdvcmxkSWQgdG8gZGV0ZXJtaW5lIHdoYXQgZXh0ZW5zaW9uIGlzIHJ1bm5p bmcgaW4gYQorICAgICAgICB2OCBjb250ZXh0IGFuZCBrbm93aW5nIHRoYXQgYXQgdGhlIHRpbWUg YWxsb3dTY3JpcHRFeHRlbnNpb24oKSBpcworICAgICAgICBjYWxsZWQgYWxsb3dzIHVzIHRvIGNv bmRpdGlvbmFsbHkgaW5qZWN0IGV4dGVuc2lvbiBBUElzLgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcHVibGljL1dlYlBlcm1pc3Npb25DbGllbnQu aDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGVybWlzc2lvbkNsaWVudDo6YWxsb3dTY3JpcHRFeHRl bnNpb24pOgorICAgICAgICAqIHNyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwOgorICAgICAg ICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudEltcGw6OmFsbG93U2NyaXB0RXh0ZW5zaW9uKToK KyAgICAgICAgKiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmg6CisKIDIwMTEtMTItMTUgIE5h dCBEdWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gQWRkIGZv clVzZU9uQW5vdGhlclRocmVhZCB0byBXZWJHcmFwaGljc0NvbnRleHQzRDo6QXR0cmlidXRlcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcAppbmRl eCAxOTczYzBhN2M1NjBiZjZlZjIyZjI3MDE3ZjRiZWEzMDkxN2ZlYTg5Li5kZjVmNjExNDBjYmNi YzMwZTFjNTQzMDU0M2QzYzY5OGE2OGQzZWI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcApAQCAtMzA1LDcgKzMwNSw3IEBAIGJvb2wgVjhE T01XaW5kb3dTaGVsbDo6aW5pdENvbnRleHRJZk5lZWRlZCgpCiAgICAgICAgIGlzVjhJbml0aWFs aXplZCA9IHRydWU7CiAgICAgfQogCi0gICAgbV9jb250ZXh0ID0gY3JlYXRlTmV3Q29udGV4dCht X2dsb2JhbCwgMCk7CisgICAgbV9jb250ZXh0ID0gY3JlYXRlTmV3Q29udGV4dChtX2dsb2JhbCwg MCwgMCk7CiAgICAgaWYgKG1fY29udGV4dC5Jc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIApAQCAtMzQ4LDcgKzM0OCw3IEBAIGJvb2wgVjhET01XaW5kb3dTaGVsbDo6aW5pdENvbnRl eHRJZk5lZWRlZCgpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXY4OjpQZXJzaXN0ZW50PHY4OjpD b250ZXh0PiBWOERPTVdpbmRvd1NoZWxsOjpjcmVhdGVOZXdDb250ZXh0KHY4OjpIYW5kbGU8djg6 Ok9iamVjdD4gZ2xvYmFsLCBpbnQgZXh0ZW5zaW9uR3JvdXApCit2ODo6UGVyc2lzdGVudDx2ODo6 Q29udGV4dD4gVjhET01XaW5kb3dTaGVsbDo6Y3JlYXRlTmV3Q29udGV4dCh2ODo6SGFuZGxlPHY4 OjpPYmplY3Q+IGdsb2JhbCwgaW50IGV4dGVuc2lvbkdyb3VwLCBpbnQgd29ybGRJZCkKIHsKICAg ICB2ODo6UGVyc2lzdGVudDx2ODo6Q29udGV4dD4gcmVzdWx0OwogCkBAIC0zNzksNyArMzc5LDcg QEAgdjg6OlBlcnNpc3RlbnQ8djg6OkNvbnRleHQ+IFY4RE9NV2luZG93U2hlbGw6OmNyZWF0ZU5l d0NvbnRleHQodjg6OkhhbmRsZTx2ODo6T2IKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGV4 dGVuc2lvbnMuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgLy8gRW5zdXJlIG91ciBkYXRlIGV4dGVu c2lvbiBpcyBhbHdheXMgYWxsb3dlZC4KICAgICAgICAgaWYgKGV4dGVuc2lvbnNbaV0gIT0gRGF0 ZUV4dGVuc2lvbjo6Z2V0KCkKLSAgICAgICAgICAgICYmICFtX2ZyYW1lLT5sb2FkZXIoKS0+Y2xp ZW50KCktPmFsbG93U2NyaXB0RXh0ZW5zaW9uKGV4dGVuc2lvbnNbaV0tPm5hbWUoKSwgZXh0ZW5z aW9uR3JvdXApKQorICAgICAgICAgICAgJiYgIW1fZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKS0+ YWxsb3dTY3JpcHRFeHRlbnNpb24oZXh0ZW5zaW9uc1tpXS0+bmFtZSgpLCBleHRlbnNpb25Hcm91 cCwgd29ybGRJZCkpCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBleHRlbnNpb25O YW1lc1tpbmRleCsrXSA9IGV4dGVuc2lvbnNbaV0tPm5hbWUoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuaCBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuaAppbmRleCA3NmMyN2FmMzYxZThkN2U5NWI3 NjkzOThlYjU4MzZlMDUwNWRkNGNkLi41OTc3NDk5YmQyMDgwODg1NmJhOTlmMzIwMWU3OGYzMmUx ZTVjNGFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRv d1NoZWxsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVs bC5oCkBAIC02NSw3ICs2NSw3IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaXNDb250ZXh0SW5pdGlh bGl6ZWQoKTsKIAotICAgIHY4OjpQZXJzaXN0ZW50PHY4OjpDb250ZXh0PiBjcmVhdGVOZXdDb250 ZXh0KHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2xvYmFsLCBpbnQgZXh0ZW5zaW9uR3JvdXApOwor ICAgIHY4OjpQZXJzaXN0ZW50PHY4OjpDb250ZXh0PiBjcmVhdGVOZXdDb250ZXh0KHY4OjpIYW5k bGU8djg6Ok9iamVjdD4gZ2xvYmFsLCBpbnQgZXh0ZW5zaW9uR3JvdXAsIGludCB3b3JsZElkKTsK ICAgICB2b2lkIHNldENvbnRleHQodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4pOwogICAgIHN0YXRp YyBib29sIGluc3RhbGxET01XaW5kb3codjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCwg RE9NV2luZG93Kik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 SXNvbGF0ZWRDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4SXNvbGF0 ZWRDb250ZXh0LmNwcAppbmRleCAyMTIyZDM3YmYyZDhjZWZkMjk1M2Y0M2YyNzU3NjA5ZjFiMGU4 Y2QwLi45ZTU3ZGQ1YjY2MjVmMTExYmJhMTQ1ZDdlYzE4M2IzNDMyZGM5NTgwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOElzb2xhdGVkQ29udGV4dC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhJc29sYXRlZENvbnRleHQuY3BwCkBAIC01NCw3 ICs1NCw3IEBAIFY4SXNvbGF0ZWRDb250ZXh0OjpWOElzb2xhdGVkQ29udGV4dChWOFByb3h5KiBw cm94eSwgaW50IGV4dGVuc2lvbkdyb3VwLCBpbnQgd29yCiB7CiAgICAgdjg6OkhhbmRsZVNjb3Bl IHNjb3BlOwogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgYmUgY3JlYXRpbmcgYSBuZXcgVjhET01X aW5kb3dTaGVsbCBoZXJlIGluc3RlYWQgb2YgcmlwaW5nIG91dCB0aGUgY29udGV4dC4KLSAgICBt X2NvbnRleHQgPSBTaGFyZWRQZXJzaXN0ZW50PHY4OjpDb250ZXh0Pjo6Y3JlYXRlKHByb3h5LT53 aW5kb3dTaGVsbCgpLT5jcmVhdGVOZXdDb250ZXh0KHY4OjpIYW5kbGU8djg6Ok9iamVjdD4oKSwg ZXh0ZW5zaW9uR3JvdXApKTsKKyAgICBtX2NvbnRleHQgPSBTaGFyZWRQZXJzaXN0ZW50PHY4OjpD b250ZXh0Pjo6Y3JlYXRlKHByb3h5LT53aW5kb3dTaGVsbCgpLT5jcmVhdGVOZXdDb250ZXh0KHY4 OjpIYW5kbGU8djg6Ok9iamVjdD4oKSwgZXh0ZW5zaW9uR3JvdXAsIG1fd29ybGQtPmlkKCkpKTsK ICAgICBpZiAobV9jb250ZXh0LT5nZXQoKS5Jc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oCmluZGV4IDc2ZjgyMWQ1ZTU2ZDg0YWM1YTZl ZjNmOTIwM2YyODljMGRjZTQ0MTMuLjgwYjRkZDQ0MGY3NTQ4NGU3NDRiZDU3Mjc0ZTEzZDQ1YzU1 YjVjZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmgKQEAgLTM5Miw3ICszOTIs NyBAQCBwdWJsaWM6CiAjaWYgVVNFKFY4KQogICAgIHZpcnR1YWwgdm9pZCBkaWRDcmVhdGVTY3Jp cHRDb250ZXh0KHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+LCBpbnQgd29ybGRJZCkgeyB9CiAgICAg dmlydHVhbCB2b2lkIHdpbGxSZWxlYXNlU2NyaXB0Q29udGV4dCh2ODo6SGFuZGxlPHY4OjpDb250 ZXh0PiwgaW50IHdvcmxkSWQpIHsgfQotICAgIHZpcnR1YWwgYm9vbCBhbGxvd1NjcmlwdEV4dGVu c2lvbihjb25zdCBTdHJpbmcmIGV4dGVuc2lvbk5hbWUsIGludCBleHRlbnNpb25Hcm91cCkgeyBy ZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wgYWxsb3dTY3JpcHRFeHRlbnNpb24oY29u c3QgU3RyaW5nJiBleHRlbnNpb25OYW1lLCBpbnQgZXh0ZW5zaW9uR3JvdXAsIGludCB3b3JsZElk KSB7IHJldHVybiBmYWxzZTsgfQogI2VuZGlmCiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCmluZGV4IGJlNzRiN2MzMmExZTdiMWRk ZWQ5YTMyMmIwZThmMjM3NjBlZDJmZWYuLjQ1MTdiMzY0OGUyMjM4ZjQxM2ZlZGNkMDJhMTJmNzdj NTQ1MDJkOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNs aWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCkBA IC0yNzcsNyArMjc3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogI2lmIFVTRShWOCkKICAgICAg ICAgdmlydHVhbCB2b2lkIGRpZENyZWF0ZVNjcmlwdENvbnRleHQodjg6OkhhbmRsZTx2ODo6Q29u dGV4dD4sIGludCB3b3JsZElkKSA9IDA7CiAgICAgICAgIHZpcnR1YWwgdm9pZCB3aWxsUmVsZWFz ZVNjcmlwdENvbnRleHQodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4sIGludCB3b3JsZElkKSA9IDA7 Ci0gICAgICAgIHZpcnR1YWwgYm9vbCBhbGxvd1NjcmlwdEV4dGVuc2lvbihjb25zdCBTdHJpbmcm IGV4dGVuc2lvbk5hbWUsIGludCBleHRlbnNpb25Hcm91cCkgPSAwOworICAgICAgICB2aXJ0dWFs IGJvb2wgYWxsb3dTY3JpcHRFeHRlbnNpb24oY29uc3QgU3RyaW5nJiBleHRlbnNpb25OYW1lLCBp bnQgZXh0ZW5zaW9uR3JvdXAsIGludCB3b3JsZElkKSA9IDA7CiAjZW5kaWYKIAogICAgICAgICB2 aXJ0dWFsIHZvaWQgcmVnaXN0ZXJGb3JJY29uTm90aWZpY2F0aW9uKGJvb2wgbGlzdGVuID0gdHJ1 ZSkgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGVy bWlzc2lvbkNsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGVybWlz c2lvbkNsaWVudC5oCmluZGV4IGZiZTA5NTcyYmU4YmIxZGQ1NmU0YjZkYTRjZDNhYTI1YjcxZDNl NWIuLmJjMjUxODI1Y2M0MjM0ZWY4MzZhYWQ3MDlmNzYyODU2YzkwNWM1YzAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBlcm1pc3Npb25DbGllbnQuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQZXJtaXNzaW9uQ2xpZW50LmgKQEAg LTc0LDYgKzc0LDExIEBAIHB1YmxpYzoKICAgICAvLyB2YWx1ZS4KICAgICB2aXJ0dWFsIGJvb2wg YWxsb3dTY3JpcHRFeHRlbnNpb24oV2ViRnJhbWUqLCBjb25zdCBXZWJTdHJpbmcmIGV4dGVuc2lv bk5hbWUsIGludCBleHRlbnNpb25Hcm91cCkgeyByZXR1cm4gdHJ1ZTsgfQogCisgICAgdmlydHVh bCBib29sIGFsbG93U2NyaXB0RXh0ZW5zaW9uKFdlYkZyYW1lKiB3ZWJGcmFtZSwgY29uc3QgV2Vi U3RyaW5nJiBleHRlbnNpb25OYW1lLCBpbnQgZXh0ZW5zaW9uR3JvdXAsIGludCB3b3JsZElkKQor ICAgIHsKKyAgICAgICAgcmV0dXJuIGFsbG93U2NyaXB0RXh0ZW5zaW9uKHdlYkZyYW1lLCBleHRl bnNpb25OYW1lLCBleHRlbnNpb25Hcm91cCk7CisgICAgfQorCiAgICAgLy8gQ29udHJvbHMgd2hl dGhlciBIVE1MNSBXZWIgU3RvcmFnZSBpcyBhbGxvd2VkIGZvciB0aGlzIGZyYW1lLgogICAgIC8v IElmIGxvY2FsIGlzIHRydWUsIHRoZW4gdGhpcyBpcyBmb3IgbG9jYWwgc3RvcmFnZSwgb3RoZXJ3 aXNlIGl0J3MgZm9yIHNlc3Npb24gc3RvcmFnZS4KICAgICB2aXJ0dWFsIGJvb2wgYWxsb3dTdG9y YWdlKFdlYkZyYW1lKiwgYm9vbCBsb2NhbCkgeyByZXR1cm4gdHJ1ZTsgfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKaW5kZXgg MGRkMWRiOGM3YWRiZDEwOTVlNTQxNGE1ZmQ4YjZlYWFhMDYwN2ZiOS4uOTA1YTM3NzcyMjU5YWJl MzBiNzFhYTRjMTdkNGU1NmVlYmYxNGY2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCkBAIC0xNTUsMTEgKzE1NSwxMiBA QCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6d2lsbFJlbGVhc2VTY3JpcHRDb250ZXh0KHY4 OjpIYW5kbGU8djg6OkNvbnRleHQ+IGNvbgogI2VuZGlmCiAKIGJvb2wgRnJhbWVMb2FkZXJDbGll bnRJbXBsOjphbGxvd1NjcmlwdEV4dGVuc2lvbihjb25zdCBTdHJpbmcmIGV4dGVuc2lvbk5hbWUs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGV4 dGVuc2lvbkdyb3VwKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGludCBleHRlbnNpb25Hcm91cCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBpbnQgd29ybGRJZCkKIHsKICAgICBXZWJWaWV3SW1wbCogd2Vi dmlldyA9IG1fd2ViRnJhbWUtPnZpZXdJbXBsKCk7CiAgICAgaWYgKHdlYnZpZXcgJiYgd2Vidmll dy0+cGVybWlzc2lvbkNsaWVudCgpKQotICAgICAgICByZXR1cm4gd2Vidmlldy0+cGVybWlzc2lv bkNsaWVudCgpLT5hbGxvd1NjcmlwdEV4dGVuc2lvbihtX3dlYkZyYW1lLCBleHRlbnNpb25OYW1l LCBleHRlbnNpb25Hcm91cCk7CisgICAgICAgIHJldHVybiB3ZWJ2aWV3LT5wZXJtaXNzaW9uQ2xp ZW50KCktPmFsbG93U2NyaXB0RXh0ZW5zaW9uKG1fd2ViRnJhbWUsIGV4dGVuc2lvbk5hbWUsIGV4 dGVuc2lvbkdyb3VwLCB3b3JsZElkKTsKIAogICAgIHJldHVybiB0cnVlOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmggYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuaAppbmRleCAy MjI5NGY5MGMzM2E2ODNlODk5MzY1ZDg5MGFlZDIxMzNkNWI0NDg4Li41OTZiNWY0YTA3OWIwMzBj YTM4MTFjZmYzNzAzMTc0OTQyMDVmYWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuaApAQCAtNjgsNyArNjgsNyBAQCBwdWJsaWM6 CiAKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgd2Ugc2hvdWxkIGFsbG93IHRoZSBnaXZlbiBWOCBl eHRlbnNpb24gdG8gYmUgYWRkZWQgdG8KICAgICAvLyB0aGUgc2NyaXB0IGNvbnRleHQgYXQgdGhl IGN1cnJlbnRseSBsb2FkaW5nIHBhZ2UgYW5kIGdpdmVuIGV4dGVuc2lvbiBncm91cC4KLSAgICB2 aXJ0dWFsIGJvb2wgYWxsb3dTY3JpcHRFeHRlbnNpb24oY29uc3QgU3RyaW5nJiBleHRlbnNpb25O YW1lLCBpbnQgZXh0ZW5zaW9uR3JvdXApOworICAgIHZpcnR1YWwgYm9vbCBhbGxvd1NjcmlwdEV4 dGVuc2lvbihjb25zdCBTdHJpbmcmIGV4dGVuc2lvbk5hbWUsIGludCBleHRlbnNpb25Hcm91cCwg aW50IHdvcmxkSWQpOwogCiAgICAgdmlydHVhbCBib29sIGhhc1dlYlZpZXcoKSBjb25zdDsKICAg ICB2aXJ0dWFsIGJvb2wgaGFzRnJhbWVWaWV3KCkgY29uc3Q7Cg== 119781 2011-12-18 14:33:01 -0800 2011-12-18 16:38:11 -0800 Patch for landing bug-74214-20111219093259.patch text/plain 9861 koz U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyOTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWNkMTI3NjgyZTA1Yjkz MDFiZTljY2I5YjJkNmZhMjJmMDllNDg0Yy4uY2M0MzcxZTM4NmRjNjI5ZTg3NjkzZDBjNWQxMzll OGQ5MWRiODU3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDExLTEyLTE1ICBKYW1l cyBLb3ppYW5za2kgIDxrb3pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRk IHdvcmxkSWQgcGFyYW1ldGVyIHRvIGFsbG93U2NyaXB0RXh0ZW5zaW9uKCkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0MjE0CisKKyAgICAgICAgQ2hy b21pdW0gdXNlcyB0aGUgd29ybGRJZCB0byBkZXRlcm1pbmUgd2hhdCBleHRlbnNpb24gaXMgcnVu bmluZyBpbiBhCisgICAgICAgIHY4IGNvbnRleHQgYW5kIGtub3dpbmcgdGhhdCBhdCB0aGUgdGlt ZSBhbGxvd1NjcmlwdEV4dGVuc2lvbigpIGlzCisgICAgICAgIGNhbGxlZCBhbGxvd3MgdXMgdG8g Y29uZGl0aW9uYWxseSBpbmplY3QgZXh0ZW5zaW9uIEFQSXMuCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgRGFyaW4gRmlzaGVyLgorCisgICAgICAgICogYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVs bC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOERPTVdpbmRvd1NoZWxsOjppbml0Q29udGV4dElm TmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlY4RE9NV2luZG93U2hlbGw6OmNyZWF0ZU5ld0Nv bnRleHQpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuaDoKKyAgICAg ICAgKiBiaW5kaW5ncy92OC9WOElzb2xhdGVkQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpWOElzb2xhdGVkQ29udGV4dDo6VjhJc29sYXRlZENvbnRleHQpOgorICAgICAgICAqIGxvYWRl ci9FbXB0eUNsaWVudHMuaDoKKyAgICAgICAgKFdlYkNvcmU6OkVtcHR5RnJhbWVMb2FkZXJDbGll bnQ6OmFsbG93U2NyaXB0RXh0ZW5zaW9uKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXJD bGllbnQuaDoKKwogMjAxMS0xMi0xNSAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMTAyNjYzKTogZ2VuZXJhdGUtYmluZGluZ3MucGwg cnVucyBldmVyeSB0aW1lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDRlYzEyZmM4NmNl MmY2MDI1MDk5OGJiNjAyMDEyNGVlNDA3ZjM2Y2QuLmVjOTk3MWQ3YWJhZDRkZjk1Yjg5NTBlMWJk OGZkYTJlNWNjZWM3ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMTItMTUgIEphbWVzIEtvemlhbnNraSAgPGtvekBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgW2Nocm9taXVtXSBBZGQgd29ybGRJZCBwYXJhbWV0ZXIgdG8gYWxsb3dTY3JpcHRFeHRl bnNpb24oKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzQyMTQKKworICAgICAgICBDaHJvbWl1bSB1c2VzIHRoZSB3b3JsZElkIHRvIGRldGVybWluZSB3 aGF0IGV4dGVuc2lvbiBpcyBydW5uaW5nIGluIGEKKyAgICAgICAgdjggY29udGV4dCBhbmQga25v d2luZyB0aGF0IGF0IHRoZSB0aW1lIGFsbG93U2NyaXB0RXh0ZW5zaW9uKCkgaXMKKyAgICAgICAg Y2FsbGVkIGFsbG93cyB1cyB0byBjb25kaXRpb25hbGx5IGluamVjdCBleHRlbnNpb24gQVBJcy4K KworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBGaXNoZXIuCisKKyAgICAgICAgKiBwdWJsaWMv V2ViUGVybWlzc2lvbkNsaWVudC5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQZXJtaXNzaW9uQ2xp ZW50OjphbGxvd1NjcmlwdEV4dGVuc2lvbik6CisgICAgICAgICogc3JjL0ZyYW1lTG9hZGVyQ2xp ZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6YWxs b3dTY3JpcHRFeHRlbnNpb24pOgorICAgICAgICAqIHNyYy9GcmFtZUxvYWRlckNsaWVudEltcGwu aDoKKwogMjAxMS0xMi0xNSAgTmF0IER1Y2EgIDxuZHVjYUBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgW2Nocm9taXVtXSBBZGQgZm9yVXNlT25Bbm90aGVyVGhyZWFkIHRvIFdlYkdyYXBoaWNzQ29u dGV4dDNEOjpBdHRyaWJ1dGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9WOERPTVdpbmRvd1NoZWxsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9N V2luZG93U2hlbGwuY3BwCmluZGV4IDE5NzNjMGE3YzU2MGJmNmVmMjJmMjcwMTdmNGJlYTMwOTE3 ZmVhODkuLmRmNWY2MTE0MGNiY2JjMzBlMWM1NDMwNTQzZDNjNjk4YTY4ZDNlYjcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuY3BwCkBAIC0zMDUs NyArMzA1LDcgQEAgYm9vbCBWOERPTVdpbmRvd1NoZWxsOjppbml0Q29udGV4dElmTmVlZGVkKCkK ICAgICAgICAgaXNWOEluaXRpYWxpemVkID0gdHJ1ZTsKICAgICB9CiAKLSAgICBtX2NvbnRleHQg PSBjcmVhdGVOZXdDb250ZXh0KG1fZ2xvYmFsLCAwKTsKKyAgICBtX2NvbnRleHQgPSBjcmVhdGVO ZXdDb250ZXh0KG1fZ2xvYmFsLCAwLCAwKTsKICAgICBpZiAobV9jb250ZXh0LklzRW1wdHkoKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCkBAIC0zNDgsNyArMzQ4LDcgQEAgYm9vbCBWOERPTVdp bmRvd1NoZWxsOjppbml0Q29udGV4dElmTmVlZGVkKCkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAot djg6OlBlcnNpc3RlbnQ8djg6OkNvbnRleHQ+IFY4RE9NV2luZG93U2hlbGw6OmNyZWF0ZU5ld0Nv bnRleHQodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBnbG9iYWwsIGludCBleHRlbnNpb25Hcm91cCkK K3Y4OjpQZXJzaXN0ZW50PHY4OjpDb250ZXh0PiBWOERPTVdpbmRvd1NoZWxsOjpjcmVhdGVOZXdD b250ZXh0KHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2xvYmFsLCBpbnQgZXh0ZW5zaW9uR3JvdXAs IGludCB3b3JsZElkKQogewogICAgIHY4OjpQZXJzaXN0ZW50PHY4OjpDb250ZXh0PiByZXN1bHQ7 CiAKQEAgLTM3OSw3ICszNzksNyBAQCB2ODo6UGVyc2lzdGVudDx2ODo6Q29udGV4dD4gVjhET01X aW5kb3dTaGVsbDo6Y3JlYXRlTmV3Q29udGV4dCh2ODo6SGFuZGxlPHY4OjpPYgogICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgZXh0ZW5zaW9ucy5zaXplKCk7ICsraSkgewogICAgICAgICAvLyBF bnN1cmUgb3VyIGRhdGUgZXh0ZW5zaW9uIGlzIGFsd2F5cyBhbGxvd2VkLgogICAgICAgICBpZiAo ZXh0ZW5zaW9uc1tpXSAhPSBEYXRlRXh0ZW5zaW9uOjpnZXQoKQotICAgICAgICAgICAgJiYgIW1f ZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKS0+YWxsb3dTY3JpcHRFeHRlbnNpb24oZXh0ZW5zaW9u c1tpXS0+bmFtZSgpLCBleHRlbnNpb25Hcm91cCkpCisgICAgICAgICAgICAmJiAhbV9mcmFtZS0+ bG9hZGVyKCktPmNsaWVudCgpLT5hbGxvd1NjcmlwdEV4dGVuc2lvbihleHRlbnNpb25zW2ldLT5u YW1lKCksIGV4dGVuc2lvbkdyb3VwLCB3b3JsZElkKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwog CiAgICAgICAgIGV4dGVuc2lvbk5hbWVzW2luZGV4KytdID0gZXh0ZW5zaW9uc1tpXS0+bmFtZSgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVs bC5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5oCmluZGV4 IDc2YzI3YWYzNjFlOGQ3ZTk1Yjc2OTM5OGViNTgzNmUwNTA1ZGQ0Y2QuLjU5Nzc0OTliZDIwODA4 ODU2YmE5OWYzMjAxZTc4ZjMyZTFlNWM0YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9WOERPTVdpbmRvd1NoZWxsLmgKQEAgLTY1LDcgKzY1LDcgQEAgcHVibGljOgogCiAgICAg Ym9vbCBpc0NvbnRleHRJbml0aWFsaXplZCgpOwogCi0gICAgdjg6OlBlcnNpc3RlbnQ8djg6OkNv bnRleHQ+IGNyZWF0ZU5ld0NvbnRleHQodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBnbG9iYWwsIGlu dCBleHRlbnNpb25Hcm91cCk7CisgICAgdjg6OlBlcnNpc3RlbnQ8djg6OkNvbnRleHQ+IGNyZWF0 ZU5ld0NvbnRleHQodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBnbG9iYWwsIGludCBleHRlbnNpb25H cm91cCwgaW50IHdvcmxkSWQpOwogICAgIHZvaWQgc2V0Q29udGV4dCh2ODo6SGFuZGxlPHY4OjpD b250ZXh0Pik7CiAgICAgc3RhdGljIGJvb2wgaW5zdGFsbERPTVdpbmRvdyh2ODo6SGFuZGxlPHY4 OjpDb250ZXh0PiBjb250ZXh0LCBET01XaW5kb3cqKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvVjhJc29sYXRlZENvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvVjhJc29sYXRlZENvbnRleHQuY3BwCmluZGV4IDIxMjJkMzdiZjJkOGNlZmQy OTUzZjQzZjI3NTc2MDlmMWIwZThjZDAuLjllNTdkZDViNjYyNWYxMTFiYmExNDVkN2VjMTgzYjM0 MzJkYzk1ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4SXNvbGF0 ZWRDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOElzb2xhdGVk Q29udGV4dC5jcHAKQEAgLTU0LDcgKzU0LDcgQEAgVjhJc29sYXRlZENvbnRleHQ6OlY4SXNvbGF0 ZWRDb250ZXh0KFY4UHJveHkqIHByb3h5LCBpbnQgZXh0ZW5zaW9uR3JvdXAsIGludCB3b3IKIHsK ICAgICB2ODo6SGFuZGxlU2NvcGUgc2NvcGU7CiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBiZSBj cmVhdGluZyBhIG5ldyBWOERPTVdpbmRvd1NoZWxsIGhlcmUgaW5zdGVhZCBvZiByaXBpbmcgb3V0 IHRoZSBjb250ZXh0LgotICAgIG1fY29udGV4dCA9IFNoYXJlZFBlcnNpc3RlbnQ8djg6OkNvbnRl eHQ+OjpjcmVhdGUocHJveHktPndpbmRvd1NoZWxsKCktPmNyZWF0ZU5ld0NvbnRleHQodjg6Okhh bmRsZTx2ODo6T2JqZWN0PigpLCBleHRlbnNpb25Hcm91cCkpOworICAgIG1fY29udGV4dCA9IFNo YXJlZFBlcnNpc3RlbnQ8djg6OkNvbnRleHQ+OjpjcmVhdGUocHJveHktPndpbmRvd1NoZWxsKCkt PmNyZWF0ZU5ld0NvbnRleHQodjg6OkhhbmRsZTx2ODo6T2JqZWN0PigpLCBleHRlbnNpb25Hcm91 cCwgbV93b3JsZC0+aWQoKSkpOwogICAgIGlmIChtX2NvbnRleHQtPmdldCgpLklzRW1wdHkoKSkK ICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1w dHlDbGllbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmgKaW5kZXgg NzZmODIxZDVlNTZkODRhYzVhNmVmM2Y5MjAzZjI4OWMwZGNlNDQxMy4uODBiNGRkNDQwZjc1NDg0 ZTc0NGJkNTcyNzRlMTNkNDVjNTViNWNmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0VtcHR5Q2xpZW50cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVu dHMuaApAQCAtMzkyLDcgKzM5Miw3IEBAIHB1YmxpYzoKICNpZiBVU0UoVjgpCiAgICAgdmlydHVh bCB2b2lkIGRpZENyZWF0ZVNjcmlwdENvbnRleHQodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4sIGlu dCB3b3JsZElkKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgd2lsbFJlbGVhc2VTY3JpcHRDb250ZXh0 KHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+LCBpbnQgd29ybGRJZCkgeyB9Ci0gICAgdmlydHVhbCBi b29sIGFsbG93U2NyaXB0RXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgZXh0ZW5zaW9uTmFtZSwgaW50 IGV4dGVuc2lvbkdyb3VwKSB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwgYm9vbCBhbGxv d1NjcmlwdEV4dGVuc2lvbihjb25zdCBTdHJpbmcmIGV4dGVuc2lvbk5hbWUsIGludCBleHRlbnNp b25Hcm91cCwgaW50IHdvcmxkSWQpIHsgcmV0dXJuIGZhbHNlOyB9CiAjZW5kaWYKIAogI2lmIFBM QVRGT1JNKE1BQykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKaW5k ZXggYmU3NGI3YzMyYTFlN2IxZGRlZDlhMzIyYjBlOGYyMzc2MGVkMmZlZi4uNDUxN2IzNjQ4ZTIy MzhmNDEzZmVkY2QwMmExMmY3N2M1NDUwMmQ5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyQ2xpZW50LmgKQEAgLTI3Nyw3ICsyNzcsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAjaWYgVVNFKFY4KQogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkQ3JlYXRlU2NyaXB0Q29udGV4 dCh2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiwgaW50IHdvcmxkSWQpID0gMDsKICAgICAgICAgdmly dHVhbCB2b2lkIHdpbGxSZWxlYXNlU2NyaXB0Q29udGV4dCh2ODo6SGFuZGxlPHY4OjpDb250ZXh0 PiwgaW50IHdvcmxkSWQpID0gMDsKLSAgICAgICAgdmlydHVhbCBib29sIGFsbG93U2NyaXB0RXh0 ZW5zaW9uKGNvbnN0IFN0cmluZyYgZXh0ZW5zaW9uTmFtZSwgaW50IGV4dGVuc2lvbkdyb3VwKSA9 IDA7CisgICAgICAgIHZpcnR1YWwgYm9vbCBhbGxvd1NjcmlwdEV4dGVuc2lvbihjb25zdCBTdHJp bmcmIGV4dGVuc2lvbk5hbWUsIGludCBleHRlbnNpb25Hcm91cCwgaW50IHdvcmxkSWQpID0gMDsK ICNlbmRpZgogCiAgICAgICAgIHZpcnR1YWwgdm9pZCByZWdpc3RlckZvckljb25Ob3RpZmljYXRp b24oYm9vbCBsaXN0ZW4gPSB0cnVlKSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJQZXJtaXNzaW9uQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJQZXJtaXNzaW9uQ2xpZW50LmgKaW5kZXggZmJlMDk1NzJiZThiYjFkZDU2 ZTRiNmRhNGNkM2FhMjViNzFkM2U1Yi4uYmMyNTE4MjVjYzQyMzRlZjgzNmFhZDcwOWY3NjI4NTZj OTA1YzVjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGVy bWlzc2lvbkNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBl cm1pc3Npb25DbGllbnQuaApAQCAtNzQsNiArNzQsMTEgQEAgcHVibGljOgogICAgIC8vIHZhbHVl LgogICAgIHZpcnR1YWwgYm9vbCBhbGxvd1NjcmlwdEV4dGVuc2lvbihXZWJGcmFtZSosIGNvbnN0 IFdlYlN0cmluZyYgZXh0ZW5zaW9uTmFtZSwgaW50IGV4dGVuc2lvbkdyb3VwKSB7IHJldHVybiB0 cnVlOyB9CiAKKyAgICB2aXJ0dWFsIGJvb2wgYWxsb3dTY3JpcHRFeHRlbnNpb24oV2ViRnJhbWUq IHdlYkZyYW1lLCBjb25zdCBXZWJTdHJpbmcmIGV4dGVuc2lvbk5hbWUsIGludCBleHRlbnNpb25H cm91cCwgaW50IHdvcmxkSWQpCisgICAgeworICAgICAgICByZXR1cm4gYWxsb3dTY3JpcHRFeHRl bnNpb24od2ViRnJhbWUsIGV4dGVuc2lvbk5hbWUsIGV4dGVuc2lvbkdyb3VwKTsKKyAgICB9CisK ICAgICAvLyBDb250cm9scyB3aGV0aGVyIEhUTUw1IFdlYiBTdG9yYWdlIGlzIGFsbG93ZWQgZm9y IHRoaXMgZnJhbWUuCiAgICAgLy8gSWYgbG9jYWwgaXMgdHJ1ZSwgdGhlbiB0aGlzIGlzIGZvciBs b2NhbCBzdG9yYWdlLCBvdGhlcndpc2UgaXQncyBmb3Igc2Vzc2lvbiBzdG9yYWdlLgogICAgIHZp cnR1YWwgYm9vbCBhbGxvd1N0b3JhZ2UoV2ViRnJhbWUqLCBib29sIGxvY2FsKSB7IHJldHVybiB0 cnVlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRl ckNsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJD bGllbnRJbXBsLmNwcAppbmRleCAwZGQxZGI4YzdhZGJkMTA5NWU1NDE0YTVmZDhiNmVhYWEwNjA3 ZmI5Li45MDVhMzc3NzIyNTlhYmUzMGI3MWFhNGMxN2Q0ZTU2ZWViZjE0ZjY5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAK QEAgLTE1NSwxMSArMTU1LDEyIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjp3aWxsUmVs ZWFzZVNjcmlwdENvbnRleHQodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gY29uCiAjZW5kaWYKIAog Ym9vbCBGcmFtZUxvYWRlckNsaWVudEltcGw6OmFsbG93U2NyaXB0RXh0ZW5zaW9uKGNvbnN0IFN0 cmluZyYgZXh0ZW5zaW9uTmFtZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpbnQgZXh0ZW5zaW9uR3JvdXApCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGV4dGVuc2lvbkdyb3VwLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCB3b3JsZElkKQogewog ICAgIFdlYlZpZXdJbXBsKiB3ZWJ2aWV3ID0gbV93ZWJGcmFtZS0+dmlld0ltcGwoKTsKICAgICBp ZiAod2VidmlldyAmJiB3ZWJ2aWV3LT5wZXJtaXNzaW9uQ2xpZW50KCkpCi0gICAgICAgIHJldHVy biB3ZWJ2aWV3LT5wZXJtaXNzaW9uQ2xpZW50KCktPmFsbG93U2NyaXB0RXh0ZW5zaW9uKG1fd2Vi RnJhbWUsIGV4dGVuc2lvbk5hbWUsIGV4dGVuc2lvbkdyb3VwKTsKKyAgICAgICAgcmV0dXJuIHdl YnZpZXctPnBlcm1pc3Npb25DbGllbnQoKS0+YWxsb3dTY3JpcHRFeHRlbnNpb24obV93ZWJGcmFt ZSwgZXh0ZW5zaW9uTmFtZSwgZXh0ZW5zaW9uR3JvdXAsIHdvcmxkSWQpOwogCiAgICAgcmV0dXJu IHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxv YWRlckNsaWVudEltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVy Q2xpZW50SW1wbC5oCmluZGV4IDIyMjk0ZjkwYzMzYTY4M2U4OTkzNjVkODkwYWVkMjEzM2Q1YjQ0 ODguLjU5NmI1ZjRhMDc5YjAzMGNhMzgxMWNmZjM3MDMxNzQ5NDIwNWZhYjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5oCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5oCkBAIC02 OCw3ICs2OCw3IEBAIHB1YmxpYzoKIAogICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB3ZSBzaG91bGQg YWxsb3cgdGhlIGdpdmVuIFY4IGV4dGVuc2lvbiB0byBiZSBhZGRlZCB0bwogICAgIC8vIHRoZSBz Y3JpcHQgY29udGV4dCBhdCB0aGUgY3VycmVudGx5IGxvYWRpbmcgcGFnZSBhbmQgZ2l2ZW4gZXh0 ZW5zaW9uIGdyb3VwLgotICAgIHZpcnR1YWwgYm9vbCBhbGxvd1NjcmlwdEV4dGVuc2lvbihjb25z dCBTdHJpbmcmIGV4dGVuc2lvbk5hbWUsIGludCBleHRlbnNpb25Hcm91cCk7CisgICAgdmlydHVh bCBib29sIGFsbG93U2NyaXB0RXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgZXh0ZW5zaW9uTmFtZSwg aW50IGV4dGVuc2lvbkdyb3VwLCBpbnQgd29ybGRJZCk7CiAKICAgICB2aXJ0dWFsIGJvb2wgaGFz V2ViVmlldygpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBoYXNGcmFtZVZpZXcoKSBjb25zdDsK