146815 2015-07-09 15:31:00 -0700 SafariViewController loads partial webpage or entirely blank webpage 2016-07-27 09:03:21 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 160255 1 andersca andersca commit-queue oldest_to_newest 1108418 0 andersca 2015-07-09 15:31:00 -0700 SafariViewController loads partial webpage or entirely blank webpage 1108420 1 256531 andersca 2015-07-09 15:35:27 -0700 Created attachment 256531 Patch 1108421 2 commit-queue 2015-07-09 15:37:30 -0700 Attachment 256531 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/ApplicationStateTracker.mm:113: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit2/UIProcess/ApplicationStateTracker.mm:117: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit2/UIProcess/ApplicationStateTracker.mm:145: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit2/UIProcess/ApplicationStateTracker.mm:149: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 4 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1108445 3 256531 thorton 2015-07-09 16:27:12 -0700 Comment on attachment 256531 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256531&action=review r=mitz. > Source/WebKit2/UIProcess/ApplicationStateTracker.mm:136 > + break; ASSERT, instead 1108450 4 andersca 2015-07-09 16:33:20 -0700 Committed r186648: <http://trac.webkit.org/changeset/186648> 1214924 5 256531 cdumez 2016-07-27 08:56:23 -0700 Comment on attachment 256531 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256531&action=review > Source/WebKit2/UIProcess/ApplicationStateTracker.mm:141 > + auto applicationStateMonitor = adoptNS([[BKSApplicationStateMonitor alloc] init]); Should this be m_applicationStateMonitor instead of "auto applicationStateMonitor" ? applicationStateMonitor seems unused, however you are using m_applicationStateMonitor below. 1214929 6 cdumez 2016-07-27 09:03:21 -0700 (In reply to comment #5) > Comment on attachment 256531 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=256531&action=review > > > Source/WebKit2/UIProcess/ApplicationStateTracker.mm:141 > > + auto applicationStateMonitor = adoptNS([[BKSApplicationStateMonitor alloc] init]); > > Should this be m_applicationStateMonitor instead of "auto > applicationStateMonitor" ? applicationStateMonitor seems unused, however you > are using m_applicationStateMonitor below. Filed https://bugs.webkit.org/show_bug.cgi?id=160255. 256531 2015-07-09 15:35:27 -0700 2015-07-09 19:42:26 -0700 Patch bug-146815-20150709153426.patch text/plain 12516 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2NTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggM2U4YzNhMzBlOGY3Yjkx YmNhOWUzYTQ0Zjc1YmYwNDgxNzdhYjk4Mi4uNTM4MGE1NjA1YTYyZWZkMzU5MmVhYjVhMDMxMmYz ZDNkMjY5ZmE2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE1LTA3LTA5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU2FmYXJpVmlld0Nv bnRyb2xsZXIgbG9hZHMgcGFydGlhbCB3ZWJwYWdlIG9yIGVudGlyZWx5IGJsYW5rIHdlYnBhZ2UK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjgxNQor ICAgICAgICByZGFyOi8vcHJvYmxlbS8yMTczNDc1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oOgor ICAgICAgICBBZGQgX2hvc3RQcm9jZXNzSWRlbnRpZmllciBnZXR0ZXIuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQXBwbGljYXRpb25TdGF0ZVRyYWNrZXIuaDoKKyAgICAgICAgQ2hhbmdlIEFwcGxp Y2F0aW9uU3RhdGVUcmFja2VyIHRvIGhvbGQgb24gdG8gYSBXS0NvbnRlbnRWaWV3IGluc3RlYWQg b2YgYSBVSVZpZXcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQXBwbGljYXRpb25TdGF0ZVRyYWNr ZXIubW06CisgICAgICAgIChXZWJLaXQ6OmFwcGxpY2F0aW9uVHlwZSk6CisgICAgICAgIEFkZCBh IGhlbHBlciBmdW5jdGlvbiB0aGF0IHJldHVybnMgdGhlIHR5cGUgb2YgYXBwbGljYXRpb24gdGhl IHdlYiB2aWV3IGlzIGhvc3RlZCBieSAocmVndWxhcgorICAgICAgICBhcHBsaWNhdGlvbiwgdmll dyBzZXJ2aWNlIG9yIGV4dGVuc2lvbikuCisKKyAgICAgICAgKFdlYktpdDo6QXBwbGljYXRpb25T dGF0ZVRyYWNrZXI6OkFwcGxpY2F0aW9uU3RhdGVUcmFja2VyKToKKyAgICAgICAgUmVnaXN0ZXIg bm90aWZpY2F0aW9ucyBhbmQgdXBkYXRlIG1faXNJbkJhY2tncm91bmQuIEZvciByZWd1bGFyIGFw cGxpY2F0aW9ucywganVzdCBsaXN0ZW4gZm9yIFVJQXBwbGljYXRpb24gbm90aWZpY2F0aW9ucy4K KyAgICAgICAgRm9yIHZpZXcgc2VydmljZXMsIHdhbGsgdGhlIHZpZXcgY29udHJvbGxlciBoaWVy YXJjaHkgYW5kIGZpbmQgdGhlIHNlcnZpY2UgdmlldyBjb250cm9sbGVyIGFuZCBsaXN0ZW4gZm9y IG5vdGlmaWNhdGlvbnMgYW5kIHVzZQorICAgICAgICBCS1MgdG8gZmluZCB0aGUgYmFja2dyb3Vu ZCBzdGF0ZSBvZiB0aGUgaG9zdCBhcHBsaWNhdGlvbi4gRm9yIGV4dGVuc2lvbnMsIGp1c3QgdXNl IEJLU0FwcGxpY2F0aW9uU3RhdGVNb25pdG9yIGRpcmVjdGx5LgorCisgICAgICAgIChXZWJLaXQ6 OmlzVmlld1NlcnZpY2UpOiBEZWxldGVkLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3Lm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHdpbGxNb3ZlVG9XaW5kb3c6 XSk6CisgICAgICAgIElmIHdlJ3JlIG1vdmluZyBvdXQgb2YgYSB3aW5kb3csIG51bGwgb3V0IHRo ZSBzdGF0ZSB0cmFja2VyLgorCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgZGlkTW92ZVRvV2lu ZG93XSk6CisgICAgICAgIElmIHdlIG1vdmVkIHRvIGEgd2luZG93LCBjcmVhdGUgYSBuZXcgc3Rh dGUgdHJhY2tlci4KKworICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGlzQmFja2dyb3VuZF0pOgor ICAgICAgICBIYW5kbGUgYSBudWxsIGFwcGxpY2F0aW9uIHN0YXRlLgorCisgICAgICAgICgtW1dL Q29udGVudFZpZXcgX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aFByb2Nlc3NQb29sOmNvbmZpZ3Vy YXRpb246XSk6IERlbGV0ZWQuCisgICAgICAgIERvbid0IGNyZWF0ZSB0aGUgYXBwbGljYXRpb24g c3RhdGUgaGVyZS4KKwogMjAxNS0wNy0wOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBw bGUuY29tPgogCiAgICAgICAgIFdLU2VjdXJpdHlPcmlnaW4uaCBoYXMgd3JvbmcgYXZhaWxhYmls aXR5IGluZm8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3NwaS9pb3MvVUlL aXRTUEkuaCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaAppbmRl eCA4YjQ0Zjg1YzA0MmQyZjYyZDMxYjAwZWNjZjE3NjI2ZjVjNTEzOTI4Li4yMjcxYzY2MjQ5NTFm MDM1YzIxZWNiMzUxOGI5MGI2MmViOWY3MjVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9Q bGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0v c3BpL2lvcy9VSUtpdFNQSS5oCkBAIC01Nyw2ICs1Nyw3IEBACiAjaW1wb3J0IDxVSUtpdC9VSVRl eHRJbnRlcmFjdGlvbkFzc2lzdGFudF9Qcml2YXRlLmg+CiAjaW1wb3J0IDxVSUtpdC9VSVZpZXdD b250cm9sbGVyVHJhbnNpdGlvbmluZ19Qcml2YXRlLmg+CiAjaW1wb3J0IDxVSUtpdC9VSVZpZXdD b250cm9sbGVyX1ByaXZhdGUuaD4KKyNpbXBvcnQgPFVJS2l0L1VJVmlld0NvbnRyb2xsZXJfVmll d1NlcnZpY2UuaD4KICNpbXBvcnQgPFVJS2l0L1VJVmlld19Qcml2YXRlLmg+CiAjaW1wb3J0IDxV SUtpdC9VSVdLU2VsZWN0aW9uQXNzaXN0YW50Lmg+CiAjaW1wb3J0IDxVSUtpdC9VSVdLVGV4dElu dGVyYWN0aW9uQXNzaXN0YW50Lmg+CkBAIC0zMTksNiArMzIwLDEwIEBAIHR5cGVkZWYgZW51bSB7 CiArIChVSVZpZXdDb250cm9sbGVyICopdmlld0NvbnRyb2xsZXJGb3JWaWV3OihVSVZpZXcgKil2 aWV3OwogQGVuZAogCitAaW50ZXJmYWNlIFVJVmlld0NvbnRyb2xsZXIgKFZpZXdTZXJ2aWNlKQor LSAocGlkX3QpX2hvc3RQcm9jZXNzSWRlbnRpZmllcjsKK0BlbmQKKwogQHByb3RvY29sIFVJVmll d0NvbnRyb2xsZXJDb250ZXh0VHJhbnNpdGlvbmluZ0V4IDxVSVZpZXdDb250cm9sbGVyQ29udGV4 dFRyYW5zaXRpb25pbmc+CiAtICh2b2lkKV9fcnVuQWxvbmdzaWRlQW5pbWF0aW9uczsKIC0gKHZv aWQpX2ludGVyYWN0aXZpdHlEaWRDaGFuZ2U6KEJPT0wpaXNJbnRlcmFjdGl2ZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BcHBsaWNhdGlvblN0YXRlVHJhY2tlci5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLmgKaW5kZXgg NWFmNDlkZmRhYzFiNDY5N2YwYTIwZGE1YjI2ZTExMGNiMWM3ODk5Zi4uOGFiNjY4NmU4NGI2YTk2 MzIwOTQ5YzAyZDU1ZmIzNTM1ODE3Zjc5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLmgKQEAgLTMzLDEzICszMywxMyBAQAogI2lt cG9ydCA8d3RmL1dlYWtQdHIuaD4KIAogT0JKQ19DTEFTUyBCS1NBcHBsaWNhdGlvblN0YXRlTW9u aXRvcjsKLU9CSkNfQ0xBU1MgVUlWaWV3OworT0JKQ19DTEFTUyBXS0NvbnRlbnRWaWV3OwogCiBu YW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgQXBwbGljYXRpb25TdGF0ZVRyYWNrZXIgewogcHVi bGljOgotICAgIEFwcGxpY2F0aW9uU3RhdGVUcmFja2VyKFVJVmlldyAqLCBTRUwgZGlkRW50ZXJC YWNrZ3JvdW5kU2VsZWN0b3IsIFNFTCB3aWxsRW50ZXJGb3JlZ3JvdW5kU2VsZWN0b3IpOworICAg IEFwcGxpY2F0aW9uU3RhdGVUcmFja2VyKFdLQ29udGVudFZpZXcgKiwgU0VMIGRpZEVudGVyQmFj a2dyb3VuZFNlbGVjdG9yLCBTRUwgd2lsbEVudGVyRm9yZWdyb3VuZFNlbGVjdG9yKTsKICAgICB+ QXBwbGljYXRpb25TdGF0ZVRyYWNrZXIoKTsKIAogICAgIGJvb2wgaXNJbkJhY2tncm91bmQoKSBj b25zdCB7IHJldHVybiBtX2lzSW5CYWNrZ3JvdW5kOyB9CkBAIC00OCw3ICs0OCw3IEBAIHByaXZh dGU6CiAgICAgdm9pZCBhcHBsaWNhdGlvbkRpZEVudGVyQmFja2dyb3VuZCgpOwogICAgIHZvaWQg YXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kKCk7CiAKLSAgICBXZWFrT2JqQ1B0cjxVSVZp ZXc+IG1fdmlldzsKKyAgICBXZWFrT2JqQ1B0cjxXS0NvbnRlbnRWaWV3PiBtX3ZpZXc7CiAgICAg U0VMIG1fZGlkRW50ZXJCYWNrZ3JvdW5kU2VsZWN0b3I7CiAgICAgU0VMIG1fd2lsbEVudGVyRm9y ZWdyb3VuZFNlbGVjdG9yOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QXBwbGljYXRpb25TdGF0ZVRyYWNrZXIubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXBw bGljYXRpb25TdGF0ZVRyYWNrZXIubW0KaW5kZXggNTg4NDYyODkxYThjMzU0YmFjMDYyODAyOTg2 OGQ1OTY1ZWNkMWM1YS4uZjM5MTFkYTA4MTM4NmE4ZWZmNGVhNTgzOTU3ZjVmNjg0ODhkNzFkZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFj a2VyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BcHBsaWNhdGlvblN0YXRlVHJh Y2tlci5tbQpAQCAtMzAsMTkgKzMwLDE5IEBACiAKICNpbXBvcnQgIkFzc2VydGlvblNlcnZpY2Vz U1BJLmgiCiAjaW1wb3J0ICJVSUtpdFNQSS5oIgotI2ltcG9ydCA8VUlLaXQvVUlBcHBsaWNhdGlv bi5oPgorI2ltcG9ydCAiV0tDb250ZW50Vmlldy5oIgogI2ltcG9ydCA8V2ViQ29yZS9TZWN1cml0 eVNQSS5oPgogI2ltcG9ydCA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW1wb3J0IDx3dGYvT2Jq Y1J1bnRpbWVFeHRyYXMuaD4KIAorQGludGVyZmFjZSBVSVdpbmRvdyAoV0tEZXRhaWxzKQorLSAo Qk9PTClfaXNIb3N0ZWRJbkFub3RoZXJQcm9jZXNzOworQGVuZAorCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAogc3RhdGljIGJvb2wgaGFzRW50aXRsZW1lbnQoTlNTdHJpbmcgKmVudGl0bGVtZW50KQog ewotI2lmIFBMQVRGT1JNKElPU19TSU1VTEFUT1IpCi0gICAgLy8gVGhlIHNpbXVsYXRvciBkb2Vz bid0IHN1cHBvcnQgZW50aXRsZW1lbnRzLgotICAgIHJldHVybiB0cnVlOwotI2Vsc2UKICAgICBh dXRvIHRhc2sgPSBhZG9wdENGKFNlY1Rhc2tDcmVhdGVGcm9tU2VsZihDRkFsbG9jYXRvckdldERl ZmF1bHQoKSkpOwogICAgIGlmICghdGFzaykKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtNTUs MTggKzU1LDI1IEBAIHN0YXRpYyBib29sIGhhc0VudGl0bGVtZW50KE5TU3RyaW5nICplbnRpdGxl bWVudCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIENGQm9vbGVhbkdldFZh bHVlKHN0YXRpY19jYXN0PENGQm9vbGVhblJlZj4odmFsdWUuZ2V0KCkpKTsKLSNlbmRpZgogfQog Ci1zdGF0aWMgYm9vbCBpc1ZpZXdTZXJ2aWNlKCkKK2VudW0gY2xhc3MgQXBwbGljYXRpb25UeXBl IHsKKyAgICBBcHBsaWNhdGlvbiwKKyAgICBWaWV3U2VydmljZSwKKyAgICBFeHRlbnNpb24sCit9 OworCitzdGF0aWMgQXBwbGljYXRpb25UeXBlIGFwcGxpY2F0aW9uVHlwZShVSVdpbmRvdyAqd2lu ZG93KQogeworICAgIEFTU0VSVCh3aW5kb3cpOworCiAgICAgaWYgKF9VSUFwcGxpY2F0aW9uSXNF eHRlbnNpb24oKSkKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiBBcHBsaWNh dGlvblR5cGU6OkV4dGVuc2lvbjsKIAotICAgIGlmIChoYXNFbnRpdGxlbWVudChAImNvbS5hcHBs ZS5VSUtpdC52ZW5kcy12aWV3LXNlcnZpY2VzIikpCi0gICAgICAgIHJldHVybiB0cnVlOworICAg IGlmIChoYXNFbnRpdGxlbWVudChAImNvbS5hcHBsZS5VSUtpdC52ZW5kcy12aWV3LXNlcnZpY2Vz IikgJiYgd2luZG93Ll9pc0hvc3RlZEluQW5vdGhlclByb2Nlc3MpCisgICAgICAgIHJldHVybiBB cHBsaWNhdGlvblR5cGU6OlZpZXdTZXJ2aWNlOwogCi0gICAgcmV0dXJuIGZhbHNlOworICAgIHJl dHVybiBBcHBsaWNhdGlvblR5cGU6OkFwcGxpY2F0aW9uOwogfQogCiBzdGF0aWMgYm9vbCBpc0Jh Y2tncm91bmRTdGF0ZShCS1NBcHBsaWNhdGlvblN0YXRlIHN0YXRlKQpAQCAtODEsMTAgKzg4LDEx IEBAIHN0YXRpYyBib29sIGlzQmFja2dyb3VuZFN0YXRlKEJLU0FwcGxpY2F0aW9uU3RhdGUgc3Rh dGUpCiAgICAgfQogfQogCi1BcHBsaWNhdGlvblN0YXRlVHJhY2tlcjo6QXBwbGljYXRpb25TdGF0 ZVRyYWNrZXIoVUlWaWV3ICp2aWV3LCBTRUwgZGlkRW50ZXJCYWNrZ3JvdW5kU2VsZWN0b3IsIFNF TCB3aWxsRW50ZXJGb3JlZ3JvdW5kU2VsZWN0b3IpCitBcHBsaWNhdGlvblN0YXRlVHJhY2tlcjo6 QXBwbGljYXRpb25TdGF0ZVRyYWNrZXIoV0tDb250ZW50VmlldyAqdmlldywgU0VMIGRpZEVudGVy QmFja2dyb3VuZFNlbGVjdG9yLCBTRUwgd2lsbEVudGVyRm9yZWdyb3VuZFNlbGVjdG9yKQogICAg IDogbV92aWV3KHZpZXcpCiAgICAgLCBtX2RpZEVudGVyQmFja2dyb3VuZFNlbGVjdG9yKGRpZEVu dGVyQmFja2dyb3VuZFNlbGVjdG9yKQogICAgICwgbV93aWxsRW50ZXJGb3JlZ3JvdW5kU2VsZWN0 b3Iod2lsbEVudGVyRm9yZWdyb3VuZFNlbGVjdG9yKQorICAgICwgbV9pc0luQmFja2dyb3VuZCh0 cnVlKQogICAgICwgbV93ZWFrUHRyRmFjdG9yeSh0aGlzKQogICAgICwgbV9kaWRFbnRlckJhY2tn cm91bmRPYnNlcnZlcihudWxscHRyKQogICAgICwgbV93aWxsRW50ZXJGb3JlZ3JvdW5kT2JzZXJ2 ZXIobnVsbHB0cikKQEAgLTkyLDcgKzEwMCw2MCBAQCBBcHBsaWNhdGlvblN0YXRlVHJhY2tlcjo6 QXBwbGljYXRpb25TdGF0ZVRyYWNrZXIoVUlWaWV3ICp2aWV3LCBTRUwgZGlkRW50ZXJCYWNrZwog ICAgIEFTU0VSVChbbV92aWV3LmdldCgpIHJlc3BvbmRzVG9TZWxlY3RvcjptX2RpZEVudGVyQmFj a2dyb3VuZFNlbGVjdG9yXSk7CiAgICAgQVNTRVJUKFttX3ZpZXcuZ2V0KCkgcmVzcG9uZHNUb1Nl bGVjdG9yOm1fd2lsbEVudGVyRm9yZWdyb3VuZFNlbGVjdG9yXSk7CiAKLSAgICBpZiAoaXNWaWV3 U2VydmljZSgpKSB7CisgICAgVUlXaW5kb3cgKndpbmRvdyA9IFttX3ZpZXcuZ2V0KCkgd2luZG93 XTsKKyAgICBBU1NFUlQod2luZG93KTsKKworICAgIHN3aXRjaCAoYXBwbGljYXRpb25UeXBlKHdp bmRvdykpIHsKKyAgICBjYXNlIEFwcGxpY2F0aW9uVHlwZTo6QXBwbGljYXRpb246IHsKKyAgICAg ICAgVUlBcHBsaWNhdGlvbiAqYXBwbGljYXRpb24gPSBbVUlBcHBsaWNhdGlvbiBzaGFyZWRBcHBs aWNhdGlvbl07CisgICAgICAgIE5TTm90aWZpY2F0aW9uQ2VudGVyICpub3RpZmljYXRpb25DZW50 ZXIgPSBbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl07CisKKyAgICAgICAgbV9p c0luQmFja2dyb3VuZCA9IGFwcGxpY2F0aW9uLmFwcGxpY2F0aW9uU3RhdGUgPT0gVUlBcHBsaWNh dGlvblN0YXRlQmFja2dyb3VuZDsKKworICAgICAgICBtX2RpZEVudGVyQmFja2dyb3VuZE9ic2Vy dmVyID0gW25vdGlmaWNhdGlvbkNlbnRlciBhZGRPYnNlcnZlckZvck5hbWU6VUlBcHBsaWNhdGlv bkRpZEVudGVyQmFja2dyb3VuZE5vdGlmaWNhdGlvbiBvYmplY3Q6YXBwbGljYXRpb24gcXVldWU6 bmlsIHVzaW5nQmxvY2s6W3RoaXNdKE5TTm90aWZpY2F0aW9uICopIHsKKyAgICAgICAgICAgIGFw cGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKCk7CisgICAgICAgIH1dOworCisgICAgICAgIG1f d2lsbEVudGVyRm9yZWdyb3VuZE9ic2VydmVyID0gW25vdGlmaWNhdGlvbkNlbnRlciBhZGRPYnNl cnZlckZvck5hbWU6VUlBcHBsaWNhdGlvbldpbGxFbnRlckZvcmVncm91bmROb3RpZmljYXRpb24g b2JqZWN0OmFwcGxpY2F0aW9uIHF1ZXVlOm5pbCB1c2luZ0Jsb2NrOlt0aGlzXShOU05vdGlmaWNh dGlvbiAqKSB7CisgICAgICAgICAgICBhcHBsaWNhdGlvbldpbGxFbnRlckZvcmVncm91bmQoKTsK KyAgICAgICAgfV07CisgICAgICAgIGJyZWFrOworICAgIH0KKworICAgIGNhc2UgQXBwbGljYXRp b25UeXBlOjpWaWV3U2VydmljZTogeworICAgICAgICBVSVZpZXdDb250cm9sbGVyICpzZXJ2aWNl Vmlld0NvbnRyb2xsZXIgPSBuaWw7CisKKyAgICAgICAgZm9yIChVSVZpZXcgKnZpZXcgPSBtX3Zp ZXcuZ2V0KCkuZ2V0KCk7IHZpZXc7IHZpZXcgPSB2aWV3LnN1cGVydmlldykgeworICAgICAgICAg ICAgVUlWaWV3Q29udHJvbGxlciAqdmlld0NvbnRyb2xsZXIgPSBbVUlWaWV3Q29udHJvbGxlciB2 aWV3Q29udHJvbGxlckZvclZpZXc6dmlld107CisKKyAgICAgICAgICAgIGlmICh2aWV3Q29udHJv bGxlci5faG9zdFByb2Nlc3NJZGVudGlmaWVyKSB7CisgICAgICAgICAgICAgICAgc2VydmljZVZp ZXdDb250cm9sbGVyID0gdmlld0NvbnRyb2xsZXI7CisgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICBpZiAoIXNlcnZpY2VWaWV3Q29udHJv bGxlcikKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIHBpZF90IGFwcGxpY2F0aW9uUElE ID0gc2VydmljZVZpZXdDb250cm9sbGVyLl9ob3N0UHJvY2Vzc0lkZW50aWZpZXI7CisgICAgICAg IEFTU0VSVChhcHBsaWNhdGlvblBJRCk7CisKKyAgICAgICAgYXV0byBhcHBsaWNhdGlvblN0YXRl TW9uaXRvciA9IGFkb3B0TlMoW1tCS1NBcHBsaWNhdGlvblN0YXRlTW9uaXRvciBhbGxvY10gaW5p dF0pOworICAgICAgICBtX2lzSW5CYWNrZ3JvdW5kID0gaXNCYWNrZ3JvdW5kU3RhdGUoW21fYXBw bGljYXRpb25TdGF0ZU1vbml0b3IgbW9zdEVsZXZhdGVkQXBwbGljYXRpb25TdGF0ZUZvclBJRDph cHBsaWNhdGlvblBJRF0pOworCisgICAgICAgIE5TTm90aWZpY2F0aW9uQ2VudGVyICpub3RpZmlj YXRpb25DZW50ZXIgPSBbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl07CisgICAg ICAgIG1fZGlkRW50ZXJCYWNrZ3JvdW5kT2JzZXJ2ZXIgPSBbbm90aWZpY2F0aW9uQ2VudGVyIGFk ZE9ic2VydmVyRm9yTmFtZTpAIl9VSVZpZXdTZXJ2aWNlSG9zdERpZEVudGVyQmFja2dyb3VuZE5v dGlmaWNhdGlvbk5hbWUiIG9iamVjdDpzZXJ2aWNlVmlld0NvbnRyb2xsZXIgcXVldWU6bmlsIHVz aW5nQmxvY2s6W3RoaXNdKE5TTm90aWZpY2F0aW9uICopIHsKKyAgICAgICAgICAgIGFwcGxpY2F0 aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKCk7CisgICAgICAgIH1dOworCisgICAgICAgIG1fd2lsbEVu dGVyRm9yZWdyb3VuZE9ic2VydmVyID0gW25vdGlmaWNhdGlvbkNlbnRlciBhZGRPYnNlcnZlckZv ck5hbWU6QCJfVUlWaWV3U2VydmljZUhvc3RXaWxsRW50ZXJGb3JlZ3JvdW5kTm90aWZpY2F0aW9u TmFtZSIgb2JqZWN0OnNlcnZpY2VWaWV3Q29udHJvbGxlciBxdWV1ZTpuaWwgdXNpbmdCbG9jazpb dGhpc10oTlNOb3RpZmljYXRpb24gKikgeworICAgICAgICAgICAgYXBwbGljYXRpb25XaWxsRW50 ZXJGb3JlZ3JvdW5kKCk7CisgICAgICAgIH1dOworCisgICAgICAgIGJyZWFrOworICAgIH0KKwor ICAgIGNhc2UgQXBwbGljYXRpb25UeXBlOjpFeHRlbnNpb246IHsKICAgICAgICAgbV9hcHBsaWNh dGlvblN0YXRlTW9uaXRvciA9IGFkb3B0TlMoW1tCS1NBcHBsaWNhdGlvblN0YXRlTW9uaXRvciBh bGxvY10gaW5pdF0pOwogCiAgICAgICAgIG1faXNJbkJhY2tncm91bmQgPSBpc0JhY2tncm91bmRT dGF0ZShbbV9hcHBsaWNhdGlvblN0YXRlTW9uaXRvciBtb3N0RWxldmF0ZWRBcHBsaWNhdGlvblN0 YXRlRm9yUElEOmdldHBpZCgpXSk7CkBAIC0xMTcsMjAgKzE3OCw3IEBAIEFwcGxpY2F0aW9uU3Rh dGVUcmFja2VyOjpBcHBsaWNhdGlvblN0YXRlVHJhY2tlcihVSVZpZXcgKnZpZXcsIFNFTCBkaWRF bnRlckJhY2tnCiAgICAgICAgICAgICAgICAgICAgIGFwcGxpY2F0aW9uU3RhdGVUcmFja2VyLT5h cHBsaWNhdGlvbldpbGxFbnRlckZvcmVncm91bmQoKTsKICAgICAgICAgICAgIH0pOwogICAgICAg ICB9XTsKLSAgICB9IGVsc2UgewotICAgICAgICBVSUFwcGxpY2F0aW9uICphcHBsaWNhdGlvbiA9 IFtVSUFwcGxpY2F0aW9uIHNoYXJlZEFwcGxpY2F0aW9uXTsKLSAgICAgICAgTlNOb3RpZmljYXRp b25DZW50ZXIgKm5vdGlmaWNhdGlvbkNlbnRlciA9IFtOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZh dWx0Q2VudGVyXTsKLQotICAgICAgICBtX2lzSW5CYWNrZ3JvdW5kID0gYXBwbGljYXRpb24uYXBw bGljYXRpb25TdGF0ZSA9PSBVSUFwcGxpY2F0aW9uU3RhdGVCYWNrZ3JvdW5kOwotCi0gICAgICAg IG1fZGlkRW50ZXJCYWNrZ3JvdW5kT2JzZXJ2ZXIgPSBbbm90aWZpY2F0aW9uQ2VudGVyIGFkZE9i c2VydmVyRm9yTmFtZTpVSUFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kTm90aWZpY2F0aW9u IG9iamVjdDphcHBsaWNhdGlvbiBxdWV1ZTpuaWwgdXNpbmdCbG9jazpbdGhpc10oTlNOb3RpZmlj YXRpb24gKikgewotICAgICAgICAgICAgYXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91bmQoKTsK LSAgICAgICAgfV07Ci0KLSAgICAgICAgbV93aWxsRW50ZXJGb3JlZ3JvdW5kT2JzZXJ2ZXIgPSBb bm90aWZpY2F0aW9uQ2VudGVyIGFkZE9ic2VydmVyRm9yTmFtZTpVSUFwcGxpY2F0aW9uV2lsbEVu dGVyRm9yZWdyb3VuZE5vdGlmaWNhdGlvbiBvYmplY3Q6YXBwbGljYXRpb24gcXVldWU6bmlsIHVz aW5nQmxvY2s6W3RoaXNdKE5TTm90aWZpY2F0aW9uICopIHsKLSAgICAgICAgICAgIGFwcGxpY2F0 aW9uV2lsbEVudGVyRm9yZWdyb3VuZCgpOwotICAgICAgICB9XTsKLQorICAgIH0KICAgICB9CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll dy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQppbmRl eCA0MDdjZDdmMWVhNmJhZjliODU3ZTJmNTJiZWI2N2M2OTNhNDZiMDEyLi5hZmMxM2VmY2UxNjA2 M2E5N2Q3MzEwZmNhZjIxMTQ3ZDM2N2I1NWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCkBAIC0yMTIsOCArMjEyLDYgQEAgcHJpdmF0ZToKIAog ICAgIHNlbGYubGF5ZXIuaGl0VGVzdHNBc09wYXF1ZSA9IFlFUzsKIAotICAgIF9hcHBsaWNhdGlv blN0YXRlVHJhY2tlciA9IHN0ZDo6bWFrZV91bmlxdWU8QXBwbGljYXRpb25TdGF0ZVRyYWNrZXI+ KHNlbGYsIEBzZWxlY3RvcihfYXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91bmQpLCBAc2VsZWN0 b3IoX2FwcGxpY2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZCkpOwotCiAgICAgW1tOU05vdGlmaWNh dGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxl Y3RvcihfYXBwbGljYXRpb25XaWxsUmVzaWduQWN0aXZlOikgbmFtZTpVSUFwcGxpY2F0aW9uV2ls bFJlc2lnbkFjdGl2ZU5vdGlmaWNhdGlvbiBvYmplY3Q6W1VJQXBwbGljYXRpb24gc2hhcmVkQXBw bGljYXRpb25dXTsKICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFk ZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF9hcHBsaWNhdGlvbkRpZEJlY29tZUFj dGl2ZTopIG5hbWU6VUlBcHBsaWNhdGlvbkRpZEJlY29tZUFjdGl2ZU5vdGlmaWNhdGlvbiBvYmpl Y3Q6W1VJQXBwbGljYXRpb24gc2hhcmVkQXBwbGljYXRpb25dXTsKIApAQCAtMjc0LDYgKzI3Miwx MSBAQCBwcml2YXRlOgogICAgICAgICBpZiAoX3dlYlZpZXcuX2FsbG93c0xpbmtQcmV2aWV3KQog ICAgICAgICAgICAgW3NlbGYgX3VucmVnaXN0ZXJQcmV2aWV3SW5XaW5kb3c6d2luZG93XTsKICNl bmRpZgorCisgICAgICAgIGlmICghbmV3V2luZG93KSB7CisgICAgICAgICAgICBBU1NFUlQoX2Fw cGxpY2F0aW9uU3RhdGVUcmFja2VyKTsKKyAgICAgICAgICAgIF9hcHBsaWNhdGlvblN0YXRlVHJh Y2tlciA9IG51bGxwdHI7CisgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAobmV3V2luZG93KSB7 CkBAIC0yODcsNiArMjkwLDE1IEBAIHByaXZhdGU6CiAgICAgfQogfQogCistICh2b2lkKWRpZE1v dmVUb1dpbmRvdworeworICAgIGlmICghc2VsZi53aW5kb3cpCisgICAgICAgIHJldHVybjsKKwor ICAgIEFTU0VSVCghX2FwcGxpY2F0aW9uU3RhdGVUcmFja2VyKTsKKyAgICBfYXBwbGljYXRpb25T dGF0ZVRyYWNrZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEFwcGxpY2F0aW9uU3RhdGVUcmFja2VyPihz ZWxmLCBAc2VsZWN0b3IoX2FwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKSwgQHNlbGVjdG9y KF9hcHBsaWNhdGlvbldpbGxFbnRlckZvcmVncm91bmQpKTsKK30KKwogLSAoV0tCcm93c2luZ0Nv bnRleHRDb250cm9sbGVyICopYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlcgogewogICAgIGlmICgh X2Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIpCkBAIC0zMDcsNiArMzE5LDkgQEAgcHJpdmF0ZToK IAogLSAoQk9PTClpc0JhY2tncm91bmQKIHsKKyAgICBpZiAoIV9hcHBsaWNhdGlvblN0YXRlVHJh Y2tlcikKKyAgICAgICAgcmV0dXJuIFlFUzsKKwogICAgIHJldHVybiBfYXBwbGljYXRpb25TdGF0 ZVRyYWNrZXItPmlzSW5CYWNrZ3JvdW5kKCk7CiB9CiAK