145239 2015-05-20 18:34:38 -0700 Fix macros for wireless playback 2015-05-29 15:39:00 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 145314 145315 145316 145477 1 jonlee jonlee andersca eric.carlson jer.noble mitz webkit-bug-importer oldest_to_newest 1096431 0 jonlee 2015-05-20 18:34:38 -0700 Update support for wireless playback rdar://problem/21049541 1097555 1 253764 jonlee 2015-05-26 17:36:42 -0700 Created attachment 253764 Patch 1097557 2 253764 andersca 2015-05-26 17:46:38 -0700 Comment on attachment 253764 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=253764&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:350 > + return _allowsAirPlayForMediaPlayback; > +} > + > +- (void)setMediaPlaybackAllowsAirPlay:(BOOL)allowed > +{ > + _allowsAirPlayForMediaPlayback = allowed; > +} > + > +- (BOOL)mediaPlaybackRequiresUserAction > +{ > + return _requiresUserActionForMediaPlayback; > +} > + > +- (void)setMediaPlaybackRequiresUserAction:(BOOL)required > +{ > + _requiresUserActionForMediaPlayback = required; I think this should just call into the API methods instead of dealing with ivars directly. 1097565 3 253764 jonlee 2015-05-26 18:21:35 -0700 Comment on attachment 253764 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=253764&action=review >> Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:350 >> + _requiresUserActionForMediaPlayback = required; > > I think this should just call into the API methods instead of dealing with ivars directly. Ok, I will make that adjustment when I check in the patch. 1097860 4 jonlee 2015-05-28 00:27:30 -0700 Committed r184946: <http://trac.webkit.org/changeset/184946> 253764 2015-05-26 17:36:42 -0700 2015-05-26 17:46:38 -0700 Patch bug-145239-20150526173631.patch text/plain 13736 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0ODU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZjVkNWZmYTE0 MzgxZTJiNTg1NzZlZTc3OWU0NTEzNGRiYTY4ZjM2My4uYWE1ZTdiODZlMWFhNTgwOTM3YTRhZjUx Nzc3N2M3MTc0YWI4MWRiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1 LTA1LTIyICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggbWFjcm9z IGZvciB3aXJlbGVzcyBwbGF5YmFjaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ1MjM5CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzIxMDQ5NTQxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5jb21wYXNz IHRoZSBsb2dpYyB3aXRoaW4gRU5BQkxFKFdJUkVMRVNTX1RBUkdFVF9QTEFZQkFDSykuIFVwZGF0 ZSBwcm9wZXJ0eSBuYW1lLgorCisgICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1By aXZhdGUuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2VzLmg6CisgICAgICAgICog V2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbToKKyAgICAgICAgKCtbV2ViUHJlZmVyZW5jZXMgaW5p dGlhbGl6ZV0pOiBXcmFwIGluIEVOQUJMRS4KKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgYWxs b3dzQWlyUGxheUZvck1lZGlhUGxheWJhY2tdKTogRGl0dG8uCisgICAgICAgICgtW1dlYlByZWZl cmVuY2VzIHNldEFsbG93c0FpclBsYXlGb3JNZWRpYVBsYXliYWNrOl0pOiBEaXR0by4KKyAgICAg ICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX3ByZWZlcmVuY2Vz Q2hhbmdlZDpdKTogRGl0dG8uCisKIDIwMTUtMDUtMjUgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFw cGxlLmNvbT4KIAogICAgICAgICBBU1NFUlRfTUFJTl9USFJFQUQgYW5kIERPTV9BU1NFUlRfTUFJ Tl9USFJFQUQgYXJlIHVubmVjZXNzYXJ5IG5vLW9wcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGUxNWNkZmNmOWFj YTNjODkwNzViZDNhOWUxODJkZDMyMWM3M2M4NjMuLmRhY2ViOWQ2Y2Q1NGE0Y2ZmZmY0NzYxY2M2 YmVmNjJiMTE0ODY4YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxNS0wNS0yMiAg Sm9uIExlZSAgPGpvbmxlZUBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IG1hY3JvcyBmb3Igd2ly ZWxlc3MgcGxheWJhY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0NTIzOQorICAgICAgICByZGFyOi8vcHJvYmxlbS8yMTA0OTU0MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuY29tcGFzcyB0aGUgbG9n aWMgd2l0aGluIEVOQUJMRShXSVJFTEVTU19UQVJHRVRfUExBWUJBQ0spLiBVcGRhdGUgcHJvcGVy dHkgbmFtZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgor ICAgICAgICAoLVtXS1dlYlZpZXcgaW5pdFdpdGhGcmFtZTpjb25maWd1cmF0aW9uOl0pOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5oOiBVcGRh dGUgbmFtZXMuIEFkZCBhIFdLRGVwcmVjYXRlZAorICAgICAgICBjYXRlZ29yeSBzZWN0aW9uLgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5tbToK KyAgICAgICAgKC1bV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBpbml0XSk6IFVwZGF0ZSBuYW1lIG9m IHZhcmlhYmxlcyB0byByZWZsZWN0IG5ldyBwcm9wZXJ0eSBuYW1lcy4KKyAgICAgICAgKC1bV0tX ZWJWaWV3Q29uZmlndXJhdGlvbiBjb3B5V2l0aFpvbmU6XSk6IERpdHRvLgorICAgICAgICAoLVtX S1dlYlZpZXdDb25maWd1cmF0aW9uIG1lZGlhUGxheWJhY2tBbGxvd3NBaXJQbGF5XSk6IEdldCBh bmQgc2V0IG9mZiBvZiB0aGUgbmV3CisgICAgICAgIHZhcmlhYmxlLgorICAgICAgICAoLVtXS1dl YlZpZXdDb25maWd1cmF0aW9uIHNldE1lZGlhUGxheWJhY2tBbGxvd3NBaXJQbGF5Ol0pOiBEaXR0 by4KKyAgICAgICAgKC1bV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBtZWRpYVBsYXliYWNrUmVxdWly ZXNVc2VyQWN0aW9uXSk6IERpdHRvLgorICAgICAgICAoLVtXS1dlYlZpZXdDb25maWd1cmF0aW9u IHNldE1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJBY3Rpb246XSk6IERpdHRvLgorCiAyMDE1LTA1 LTI1ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgQVNTRVJUX01B SU5fVEhSRUFEIGFuZCBET01fQVNTRVJUX01BSU5fVEhSRUFEIGFyZSB1bm5lY2Vzc2FyeSBuby1v cHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtl eXNQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlz UHJpdmF0ZS5oCmluZGV4IDc1OTJmOWE3ZWRmOTI3ODBkNTBhMTYwYjBmNmY0ZTJjMzhmOWU5ZDUu LmQwYTlhYTQ0NWU5NzY3ZDkwZTVmNTNkYTgzZTI5YzA4MjdmY2JjYjkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgKKysrIGIv U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaApAQCAt MTIyLDYgKzEyMiw3IEBACiAjZGVmaW5lIFdlYktpdFJlcXVpcmVzVXNlckdlc3R1cmVGb3JNZWRp YVBsYXliYWNrUHJlZmVyZW5jZUtleSBAIldlYktpdE1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJH ZXN0dXJlIgogI2RlZmluZSBXZWJLaXRBbGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrUHJlZmVyZW5j ZUtleSBAIldlYktpdE1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUiCiAjZGVmaW5lIFdlYktpdEFs bG93c0FsdGVybmF0ZUZ1bGxzY3JlZW5QcmVmZXJlbmNlS2V5IEAiV2ViS2l0QWxsb3dzQWx0ZXJu YXRlRnVsbHNjcmVlbiIKKyNkZWZpbmUgV2ViS2l0QWxsb3dzQWlyUGxheUZvck1lZGlhUGxheWJh Y2tQcmVmZXJlbmNlS2V5IEAiV2ViS2l0TWVkaWFQbGF5YmFja0FsbG93c0FpclBsYXkiCiAjZGVm aW5lIFdlYktpdE1vY2tTY3JvbGxiYXJzRW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRNb2Nr U2Nyb2xsYmFyc0VuYWJsZWQiCiAjZGVmaW5lIFdlYktpdFNob3VsZERpc3BsYXlTdWJ0aXRsZXNQ cmVmZXJlbmNlS2V5IEAiV2ViS2l0U2hvdWxkRGlzcGxheVN1YnRpdGxlcyIKICNkZWZpbmUgV2Vi S2l0U2hvdWxkRGlzcGxheUNhcHRpb25zUHJlZmVyZW5jZUtleSBAIldlYktpdFNob3VsZERpc3Bs YXlDYXB0aW9ucyIKQEAgLTEzMCw3ICsxMzEsNiBAQAogI2RlZmluZSBXZWJLaXRTdXBwcmVzc2Vz SW5jcmVtZW50YWxSZW5kZXJpbmdLZXkgQCJXZWJLaXRTdXBwcmVzc2VzSW5jcmVtZW50YWxSZW5k ZXJpbmciCiAjZGVmaW5lIFdlYktpdFN1YnBpeGVsQ1NTT01FbGVtZW50TWV0cmljc0VuYWJsZWRQ cmVmZXJlbmNlS2V5IEAiV2ViS2l0U3VicGl4ZWxDU1NPTUVsZW1lbnRNZXRyaWNzRW5hYmxlZCIK ICNpZiBUQVJHRVRfT1NfSVBIT05FCi0jZGVmaW5lIFdlYktpdEFsbG93c0FpclBsYXlGb3JNZWRp YVBsYXliYWNrUHJlZmVyZW5jZUtleSBAIldlYktpdE1lZGlhUGxheWJhY2tBbGxvd3NBaXJQbGF5 IgogI2RlZmluZSBXZWJLaXRBdWRpb1Nlc3Npb25DYXRlZ29yeU92ZXJyaWRlIEAiV2ViS2l0QXVk aW9TZXNzaW9uQ2F0ZWdvcnlPdmVycmlkZSIKICNkZWZpbmUgV2ViS2l0QVZLaXRFbmFibGVkIEAi V2ViS2l0QVZLaXRFbmFibGVkIgogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLmggYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlByZWZlcmVuY2VzLmgKaW5kZXggMzNjMGJlODE3MDYzN2Q0YTU5MmRlOTQ3Yjc2OTM3MDM1MjFj OThkOC4uMjQ4ZGE3NzIxMDA0YzAxYmJmMTQ0Y2QzNjNkZTViYjk5ZGQ1ZDA3MyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMuaApAQCAtMjY3LDQgKzI2Nyw5IEBA IGV4dGVybiBOU1N0cmluZyAqV2ViUHJlZmVyZW5jZXNDaGFuZ2VkTm90aWZpY2F0aW9uOwogKi8K IEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIHN1cHByZXNzZXNJbmNyZW1lbnRhbFJlbmRlcmlu ZzsKIAorLyohCisgICAgQHByb3BlcnR5IGFsbG93c0FpclBsYXlGb3JNZWRpYVBsYXliYWNrCisg Ki8KK0Bwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGFsbG93c0FpclBsYXlGb3JNZWRpYVBsYXli YWNrOworCiBAZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlBy ZWZlcmVuY2VzLm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5t bQppbmRleCBlYTQ4NGM4NDg3NTNjZjUwNjE4MWZlZDdkZjM0OWIzZTUxNjdiNjQ0Li45N2ViNmJj MjJmNDJlMmMzOTdlMzhlZDJjNWZlZTQwNjk2YTcyZjA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0KQEAgLTUyOSw3ICs1MjksNiBAQCBwdWJsaWM6CiAj ZWxzZQogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgIFdlYktpdFJlcXVp cmVzVXNlckdlc3R1cmVGb3JNZWRpYVBsYXliYWNrUHJlZmVyZW5jZUtleSwKICAgICAgICAgW05T TnVtYmVyIG51bWJlcldpdGhCb29sOk5PXSwgICBXZWJLaXRBbGxvd3NJbmxpbmVNZWRpYVBsYXli YWNrUHJlZmVyZW5jZUtleSwKLSAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10s ICBXZWJLaXRBbGxvd3NBaXJQbGF5Rm9yTWVkaWFQbGF5YmFja1ByZWZlcmVuY2VLZXksCiAgICAg ICAgIFtOU051bWJlciBudW1iZXJXaXRoVW5zaWduZWRJbnQ6QXVkaW9TZXNzaW9uOjpOb25lXSwg IFdlYktpdEF1ZGlvU2Vzc2lvbkNhdGVnb3J5T3ZlcnJpZGUsCiAjaWYgSEFWRShBVktJVCkKICAg ICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sICBXZWJLaXRBVktpdEVuYWJsZWQs CkBAIC01NDUsNiArNTQ0LDkgQEAgcHVibGljOgogCiAgICAgICAgIFtOU051bWJlciBudW1iZXJX aXRoQm9vbDpZRVNdLCAgIFdlYktpdFNob3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uS2V5LAog I2VuZGlmIC8vIFBMQVRGT1JNKElPUykKKyNpZiBFTkFCTEUoV0lSRUxFU1NfVEFSR0VUX1BMQVlC QUNLKQorICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgIFdlYktpdEFsbG93 c0FpclBsYXlGb3JNZWRpYVBsYXliYWNrUHJlZmVyZW5jZUtleSwKKyNlbmRpZgogICAgICAgICBb TlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgIFdlYktpdEFsbG93c0FsdGVybmF0ZUZ1bGxz Y3JlZW5QcmVmZXJlbmNlS2V5LAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVT XSwgIFdlYktpdFJlcXVlc3RBbmltYXRpb25GcmFtZUVuYWJsZWRQcmVmZXJlbmNlS2V5LAogICAg ICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCAgIFdlYktpdFdhbnRzQmFsYW5jZWRT ZXREZWZlcnNMb2FkaW5nQmVoYXZpb3JLZXksCkBAIC0yMDc2LDYgKzIwNzgsMjIgQEAgc3RhdGlj IE5TU3RyaW5nICpjbGFzc0lCQ3JlYXRvcklEID0gbmlsOwogICAgIFtzZWxmIF9zZXRCb29sVmFs dWU6ZmxhZyBmb3JLZXk6IFdlYktpdEVuYWJsZUluaGVyaXRVUklRdWVyeUNvbXBvbmVudFByZWZl cmVuY2VLZXldOwogfQogCistIChCT09MKWFsbG93c0FpclBsYXlGb3JNZWRpYVBsYXliYWNrCit7 CisjaWYgRU5BQkxFKFdJUkVMRVNTX1RBUkdFVF9QTEFZQkFDSykKKyAgICByZXR1cm4gW3NlbGYg X2Jvb2xWYWx1ZUZvcktleTpXZWJLaXRBbGxvd3NBaXJQbGF5Rm9yTWVkaWFQbGF5YmFja1ByZWZl cmVuY2VLZXldOworI2Vsc2UKKyAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKK30KKworLSAodm9p ZClzZXRBbGxvd3NBaXJQbGF5Rm9yTWVkaWFQbGF5YmFjazooQk9PTClmbGFnCit7CisjaWYgRU5B QkxFKFdJUkVMRVNTX1RBUkdFVF9QTEFZQkFDSykKKyAgICBbc2VsZiBfc2V0Qm9vbFZhbHVlOmZs YWcgZm9yS2V5OldlYktpdEFsbG93c0FpclBsYXlGb3JNZWRpYVBsYXliYWNrUHJlZmVyZW5jZUtl eV07CisjZW5kaWYKK30KKwogI2lmIFBMQVRGT1JNKElPUykKIC0gKEJPT0wpbWVkaWFQbGF5YmFj a0FsbG93c0FpclBsYXkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQppbmRleCAz ZmU3YjdiN2ZiNDhhZmU5MGM1YjYwNDVkOTQ4OTk0MDAzOGQyZmFkLi42ODg4NmNmOWI5Y2JkNDY4 ZjEyYTFkYzE1MmVkZWY1OWQwNjg2ZTYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3 Lm1tCkBAIC0yMzQzLDYgKzIzNDMsOSBAQCBzdGF0aWMgYm9vbCBuZWVkc1NlbGZSZXRhaW5XaGls ZUxvYWRpbmdRdWlyaygpCiAgICAgc2V0dGluZ3Muc2V0UnViYmVyQmFuZGluZ0ZvclN1YlNjcm9s bGFibGVSZWdpb25zRW5hYmxlZChmYWxzZSk7CiAjZW5kaWYKIAorI2lmIEVOQUJMRShXSVJFTEVT U19QTEFZQkFDS19UQVJHRVQpCisgICAgc2V0dGluZ3Muc2V0QWxsb3dzQWlyUGxheUZvck1lZGlh UGxheWJhY2soW3ByZWZlcmVuY2VzIGFsbG93c0FpclBsYXlGb3JNZWRpYVBsYXliYWNrXSk7Cisj ZW5kaWYKICNpZiBQTEFURk9STShJT1MpCiAgICAgc2V0dGluZ3Muc2V0U3RhbmRhbG9uZShbcHJl ZmVyZW5jZXMgX3N0YW5kYWxvbmVdKTsKICAgICBzZXR0aW5ncy5zZXRUZWxlcGhvbmVOdW1iZXJQ YXJzaW5nRW5hYmxlZChbcHJlZmVyZW5jZXMgX3RlbGVwaG9uZU51bWJlclBhcnNpbmdFbmFibGVk XSk7CkBAIC0yMzUwLDcgKzIzNTMsNiBAQCBzdGF0aWMgYm9vbCBuZWVkc1NlbGZSZXRhaW5XaGls ZUxvYWRpbmdRdWlyaygpCiAgICAgc2V0dGluZ3Muc2V0TGF5b3V0SW50ZXJ2YWwoc3RkOjpjaHJv bm86Om1pbGxpc2Vjb25kcyhbcHJlZmVyZW5jZXMgX2xheW91dEludGVydmFsXSkpOwogICAgIHNl dHRpbmdzLnNldE1heFBhcnNlRHVyYXRpb24oW3ByZWZlcmVuY2VzIF9tYXhQYXJzZUR1cmF0aW9u XSk7CiAgICAgc2V0dGluZ3Muc2V0QWx3YXlzVXNlQWNjZWxlcmF0ZWRPdmVyZmxvd1Njcm9sbChb cHJlZmVyZW5jZXMgX2Fsd2F5c1VzZUFjY2VsZXJhdGVkT3ZlcmZsb3dTY3JvbGxdKTsKLSAgICBz ZXR0aW5ncy5zZXRBbGxvd3NBaXJQbGF5Rm9yTWVkaWFQbGF5YmFjayhbcHJlZmVyZW5jZXMgbWVk aWFQbGF5YmFja0FsbG93c0FpclBsYXldKTsKICAgICBzZXR0aW5ncy5zZXRBdWRpb1Nlc3Npb25D YXRlZ29yeU92ZXJyaWRlKFtwcmVmZXJlbmNlcyBhdWRpb1Nlc3Npb25DYXRlZ29yeU92ZXJyaWRl XSk7CiAgICAgc2V0dGluZ3Muc2V0TmV0d29ya0RhdGFVc2FnZVRyYWNraW5nRW5hYmxlZChbcHJl ZmVyZW5jZXMgbmV0d29ya0RhdGFVc2FnZVRyYWNraW5nRW5hYmxlZF0pOwogICAgIHNldHRpbmdz LnNldE5ldHdvcmtJbnRlcmZhY2VOYW1lKFtwcmVmZXJlbmNlcyBuZXR3b3JrSW50ZXJmYWNlTmFt ZV0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bQppbmRleCBkNzhmZDgxZjA3ZmMzM2MxYTljMTFjNjc0ZjNhMzM5NjAwYmQwNTQxLi42N2YwM2Jm MzNhODI4MjM0YmYyY2ExNjg1NDVmZWRkZjIwNjI5ZjZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtMzIwLDggKzMyMCwxMCBAQCBz dGF0aWMgYm9vbCBzaG91bGRBbGxvd0FsdGVybmF0ZUZ1bGxzY3JlZW4oKQogI2lmIFBMQVRGT1JN KElPUykKICAgICB3ZWJQYWdlQ29uZmlndXJhdGlvbi5wcmVmZXJlbmNlVmFsdWVzLnNldChXZWJL aXQ6OldlYlByZWZlcmVuY2VzS2V5OjphbGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrS2V5KCksIFdl YktpdDo6V2ViUHJlZmVyZW5jZXNTdG9yZTo6VmFsdWUoISFbX2NvbmZpZ3VyYXRpb24gYWxsb3dz SW5saW5lTWVkaWFQbGF5YmFja10pKTsKICAgICB3ZWJQYWdlQ29uZmlndXJhdGlvbi5wcmVmZXJl bmNlVmFsdWVzLnNldChXZWJLaXQ6OldlYlByZWZlcmVuY2VzS2V5OjphbGxvd3NBbHRlcm5hdGVG dWxsc2NyZWVuS2V5KCksIFdlYktpdDo6V2ViUHJlZmVyZW5jZXNTdG9yZTo6VmFsdWUoISFbX2Nv bmZpZ3VyYXRpb24gX2FsbG93c0FsdGVybmF0ZUZ1bGxzY3JlZW5dICYmIHNob3VsZEFsbG93QWx0 ZXJuYXRlRnVsbHNjcmVlbigpKSk7Ci0gICAgd2ViUGFnZUNvbmZpZ3VyYXRpb24ucHJlZmVyZW5j ZVZhbHVlcy5zZXQoV2ViS2l0OjpXZWJQcmVmZXJlbmNlc0tleTo6cmVxdWlyZXNVc2VyR2VzdHVy ZUZvck1lZGlhUGxheWJhY2tLZXkoKSwgV2ViS2l0OjpXZWJQcmVmZXJlbmNlc1N0b3JlOjpWYWx1 ZSghIVtfY29uZmlndXJhdGlvbiBtZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyQWN0aW9uXSkpOwot ICAgIHdlYlBhZ2VDb25maWd1cmF0aW9uLnByZWZlcmVuY2VWYWx1ZXMuc2V0KFdlYktpdDo6V2Vi UHJlZmVyZW5jZXNLZXk6OmFsbG93c0FpclBsYXlGb3JNZWRpYVBsYXliYWNrS2V5KCksIFdlYktp dDo6V2ViUHJlZmVyZW5jZXNTdG9yZTo6VmFsdWUoISFbX2NvbmZpZ3VyYXRpb24gbWVkaWFQbGF5 YmFja0FsbG93c0FpclBsYXldKSk7CisgICAgd2ViUGFnZUNvbmZpZ3VyYXRpb24ucHJlZmVyZW5j ZVZhbHVlcy5zZXQoV2ViS2l0OjpXZWJQcmVmZXJlbmNlc0tleTo6cmVxdWlyZXNVc2VyR2VzdHVy ZUZvck1lZGlhUGxheWJhY2tLZXkoKSwgV2ViS2l0OjpXZWJQcmVmZXJlbmNlc1N0b3JlOjpWYWx1 ZSghIVtfY29uZmlndXJhdGlvbiByZXF1aXJlc1VzZXJBY3Rpb25Gb3JNZWRpYVBsYXliYWNrXSkp OworI2VuZGlmCisjaWYgRU5BQkxFKFdJUkVMRVNTX1BMQVlCQUNLX1RBUkdFVCkKKyAgICB3ZWJQ YWdlQ29uZmlndXJhdGlvbi5wcmVmZXJlbmNlVmFsdWVzLnNldChXZWJLaXQ6OldlYlByZWZlcmVu Y2VzS2V5OjphbGxvd3NBaXJQbGF5Rm9yTWVkaWFQbGF5YmFja0tleSgpLCBXZWJLaXQ6OldlYlBy ZWZlcmVuY2VzU3RvcmU6OlZhbHVlKCEhW19jb25maWd1cmF0aW9uIGFsbG93c0FpclBsYXlGb3JN ZWRpYVBsYXliYWNrXSkpOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShJT1MpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRp b24uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmln dXJhdGlvbi5oCmluZGV4IDM0YjdiOTYzNDFjNDk2NTg4MDA2NGU0NjNjODNkNGYzMTJkZTkxOTEu LjJjNDE0ZmFjNDA0NDU3MTg3NGIwOTllYzI1NGJiYzg3N2RhOTA1ZjggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmln dXJhdGlvbi5oCkBAIC04OCw2ICs4OCwxMSBAQCBXS19DTEFTU19BVkFJTEFCTEUoMTBfMTAsIDhf MCkKICovCiBAcHJvcGVydHkgKFdLX05VTExBQkxFX1BST1BFUlRZIG5vbmF0b21pYywgY29weSkg TlNTdHJpbmcgKmFwcGxpY2F0aW9uTmFtZUZvclVzZXJBZ2VudCBXS19BVkFJTEFCTEUoV0tfTUFD X1RCQSwgV0tfSU9TX1RCQSk7CiAKKy8qISBAYWJzdHJhY3QgQSBCb29sZWFuIHZhbHVlIGluZGlj YXRpbmcgd2hldGhlciBBaXJQbGF5IGlzIGFsbG93ZWQuCisgQGRpc2N1c3Npb24gVGhlIGRlZmF1 bHQgdmFsdWUgaXMgWUVTLgorICovCitAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBhbGxvd3NB aXJQbGF5Rm9yTWVkaWFQbGF5YmFjayBXS19BVkFJTEFCTEUoV0tfTUFDX1RCQSwgV0tfSU9TX1RC QSk7CisKICNpZiBUQVJHRVRfT1NfSVBIT05FCiAvKiEgQGFic3RyYWN0IEEgQm9vbGVhbiB2YWx1 ZSBpbmRpY2F0aW5nIHdoZXRoZXIgSFRNTDUgdmlkZW9zIHBsYXkgaW5saW5lCiAgKFlFUykgb3Ig dXNlIHRoZSBuYXRpdmUgZnVsbC1zY3JlZW4gY29udHJvbGxlciAoTk8pLgpAQCAtOTksMTIgKzEw NCw3IEBAIFdLX0NMQVNTX0FWQUlMQUJMRSgxMF8xMCwgOF8wKQogIHVzZXIgdG8gc3RhcnQgcGxh eWluZyB0aGVtIChZRVMpIG9yIGNhbiBwbGF5IGF1dG9tYXRpY2FsbHkgKE5PKS4KICBAZGlzY3Vz c2lvbiBUaGUgZGVmYXVsdCB2YWx1ZSBpcyBZRVMuCiAgKi8KLUBwcm9wZXJ0eSAobm9uYXRvbWlj KSBCT09MIG1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJBY3Rpb247Ci0KLS8qISBAYWJzdHJhY3Qg QSBCb29sZWFuIHZhbHVlIGluZGljYXRpbmcgd2hldGhlciBBaXJQbGF5IGlzIGFsbG93ZWQuCi0g QGRpc2N1c3Npb24gVGhlIGRlZmF1bHQgdmFsdWUgaXMgWUVTLgotICovCi1AcHJvcGVydHkgKG5v bmF0b21pYykgQk9PTCBtZWRpYVBsYXliYWNrQWxsb3dzQWlyUGxheTsKK0Bwcm9wZXJ0eSAobm9u YXRvbWljKSBCT09MIHJlcXVpcmVzVXNlckFjdGlvbkZvck1lZGlhUGxheWJhY2sgV0tfQVZBSUxB QkxFKE5BLCBXS19JT1NfVEJBKTsKIAogLyohIEBhYnN0cmFjdCBUaGUgbGV2ZWwgb2YgZ3JhbnVs YXJpdHkgd2l0aCB3aGljaCB0aGUgdXNlciBjYW4gaW50ZXJhY3RpdmVseQogIHNlbGVjdCBjb250 ZW50IGluIHRoZSB3ZWIgdmlldy4KQEAgLTExNyw2ICsxMTcsMTUgQEAgV0tfQ0xBU1NfQVZBSUxB QkxFKDEwXzEwLCA4XzApCiAKIEBlbmQKIAorQGludGVyZmFjZSBXS1dlYlZpZXdDb25maWd1cmF0 aW9uIChXS0RlcHJlY2F0ZWQpCisKKyNpZiBUQVJHRVRfT1NfSVBIT05FCitAcHJvcGVydHkgKG5v bmF0b21pYykgQk9PTCBtZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyQWN0aW9uIFdLX0RFUFJFQ0FU RUQoTkEsIE5BLCA4XzAsIFdLX0lPU19UQkEsICJQbGVhc2UgdXNlIHJlcXVpcmVzVXNlckFjdGlv bkZvck1lZGlhUGxheWJhY2siKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIG1lZGlhUGxh eWJhY2tBbGxvd3NBaXJQbGF5IFdLX0RFUFJFQ0FURUQoTkEsIE5BLCA4XzAsIFdLX0lPU19UQkEs ICJQbGVhc2UgdXNlIGFsbG93c0FpclBsYXlGb3JNZWRpYVBsYXliYWNrIik7CisjZW5kaWYKKwor QGVuZAorCiBXS19BU1NVTUVfTk9OTlVMTF9FTkQKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb24ubW0g Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRp b24ubW0KaW5kZXggOWJlOWE2ZTdmOGM5ODg1ZjNlYjA3NzdiODIyMWVmYTNjNWE5MDczNi4uNWMx NjJhOTc5ZjNiZjFhMjJmYzhlODExNGI0OGU3NmFhYzAyODRhYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdDb25maWd1cmF0aW9uLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJh dGlvbi5tbQpAQCAtMTAzLDExICsxMDMsMTMgQEAgcHJpdmF0ZToKICAgICAgICAgcmV0dXJuIG5p bDsKICAgICAKICNpZiBQTEFURk9STShJT1MpCi0gICAgX21lZGlhUGxheWJhY2tSZXF1aXJlc1Vz ZXJBY3Rpb24gPSBZRVM7Ci0gICAgX21lZGlhUGxheWJhY2tBbGxvd3NBaXJQbGF5ID0gWUVTOwor ICAgIF9yZXF1aXJlc1VzZXJBY3Rpb25Gb3JNZWRpYVBsYXliYWNrID0gWUVTOwogICAgIF9hbGxv d3NBbHRlcm5hdGVGdWxsc2NyZWVuID0gWUVTOwogI2VuZGlmCi0gICAgCisjaWYgRU5BQkxFKFdJ UkVMRVNTX1RBUkdFVF9QTEFZQkFDSykKKyAgICBfYWxsb3dzQWlyUGxheUZvck1lZGlhUGxheWJh Y2sgPSBZRVM7CisjZW5kaWYKKwogICAgIHJldHVybiBzZWxmOwogfQogCkBAIC0xMzgsMTAgKzE0 MCwxMiBAQCBwcml2YXRlOgogI2lmIFBMQVRGT1JNKElPUykKICAgICBjb25maWd1cmF0aW9uLT5f YWxsb3dzSW5saW5lTWVkaWFQbGF5YmFjayA9IHNlbGYtPl9hbGxvd3NJbmxpbmVNZWRpYVBsYXli YWNrOwogICAgIGNvbmZpZ3VyYXRpb24tPl9hbGxvd3NBbHRlcm5hdGVGdWxsc2NyZWVuID0gc2Vs Zi0+X2FsbG93c0FsdGVybmF0ZUZ1bGxzY3JlZW47Ci0gICAgY29uZmlndXJhdGlvbi0+X21lZGlh UGxheWJhY2tSZXF1aXJlc1VzZXJBY3Rpb24gPSBzZWxmLT5fbWVkaWFQbGF5YmFja1JlcXVpcmVz VXNlckFjdGlvbjsKLSAgICBjb25maWd1cmF0aW9uLT5fbWVkaWFQbGF5YmFja0FsbG93c0FpclBs YXkgPSBzZWxmLT5fbWVkaWFQbGF5YmFja0FsbG93c0FpclBsYXk7CisgICAgY29uZmlndXJhdGlv bi0+X3JlcXVpcmVzVXNlckFjdGlvbkZvck1lZGlhUGxheWJhY2sgPSBzZWxmLT5fcmVxdWlyZXNV c2VyQWN0aW9uRm9yTWVkaWFQbGF5YmFjazsKICAgICBjb25maWd1cmF0aW9uLT5fc2VsZWN0aW9u R3JhbnVsYXJpdHkgPSBzZWxmLT5fc2VsZWN0aW9uR3JhbnVsYXJpdHk7CiAjZW5kaWYKKyNpZiBF TkFCTEUoV0lSRUxFU1NfVEFSR0VUX1BMQVlCQUNLKQorICAgIGNvbmZpZ3VyYXRpb24tPl9hbGxv d3NBaXJQbGF5Rm9yTWVkaWFQbGF5YmFjayA9IHNlbGYtPl9hbGxvd3NBaXJQbGF5Rm9yTWVkaWFQ bGF5YmFjazsKKyNlbmRpZgogCiAgICAgcmV0dXJuIGNvbmZpZ3VyYXRpb247CiB9CkBAIC0zMjMs NCArMzI3LDMwIEBAIHN0YXRpYyBOU1N0cmluZyAqZGVmYXVsdEFwcGxpY2F0aW9uTmFtZUZvclVz ZXJBZ2VudCgpCiAKIEBlbmQKIAorQGltcGxlbWVudGF0aW9uIFdLV2ViVmlld0NvbmZpZ3VyYXRp b24gKFdLRGVwcmVjYXRlZCkKKworI2lmIFBMQVRGT1JNKElPUykKKy0gKEJPT0wpbWVkaWFQbGF5 YmFja0FsbG93c0FpclBsYXkKK3sKKyAgICByZXR1cm4gX2FsbG93c0FpclBsYXlGb3JNZWRpYVBs YXliYWNrOworfQorCistICh2b2lkKXNldE1lZGlhUGxheWJhY2tBbGxvd3NBaXJQbGF5OihCT09M KWFsbG93ZWQKK3sKKyAgICBfYWxsb3dzQWlyUGxheUZvck1lZGlhUGxheWJhY2sgPSBhbGxvd2Vk OworfQorCistIChCT09MKW1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJBY3Rpb24KK3sKKyAgICBy ZXR1cm4gX3JlcXVpcmVzVXNlckFjdGlvbkZvck1lZGlhUGxheWJhY2s7Cit9CisKKy0gKHZvaWQp c2V0TWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckFjdGlvbjooQk9PTClyZXF1aXJlZAoreworICAg IF9yZXF1aXJlc1VzZXJBY3Rpb25Gb3JNZWRpYVBsYXliYWNrID0gcmVxdWlyZWQ7Cit9CisjZW5k aWYgLy8gUExBVEZPUk0oSU9TKQorCitAZW5kCisKICNlbmRpZiAvLyBXS19BUElfRU5BQkxFRAo=