112426 2013-03-15 04:16:53 -0700 [WK2] Add support for selectTrailingWhitespaceEnabled setting 2013-05-17 12:50:16 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108528 1 rego webkit-unassigned benjamin commit-queue enrica g.czajkowski rniwa thorton oldest_to_newest 855883 0 rego 2013-03-15 04:16:53 -0700 Once bug #109404 has landed and as we agreed there this will include the WK2 part of the original patch. The idea is to add support for the new WebCore::Page setting selectTrailingWhitespaceEnabled. Something similar to what we do in but #107840 for smartInsertDeleteEnabled. 855884 1 193277 rego 2013-03-15 04:24:18 -0700 Created attachment 193277 Patch 862077 2 193277 thorton 2013-03-22 18:49:23 -0700 Comment on attachment 193277 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193277&action=review > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:3819 > + setSelectTrailingWhitespaceEnabled(!enabled); Is a strict 'not' right here? > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:3832 > + setSmartInsertDeleteEnabled(!enabled); Ditto. 862580 3 rego 2013-03-25 02:25:49 -0700 (In reply to comment #2) > (From update of attachment 193277 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=193277&action=review > > > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:3819 > > + setSelectTrailingWhitespaceEnabled(!enabled); > > Is a strict 'not' right here? > > > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:3832 > > + setSmartInsertDeleteEnabled(!enabled); > > Ditto. The reason to do that is to keep the behavior of the different ports in WK1 where these 2 settings are mutually exclusive. The only exception is Chromium port, where in some situations these settings are not exclusive, however as Chromium didn't use WK2 I keep a similar approach to WK1 here. Originally this comes from a comment in WebCore::Editor: // smartInsertDeleteEnabled and selectTrailingWhitespaceEnabled are // mutually exclusive, meaning that enabling one will disable the other. bool smartInsertDeleteEnabled(); bool isSelectTrailingWhitespaceEnabled(); Anyway maybe this is not accurate anymore, and we could remove the lines establishing the other setting and everyone using it should be responsible to update it (or not) accordingly. Let me know what do you think and I can prepare a patch without these 2 lines if needed. Thanks for the review. 867041 4 195954 rego 2013-04-01 04:21:12 -0700 Created attachment 195954 Patch Uploading a new version of the patch without the lines establishing the related setting to the opposite value.\nI think that now it's a matter of deciding what's the preferred option: if we want to keep a similar behavior to WK1 (old patch) or not (new patch).\nI'm not marking as obsolete previous patch so we can decide what's the best approach and choose among them. 889690 5 rego 2013-05-15 22:45:39 -0700 Ping. These patches have been ready for a while we just need to chose what's the preferred behavior for WK2 forcing smartInsertDeleteEnabled and selectTrailingWhitespaceEnabled to be mutually exclusive (first patch) or not (second patch). 889699 6 195954 benjamin 2013-05-15 23:05:39 -0700 Comment on attachment 195954 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195954&action=review I am confused. How does added two preferences, but not use them anywhere, fixes the tests? > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:3842 > +bool WebPage::isSelectTrailingWhitespaceEnabled() > +{ > + return m_page->settings()->selectTrailingWhitespaceEnabled(); > +} > + > +void WebPage::setSelectTrailingWhitespaceEnabled(bool enabled) > +{ > + m_page->settings()->setSelectTrailingWhitespaceEnabled(enabled); > +} > + This code looks unused, am I missing something? 889729 7 rego 2013-05-16 00:50:47 -0700 (In reply to comment #6) > (From update of attachment 195954 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=195954&action=review > > I am confused. How does added two preferences, but not use them anywhere, fixes the tests? The tests were already fixed in r144221 and r145849, where you can see changes like: - testRunner.setSmartInsertDeleteEnabled(false); - internals.settings.setSmartInsertDeleteEnabled(false); or: - testRunner.setSelectTrailingWhitespaceEnabled(true); + internals.settings.setSelectTrailingWhitespaceEnabled(true); This patch just adds support for selectTrailingWhitespaceEnabled in WK2 as smartInsertDeleteEnabled is already supported. In WK1 both are already supported. > > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:3842 > > +bool WebPage::isSelectTrailingWhitespaceEnabled() > > +{ > > + return m_page->settings()->selectTrailingWhitespaceEnabled(); > > +} > > + > > +void WebPage::setSelectTrailingWhitespaceEnabled(bool enabled) > > +{ > > + m_page->settings()->setSelectTrailingWhitespaceEnabled(enabled); > > +} > > + > > This code looks unused, am I missing something? As I explained before it's used from the tests modified in r145849. 890237 8 benjamin 2013-05-17 00:50:14 -0700 If the tests are unrelated changes, they should not be in the same patch. 890282 9 202059 rego 2013-05-17 04:20:20 -0700 Created attachment 202059 Patch Uploaded new patch without the changes in TestExpectations file that will be done later in a separated patch. 890585 10 rniwa 2013-05-17 12:29:13 -0700 Please unskip tests as appropriate. 890604 11 202059 commit-queue 2013-05-17 12:50:13 -0700 Comment on attachment 202059 Patch Clearing flags on attachment: 202059 Committed r150289: <http://trac.webkit.org/changeset/150289> 890605 12 commit-queue 2013-05-17 12:50:16 -0700 All reviewed patches have been landed. Closing bug. 193277 2013-03-15 04:24:18 -0700 2013-05-17 04:19:05 -0700 Patch bug-112426-20130315122013.patch text/plain 10278 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWQ1ODU5NzFjMGVjOWRm MmYzNWM2Yjg0MDUyYWM4OWE0NTM2YWVmYS4uZjFkN2M2NzNiZDJjNzM4ZGQ0YzkzMWQ1N2RjNWYx Njg2YzkwYWE5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEzLTAzLTE1ICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtXSzJdIEFk ZCBzdXBwb3J0IGZvciBzZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkIHNldHRpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjQyNgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dl YlByZWZlcmVuY2VzU3RvcmUuaDoKKyAgICAgICAgKFdlYktpdCk6IEFkZCBtYWNybyBmb3Igc2Vs ZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Mv V0tQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXS1ByZWZlcmVuY2VzU2V0U2VsZWN0VHJhaWxp bmdXaGl0ZXNwYWNlRW5hYmxlZCk6CisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0U2VsZWN0VHJh aWxpbmdXaGl0ZXNwYWNlRW5hYmxlZCk6IEltcGxlbWVudCBtZXRob2RzCisgICAgICAgIHVzaW5n IHRoZSBuZXcgc2V0dGluZy4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNl c1ByaXZhdGUuaDogQWRkIG5ldyBtZXRob2RzIGhlYWRlcnMuCisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJFZGl0b3JDbGllbnQ6OmlzU2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZCk6IEltcGxl bWVudAorICAgICAgICBtZXRob2QgZGVsZWdhdGluZyBpbiBXZWJQYWdlLgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6 dXBkYXRlUHJlZmVyZW5jZXMpOiBTZXQKKyAgICAgICAgc2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNl RW5hYmxlZCBzZXR0aW5nLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRTbWFydEluc2Vy dERlbGV0ZUVuYWJsZWQpOiBTZXQKKyAgICAgICAgc2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5h YmxlZCBhcyB0aGV5IGFyZSBtdXR1YWxseSBleGNsdXNpdmUuCisgICAgICAgIChXZWJLaXQpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjppc1NlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJs ZWQpOiBJbXBsZW1lbnQgbWV0aG9kCisgICAgICAgIHVzaW5nIHNldHRpbmdzLgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlOjpzZXRTZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKTogSW1w bGVtZW50IG1ldGhvZAorICAgICAgICB1c2luZyBzZXR0aW5ncyBhbmQgc2V0IHNtYXJ0SW5zZXJ0 RGVsZXRlRW5hYmxlZCBhcyB0aGV5IGFyZSBtdXR1YWxseQorICAgICAgICBleGNsdXNpdmUuCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKFdlYlBhZ2Up OiBBZGQgbmV3IG1ldGhvZHMgaGVhZGVycy4KKwogMjAxMy0wMy0xNCAgQW5keSBFc3RlcyAgPGFl c3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYktpdDJdIE9ubHkgcHJlcHJvY2VzcyBzYW5k Ym94IHByb2ZpbGVzIGlmIHdlJ3JlIGJ1aWxkaW5nIGZvciB0aGUgT1MgWCBTREsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmggYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oCmluZGV4IDg0YzQwN2E0YWIxMjhm NTJiMTgyNWYyNjBiODg1OTViY2YwMWU2ZGIuLmU2MWJiZGE4Y2M5MDNjYTQzZTQ4Njc4ZDZiZThl YjVhYmFhODNlYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJl bmNlc1N0b3JlLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3Rv cmUuaApAQCAtMTQzLDYgKzE0Myw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogICAgIG1hY3JvKExv Z3NQYWdlTWVzc2FnZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkLCBsb2dzUGFnZU1lc3NhZ2VzVG9T eXN0ZW1Db25zb2xlRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhQYWdl VmlzaWJpbGl0eUJhc2VkUHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCwgcGFnZVZpc2liaWxpdHlC YXNlZFByb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAgICAg bWFjcm8oU21hcnRJbnNlcnREZWxldGVFbmFibGVkLCBzbWFydEluc2VydERlbGV0ZUVuYWJsZWQs IEJvb2wsIGJvb2wsIHRydWUpIFwKKyAgICBtYWNybyhTZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VF bmFibGVkLCBzZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkLCBCb29sLCBib29sLCBmYWxz ZSkgXAogICAgIG1hY3JvKFNob3dzVVJMc0luVG9vbFRpcHNFbmFibGVkLCBzaG93c1VSTHNJblRv b2xUaXBzRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhBY2NlbGVyYXRl ZENvbXBvc2l0aW5nRm9yT3ZlcmZsb3dTY3JvbGxFbmFibGVkLCBhY2NlbGVyYXRlZENvbXBvc2l0 aW5nRm9yT3ZlcmZsb3dTY3JvbGxFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIFwK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2Vz LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcApp bmRleCBlNjk4Mzk3NWYwODk3OWRkOTQwNWUyM2VlNmNhM2ZlYTI3ZDgyMWY3Li41ZTk0MTE4YmJk OTc2ZTFlZGY5Yzk0MjY3OWJmNTcxNmIyOGIwN2Q0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCkBAIC0xMDY0LDYgKzEwNjQsMTYgQEAg Ym9vbCBXS1ByZWZlcmVuY2VzR2V0U21hcnRJbnNlcnREZWxldGVFbmFibGVkKFdLUHJlZmVyZW5j ZXNSZWYgcHJlZmVyZW5jZXNSZWYpCiAgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZikt PnNtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZCgpOwogfQogCit2b2lkIFdLUHJlZmVyZW5jZXNTZXRT ZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5j ZXNSZWYsIGJvb2wgZW5hYmxlZCkKK3sKKyAgICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRT ZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKGVuYWJsZWQpOworfQorCitib29sIFdLUHJl ZmVyZW5jZXNHZXRTZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKFdLUHJlZmVyZW5jZXNS ZWYgcHJlZmVyZW5jZXNSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZikt PnNlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoKTsKK30KKwogdm9pZCBXS1ByZWZlcmVu Y2VzU2V0U2hvd3NVUkxzSW5Ub29sVGlwc0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJl bmNlc1JlZiwgYm9vbCBlbmFibGVkKQogewogICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNl dFNob3dzVVJMc0luVG9vbFRpcHNFbmFibGVkKGVuYWJsZWQpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaAppbmRleCA1NTQy ZmRkMDg0MmIwM2FmZWY0YWExYzRmNzVmODU4OTAwNWI1NWYxLi5kN2I0MjM4ZTRiYzgzYTczYjU2 ZTFlOTE4ZDZjN2E5YjI4MzUwMmZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaApAQCAtMjU2LDYgKzI1NiwxMCBAQCBX S19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0U21hcnRJbnNlcnREZWxldGVFbmFibGVkKFdL UHJlZmVyZW5jZXNSZWYgcHJlZmVyZQogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFNt YXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzKTsKIAog Ly8gRGVmYXVsdHMgdG8gZmFsc2UKK1dLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRTZWxl Y3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXMs IGJvb2wgZW5hYmxlZCk7CitXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0U2VsZWN0VHJh aWxpbmdXaGl0ZXNwYWNlRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzKTsKKwor Ly8gRGVmYXVsdHMgdG8gZmFsc2UKIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRTaG93 c1VSTHNJblRvb2xUaXBzRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzLCBib29s IGVuYWJsZWQpOwogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFNob3dzVVJMc0luVG9v bFRpcHNFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXMpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVu dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRv ckNsaWVudC5jcHAKaW5kZXggOTA5ZDczZmEyYjk0ZGQzZTk0NTEwODdhZWNmZjIxOWFmYjZlNDky ZS4uZDAyYjI4NWI5MjcwZjQzOWY3NWIyNDM5OTI2YmJkYjU3YTViYzNhYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRWRp dG9yQ2xpZW50LmNwcApAQCAtOTUsOCArOTUsNyBAQCBib29sIFdlYkVkaXRvckNsaWVudDo6c21h cnRJbnNlcnREZWxldGVFbmFibGVkKCkKICAKIGJvb2wgV2ViRWRpdG9yQ2xpZW50Ojppc1NlbGVj dFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0g ICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBtX3BhZ2UtPmlzU2VsZWN0VHJhaWxpbmdXaGl0 ZXNwYWNlRW5hYmxlZCgpOwogfQogCiBib29sIFdlYkVkaXRvckNsaWVudDo6aXNDb250aW51b3Vz U3BlbGxDaGVja2luZ0VuYWJsZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwCmluZGV4IGMyODhmYzc5ZDJmNjJmNTVhYzA4OTNlNmU2YzRhNTA5Yzhl NGE0MTcuLjNjZGRiNGM1YTZlM2I4NDJkYWQ5YmQ3YWQ5Njk1YjAyNTE4NGZjZTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTI0MTQsNiAr MjQxNCw3IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVy ZW5jZXNTdG9yZSYgc3RvcmUpCiAgICAgc2V0dGluZ3MtPnNldEFzeW5jaHJvbm91c1NwZWxsQ2hl Y2tpbmdFbmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6 YXN5bmNocm9ub3VzU3BlbGxDaGVja2luZ0VuYWJsZWRLZXkoKSkpOwogCiAgICAgc2V0dGluZ3Mt PnNldFNtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2Vi UHJlZmVyZW5jZXNLZXk6OnNtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZEtleSgpKSk7CisgICAgc2V0 dGluZ3MtPnNldFNlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZh bHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpzZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFi bGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy0+c2V0U2hvd3NVUkxzSW5Ub29sVGlwcyhzdG9yZS5n ZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnNob3dzVVJMc0luVG9vbFRpcHNF bmFibGVkS2V5KCkpKTsKIAogICAgIHBsYXRmb3JtUHJlZmVyZW5jZXNEaWRDaGFuZ2Uoc3RvcmUp OwpAQCAtMzgxMyw3ICszODE0LDIzIEBAIGJvb2wgV2ViUGFnZTo6aXNTbWFydEluc2VydERlbGV0 ZUVuYWJsZWQoKQogCiB2b2lkIFdlYlBhZ2U6OnNldFNtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZChi b29sIGVuYWJsZWQpCiB7Ci0gICAgbV9wYWdlLT5zZXR0aW5ncygpLT5zZXRTbWFydEluc2VydERl bGV0ZUVuYWJsZWQoZW5hYmxlZCk7CisgICAgaWYgKG1fcGFnZS0+c2V0dGluZ3MoKS0+c21hcnRJ bnNlcnREZWxldGVFbmFibGVkKCkgIT0gZW5hYmxlZCkgeworICAgICAgICBtX3BhZ2UtPnNldHRp bmdzKCktPnNldFNtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZChlbmFibGVkKTsKKyAgICAgICAgc2V0 U2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZCghZW5hYmxlZCk7CisgICAgfQorfQorCiti b29sIFdlYlBhZ2U6OmlzU2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZCgpCit7CisgICAg cmV0dXJuIG1fcGFnZS0+c2V0dGluZ3MoKS0+c2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxl ZCgpOworfQorCit2b2lkIFdlYlBhZ2U6OnNldFNlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJs ZWQoYm9vbCBlbmFibGVkKQoreworICAgIGlmIChtX3BhZ2UtPnNldHRpbmdzKCktPnNlbGVjdFRy YWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoKSAhPSBlbmFibGVkKSB7CisgICAgICAgIG1fcGFnZS0+ c2V0dGluZ3MoKS0+c2V0U2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZChlbmFibGVkKTsK KyAgICAgICAgc2V0U21hcnRJbnNlcnREZWxldGVFbmFibGVkKCFlbmFibGVkKTsKKyAgICB9CiB9 CiAKIGJvb2wgV2ViUGFnZTo6Y2FuU2hvd01JTUVUeXBlKGNvbnN0IFN0cmluZyYgTUlNRVR5cGUp IGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRl eCBhODY5MmU4MjVjMjI5OWZiNzRlMDJjMGQ2YWRhZjdkZGYyNGIxNTk1Li45NmIxODY2YjRlYWNk ZDQ5Njg2NDA0MzdhNjE5M2YzMjZjNmRiNjRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTUwOCw2ICs1MDgsOSBAQCBwdWJsaWM6CiAgICAgYm9v bCBpc1NtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZCgpOwogICAgIHZvaWQgc2V0U21hcnRJbnNlcnRE ZWxldGVFbmFibGVkKGJvb2wpOwogCisgICAgYm9vbCBpc1NlbGVjdFRyYWlsaW5nV2hpdGVzcGFj ZUVuYWJsZWQoKTsKKyAgICB2b2lkIHNldFNlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQo Ym9vbCk7CisKICAgICB2b2lkIHJlcGxhY2VTZWxlY3Rpb25XaXRoVGV4dChXZWJDb3JlOjpGcmFt ZSosIGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgY2xlYXJTZWxlY3Rpb24oKTsKIApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IGE3ZTQwZTkyNTM1NjA4Njg0ZDJmOWY5MzA4OTk0MWM5M2U1OTRjZjAuLjMwMTcyZGQwYjk3YmE5 MGI3NDJmOWYxZGIwMjYwNjI3OWFkZjNhMzcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMy0w My0xNSAgTWFudWVsIFJlZ28gQ2FzYXNub3ZhcyAgPHJlZ29AaWdhbGlhLmNvbT4KKworICAgICAg ICBbV0syXSBBZGQgc3VwcG9ydCBmb3Igc2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZCBz ZXR0aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTI0MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHBsYXRmb3JtL2d0ay13azIvVGVzdEV4cGVjdGF0aW9uczogVW5mbGFnIHNldmVyYWwgdGVzdHMg cGFzc2luZyBub3cKKyAgICAgICAgYW5kIG1hcmsgb25lIHRlc3QgYXMgdGltZW91dC4KKwogMjAx My0wMy0xNCAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgogCiAgICAgICAgIENo YXJhY3RlciBvcmllbnRhdGlvbiBzaG91bGQgZm9sbG93IFVUUjUwIHNwZWNzIGZvciB2ZXJ0aWNh bCBsYXlvdXQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGstd2syL1Rlc3RF eHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGstd2syL1Rlc3RFeHBlY3RhdGlv bnMKaW5kZXggNjdmNTMwZmM4NWI5ZGExMjY5M2U4MWViYjUyNDE3N2FkYWUxMDMzNS4uY2M1MjI5 OWJkMTZjN2QwMzZhYmQzOTU0NzVjNTc1MmI4ZDRiYjU4YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvcGxhdGZvcm0vZ3RrLXdrMi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL2d0ay13azIvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTAwLDEyICsxMDAsNiBAQCB3ZWJr aXQub3JnL2IvNjM3MDYgaHR0cC90ZXN0cy9zZWN1cml0eS9kcmFnLW92ZXItcmVtb3RlLWNvbnRl bnQtaWZyYW1lLmh0bWwgWyBGYQogd2Via2l0Lm9yZy9iLzYzNzA2IHBsdWdpbnMvbW91c2UtZXZl bnRzLWZpeGVkcG9zLmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi82MzcwNiBwbHVnaW5z L21vdXNlLWV2ZW50cy5odG1sIFsgRmFpbHVyZSBdCiAKLSMgV2ViS2l0MiBuZWVkcyBsYXlvdXRU ZXN0Q29udHJvbGxlci5zZXRTbWFydEluc2VydERlbGV0ZUVuYWJsZWQKLUJ1ZyhHVEspIGVkaXRp bmcvc2VsZWN0aW9uL2RvdWJsZWNsaWNrLWJlc2lkZS1jci1zcGFuLmh0bWwgWyBGYWlsdXJlIF0K LUJ1ZyhHVEspIGVkaXRpbmcvc2VsZWN0aW9uL2RvdWJsZWNsaWNrLXdoaXRlc3BhY2UuaHRtbCBb IEZhaWx1cmUgXQotQnVnKEdUSykgZWRpdGluZy9zZWxlY3Rpb24vZG91YmxlY2xpY2std2hpdGVz cGFjZS1jcmFzaC5odG1sIFsgRmFpbHVyZSBdCi1CdWcoR1RLKSBlZGl0aW5nL3NlbGVjdGlvbi9k b3VibGVjbGljay13aGl0ZXNwYWNlLWltZy1jcmFzaC5odG1sIFsgRmFpbHVyZSBdCi0KICMgV2Vi S2l0MiBuZWVkcyBsYXlvdXRUZXN0Q29udHJvbGxlci5hZGRNb2NrU3BlZWNoSW5wdXRSZXN1bHQK IEJ1ZyhHVEspIGZhc3Qvc3BlZWNoL2lucHV0LW9uc3BlZWNoY2hhbmdlLWV2ZW50Lmh0bWwgWyBG YWlsdXJlIF0KIEJ1ZyhHVEspIGZhc3Qvc3BlZWNoL2lucHV0LW9udGV4dGlucHV0LWV2ZW50Lmh0 bWwgWyBGYWlsdXJlIF0KQEAgLTM4Myw2ICszNzcsNyBAQCBCdWcoR1RLKSBlZGl0aW5nL2RlbGV0 aW5nL3BhcmFncmFwaC1pbi1wcmVzZXJ2ZU5ld2xpbmUuaHRtbCBbIEZhaWx1cmUgXQogQnVnKEdU SykgZWRpdGluZy9kZWxldGluZy93aGl0ZXNwYWNlLXByZS0xLmh0bWwgWyBGYWlsdXJlIF0KIEJ1 ZyhHVEspIGVkaXRpbmcvZXhlY0NvbW1hbmQvZGVsZXRlLXNlbGVjdGlvbi1oYXMtc3R5bGUuaHRt bCBbIEZhaWx1cmUgXQogQnVnKEdUSykgZWRpdGluZy9zZWxlY3Rpb24vNTEzNjY5Ni5odG1sIFsg RmFpbHVyZSBdCitCdWcoR1RLKSBlZGl0aW5nL3NlbGVjdGlvbi9kb3VibGVjbGljay1iZXNpZGUt Y3Itc3Bhbi5odG1sIFsgVGltZW91dCBdCiBCdWcoR1RLKSBlZGl0aW5nL3NlbGVjdGlvbi9pbmFj dGl2ZS1zZWxlY3Rpb24uaHRtbCBbIEZhaWx1cmUgXQogQnVnKEdUSykgZWRpdGluZy9zZWxlY3Rp b24vcHJvZ3JhbW1hdGljLXNlbGVjdGlvbi1vbi1tYWMtaXMtZGlyZWN0aW9ubGVzcy5odG1sIFsg RmFpbHVyZSBdCiBCdWcoR1RLKSBlZGl0aW5nL3NwZWxsaW5nL3NwZWxsaW5nLWluc2VydC1odG1s Lmh0bWwgWyBGYWlsdXJlIF0K 195954 2013-04-01 04:21:12 -0700 2013-05-17 04:19:26 -0700 Patch bug-112426-20130401132104.patch text/plain 9832 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MzA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWJhYWZlYzM0ZDUyODZi ZGE0NzE0NzVmYTY5NjI0OGI4OTY5YzMxMS4uYTY5Y2I5ZTNhY2JlMzBhZmRiZmY5ZTVmYmZiNzkw YjRhOGE0NWQ5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTAzLTE1ICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtXSzJdIEFk ZCBzdXBwb3J0IGZvciBzZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkIHNldHRpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjQyNgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dl YlByZWZlcmVuY2VzU3RvcmUuaDoKKyAgICAgICAgKFdlYktpdCk6IEFkZCBtYWNybyBmb3Igc2Vs ZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Mv V0tQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXS1ByZWZlcmVuY2VzU2V0U2VsZWN0VHJhaWxp bmdXaGl0ZXNwYWNlRW5hYmxlZCk6CisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0U2VsZWN0VHJh aWxpbmdXaGl0ZXNwYWNlRW5hYmxlZCk6IEltcGxlbWVudCBtZXRob2RzCisgICAgICAgIHVzaW5n IHRoZSBuZXcgc2V0dGluZy4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNl c1ByaXZhdGUuaDogQWRkIG5ldyBtZXRob2RzIGhlYWRlcnMuCisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJFZGl0b3JDbGllbnQ6OmlzU2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZCk6IEltcGxl bWVudAorICAgICAgICBtZXRob2QgZGVsZWdhdGluZyBpbiBXZWJQYWdlLgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6 dXBkYXRlUHJlZmVyZW5jZXMpOiBTZXQKKyAgICAgICAgc2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNl RW5hYmxlZCBzZXR0aW5nLgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZTo6aXNTZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKTogSW1wbGVtZW50IG1ldGhv ZAorICAgICAgICB1c2luZyBzZXR0aW5ncy4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0 U2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZCk6IEltcGxlbWVudCBtZXRob2QKKyAgICAg ICAgdXNpbmcgc2V0dGluZ3MuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu aDoKKyAgICAgICAgKFdlYlBhZ2UpOiBBZGQgbmV3IG1ldGhvZHMgaGVhZGVycy4KKwogMjAxMy0w My0zMCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVu cmV2aWV3ZWQgYnVpbGRmaXggYWZ0ZXIgcjE0NzI2MC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViUHJlZmVyZW5jZXNTdG9yZS5oCmluZGV4IDA5ZjMzNjkzZjcyOThhNDI0YjZmYmMzMTA2NmY5 YTdjNTA3OGNkZTQuLjBlODk3MjNmOTZkMGEyNDNkMmM1MjhkZTllYjkzZWY5NTM5ZDQ0MGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmgKKysr IGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaApAQCAtMTUyLDYg KzE1Miw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogICAgIG1hY3JvKExvZ3NQYWdlTWVzc2FnZXNU b1N5c3RlbUNvbnNvbGVFbmFibGVkLCBsb2dzUGFnZU1lc3NhZ2VzVG9TeXN0ZW1Db25zb2xlRW5h YmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhQYWdlVmlzaWJpbGl0eUJhc2Vk UHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCwgcGFnZVZpc2liaWxpdHlCYXNlZFByb2Nlc3NTdXBw cmVzc2lvbkVuYWJsZWQsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oU21hcnRJbnNl cnREZWxldGVFbmFibGVkLCBzbWFydEluc2VydERlbGV0ZUVuYWJsZWQsIEJvb2wsIGJvb2wsIHRy dWUpIFwKKyAgICBtYWNybyhTZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkLCBzZWxlY3RU cmFpbGluZ1doaXRlc3BhY2VFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3Jv KFNob3dzVVJMc0luVG9vbFRpcHNFbmFibGVkLCBzaG93c1VSTHNJblRvb2xUaXBzRW5hYmxlZCwg Qm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhBY2NlbGVyYXRlZENvbXBvc2l0aW5nRm9y T3ZlcmZsb3dTY3JvbGxFbmFibGVkLCBhY2NlbGVyYXRlZENvbXBvc2l0aW5nRm9yT3ZlcmZsb3dT Y3JvbGxFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3JvKEhpZGRlblBhZ2VE T01UaW1lclRocm90dGxpbmdFbmFibGVkLCBoaWRkZW5QYWdlRE9NVGltZXJUaHJvdHRsaW5nRW5h YmxlZCwgQm9vbCwgYm9vbCwgREVGQVVMVF9ISURERU5fUEFHRV9ET01fVElNRVJfVEhST1RUTElO R19FTkFCTEVEKSBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mv V0tQcmVmZXJlbmNlcy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVm ZXJlbmNlcy5jcHAKaW5kZXggNDUxY2YwYmU1MGIwY2U3NTNhMWM4ZjhhMWQ3YjcyYWYyYTI0YjA5 ZS4uNDUzZWY0YzE1MTZhM2E0OWNmNzJkZjdkNjBmM2M5YTAyNjIwN2M5YSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcApAQCAtMTA3NCw2 ICsxMDc0LDE2IEBAIGJvb2wgV0tQcmVmZXJlbmNlc0dldFNtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxl ZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKQogICAgIHJldHVybiB0b0ltcGwocHJl ZmVyZW5jZXNSZWYpLT5zbWFydEluc2VydERlbGV0ZUVuYWJsZWQoKTsKIH0KIAordm9pZCBXS1By ZWZlcmVuY2VzU2V0U2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZChXS1ByZWZlcmVuY2Vz UmVmIHByZWZlcmVuY2VzUmVmLCBib29sIGVuYWJsZWQpCit7CisgICAgdG9JbXBsKHByZWZlcmVu Y2VzUmVmKS0+c2V0U2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZChlbmFibGVkKTsKK30K KworYm9vbCBXS1ByZWZlcmVuY2VzR2V0U2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZChX S1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKQoreworICAgIHJldHVybiB0b0ltcGwocHJl ZmVyZW5jZXNSZWYpLT5zZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKCk7Cit9CisKIHZv aWQgV0tQcmVmZXJlbmNlc1NldFNob3dzVVJMc0luVG9vbFRpcHNFbmFibGVkKFdLUHJlZmVyZW5j ZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZW5hYmxlZCkKIHsKICAgICB0b0ltcGwocHJlZmVy ZW5jZXNSZWYpLT5zZXRTaG93c1VSTHNJblRvb2xUaXBzRW5hYmxlZChlbmFibGVkKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUHJpdmF0 ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRl LmgKaW5kZXggYTVjYjFhZmVkZDgwNzkzZjI2Y2UxM2VjMjBjOTI5MWEwYWQ4NjJhNi4uM2JhNjc1 MTkwMzJjNDgwY2EyMWZkODljZmZhYmRiYWNhY2M0YzY0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmgKQEAgLTI1Niw2 ICsyNTYsMTAgQEAgV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldFNtYXJ0SW5zZXJ0RGVs ZXRlRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmUKIFdLX0VYUE9SVCBib29sIFdLUHJl ZmVyZW5jZXNHZXRTbWFydEluc2VydERlbGV0ZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVm ZXJlbmNlcyk7CiAKIC8vIERlZmF1bHRzIHRvIGZhbHNlCitXS19FWFBPUlQgdm9pZCBXS1ByZWZl cmVuY2VzU2V0U2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVm IHByZWZlcmVuY2VzLCBib29sIGVuYWJsZWQpOworV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNl c0dldFNlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVm ZXJlbmNlcyk7CisKKy8vIERlZmF1bHRzIHRvIGZhbHNlCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZl cmVuY2VzU2V0U2hvd3NVUkxzSW5Ub29sVGlwc0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVm ZXJlbmNlcywgYm9vbCBlbmFibGVkKTsKIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRT aG93c1VSTHNJblRvb2xUaXBzRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzKTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJFZGl0b3JDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJFZGl0b3JDbGllbnQuY3BwCmluZGV4IDkwOWQ3M2ZhMmI5NGRkM2U5NDUxMDg3YWVj ZmYyMTlhZmI2ZTQ5MmUuLmQwMmIyODViOTI3MGY0MzlmNzViMjQzOTkyNmJiZGI1N2E1YmMzYWMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi RWRpdG9yQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L1dlYkVkaXRvckNsaWVudC5jcHAKQEAgLTk1LDggKzk1LDcgQEAgYm9vbCBXZWJFZGl0 b3JDbGllbnQ6OnNtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZCgpCiAgCiBib29sIFdlYkVkaXRvckNs aWVudDo6aXNTZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKCkKIHsKLSAgICBub3RJbXBs ZW1lbnRlZCgpOwotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gbV9wYWdlLT5pc1NlbGVj dFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoKTsKIH0KIAogYm9vbCBXZWJFZGl0b3JDbGllbnQ6 OmlzQ29udGludW91c1NwZWxsQ2hlY2tpbmdFbmFibGVkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCA0MjI4OGRkNzlkNzQ2MTA2MDQ1NDNm MGY3MTJjNDdlNTE5ZjQ3MzdiLi5iZjc1ZjA3ODg3ZTY2ZmI3NzRlMTBlZjg3MjMyYjY3NGFlMWQ3 YmJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CkBAIC0yNDIwLDYgKzI0MjAsNyBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZVByZWZlcmVuY2VzKGNv bnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmIHN0b3JlKQogICAgIHNldHRpbmdzLT5zZXRBc3luY2hy b25vdXNTcGVsbENoZWNraW5nRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJl ZmVyZW5jZXNLZXk6OmFzeW5jaHJvbm91c1NwZWxsQ2hlY2tpbmdFbmFibGVkS2V5KCkpKTsKIAog ICAgIHNldHRpbmdzLT5zZXRTbWFydEluc2VydERlbGV0ZUVuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZh bHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpzbWFydEluc2VydERlbGV0ZUVuYWJsZWRLZXko KSkpOworICAgIHNldHRpbmdzLT5zZXRTZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKHN0 b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6c2VsZWN0VHJhaWxpbmdX aGl0ZXNwYWNlRW5hYmxlZEtleSgpKSk7CiAgICAgc2V0dGluZ3MtPnNldFNob3dzVVJMc0luVG9v bFRpcHMoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpzaG93c1VS THNJblRvb2xUaXBzRW5hYmxlZEtleSgpKSk7CiAKICNpZiBFTkFCTEUoSElEREVOX1BBR0VfRE9N X1RJTUVSX1RIUk9UVExJTkcpCkBAIC0zODI5LDYgKzM4MzAsMTYgQEAgdm9pZCBXZWJQYWdlOjpz ZXRTbWFydEluc2VydERlbGV0ZUVuYWJsZWQoYm9vbCBlbmFibGVkKQogICAgIG1fcGFnZS0+c2V0 dGluZ3MoKS0+c2V0U21hcnRJbnNlcnREZWxldGVFbmFibGVkKGVuYWJsZWQpOwogfQogCitib29s IFdlYlBhZ2U6OmlzU2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZCgpCit7CisgICAgcmV0 dXJuIG1fcGFnZS0+c2V0dGluZ3MoKS0+c2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZCgp OworfQorCit2b2lkIFdlYlBhZ2U6OnNldFNlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQo Ym9vbCBlbmFibGVkKQoreworICAgIG1fcGFnZS0+c2V0dGluZ3MoKS0+c2V0U2VsZWN0VHJhaWxp bmdXaGl0ZXNwYWNlRW5hYmxlZChlbmFibGVkKTsKK30KKwogYm9vbCBXZWJQYWdlOjpjYW5TaG93 TUlNRVR5cGUoY29uc3QgU3RyaW5nJiBNSU1FVHlwZSkgY29uc3QKIHsKICAgICBpZiAoTUlNRVR5 cGVSZWdpc3RyeTo6Y2FuU2hvd01JTUVUeXBlKE1JTUVUeXBlKSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDU0NTRlYzc5YTFhZWM1N2E2NDRmMDQ3 MjJiYTg3ZmYxNGNmZjBhNDcuLmQzM2RjM2ZhMTE2YWJhM2FhNDg4NTI2NzgxNjZhYjMyMDA4MTMx NjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAt NTE1LDYgKzUxNSw5IEBAIHB1YmxpYzoKICAgICBib29sIGlzU21hcnRJbnNlcnREZWxldGVFbmFi bGVkKCk7CiAgICAgdm9pZCBzZXRTbWFydEluc2VydERlbGV0ZUVuYWJsZWQoYm9vbCk7CiAKKyAg ICBib29sIGlzU2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZCgpOworICAgIHZvaWQgc2V0 U2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZChib29sKTsKKwogICAgIHZvaWQgcmVwbGFj ZVNlbGVjdGlvbldpdGhUZXh0KFdlYkNvcmU6OkZyYW1lKiwgY29uc3QgU3RyaW5nJik7CiAgICAg dm9pZCBjbGVhclNlbGVjdGlvbigpOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjZmZTlhNTVhMzI4ZGI1OGZiZmRkYTJm MTVmN2JlNTYwMjYyZWFmMC4uODJmNTJkZDA1ZWRlMzg0NGIyOGEwNmQyNmUyZTUwOTE3MGZmOGMw YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEzLTAzLTE1ICBNYW51ZWwgUmVnbyBDYXNhc25v dmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtXSzJdIEFkZCBzdXBwb3J0IGZvciBz ZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkIHNldHRpbmcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjQyNgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrLXdrMi9UZXN0RXhw ZWN0YXRpb25zOiBVbmZsYWcgc2V2ZXJhbCB0ZXN0cyBwYXNzaW5nIG5vdworICAgICAgICBhbmQg bWFyayBvbmUgdGVzdCBhcyB0aW1lb3V0LgorCiAyMDEzLTA0LTAxICBKaW53b28gU29uZyAgPGpp bndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXSBFbmFibGUgdXNlci1zZWxl Y3Q6YWxsIGZvciBFRkwgcG9ydApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3Rr LXdrMi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrLXdrMi9UZXN0 RXhwZWN0YXRpb25zCmluZGV4IDk3ZmY1MzA1NTM4MTc5MmFjNTAyYTBjYjM5NTJiZDY1MmQ4NjE4 YTEuLjk0M2UzNTgzNzNlZjcwODhlZTliYzhkZWI3ZWU2YjZmYTI2YTdjYzUgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay13azIvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9ndGstd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTEwMCwxMiArMTAw LDYgQEAgd2Via2l0Lm9yZy9iLzYzNzA2IGh0dHAvdGVzdHMvc2VjdXJpdHkvZHJhZy1vdmVyLXJl bW90ZS1jb250ZW50LWlmcmFtZS5odG1sIFsgRmEKIHdlYmtpdC5vcmcvYi82MzcwNiBwbHVnaW5z L21vdXNlLWV2ZW50cy1maXhlZHBvcy5odG1sIFsgRmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvNjM3 MDYgcGx1Z2lucy9tb3VzZS1ldmVudHMuaHRtbCBbIEZhaWx1cmUgXQogCi0jIFdlYktpdDIgbmVl ZHMgbGF5b3V0VGVzdENvbnRyb2xsZXIuc2V0U21hcnRJbnNlcnREZWxldGVFbmFibGVkCi1CdWco R1RLKSBlZGl0aW5nL3NlbGVjdGlvbi9kb3VibGVjbGljay1iZXNpZGUtY3Itc3Bhbi5odG1sIFsg RmFpbHVyZSBdCi1CdWcoR1RLKSBlZGl0aW5nL3NlbGVjdGlvbi9kb3VibGVjbGljay13aGl0ZXNw YWNlLmh0bWwgWyBGYWlsdXJlIF0KLUJ1ZyhHVEspIGVkaXRpbmcvc2VsZWN0aW9uL2RvdWJsZWNs aWNrLXdoaXRlc3BhY2UtY3Jhc2guaHRtbCBbIEZhaWx1cmUgXQotQnVnKEdUSykgZWRpdGluZy9z ZWxlY3Rpb24vZG91YmxlY2xpY2std2hpdGVzcGFjZS1pbWctY3Jhc2guaHRtbCBbIEZhaWx1cmUg XQotCiAjIFdlYktpdDIgbmVlZHMgbGF5b3V0VGVzdENvbnRyb2xsZXIuYWRkTW9ja1NwZWVjaElu cHV0UmVzdWx0CiBCdWcoR1RLKSBmYXN0L3NwZWVjaC9pbnB1dC1vbnNwZWVjaGNoYW5nZS1ldmVu dC5odG1sIFsgRmFpbHVyZSBdCiBCdWcoR1RLKSBmYXN0L3NwZWVjaC9pbnB1dC1vbnRleHRpbnB1 dC1ldmVudC5odG1sIFsgRmFpbHVyZSBdCkBAIC0zNzcsNiArMzcxLDcgQEAgQnVnKEdUSykgZWRp dGluZy9kZWxldGluZy9wYXJhZ3JhcGgtaW4tcHJlc2VydmVOZXdsaW5lLmh0bWwgWyBGYWlsdXJl IF0KIEJ1ZyhHVEspIGVkaXRpbmcvZGVsZXRpbmcvd2hpdGVzcGFjZS1wcmUtMS5odG1sIFsgRmFp bHVyZSBdCiBCdWcoR1RLKSBlZGl0aW5nL2V4ZWNDb21tYW5kL2RlbGV0ZS1zZWxlY3Rpb24taGFz LXN0eWxlLmh0bWwgWyBGYWlsdXJlIF0KIEJ1ZyhHVEspIGVkaXRpbmcvc2VsZWN0aW9uLzUxMzY2 OTYuaHRtbCBbIEZhaWx1cmUgXQorQnVnKEdUSykgZWRpdGluZy9zZWxlY3Rpb24vZG91YmxlY2xp Y2stYmVzaWRlLWNyLXNwYW4uaHRtbCBbIFRpbWVvdXQgXQogQnVnKEdUSykgZWRpdGluZy9zZWxl Y3Rpb24vaW5hY3RpdmUtc2VsZWN0aW9uLmh0bWwgWyBGYWlsdXJlIF0KIEJ1ZyhHVEspIGVkaXRp bmcvc2VsZWN0aW9uL3Byb2dyYW1tYXRpYy1zZWxlY3Rpb24tb24tbWFjLWlzLWRpcmVjdGlvbmxl c3MuaHRtbCBbIEZhaWx1cmUgXQogQnVnKEdUSykgZWRpdGluZy9zcGVsbGluZy9zcGVsbGluZy1p bnNlcnQtaHRtbC5odG1sIFsgRmFpbHVyZSBdCg== 202059 2013-05-17 04:20:20 -0700 2013-05-17 12:50:13 -0700 Patch bug-112426-20130517131906.patch text/plain 8031 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjc3ODg4MjNjMDUzODA4 YTFhMjZhNGQyNzIxMDMxMmNlNTAzMTQ1ZC4uOTM3YzE2OTMxZmRlNGUxM2JmNjk1Zjg0MzM1NmU3 YTYyNzQ1YWQxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEzLTA1LTE3ICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtXSzJdIEFk ZCBzdXBwb3J0IGZvciBzZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkIHNldHRpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjQyNgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dl YlByZWZlcmVuY2VzU3RvcmUuaDoKKyAgICAgICAgKFdlYktpdCk6IEFkZCBtYWNybyBmb3Igc2Vs ZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Mv V0tQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXS1ByZWZlcmVuY2VzU2V0U2VsZWN0VHJhaWxp bmdXaGl0ZXNwYWNlRW5hYmxlZCk6CisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0U2VsZWN0VHJh aWxpbmdXaGl0ZXNwYWNlRW5hYmxlZCk6IEltcGxlbWVudCBtZXRob2RzCisgICAgICAgIHVzaW5n IHRoZSBuZXcgc2V0dGluZy4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNl c1ByaXZhdGUuaDogQWRkIG5ldyBtZXRob2RzIGhlYWRlcnMuCisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJFZGl0b3JDbGllbnQ6OmlzU2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZCk6IEltcGxl bWVudAorICAgICAgICBtZXRob2QgZGVsZWdhdGluZyBpbiBXZWJQYWdlLgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6 dXBkYXRlUHJlZmVyZW5jZXMpOiBTZXQKKyAgICAgICAgc2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNl RW5hYmxlZCBzZXR0aW5nLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRTbWFydEluc2Vy dERlbGV0ZUVuYWJsZWQpOiBTZXQKKyAgICAgICAgc2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5h YmxlZCBhcyB0aGV5IGFyZSBtdXR1YWxseSBleGNsdXNpdmUuCisgICAgICAgIChXZWJLaXQpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjppc1NlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJs ZWQpOiBJbXBsZW1lbnQgbWV0aG9kCisgICAgICAgIHVzaW5nIHNldHRpbmdzLgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlOjpzZXRTZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKTogSW1w bGVtZW50IG1ldGhvZAorICAgICAgICB1c2luZyBzZXR0aW5ncyBhbmQgc2V0IHNtYXJ0SW5zZXJ0 RGVsZXRlRW5hYmxlZCBhcyB0aGV5IGFyZSBtdXR1YWxseQorICAgICAgICBleGNsdXNpdmUuCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKFdlYlBhZ2Up OiBBZGQgbmV3IG1ldGhvZHMgaGVhZGVycy4KKwogMjAxMy0wNS0xNCAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmVtb3ZlIFdURl9VU0VfUExB VEZPUk1fU1RSQVRFR0lFUwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBy ZWZlcmVuY2VzU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0 b3JlLmgKaW5kZXggM2YyZDc1MWExZDZiMzViYzhhMjg1MmU3MGJkMTBjMWM5Mzg5ZDYxYi4uMzNk NzgzZTJhMTY3YWVhYmNhYmIzM2Y4ZGZjNzJlZDAzMjM4N2I3OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oCkBAIC0xNTUsNiArMTU1LDcgQEAgbmFtZXNw YWNlIFdlYktpdCB7CiAgICAgbWFjcm8oTG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVu YWJsZWQsIGxvZ3NQYWdlTWVzc2FnZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkLCBCb29sLCBib29s LCBmYWxzZSkgXAogICAgIG1hY3JvKFBhZ2VWaXNpYmlsaXR5QmFzZWRQcm9jZXNzU3VwcHJlc3Np b25FbmFibGVkLCBwYWdlVmlzaWJpbGl0eUJhc2VkUHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCwg Qm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhTbWFydEluc2VydERlbGV0ZUVuYWJsZWQs IHNtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZCwgQm9vbCwgYm9vbCwgdHJ1ZSkgXAorICAgIG1hY3Jv KFNlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQsIHNlbGVjdFRyYWlsaW5nV2hpdGVzcGFj ZUVuYWJsZWQsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oU2hvd3NVUkxzSW5Ub29s VGlwc0VuYWJsZWQsIHNob3dzVVJMc0luVG9vbFRpcHNFbmFibGVkLCBCb29sLCBib29sLCBmYWxz ZSkgXAogICAgIG1hY3JvKEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdGb3JPdmVyZmxvd1Njcm9sbEVu YWJsZWQsIGFjY2VsZXJhdGVkQ29tcG9zaXRpbmdGb3JPdmVyZmxvd1Njcm9sbEVuYWJsZWQsIEJv b2wsIGJvb2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oSGlkZGVuUGFnZURPTVRpbWVyVGhyb3R0bGlu Z0VuYWJsZWQsIGhpZGRlblBhZ2VET01UaW1lclRocm90dGxpbmdFbmFibGVkLCBCb29sLCBib29s LCBERUZBVUxUX0hJRERFTl9QQUdFX0RPTV9USU1FUl9USFJPVFRMSU5HX0VOQUJMRUQpIFwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAppbmRl eCAyM2Y5ZTg3Yjc0ZDc5MDQyODJiOGU0ZTk4NzU4ZjMxN2Y5MTMyYTU3Li4zZGE5MzdkZTNiODdh NTVhYmU1NDY3YjYyN2E0ZmI0OGI1ODRjZjExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCkBAIC0xMTA0LDYgKzExMDQsMTYgQEAgYm9v bCBXS1ByZWZlcmVuY2VzR2V0U21hcnRJbnNlcnREZWxldGVFbmFibGVkKFdLUHJlZmVyZW5jZXNS ZWYgcHJlZmVyZW5jZXNSZWYpCiAgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNt YXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZCgpOwogfQogCit2b2lkIFdLUHJlZmVyZW5jZXNTZXRTZWxl Y3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNS ZWYsIGJvb2wgZW5hYmxlZCkKK3sKKyAgICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRTZWxl Y3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKGVuYWJsZWQpOworfQorCitib29sIFdLUHJlZmVy ZW5jZXNHZXRTZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYg cHJlZmVyZW5jZXNSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNl bGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoKTsKK30KKwogdm9pZCBXS1ByZWZlcmVuY2Vz U2V0U2hvd3NVUkxzSW5Ub29sVGlwc0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNl c1JlZiwgYm9vbCBlbmFibGVkKQogewogICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldFNo b3dzVVJMc0luVG9vbFRpcHNFbmFibGVkKGVuYWJsZWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaAppbmRleCA1ZWE2ZDM0 YmU4YzI4OTRiNmIxOTQ0NGY0ZTY1NTc2MzVlNzIxZGYzLi4yYjVjNzEyMzk5YWZhMGZhYjRkZTli Y2JlNWQ3OWIzMWEzOWJmMzIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaApAQCAtMjU2LDYgKzI1NiwxMCBAQCBXS19F WFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0U21hcnRJbnNlcnREZWxldGVFbmFibGVkKFdLUHJl ZmVyZW5jZXNSZWYgcHJlZmVyZQogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFNtYXJ0 SW5zZXJ0RGVsZXRlRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzKTsKIAogLy8g RGVmYXVsdHMgdG8gZmFsc2UKK1dLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRTZWxlY3RU cmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXMsIGJv b2wgZW5hYmxlZCk7CitXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0U2VsZWN0VHJhaWxp bmdXaGl0ZXNwYWNlRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzKTsKKworLy8g RGVmYXVsdHMgdG8gZmFsc2UKIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRTaG93c1VS THNJblRvb2xUaXBzRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzLCBib29sIGVu YWJsZWQpOwogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFNob3dzVVJMc0luVG9vbFRp cHNFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXMpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNs aWVudC5jcHAKaW5kZXggYzE3M2FiYzZmYThiZGIyZjdmNTJkYWI3NWM1MTY4OTRlNjZjMjBiMi4u MTJhMDI4YTFiMTU4OWM2OWQ3OWNkZjRlZmUzYzk5ZWUxODVjZGRhZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9y Q2xpZW50LmNwcApAQCAtOTUsOCArOTUsNyBAQCBib29sIFdlYkVkaXRvckNsaWVudDo6c21hcnRJ bnNlcnREZWxldGVFbmFibGVkKCkKICAKIGJvb2wgV2ViRWRpdG9yQ2xpZW50Ojppc1NlbGVjdFRy YWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAg cmV0dXJuIGZhbHNlOworICAgIHJldHVybiBtX3BhZ2UtPmlzU2VsZWN0VHJhaWxpbmdXaGl0ZXNw YWNlRW5hYmxlZCgpOwogfQogCiBib29sIFdlYkVkaXRvckNsaWVudDo6aXNDb250aW51b3VzU3Bl bGxDaGVja2luZ0VuYWJsZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCmluZGV4IDk5NDdlZWJkNjQ3NmVjNzNiNjYwZTJjMDA4OGRjMjc3ODEyMDVl MWQuLjM4YjNmZDE1Y2EzMmY0NDBjNGRhYzAzMTJhN2Y3NzJhMjY3Y2MxZWIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTI1MDQsNiArMjUw NCw3IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5j ZXNTdG9yZSYgc3RvcmUpCiAgICAgc2V0dGluZ3MtPnNldEFzeW5jaHJvbm91c1NwZWxsQ2hlY2tp bmdFbmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6YXN5 bmNocm9ub3VzU3BlbGxDaGVja2luZ0VuYWJsZWRLZXkoKSkpOwogCiAgICAgc2V0dGluZ3MtPnNl dFNtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJl ZmVyZW5jZXNLZXk6OnNtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZEtleSgpKSk7CisgICAgc2V0dGlu Z3MtPnNldFNlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVl Rm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpzZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVk S2V5KCkpKTsKICAgICBzZXR0aW5ncy0+c2V0U2hvd3NVUkxzSW5Ub29sVGlwcyhzdG9yZS5nZXRC b29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnNob3dzVVJMc0luVG9vbFRpcHNFbmFi bGVkS2V5KCkpKTsKIAogI2lmIEVOQUJMRShISURERU5fUEFHRV9ET01fVElNRVJfVEhST1RUTElO RykKQEAgLTM5MTMsNyArMzkxNCwyMyBAQCBib29sIFdlYlBhZ2U6OmlzU21hcnRJbnNlcnREZWxl dGVFbmFibGVkKCkKIAogdm9pZCBXZWJQYWdlOjpzZXRTbWFydEluc2VydERlbGV0ZUVuYWJsZWQo Ym9vbCBlbmFibGVkKQogewotICAgIG1fcGFnZS0+c2V0dGluZ3MoKS0+c2V0U21hcnRJbnNlcnRE ZWxldGVFbmFibGVkKGVuYWJsZWQpOworICAgIGlmIChtX3BhZ2UtPnNldHRpbmdzKCktPnNtYXJ0 SW5zZXJ0RGVsZXRlRW5hYmxlZCgpICE9IGVuYWJsZWQpIHsKKyAgICAgICAgbV9wYWdlLT5zZXR0 aW5ncygpLT5zZXRTbWFydEluc2VydERlbGV0ZUVuYWJsZWQoZW5hYmxlZCk7CisgICAgICAgIHNl dFNlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoIWVuYWJsZWQpOworICAgIH0KK30KKwor Ym9vbCBXZWJQYWdlOjppc1NlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoKQoreworICAg IHJldHVybiBtX3BhZ2UtPnNldHRpbmdzKCktPnNlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJs ZWQoKTsKK30KKwordm9pZCBXZWJQYWdlOjpzZXRTZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFi bGVkKGJvb2wgZW5hYmxlZCkKK3sKKyAgICBpZiAobV9wYWdlLT5zZXR0aW5ncygpLT5zZWxlY3RU cmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKCkgIT0gZW5hYmxlZCkgeworICAgICAgICBtX3BhZ2Ut PnNldHRpbmdzKCktPnNldFNlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoZW5hYmxlZCk7 CisgICAgICAgIHNldFNtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZCghZW5hYmxlZCk7CisgICAgfQog fQogCiBib29sIFdlYlBhZ2U6OmNhblNob3dNSU1FVHlwZShjb25zdCBTdHJpbmcmIE1JTUVUeXBl KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5k ZXggNzc0OWJhMWEyNzRkMjFkNmE2NGNiMmYwYTY1ZDI4MDE1NGU0OGQ5ZC4uYjNhY2Q0MDZjNDgw OGJhMzNjZmY5YjdhOTAyZDJjNDJlYjM2NjU3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC01MjUsNiArNTI1LDkgQEAgcHVibGljOgogICAgIGJv b2wgaXNTbWFydEluc2VydERlbGV0ZUVuYWJsZWQoKTsKICAgICB2b2lkIHNldFNtYXJ0SW5zZXJ0 RGVsZXRlRW5hYmxlZChib29sKTsKIAorICAgIGJvb2wgaXNTZWxlY3RUcmFpbGluZ1doaXRlc3Bh Y2VFbmFibGVkKCk7CisgICAgdm9pZCBzZXRTZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVk KGJvb2wpOworCiAgICAgdm9pZCByZXBsYWNlU2VsZWN0aW9uV2l0aFRleHQoV2ViQ29yZTo6RnJh bWUqLCBjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIGNsZWFyU2VsZWN0aW9uKCk7CiAK