139252 2014-12-04 00:55:15 -0800 TextIndicator::createWithSelectionInFrame does synchronous IPC in WebKit2 2014-12-04 13:32:10 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca bdakin commit-queue mitz sam simon.fraser webkit-bug-importer oldest_to_newest 1052420 0 thorton 2014-12-04 00:55:15 -0800 TextIndicator::createWithSelectionInFrame does synchronous IPC in WebKit2 1052421 1 242556 thorton 2014-12-04 00:56:22 -0800 Created attachment 242556 Patch 1052423 2 webkit-bug-importer 2014-12-04 00:57:04 -0800 <rdar://problem/19140827> 1052424 3 commit-queue 2014-12-04 00:57:51 -0800 Attachment 242556 did not pass style-queue: ERROR: Source/WebCore/page/mac/TextIndicatorWindow.mm:269: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/page/mac/TextIndicatorWindow.h:51: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 1052529 4 thorton 2014-12-04 11:58:08 -0800 http://trac.webkit.org/changeset/176810 1052547 5 thorton 2014-12-04 13:10:49 -0800 And http://trac.webkit.org/changeset/176811 1052549 6 thorton 2014-12-04 13:32:10 -0800 And http://trac.webkit.org/changeset/176812 242556 2014-12-04 00:56:22 -0800 2014-12-04 08:58:24 -0800 Patch bug-139252-20141204005655.patch text/plain 17548 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2Nzc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODYyYmU2NmU1M2I4YmZl Y2RkYmY4YjFiZmVlMWZmMWU5ZDllZmM0OS4uY2JjMTE2ZjQzOTAxNTc3MDhmYmU5ZGRjNWUwOTI4 Yzg5MzVhNDE2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTEyLTA0ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFRleHRJbmRpY2F0 b3I6OmNyZWF0ZVdpdGhTZWxlY3Rpb25JbkZyYW1lIGRvZXMgc3luY2hyb25vdXMgSVBDIGluIFdl YktpdDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz OTI1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog V2ViQ29yZS5leHAuaW46CisgICAgICAgICogcGFnZS9UZXh0SW5kaWNhdG9yLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhTZWxlY3Rpb25JbkZyYW1lKToK KyAgICAgICAgKFdlYkNvcmU6OlRleHRJbmRpY2F0b3I6OlRleHRJbmRpY2F0b3IpOgorICAgICAg ICAqIHBhZ2UvVGV4dEluZGljYXRvci5oOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEluZGljYXRv cjo6c2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0ZXMpOgorICAgICAgICAoV2ViQ29yZTo6 VGV4dEluZGljYXRvcjo6dGV4dEJvdW5kaW5nUmVjdEluV2luZG93Q29vcmRpbmF0ZXMpOgorICAg ICAgICAoV2ViQ29yZTo6VGV4dEluZGljYXRvcjo6c2VsZWN0aW9uUmVjdEluU2NyZWVuQ29vcmRp bmF0ZXMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6VGV4dEluZGljYXRvcjo6dGV4dEJv dW5kaW5nUmVjdEluU2NyZWVuQ29vcmRpbmF0ZXMpOiBEZWxldGVkLgorICAgICAgICBHbyBiYWNr IHRvIGtlZXBpbmcgdGhlIHJlY3RzIGluICJ3aW5kb3ciIGNvb3JkaW5hdGVzLgorCisgICAgICAg ICogcGFnZS9tYWMvVGV4dEluZGljYXRvcldpbmRvdy5oOgorICAgICAgICAqIHBhZ2UvbWFjL1Rl eHRJbmRpY2F0b3JXaW5kb3cubW06CisgICAgICAgICgtW1dlYlRleHRJbmRpY2F0b3JWaWV3IGlu aXRXaXRoRnJhbWU6dGV4dEluZGljYXRvcjptYXJnaW46XSk6CisgICAgICAgIChXZWJDb3JlOjpU ZXh0SW5kaWNhdG9yV2luZG93OjpzZXRUZXh0SW5kaWNhdG9yKToKKyAgICAgICAgTGV0IGNhbGxl cnMgcGFzcyBpbiB0aGUgY29udGVudFJlY3QgaW5zdGVhZCBvZiB0cnlpbmcgdG8gc2hhcmUgdGhl IGNvZGUKKyAgICAgICAgdG8gY29tcHV0ZSBpdCwgc2luY2UgaXQgbmVlZHMgdG8gYmUgZGlmZmVy ZW50IGZvciBsZWdhY3kgYW5kIG1vZGVybiBXZWJLaXQuCisKIDIwMTQtMTItMDMgIEJlbmphbWlu IFBvdWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgR2V0IHJpZCBvZiBGcmFt ZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxsUmVxdWVzdFJlc291cmNlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cK aW5kZXggNWU5MWQyN2IxZDRjNTY0NzdiN2Y5MzIyYjliMDk1NmNlMGMwYTQ5YS4uOWNlNGFhZmU5 OWM1MDMwNjI5M2FhZDdiMzIzMjY4N2U3NWJjZTMzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDE0LTEyLTA0ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu Y29tPgorCisgICAgICAgIFRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhTZWxlY3Rpb25JbkZyYW1l IGRvZXMgc3luY2hyb25vdXMgSVBDIGluIFdlYktpdDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTI1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAo LVtXZWJWaWV3IF9zZXRUZXh0SW5kaWNhdG9yOmZhZGVPdXQ6YW5pbWF0aW9uQ29tcGxldGlvbkhh bmRsZXI6XSk6CisgICAgICAgIEFkanVzdCB0byB0aGUgV2ViQ29yZSBjaGFuZ2VzLgorCiAyMDE0 LTEyLTAzICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAg ICAgICBJbXBsZW1lbnQgYWN0aW9uIG1lbnVzIGZvciB0ZWw6IFVSTHMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBl YTlkNGQ4NWFhNmIxMjQ5YzM3ZTExYjgzYTA1MTVjYjExNDIwOWQzLi42M2M4NDU2ZmUwZWEwZDE3 Yzg1OTNlNjMyODVhNDMzOTkxYjM5M2NiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIw MTQtMTItMDQgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAg ICAgVGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFNlbGVjdGlvbkluRnJhbWUgZG9lcyBzeW5jaHJv bm91cyBJUEMgaW4gV2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTM5MjUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSXQgdHVybnMgb3V0IGNvbnRlbnRzVG9TY3JlZW4gcmVxdWlyZXMgc3luYyBJ UEMgaW4gTWFjIFdlYktpdDIsIHdoaWNoIHdlCisgICAgICAgIHJlYWxseSBkb24ndCB3YW50IHRv IGJlIGRvaW5nIGhlcmUgKGVzcGVjaWFsbHkgc2luY2UgdGhlIFVJIHByb2Nlc3Mgd2lsbCBvZnRl bgorICAgICAgICBiZSBzaXR0aW5nIGluIHdhaXRGb3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5IHdh aXRpbmcgZm9yIGRpZFBlcmZvcm1BY3Rpb25NZW51SGl0VGVzdCkuCisKKyAgICAgICAgR28gYmFj ayB0byBrZWVwaW5nIFRleHRJbmRpY2F0b3IgcmVjdHMgaW4gIndpbmRvdyIgY29vcmRpbmF0ZXMg YW5kIGRvIHRoZSBjb252ZXJzaW9uCisgICAgICAgIGluIGVhY2ggb2YgdGhlIFdlYktpdHMgaW5z dGVhZCBvZiB0cnlpbmcgdG8gc2hhcmUgdGhhdCBjb2RlLgorCisgICAgICAgICogU2hhcmVkL1dl YkNvcmVBcmd1bWVudENvZGVycy5jcHA6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8VGV4 dEluZGljYXRvckRhdGE+OjplbmNvZGUpOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFRl eHRJbmRpY2F0b3JEYXRhPjo6ZGVjb2RlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9X S1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBfc2V0VGV4dEluZGljYXRvcjpmYWRlT3V0OmFu aW1hdGlvbkNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9GaW5kQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZpbmRDb250cm9sbGVyOjp1 cGRhdGVGaW5kSW5kaWNhdG9yKToKKyAgICAgICAgKFdlYktpdDo6RmluZENvbnRyb2xsZXI6OmRy YXdSZWN0KToKKyAgICAgICAgQWRqdXN0IHRvIHRoZSBXZWJDb3JlIGNoYW5nZXMuCisKIDIwMTQt MTItMDMgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAg IFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxNzY0NTcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4 IDc4MzcyMTJmZWI0ZWQ1YzI1MmM2ZWVkNjZjZGIyNTQzZDIxZTQzZjcuLmMwYzAyODQ0ZDg0MWFi MWM0MjczZWRlYmE0MjM4OTg3NWU2MDgyNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0yMzEx LDcgKzIzMTEsNyBAQCBfX1pON1dlYkNvcmUxN1Njcm9sbGJhclRoZW1lTWFjMjNzZXRVcE92ZXJo YW5nQXJlYVNoYWRvd0VQN0NBTGF5ZXIKIF9fWk43V2ViQ29yZTE3U2Nyb2xsYmFyVGhlbWVNYWMy NHJlbW92ZU92ZXJoYW5nQXJlYVNoYWRvd0VQN0NBTGF5ZXIKIF9fWk43V2ViQ29yZTE3U2Nyb2xs YmFyVGhlbWVNYWMyN3NldFVwT3ZlcmhhbmdBcmVhQmFja2dyb3VuZEVQN0NBTGF5ZXJSS05TXzVD b2xvckUKIF9fWk43V2ViQ29yZTE3U2Nyb2xsYmFyVGhlbWVNYWMyOHJlbW92ZU92ZXJoYW5nQXJl YUJhY2tncm91bmRFUDdDQUxheWVyCi1fX1pON1dlYkNvcmUxOVRleHRJbmRpY2F0b3JXaW5kb3cx NnNldFRleHRJbmRpY2F0b3JFTjNXVEYxMFBhc3NSZWZQdHJJTlNfMTNUZXh0SW5kaWNhdG9yRUVF Yk5TdDNfXzE4ZnVuY3Rpb25JRnZ2RUVFCitfX1pON1dlYkNvcmUxOVRleHRJbmRpY2F0b3JXaW5k b3cxNnNldFRleHRJbmRpY2F0b3JFTjNXVEYxMFBhc3NSZWZQdHJJTlNfMTNUZXh0SW5kaWNhdG9y RUVFNkNHUmVjdGJOU3QzX18xOGZ1bmN0aW9uSUZ2dkVFRQogX19aTjdXZWJDb3JlMTlUZXh0SW5k aWNhdG9yV2luZG93QzFFUDZOU1ZpZXcKIF9fWk43V2ViQ29yZTE5VGV4dEluZGljYXRvcldpbmRv d0QxRXYKIF9fWk43V2ViQ29yZTE5YXBwbGljYXRpb25Jc1NhZmFyaUV2CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9UZXh0SW5kaWNhdG9yLmNwcAppbmRleCBiZWZhOTY5MDg4NzBkZDE1ZWYwZTgyOGJhNGNlZTZh M2QzMGJmYTk2Li5lZTFkZTlkNGFhMjk2YzIwNTU2Zjk4NzEyMmM1YTkyODg5YTMzNmQ5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvVGV4dEluZGljYXRvci5jcHAKQEAgLTE0Niw3ICsxNDYsNyBAQCBQYXNz UmVmUHRyPFRleHRJbmRpY2F0b3I+IFRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhTZWxlY3Rpb25J bkZyYW1lKEZyYW1lJiBmcmFtZQogCiAgICAgLy8gU3RvcmUgdGhlIHNlbGVjdGlvbiByZWN0IGlu IHdpbmRvdyBjb29yZGluYXRlcywgdG8gYmUgdXNlZCBzdWJzZXF1ZW50bHkKICAgICAvLyB0byBk ZXRlcm1pbmUgaWYgdGhlIGluZGljYXRvciBhbmQgc2VsZWN0aW9uIHN0aWxsIHByZWNpc2VseSBv dmVybGFwLgotICAgIEludFJlY3Qgc2VsZWN0aW9uUmVjdEluU2NyZWVuQ29vcmRpbmF0ZXMgPSBm cmFtZS52aWV3KCktPmNvbnRlbnRzVG9TY3JlZW4oc2VsZWN0aW9uUmVjdCk7CisgICAgSW50UmVj dCBzZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcyA9IGZyYW1lLnZpZXcoKS0+Y29udGVu dHNUb1dpbmRvdyhzZWxlY3Rpb25SZWN0KTsKIAogICAgIFZlY3RvcjxGbG9hdFJlY3Q+IHRleHRS ZWN0czsKICAgICBmcmFtZS5zZWxlY3Rpb24oKS5nZXRDbGlwcGVkVmlzaWJsZVRleHRSZWN0YW5n bGVzKHRleHRSZWN0cyk7CkBAIC0xNTQsMjMgKzE1NCwyMyBAQCBQYXNzUmVmUHRyPFRleHRJbmRp Y2F0b3I+IFRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhTZWxlY3Rpb25JbkZyYW1lKEZyYW1lJiBm cmFtZQogICAgIC8vIFRoZSBib3VuZGluZyByZWN0IG9mIGFsbCB0aGUgdGV4dCByZWN0cyBjYW4g YmUgZGlmZmVyZW50IHRoYW4gdGhlIHNlbGVjdGlvbgogICAgIC8vIHJlY3Qgd2hlbiB0aGUgc2Vs ZWN0aW9uIHNwYW5zIG11bHRpcGxlIGxpbmVzOyB0aGUgaW5kaWNhdG9yIGRvZXNuJ3QgYWN0dWFs bHkKICAgICAvLyBjYXJlIHdoZXJlIHRoZSBzZWxlY3Rpb24gaGlnaGxpZ2h0IGdvZXMsIGp1c3Qg d2hlcmUgdGhlIHRleHQgYWN0dWFsbHkgaXMuCi0gICAgRmxvYXRSZWN0IHRleHRCb3VuZGluZ1Jl Y3RJblNjcmVlbkNvb3JkaW5hdGVzOwotICAgIFZlY3RvcjxGbG9hdFJlY3Q+IHRleHRSZWN0c0lu U2NyZWVuQ29vcmRpbmF0ZXM7CisgICAgRmxvYXRSZWN0IHRleHRCb3VuZGluZ1JlY3RJbldpbmRv d0Nvb3JkaW5hdGVzOworICAgIFZlY3RvcjxGbG9hdFJlY3Q+IHRleHRSZWN0c0luV2luZG93Q29v cmRpbmF0ZXM7CiAgICAgZm9yIChjb25zdCBGbG9hdFJlY3QmIHRleHRSZWN0IDogdGV4dFJlY3Rz KSB7Ci0gICAgICAgIEZsb2F0UmVjdCB0ZXh0UmVjdEluU2NyZWVuQ29vcmRpbmF0ZXMgPSBmcmFt ZS52aWV3KCktPmNvbnRlbnRzVG9TY3JlZW4oZW5jbG9zaW5nSW50UmVjdCh0ZXh0UmVjdCkpOwot ICAgICAgICB0ZXh0UmVjdHNJblNjcmVlbkNvb3JkaW5hdGVzLmFwcGVuZCh0ZXh0UmVjdEluU2Ny ZWVuQ29vcmRpbmF0ZXMpOwotICAgICAgICB0ZXh0Qm91bmRpbmdSZWN0SW5TY3JlZW5Db29yZGlu YXRlcy51bml0ZSh0ZXh0UmVjdEluU2NyZWVuQ29vcmRpbmF0ZXMpOworICAgICAgICBGbG9hdFJl Y3QgdGV4dFJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzID0gZnJhbWUudmlldygpLT5jb250ZW50c1Rv V2luZG93KGVuY2xvc2luZ0ludFJlY3QodGV4dFJlY3QpKTsKKyAgICAgICAgdGV4dFJlY3RzSW5X aW5kb3dDb29yZGluYXRlcy5hcHBlbmQodGV4dFJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKTsKKyAg ICAgICAgdGV4dEJvdW5kaW5nUmVjdEluV2luZG93Q29vcmRpbmF0ZXMudW5pdGUodGV4dFJlY3RJ bldpbmRvd0Nvb3JkaW5hdGVzKTsKICAgICB9CiAKICAgICBWZWN0b3I8RmxvYXRSZWN0PiB0ZXh0 UmVjdHNJbkJvdW5kaW5nUmVjdENvb3JkaW5hdGVzOwotICAgIGZvciAoYXV0byByZWN0IDogdGV4 dFJlY3RzSW5TY3JlZW5Db29yZGluYXRlcykgewotICAgICAgICByZWN0Lm1vdmVCeSgtdGV4dEJv dW5kaW5nUmVjdEluU2NyZWVuQ29vcmRpbmF0ZXMubG9jYXRpb24oKSk7CisgICAgZm9yIChhdXRv IHJlY3QgOiB0ZXh0UmVjdHNJbldpbmRvd0Nvb3JkaW5hdGVzKSB7CisgICAgICAgIHJlY3QubW92 ZUJ5KC10ZXh0Qm91bmRpbmdSZWN0SW5XaW5kb3dDb29yZGluYXRlcy5sb2NhdGlvbigpKTsKICAg ICAgICAgdGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlcy5hcHBlbmQocmVjdCk7CiAg ICAgfQogCiAgICAgVGV4dEluZGljYXRvckRhdGEgZGF0YTsKLSAgICBkYXRhLnNlbGVjdGlvblJl Y3RJblNjcmVlbkNvb3JkaW5hdGVzID0gc2VsZWN0aW9uUmVjdEluU2NyZWVuQ29vcmRpbmF0ZXM7 Ci0gICAgZGF0YS50ZXh0Qm91bmRpbmdSZWN0SW5TY3JlZW5Db29yZGluYXRlcyA9IHRleHRCb3Vu ZGluZ1JlY3RJblNjcmVlbkNvb3JkaW5hdGVzOworICAgIGRhdGEuc2VsZWN0aW9uUmVjdEluV2lu ZG93Q29vcmRpbmF0ZXMgPSBzZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlczsKKyAgICBk YXRhLnRleHRCb3VuZGluZ1JlY3RJbldpbmRvd0Nvb3JkaW5hdGVzID0gdGV4dEJvdW5kaW5nUmVj dEluV2luZG93Q29vcmRpbmF0ZXM7CiAgICAgZGF0YS50ZXh0UmVjdHNJbkJvdW5kaW5nUmVjdENv b3JkaW5hdGVzID0gdGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlczsKICAgICBkYXRh LmNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yID0gZnJhbWUucGFnZSgpLT5kZXZpY2VTY2FsZUZhY3Rv cigpOwogICAgIGRhdGEuY29udGVudEltYWdlID0gaW5kaWNhdG9yQml0bWFwOwpAQCAtMTgzLDcg KzE4Myw3IEBAIFBhc3NSZWZQdHI8VGV4dEluZGljYXRvcj4gVGV4dEluZGljYXRvcjo6Y3JlYXRl V2l0aFNlbGVjdGlvbkluRnJhbWUoRnJhbWUmIGZyYW1lCiBUZXh0SW5kaWNhdG9yOjpUZXh0SW5k aWNhdG9yKGNvbnN0IFRleHRJbmRpY2F0b3JEYXRhJiBkYXRhKQogICAgIDogbV9kYXRhKGRhdGEp CiB7Ci0gICAgQVNTRVJUKG1fZGF0YS5jb250ZW50SW1hZ2VTY2FsZUZhY3RvciAhPSAxIHx8IG1f ZGF0YS5jb250ZW50SW1hZ2UtPnNpemUoKSA9PSBlbmNsb3NpbmdJbnRSZWN0KG1fZGF0YS5zZWxl Y3Rpb25SZWN0SW5TY3JlZW5Db29yZGluYXRlcykuc2l6ZSgpKTsKKyAgICBBU1NFUlQobV9kYXRh LmNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yICE9IDEgfHwgbV9kYXRhLmNvbnRlbnRJbWFnZS0+c2l6 ZSgpID09IGVuY2xvc2luZ0ludFJlY3QobV9kYXRhLnNlbGVjdGlvblJlY3RJbldpbmRvd0Nvb3Jk aW5hdGVzKS5zaXplKCkpOwogCiAgICAgaWYgKHRleHRJbmRpY2F0b3JzRm9yVGV4dFJlY3RzT3Zl cmxhcChtX2RhdGEudGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlcykpIHsKICAgICAg ICAgbV9kYXRhLnRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0ZXNbMF0gPSB1bmlvblJl Y3QobV9kYXRhLnRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0ZXMpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9UZXh0SW5kaWNhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1RleHRJbmRpY2F0b3IuaAppbmRleCA0N2JhNmMzMjM3OThlNjM5NjQzODhhYTZlOTE2YmE3 NDQ2YjgxZTZjLi5iZTEwYTMzMzNmMmZlZTIzNTcxM2VmNzA4ZjBhMmQ4MWY0YzY4ZDI0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuaApAQCAtNTEsOCArNTEsOCBAQCBlbnVtIGNsYXNz IFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9uIHsKIH07CiAKIHN0cnVjdCBUZXh0 SW5kaWNhdG9yRGF0YSB7Ci0gICAgRmxvYXRSZWN0IHNlbGVjdGlvblJlY3RJblNjcmVlbkNvb3Jk aW5hdGVzOwotICAgIEZsb2F0UmVjdCB0ZXh0Qm91bmRpbmdSZWN0SW5TY3JlZW5Db29yZGluYXRl czsKKyAgICBGbG9hdFJlY3Qgc2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0ZXM7CisgICAg RmxvYXRSZWN0IHRleHRCb3VuZGluZ1JlY3RJbldpbmRvd0Nvb3JkaW5hdGVzOwogICAgIFZlY3Rv cjxGbG9hdFJlY3Q+IHRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0ZXM7CiAgICAgZmxv YXQgY29udGVudEltYWdlU2NhbGVGYWN0b3I7CiAgICAgUmVmUHRyPEltYWdlPiBjb250ZW50SW1h Z2VXaXRoSGlnaGxpZ2h0OwpAQCAtNjgsOCArNjgsOCBAQCBwdWJsaWM6CiAKICAgICB+VGV4dElu ZGljYXRvcigpOwogCi0gICAgRmxvYXRSZWN0IHNlbGVjdGlvblJlY3RJblNjcmVlbkNvb3JkaW5h dGVzKCkgY29uc3QgeyByZXR1cm4gbV9kYXRhLnNlbGVjdGlvblJlY3RJblNjcmVlbkNvb3JkaW5h dGVzOyB9Ci0gICAgRmxvYXRSZWN0IHRleHRCb3VuZGluZ1JlY3RJblNjcmVlbkNvb3JkaW5hdGVz KCkgY29uc3QgeyByZXR1cm4gbV9kYXRhLnRleHRCb3VuZGluZ1JlY3RJblNjcmVlbkNvb3JkaW5h dGVzOyB9CisgICAgRmxvYXRSZWN0IHNlbGVjdGlvblJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKCkg Y29uc3QgeyByZXR1cm4gbV9kYXRhLnNlbGVjdGlvblJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzOyB9 CisgICAgRmxvYXRSZWN0IHRleHRCb3VuZGluZ1JlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKCkgY29u c3QgeyByZXR1cm4gbV9kYXRhLnRleHRCb3VuZGluZ1JlY3RJbldpbmRvd0Nvb3JkaW5hdGVzOyB9 CiAgICAgY29uc3QgVmVjdG9yPEZsb2F0UmVjdD4mIHRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29v cmRpbmF0ZXMoKSBjb25zdCB7IHJldHVybiBtX2RhdGEudGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RD b29yZGluYXRlczsgfQogICAgIGZsb2F0IGNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yKCkgY29uc3Qg eyByZXR1cm4gbV9kYXRhLmNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yOyB9CiAgICAgSW1hZ2UgKmNv bnRlbnRJbWFnZVdpdGhIaWdobGlnaHQoKSBjb25zdCB7IHJldHVybiBtX2RhdGEuY29udGVudElt YWdlV2l0aEhpZ2hsaWdodC5nZXQoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9tYWMvVGV4dEluZGljYXRvcldpbmRvdy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvVGV4 dEluZGljYXRvcldpbmRvdy5oCmluZGV4IDk5ZDIxNDBlZDdlODI5NDAxNzk0Y2M0NDVjYzk0YjYy N2NlZjRkYjUuLmQ0ZDFkMjJmYTRlOTQ3MjJlNDRlNmMxMzVlZTE0ZWFlMTExODgxNjkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL1RleHRJbmRpY2F0b3JXaW5kb3cuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9UZXh0SW5kaWNhdG9yV2luZG93LmgKQEAgLTQ4LDcg KzQ4LDcgQEAgcHVibGljOgogICAgIGV4cGxpY2l0IFRleHRJbmRpY2F0b3JXaW5kb3coTlNWaWV3 ICopOwogICAgIH5UZXh0SW5kaWNhdG9yV2luZG93KCk7CiAKLSAgICB2b2lkIHNldFRleHRJbmRp Y2F0b3IoUGFzc1JlZlB0cjxUZXh0SW5kaWNhdG9yPiwgYm9vbCBmYWRlT3V0LCBzdGQ6OmZ1bmN0 aW9uPHZvaWQgKCk+IGFuaW1hdGlvbkNvbXBsZXRpb25IYW5kbGVyKTsKKyAgICB2b2lkIHNldFRl eHRJbmRpY2F0b3IoUGFzc1JlZlB0cjxUZXh0SW5kaWNhdG9yPiwgTlNSZWN0IGNvbnRlbnRSZWN0 LCBib29sIGZhZGVPdXQsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gYW5pbWF0aW9uQ29tcGxldGlv bkhhbmRsZXIpOwogCiBwcml2YXRlOgogICAgIHZvaWQgY2xvc2VXaW5kb3coKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL1RleHRJbmRpY2F0b3JXaW5kb3cubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL21hYy9UZXh0SW5kaWNhdG9yV2luZG93Lm1tCmluZGV4IDFmOWJlMDdi YzlkNjhjMDAyODc5Yjc0ZGVjZDg1MmVkMjQyYTkxM2UuLmFjMWQwMjA3YWZkMGJlMGIzYTI5ZWM4 ZmUwODI5YWZmYzI4NDE3YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL1Rl eHRJbmRpY2F0b3JXaW5kb3cubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvVGV4dElu ZGljYXRvcldpbmRvdy5tbQpAQCAtMTcxLDcgKzE3MSw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJD b3JlOwogICAgICAgICBbdGV4dExheWVyIHNldENvbnRlbnRzOihpZCljb250ZW50c0ltYWdlLmdl dCgpXTsKIAogICAgICAgICBGbG9hdFJlY3QgaW1hZ2VSZWN0ID0gdGV4dFJlY3Q7Ci0gICAgICAg IGltYWdlUmVjdC5tb3ZlKF90ZXh0SW5kaWNhdG9yLT50ZXh0Qm91bmRpbmdSZWN0SW5TY3JlZW5D b29yZGluYXRlcygpLmxvY2F0aW9uKCkgLSBfdGV4dEluZGljYXRvci0+c2VsZWN0aW9uUmVjdElu U2NyZWVuQ29vcmRpbmF0ZXMoKS5sb2NhdGlvbigpKTsKKyAgICAgICAgaW1hZ2VSZWN0Lm1vdmUo X3RleHRJbmRpY2F0b3ItPnRleHRCb3VuZGluZ1JlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKCkubG9j YXRpb24oKSAtIF90ZXh0SW5kaWNhdG9yLT5zZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRl cygpLmxvY2F0aW9uKCkpOwogICAgICAgICBbdGV4dExheWVyIHNldENvbnRlbnRzUmVjdDpDR1Jl Y3RNYWtlKGltYWdlUmVjdC54KCkgLyBjb250ZW50c0ltYWdlTG9naWNhbFNpemUud2lkdGgoKSwg aW1hZ2VSZWN0LnkoKSAvIGNvbnRlbnRzSW1hZ2VMb2dpY2FsU2l6ZS5oZWlnaHQoKSwgaW1hZ2VS ZWN0LndpZHRoKCkgLyBjb250ZW50c0ltYWdlTG9naWNhbFNpemUud2lkdGgoKSwgaW1hZ2VSZWN0 LmhlaWdodCgpIC8gY29udGVudHNJbWFnZUxvZ2ljYWxTaXplLmhlaWdodCgpKV07CiAgICAgICAg IFt0ZXh0TGF5ZXIgc2V0Q29udGVudHNHcmF2aXR5OmtDQUdyYXZpdHlDZW50ZXJdOwogICAgICAg ICBbdGV4dExheWVyIHNldENvbnRlbnRzU2NhbGU6X3RleHRJbmRpY2F0b3ItPmNvbnRlbnRJbWFn ZVNjYWxlRmFjdG9yKCldOwpAQCAtMjY2LDcgKzI2Niw3IEBAIFRleHRJbmRpY2F0b3JXaW5kb3c6 On5UZXh0SW5kaWNhdG9yV2luZG93KCkKICAgICBjbG9zZVdpbmRvdygpOwogfQogCi12b2lkIFRl eHRJbmRpY2F0b3JXaW5kb3c6OnNldFRleHRJbmRpY2F0b3IoUGFzc1JlZlB0cjxUZXh0SW5kaWNh dG9yPiB0ZXh0SW5kaWNhdG9yLCBib29sIGZhZGVPdXQsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4g YW5pbWF0aW9uQ29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFRleHRJbmRpY2F0b3JXaW5kb3c6OnNl dFRleHRJbmRpY2F0b3IoUGFzc1JlZlB0cjxUZXh0SW5kaWNhdG9yPiB0ZXh0SW5kaWNhdG9yLCBO U1JlY3QgY29udGVudFJlY3QsIGJvb2wgZmFkZU91dCwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBh bmltYXRpb25Db21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBpZiAobV90ZXh0SW5kaWNhdG9yID09 IHRleHRJbmRpY2F0b3IpCiAgICAgICAgIHJldHVybjsKQEAgLTI3OSw3ICsyNzksNiBAQCB2b2lk IFRleHRJbmRpY2F0b3JXaW5kb3c6OnNldFRleHRJbmRpY2F0b3IoUGFzc1JlZlB0cjxUZXh0SW5k aWNhdG9yPiB0ZXh0SW5kaWNhdAogICAgIGlmICghbV90ZXh0SW5kaWNhdG9yKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBOU1JlY3QgY29udGVudFJlY3QgPSBtX3RleHRJbmRpY2F0b3ItPnRleHRC b3VuZGluZ1JlY3RJblNjcmVlbkNvb3JkaW5hdGVzKCk7CiAgICAgQ0dGbG9hdCBob3Jpem9udGFs TWFyZ2luID0gc3RkOjptYXgoZHJvcFNoYWRvd0JsdXJSYWRpdXMgKiAyICsgaG9yaXpvbnRhbEJv cmRlciwgY29udGVudFJlY3Quc2l6ZS53aWR0aCAqIDIpOwogICAgIENHRmxvYXQgdmVydGljYWxN YXJnaW4gPSBzdGQ6Om1heChkcm9wU2hhZG93Qmx1clJhZGl1cyAqIDIgKyB2ZXJ0aWNhbEJvcmRl ciwgY29udGVudFJlY3Quc2l6ZS5oZWlnaHQgKiAyKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJWaWV3Lm1tCmluZGV4IDA0MWJjMTQ2ZDE2Mjg3Mjk4NjY3NzhkNmUzNzRmYmUxZjgzYTc2MWQu LjEyNzhjY2I0N2I2ZGJmODQxMzgwZDRkODY3OWY4ZTY3NDE5NjRiOGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTg2MDEsNyArODYwMSw4IEBAIHN0YXRpYyB2b2lkIGds aWJDb250ZXh0SXRlcmF0aW9uQ2FsbGJhY2soQ0ZSdW5Mb29wT2JzZXJ2ZXJSZWYsIENGUnVuTG9v cEFjdGl2aXR5CiAgICAgaWYgKCFfcHJpdmF0ZS0+dGV4dEluZGljYXRvcldpbmRvdykKICAgICAg ICAgX3ByaXZhdGUtPnRleHRJbmRpY2F0b3JXaW5kb3cgPSBzdGQ6Om1ha2VfdW5pcXVlPFRleHRJ bmRpY2F0b3JXaW5kb3c+KHNlbGYpOwogCi0gICAgX3ByaXZhdGUtPnRleHRJbmRpY2F0b3JXaW5k b3ctPnNldFRleHRJbmRpY2F0b3IodGV4dEluZGljYXRvciwgZmFkZU91dCwgV1RGOjptb3ZlKGNv bXBsZXRpb25IYW5kbGVyKSk7CisgICAgTlNSZWN0IGNvbnRlbnRSZWN0ID0gW3NlbGYud2luZG93 IGNvbnZlcnRSZWN0VG9TY3JlZW46dGV4dEluZGljYXRvci0+dGV4dEJvdW5kaW5nUmVjdEluV2lu ZG93Q29vcmRpbmF0ZXMoKV07CisgICAgX3ByaXZhdGUtPnRleHRJbmRpY2F0b3JXaW5kb3ctPnNl dFRleHRJbmRpY2F0b3IodGV4dEluZGljYXRvciwgY29udGVudFJlY3QsIGZhZGVPdXQsIFdURjo6 bW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogfQogCiAtICh2b2lkKV9jbGVhclRleHRJbmRpY2F0 b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2Rl cnMuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAK aW5kZXggZDJmZGExMmQyM2U2Yjc4MDljNDc4ZTQ0YmNiMDZiMDRjNDQ3NDVmMi4uMmIzZmI1NjM5 MDNlYWQ3NTBmYWU4MTBkOTg1MjMwMDM5NjA0M2NlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv U2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKQEAgLTE5NjMsOCArMTk2Myw4IEBAIGJv b2wgQXJndW1lbnRDb2RlcjxCbG9iUGFydD46OmRlY29kZShBcmd1bWVudERlY29kZXImIGRlY29k ZXIsIEJsb2JQYXJ0JiBibG9iUGFyCiAKIHZvaWQgQXJndW1lbnRDb2RlcjxUZXh0SW5kaWNhdG9y RGF0YT46OmVuY29kZShBcmd1bWVudEVuY29kZXImIGVuY29kZXIsIGNvbnN0IFRleHRJbmRpY2F0 b3JEYXRhJiB0ZXh0SW5kaWNhdG9yRGF0YSkKIHsKLSAgICBlbmNvZGVyIDw8IHRleHRJbmRpY2F0 b3JEYXRhLnNlbGVjdGlvblJlY3RJblNjcmVlbkNvb3JkaW5hdGVzOwotICAgIGVuY29kZXIgPDwg dGV4dEluZGljYXRvckRhdGEudGV4dEJvdW5kaW5nUmVjdEluU2NyZWVuQ29vcmRpbmF0ZXM7Cisg ICAgZW5jb2RlciA8PCB0ZXh0SW5kaWNhdG9yRGF0YS5zZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29y ZGluYXRlczsKKyAgICBlbmNvZGVyIDw8IHRleHRJbmRpY2F0b3JEYXRhLnRleHRCb3VuZGluZ1Jl Y3RJbldpbmRvd0Nvb3JkaW5hdGVzOwogICAgIGVuY29kZXIgPDwgdGV4dEluZGljYXRvckRhdGEu dGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlczsKICAgICBlbmNvZGVyIDw8IHRleHRJ bmRpY2F0b3JEYXRhLmNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yOwogICAgIGVuY29kZXIuZW5jb2Rl RW51bSh0ZXh0SW5kaWNhdG9yRGF0YS5wcmVzZW50YXRpb25UcmFuc2l0aW9uKTsKQEAgLTE5ODIs MTAgKzE5ODIsMTAgQEAgdm9pZCBBcmd1bWVudENvZGVyPFRleHRJbmRpY2F0b3JEYXRhPjo6ZW5j b2RlKEFyZ3VtZW50RW5jb2RlciYgZW5jb2RlciwgY29uc3QgVGUKIAogYm9vbCBBcmd1bWVudENv ZGVyPFRleHRJbmRpY2F0b3JEYXRhPjo6ZGVjb2RlKEFyZ3VtZW50RGVjb2RlciYgZGVjb2Rlciwg VGV4dEluZGljYXRvckRhdGEmIHRleHRJbmRpY2F0b3JEYXRhKQogewotICAgIGlmICghZGVjb2Rl ci5kZWNvZGUodGV4dEluZGljYXRvckRhdGEuc2VsZWN0aW9uUmVjdEluU2NyZWVuQ29vcmRpbmF0 ZXMpKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGUodGV4dEluZGljYXRvckRhdGEuc2VsZWN0aW9u UmVjdEluV2luZG93Q29vcmRpbmF0ZXMpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBp ZiAoIWRlY29kZXIuZGVjb2RlKHRleHRJbmRpY2F0b3JEYXRhLnRleHRCb3VuZGluZ1JlY3RJblNj cmVlbkNvb3JkaW5hdGVzKSkKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHRleHRJbmRpY2F0b3JE YXRhLnRleHRCb3VuZGluZ1JlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZSh0ZXh0SW5kaWNhdG9yRGF0YS50ZXh0 UmVjdHNJbkJvdW5kaW5nUmVjdENvb3JkaW5hdGVzKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1dLVmlldy5tbQppbmRleCBmZGYyYmE4MDA1MmI4MDE5MDRkYmNkNjAzZDA0Yzg1 MzdiNDk1MWUzLi44ZjllNjU2Mzk1ZDdlNDQ1Y2ZjN2M3MWFmMGZjZmZmYTRjMGU2YTU2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCkBAIC0zMDgxLDcgKzMw ODEsOCBAQCBzdGF0aWMgdm9pZCoga2V5VmFsdWVPYnNlcnZpbmdDb250ZXh0ID0gJmtleVZhbHVl T2JzZXJ2aW5nQ29udGV4dDsKICAgICBpZiAoIV9kYXRhLT5fdGV4dEluZGljYXRvcldpbmRvdykK ICAgICAgICAgX2RhdGEtPl90ZXh0SW5kaWNhdG9yV2luZG93ID0gc3RkOjptYWtlX3VuaXF1ZTxU ZXh0SW5kaWNhdG9yV2luZG93PihzZWxmKTsKIAotICAgIF9kYXRhLT5fdGV4dEluZGljYXRvcldp bmRvdy0+c2V0VGV4dEluZGljYXRvcih0ZXh0SW5kaWNhdG9yLCBmYWRlT3V0LCBXVEY6Om1vdmUo Y29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICBOU1JlY3QgY29udGVudFJlY3QgPSBbc2VsZi53aW5k b3cgY29udmVydFJlY3RUb1NjcmVlbjpbc2VsZiBjb252ZXJ0UmVjdDp0ZXh0SW5kaWNhdG9yLT50 ZXh0Qm91bmRpbmdSZWN0SW5XaW5kb3dDb29yZGluYXRlcygpIHRvVmlldzpuaWxdXTsKKyAgICBf ZGF0YS0+X3RleHRJbmRpY2F0b3JXaW5kb3ctPnNldFRleHRJbmRpY2F0b3IodGV4dEluZGljYXRv ciwgY29udGVudFJlY3QsIGZhZGVPdXQsIFdURjo6bW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwog fQogCiAtICh2b2lkKV9zZXRUZXh0SW5kaWNhdG9yOihQYXNzUmVmUHRyPFRleHRJbmRpY2F0b3I+ KXRleHRJbmRpY2F0b3IgZmFkZU91dDooQk9PTClmYWRlT3V0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcAppbmRleCAwNWUzMTc3 NmNmYjM0NDhmMzJmN2I2ODJhMTc0ODcyNTBkN2RjMjE4Li5hODZiMDk2MTFhOGZhZjkxZjE0Zjcz NzZjZjAyZjQwZjRhYTI1YmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAKQEAgLTMxOCw3ICszMTgsNyBAQCBib29sIEZp bmRDb250cm9sbGVyOjp1cGRhdGVGaW5kSW5kaWNhdG9yKEZyYW1lJiBzZWxlY3RlZEZyYW1lLCBi b29sIGlzU2hvd2luZ092ZQogICAgIGlmICghaW5kaWNhdG9yKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICBtX2ZpbmRJbmRpY2F0b3JSZWN0ID0gZW5jbG9zaW5nSW50UmVjdChpbmRpY2F0 b3ItPnNlbGVjdGlvblJlY3RJblNjcmVlbkNvb3JkaW5hdGVzKCkpOworICAgIG1fZmluZEluZGlj YXRvclJlY3QgPSBlbmNsb3NpbmdJbnRSZWN0KGluZGljYXRvci0+c2VsZWN0aW9uUmVjdEluV2lu ZG93Q29vcmRpbmF0ZXMoKSk7CiAgICAgbV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OlNldFRleHRJbmRpY2F0b3IoaW5kaWNhdG9yLT5kYXRhKCksICFpc1Nob3dpbmdPdmVy bGF5KSk7CiAgICAgbV9pc1Nob3dpbmdGaW5kSW5kaWNhdG9yID0gdHJ1ZTsKIApAQCAtNDUwLDcg KzQ1MCw3IEBAIHZvaWQgRmluZENvbnRyb2xsZXI6OmRyYXdSZWN0KFBhZ2VPdmVybGF5JiwgR3Jh cGhpY3NDb250ZXh0JiBncmFwaGljc0NvbnRleHQsIGNvCiAgICAgICAgIHJldHVybjsKIAogICAg IGlmIChGcmFtZSogc2VsZWN0ZWRGcmFtZSA9IGZyYW1lV2l0aFNlbGVjdGlvbihtX3dlYlBhZ2Ut PmNvcmVQYWdlKCkpKSB7Ci0gICAgICAgIEludFJlY3QgZmluZEluZGljYXRvclJlY3QgPSBzZWxl Y3RlZEZyYW1lLT52aWV3KCktPmNvbnRlbnRzVG9TY3JlZW4oZW5jbG9zaW5nSW50UmVjdChzZWxl Y3RlZEZyYW1lLT5zZWxlY3Rpb24oKS5zZWxlY3Rpb25Cb3VuZHMoKSkpOworICAgICAgICBJbnRS ZWN0IGZpbmRJbmRpY2F0b3JSZWN0ID0gc2VsZWN0ZWRGcmFtZS0+dmlldygpLT5jb250ZW50c1Rv V2luZG93KGVuY2xvc2luZ0ludFJlY3Qoc2VsZWN0ZWRGcmFtZS0+c2VsZWN0aW9uKCkuc2VsZWN0 aW9uQm91bmRzKCkpKTsKIAogICAgICAgICBpZiAoZmluZEluZGljYXRvclJlY3QgIT0gbV9maW5k SW5kaWNhdG9yUmVjdCkKICAgICAgICAgICAgIGhpZGVGaW5kSW5kaWNhdG9yKCk7Cg==