151964 2015-12-07 14:00:38 -0800 UIProcess should determine AppNap state for WebPage 2015-12-07 16:20:39 -0800 1 1 1 Unclassified WebKit WebKit2 Other Unspecified Unspecified REOPENED P2 Normal --- 151970 1 barraclough barraclough commit-queue ryanhaddad oldest_to_newest 1147000 0 barraclough 2015-12-07 14:00:38 -0800 Step 1 in unifying this with the iOS process suppression mechanism is to move the decision out of the WebContent process. 1147013 1 266814 barraclough 2015-12-07 14:28:12 -0800 Created attachment 266814 Fix 1147015 2 commit-queue 2015-12-07 14:29:17 -0800 Attachment 266814 did not pass style-queue: ERROR: Source/WebKit2/WebProcess/WebPage/WebPage.h:994: The parameter name "started" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/WebKit2/UIProcess/WebPageProxy.h:423: The parameter name "activityState" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1147019 3 266814 andersca 2015-12-07 14:31:20 -0800 Comment on attachment 266814 Fix r=me if you fix the stylebot warnings. 1147029 4 barraclough 2015-12-07 15:00:16 -0800 Transmitting file data ....... Committed revision 193655. 1147057 5 ryanhaddad 2015-12-07 16:01:42 -0800 This change seems to have caused the following LayoutTests to fail or time out on El Capitan WK2: media/media-fragments/TC0078.html media/media-fragments/TC0086.html media/media-fragments/TC0090.html media/video-aspect-ratio.html streams/pipe-to.html webgl/1.0.2/conformance/textures/texture-size-limit.html webgl/1.0.3/conformance/extensions/oes-texture-half-float-with-canvas.html <https://build.webkit.org/results/Apple%20El%20Capitan%20Release%20WK2%20(Tests)/r193655%20(1711)/results.html> <https://build.webkit.org/results/Apple%20El%20Capitan%20Release%20WK2%20(Tests)/r193657%20(1712)/results.html> <https://build.webkit.org/builders/Apple%20El%20Capitan%20Release%20WK2%20%28Tests%29/builds/1713> 1147093 6 commit-queue 2015-12-07 16:20:39 -0800 Re-opened since this is blocked by bug 151970 266814 2015-12-07 14:28:12 -0800 2015-12-07 14:30:29 -0800 Fix 151964.1.patch text/plain 9678 barraclough SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MzUyNCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBACisyMDE1LTEyLTA1ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBVSVByb2Nlc3Mg c2hvdWxkIGRldGVybWluZSBBcHBOYXAgc3RhdGUgZm9yIFdlYlBhZ2UKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTk2NAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0ZXAgMSBpbiB1bmlmeWluZyB0aGlz IHdpdGggdGhlIGlPUyBwcm9jZXNzIHN1cHByZXNzaW9uIG1lY2hhbmlzbSBpcyB0byBtb3ZlIHRo ZSBkZWNpc2lvbiBvdXQgb2YgdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OldlYlBhZ2VQcm94eSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlzcGF0Y2hW aWV3U3RhdGVDaGFuZ2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldFBhZ2VB Y3Rpdml0eVN0YXRlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp1cGRhdGVBY3Rp dml0eVRva2VuKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpwcmVmZXJlbmNlc0Rp ZENoYW5nZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OmlzSW5XaW5kb3cpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmRpZFVwZGF0ZVZpZXdTdGF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgICAgIC0gV2ViUGFnZSBub3cgcHJvcGFnYXRl cyBQYWdlQWN0aXZpdHlTdGF0ZSB0byB0aGUgV2ViUGFnZVByb3h5LCBmb3IgdXNlCisgICAgICAg ICAgICAgIGRldGVybWluaW5nIHRoZSBzdXByZXNzaW9uIHN0YXRlIG9mIHRoZSBXZWJQcm9jZXNz LgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6bV9zaG91bGREaXNwYXRjaEZha2VNb3VzZU1vdmVFdmVudHMpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlOjpzZXRQYWdlQWN0aXZpdHlTdGF0ZSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2U6OnNldFVzZXJBY3Rpdml0eVN0YXJ0ZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl OjpzZXRWaWV3U3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVQcmVmZXJl bmNlcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVwZGF0ZVVzZXJBY3Rpdml0eSk6IERl bGV0ZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKyAgICAgICAgICAgIC0g V2ViUGFnZSBubyBsb25nZXIgZGV0ZXJtaW5lcyB3aGVuIHRvIHVwZGF0ZSBpdCdzIG93biBVc2Vy QWN0aXZpdHkgLSBpbnN0ZWFkLAorICAgICAgICAgICAgICBsZXQgdGhlIFVJIHByb2Nlc3MgZG8g c28uIEFzIHN1Y2gsIG5vIGxvbmdlciBuZWVkIHRvIHRyYWNrIHdoZXRoZXIgcHJvY2VzcworICAg ICAgICAgICAgICBzdXByZXNzaW9uIGlzIGVuYWJsZWQuIEluc3RlYWQsIGFkZCBtZXNzYWdlIHRv CisKIDIwMTUtMTItMDQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAog ICAgICAgICBDcmFzaCB3aGVuIHNlY29uZGFyeSBjbGlja2luZyBvbiBhIGxpbmsgb24geWFob28u Y29tCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2 aXNpb24gMTkzNDgxKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTMzOCw2ICszMzgsOCBAQCBXZWJQYWdlUHJveHk6OldlYlBh Z2VQcm94eShQYWdlQ2xpZW50JiBwCiAgICAgLCBtX25vdGlmaWNhdGlvblBlcm1pc3Npb25SZXF1 ZXN0TWFuYWdlcigqdGhpcykKICAgICAsIG1fdXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5h Z2VyKCp0aGlzKQogICAgICwgbV92aWV3U3RhdGUoVmlld1N0YXRlOjpOb0ZsYWdzKQorICAgICwg bV9hY3Rpdml0eVN0YXRlKFBhZ2VBY3Rpdml0eVN0YXRlOjpOb0ZsYWdzKQorICAgICwgbV91c2Vy QWN0aXZpdHlTdGFydGVkKGZhbHNlKQogICAgICwgbV92aWV3V2FzRXZlckluV2luZG93KGZhbHNl KQogI2lmIFBMQVRGT1JNKElPUykKICAgICAsIG1fYWx3YXlzUnVuc0F0Rm9yZWdyb3VuZFByaW9y aXR5KG1fY29uZmlndXJhdGlvbi0+YWx3YXlzUnVuc0F0Rm9yZWdyb3VuZFByaW9yaXR5KCkpCkBA IC0xNDQ4LDYgKzE0NTAsMTUgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpc3BhdGNoVmlld1N0YXRl Q2hhbgogICAgIG1fdmlld1dhc0V2ZXJJbldpbmRvdyB8PSBpc05vd0luV2luZG93OwogfQogCit2 b2lkIFdlYlBhZ2VQcm94eTo6c2V0UGFnZUFjdGl2aXR5U3RhdGUoUGFnZUFjdGl2aXR5U3RhdGU6 OkZsYWdzIGFjdGl2aXR5U3RhdGUpCit7CisgICAgaWYgKG1fYWN0aXZpdHlTdGF0ZSA9PSBhY3Rp dml0eVN0YXRlKQorICAgICAgICByZXR1cm47CisKKyAgICBtX2FjdGl2aXR5U3RhdGUgPSBhY3Rp dml0eVN0YXRlOworICAgIHVwZGF0ZUFjdGl2aXR5VG9rZW4oKTsKK30KKwogdm9pZCBXZWJQYWdl UHJveHk6OnVwZGF0ZUFjdGl2aXR5VG9rZW4oKQogewogICAgIGlmIChtX3ZpZXdTdGF0ZSAmIFZp ZXdTdGF0ZTo6SXNWaXN1YWxseUlkbGUpCkBAIC0xNDU1LDYgKzE0NjYsMTQgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OnVwZGF0ZUFjdGl2aXR5VG9rZW4oKQogICAgIGVsc2UgaWYgKCFtX3BhZ2VJc1Vz ZXJPYnNlcnZhYmxlQ291bnQpCiAgICAgICAgIG1fcGFnZUlzVXNlck9ic2VydmFibGVDb3VudCA9 IG1fcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS51c2VyT2JzZXJ2YWJsZVBhZ2VDb3VudCgpOwogCisg ICAgLy8gU3RhcnQgdGhlIGFjdGl2aXR5IHRvIHByZXZlbnQgQXBwTmFwIGlmIHRoZSBwYWdlIGFj dGl2aXR5IGlzIGluIHByb2dyZXNzLAorICAgIC8vIHRoZSBwYWdlIGlzIHZpc2libGUgYW5kIG5v bi1pZGxlLCBvciBwcm9jZXNzIHN1cHByZXNzaW9uIGlzIGRpc2FibGVkLgorICAgIGJvb2wgc2hv dWxkSG9sZFVzZXJBY3Rpdml0eSA9IG1fYWN0aXZpdHlTdGF0ZSB8fCAhKG1fdmlld1N0YXRlICYg Vmlld1N0YXRlOjpJc1Zpc3VhbGx5SWRsZSkgfHwgIW1fcHJlZmVyZW5jZXMtPnBhZ2VWaXNpYmls aXR5QmFzZWRQcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKCk7CisgICAgaWYgKG1fdXNlckFjdGl2 aXR5U3RhcnRlZCAhPSBzaG91bGRIb2xkVXNlckFjdGl2aXR5KSB7CisgICAgICAgIG1fcHJvY2Vz cy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0VXNlckFjdGl2aXR5U3RhcnRlZChzaG91bGRI b2xkVXNlckFjdGl2aXR5KSwgbV9wYWdlSUQpOworICAgICAgICBtX3VzZXJBY3Rpdml0eVN0YXJ0 ZWQgPSBzaG91bGRIb2xkVXNlckFjdGl2aXR5OworICAgIH0KKwogI2lmIFBMQVRGT1JNKElPUykK ICAgICBpZiAoIWlzVmlld1Zpc2libGUoKSAmJiAhbV9hbHdheXNSdW5zQXRGb3JlZ3JvdW5kUHJp b3JpdHkpCiAgICAgICAgIG1fYWN0aXZpdHlUb2tlbiA9IG51bGxwdHI7CkBAIC0yNzMyLDYgKzI3 NTEsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cHJlZmVyZW5jZXNEaWRDaGFuZ2UoCiAjZW5kaWYK IAogICAgIHVwZGF0ZVByb2NjZXNzU3VwcHJlc3Npb25TdGF0ZSgpOworICAgIHVwZGF0ZUFjdGl2 aXR5VG9rZW4oKTsKIAogICAgIG1fcGFnZUNsaWVudC5wcmVmZXJlbmNlc0RpZENoYW5nZSgpOwog CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiAx OTM0ODEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtp bmcgY29weSkKQEAgLTQyMCw2ICs0MjAsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0luV2luZG93 KCkgY29uc3QgeyByZXR1cm4gbV92aWV3U3RhdGUgJiBXZWJDb3JlOjpWaWV3U3RhdGU6OklzSW5X aW5kb3c7IH0KICAgICB2b2lkIHdhaXRGb3JEaWRVcGRhdGVWaWV3U3RhdGUoKTsKICAgICB2b2lk IGRpZFVwZGF0ZVZpZXdTdGF0ZSgpIHsgbV93YWl0aW5nRm9yRGlkVXBkYXRlVmlld1N0YXRlID0g ZmFsc2U7IH0KKyAgICB2b2lkIHNldFBhZ2VBY3Rpdml0eVN0YXRlKFdlYkNvcmU6OlBhZ2VBY3Rp dml0eVN0YXRlOjpGbGFncyBhY3Rpdml0eVN0YXRlKTsKIAogICAgIHZvaWQgbGF5ZXJIb3N0aW5n TW9kZURpZENoYW5nZSgpOwogCkBAIC0xNTU2LDYgKzE1NTcsOCBAQCBwcml2YXRlOgogICAgIFVz ZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5IG1fdXNlck1lZGlhUGVybWlzc2lv blJlcXVlc3RNYW5hZ2VyOwogCiAgICAgV2ViQ29yZTo6Vmlld1N0YXRlOjpGbGFncyBtX3ZpZXdT dGF0ZTsKKyAgICBXZWJDb3JlOjpQYWdlQWN0aXZpdHlTdGF0ZTo6RmxhZ3MgbV9hY3Rpdml0eVN0 YXRlOworICAgIGJvb2wgbV91c2VyQWN0aXZpdHlTdGFydGVkOwogICAgIGJvb2wgbV92aWV3V2Fz RXZlckluV2luZG93OwogI2lmIFBMQVRGT1JNKElPUykKICAgICBib29sIG1fYWxsb3dzTWVkaWFE b2N1bWVudElubGluZVBsYXliYWNrIHsgZmFsc2UgfTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gMTkzNDgx KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgko d29ya2luZyBjb3B5KQpAQCAtNDQ3LDQgKzQ0Nyw2IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94 eSB7CiAjZW5kaWYKIAogICAgIERpZFJlc3RvcmVTY3JvbGxQb3NpdGlvbigpCisKKyAgICBTZXRQ YWdlQWN0aXZpdHlTdGF0ZSh1bnNpZ25lZCBhY3Rpdml0eVN0YXRlKQogfQpJbmRleDogU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMTkz NDgxKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNDEsNyArMzQxLDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRf dCBwYWdlSUQsIGNvbnN0IAogICAgICwgbV9zY3JvbGxQaW5uaW5nQmVoYXZpb3IoRG9Ob3RQaW4p CiAgICAgLCBtX3VzZUFzeW5jU2Nyb2xsaW5nKGZhbHNlKQogICAgICwgbV92aWV3U3RhdGUocGFy YW1ldGVycy52aWV3U3RhdGUpCi0gICAgLCBtX3Byb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQodHJ1 ZSkKKyAgICAsIG1fYWN0aXZpdHlTdGF0ZShQYWdlQWN0aXZpdHlTdGF0ZTo6Tm9GbGFncykKICAg ICAsIG1fdXNlckFjdGl2aXR5KCJQcm9jZXNzIHN1cHByZXNzaW9uIGRpc2FibGVkIGZvciBwYWdl LiIpCiAgICAgLCBtX3BlbmRpbmdOYXZpZ2F0aW9uSUQoMCkKICNpZiBFTkFCTEUoV0VCR0wpCkBA IC00NDgsNyArNDQ4LDYgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0 IAogICAgIG1fcGFnZS0+c2V0Vmlld1N0YXRlKG1fdmlld1N0YXRlKTsKICAgICBpZiAoIWlzVmlz aWJsZSgpKQogICAgICAgICBtX3BhZ2UtPnNldElzUHJlcmVuZGVyKCk7Ci0gICAgdXBkYXRlVXNl ckFjdGl2aXR5KCk7CiAKICAgICB1cGRhdGVJc0luV2luZG93KHRydWUpOwogCkBAIC01MzQsMTgg KzUzMywxNiBAQCB2b2lkIFdlYlBhZ2U6OnJlaW5pdGlhbGl6ZVdlYlBhZ2UoY29uc3QgCiAKIHZv aWQgV2ViUGFnZTo6c2V0UGFnZUFjdGl2aXR5U3RhdGUoUGFnZUFjdGl2aXR5U3RhdGU6OkZsYWdz IGFjdGl2aXR5U3RhdGUpCiB7Ci0gICAgUGFnZUFjdGl2aXR5U3RhdGU6OkZsYWdzIGNoYW5nZWQg PSBtX2FjdGl2aXR5U3RhdGUgXiBhY3Rpdml0eVN0YXRlOwotICAgIG1fYWN0aXZpdHlTdGF0ZSA9 IGFjdGl2aXR5U3RhdGU7CisgICAgaWYgKG1fYWN0aXZpdHlTdGF0ZSA9PSBhY3Rpdml0eVN0YXRl KQorICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoY2hhbmdlZCkKLSAgICAgICAgdXBkYXRlVXNl ckFjdGl2aXR5KCk7CisgICAgbV9hY3Rpdml0eVN0YXRlID0gYWN0aXZpdHlTdGF0ZTsKKyAgICBz ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNldFBhZ2VBY3Rpdml0eVN0YXRlKGFjdGl2aXR5 U3RhdGUpKTsKIH0KIAotdm9pZCBXZWJQYWdlOjp1cGRhdGVVc2VyQWN0aXZpdHkoKQordm9pZCBX ZWJQYWdlOjpzZXRVc2VyQWN0aXZpdHlTdGFydGVkKGJvb2wgc3RhcnRlZCkKIHsKLSAgICAvLyBT dGFydCB0aGUgYWN0aXZpdHkgdG8gcHJldmVudCBBcHBOYXAgaWYgdGhlIHBhZ2UgYWN0aXZpdHkg aXMgaW4gcHJvZ3Jlc3MsCi0gICAgLy8gdGhlIHBhZ2UgaXMgdmlzaWJsZSBhbmQgbm9uLWlkbGUs IG9yIHByb2Nlc3Mgc3VwcHJlc3Npb24gaXMgZGlzYWJsZWQuCi0gICAgaWYgKG1fYWN0aXZpdHlT dGF0ZSB8fCAhKG1fdmlld1N0YXRlICYgVmlld1N0YXRlOjpJc1Zpc3VhbGx5SWRsZSkgfHwgIW1f cHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCkKKyAgICBpZiAoc3RhcnRlZCkKICAgICAgICAgbV91 c2VyQWN0aXZpdHkuc3RhcnQoKTsKICAgICBlbHNlCiAgICAgICAgIG1fdXNlckFjdGl2aXR5LnN0 b3AoKTsKQEAgLTIzNzEsOSArMjM2OCw2IEBAIHZvaWQgV2ViUGFnZTo6c2V0Vmlld1N0YXRlKFZp ZXdTdGF0ZTo6RmwKICAgICBWaWV3U3RhdGU6OkZsYWdzIGNoYW5nZWQgPSBtX3ZpZXdTdGF0ZSBe IHZpZXdTdGF0ZTsKICAgICBtX3ZpZXdTdGF0ZSA9IHZpZXdTdGF0ZTsKIAotICAgIGlmIChjaGFu Z2VkKQotICAgICAgICB1cGRhdGVVc2VyQWN0aXZpdHkoKTsKLQogICAgIG1fcGFnZS0+c2V0Vmll d1N0YXRlKHZpZXdTdGF0ZSk7CiAgICAgZm9yIChhdXRvKiBwbHVnaW5WaWV3IDogbV9wbHVnaW5W aWV3cykKICAgICAgICAgcGx1Z2luVmlldy0+dmlld1N0YXRlRGlkQ2hhbmdlKGNoYW5nZWQpOwpA QCAtMjkzMSwxMiArMjkyNSw2IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29u c3QgV2UKICAgICBzZXR0aW5ncy5zZXRTZXJ2aWNlQ29udHJvbHNFbmFibGVkKHN0b3JlLmdldEJv b2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6c2VydmljZUNvbnRyb2xzRW5hYmxlZEtl eSgpKSk7CiAjZW5kaWYKIAotICAgIGJvb2wgcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCA9IHN0 b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6cGFnZVZpc2liaWxpdHlC YXNlZFByb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWRLZXkoKSk7Ci0gICAgaWYgKG1fcHJvY2Vzc1N1 cHByZXNzaW9uRW5hYmxlZCAhPSBwcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKSB7Ci0gICAgICAg IG1fcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCA9IHByb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQ7 Ci0gICAgICAgIHVwZGF0ZVVzZXJBY3Rpdml0eSgpOwotICAgIH0KLQogICAgIHBsYXRmb3JtUHJl ZmVyZW5jZXNEaWRDaGFuZ2Uoc3RvcmUpOwogCiAgICAgaWYgKG1fZHJhd2luZ0FyZWEpCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHJldmlzaW9u IDE5MzQ4MSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTk5MSw3ICs5OTEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZXhl Y3V0ZUVkaXRDb21tYW5kKGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQg c2V0RWRpdGFibGUoYm9vbCk7CiAKLSAgICB2b2lkIHVwZGF0ZVVzZXJBY3Rpdml0eSgpOworICAg IHZvaWQgc2V0VXNlckFjdGl2aXR5U3RhcnRlZChib29sIHN0YXJ0ZWQpOwogCiAgICAgdm9pZCBt b3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmKTsKICAgICB2b2lkIGtleUV2ZW50KGNvbnN0 IFdlYktleWJvYXJkRXZlbnQmKTsKQEAgLTEzOTQsNyArMTM5NCw2IEBAIHByaXZhdGU6CiAgICAg V2ViQ29yZTo6Vmlld1N0YXRlOjpGbGFncyBtX3ZpZXdTdGF0ZTsKICAgICBXZWJDb3JlOjpQYWdl QWN0aXZpdHlTdGF0ZTo6RmxhZ3MgbV9hY3Rpdml0eVN0YXRlOwogCi0gICAgYm9vbCBtX3Byb2Nl c3NTdXBwcmVzc2lvbkVuYWJsZWQ7CiAgICAgVXNlckFjdGl2aXR5IG1fdXNlckFjdGl2aXR5Owog CiAgICAgdWludDY0X3QgbV9wZW5kaW5nTmF2aWdhdGlvbklEOwpJbmRleDogU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJl dmlzaW9uIDE5MzQ4MSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0yMyw2ICsyMyw3IEBACiBtZXNzYWdl cyAtPiBXZWJQYWdlIExlZ2FjeVJlY2VpdmVyIHsKICAgICBTZXRJbml0aWFsRm9jdXMoYm9vbCBm b3J3YXJkLCBib29sIGlzS2V5Ym9hcmRFdmVudFZhbGlkLCBXZWJLaXQ6OldlYktleWJvYXJkRXZl bnQgZXZlbnQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCiAgICAgU2V0Vmlld1N0YXRlKHVuc2lnbmVk IHZpZXdTdGF0ZSwgYm9vbCB3YW50c0RpZFVwZGF0ZVZpZXdTdGF0ZSwgVmVjdG9yPHVpbnQ2NF90 PiBjYWxsYmFja0lEcykKKyAgICBTZXRVc2VyQWN0aXZpdHlTdGFydGVkKGJvb2wgc3RhcnRlZCkK ICAgICBTZXRMYXllckhvc3RpbmdNb2RlKHVuc2lnbmVkIGxheWVySG9zdGluZ01vZGUpCiAKICAg ICBTZXRTZXNzaW9uSUQoV2ViQ29yZTo6U2Vzc2lvbklEIHNlc3Npb25JRCkK