135987 2014-08-15 11:40:45 -0700 de-PLATFORM(COCOA) a couple of methods in plugin code 2014-08-15 11:57:13 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough oldest_to_newest 1029402 0 barraclough 2014-08-15 11:40:45 -0700 Pass through the visibility & focus on all platforms, to simplify & avoid any weird inconsistencies between platforms. 1029409 1 236662 barraclough 2014-08-15 11:48:12 -0700 Created attachment 236662 Fix 1029412 2 236662 sam 2014-08-15 11:52:19 -0700 Comment on attachment 236662 Fix View in context: https://bugs.webkit.org/attachment.cgi?id=236662&action=review > Source/WebKit2/PluginProcess/PluginControllerProxy.cpp:445 > + m_plugin->windowVisibilityChanged(isVisible); Add ASSERT to match? 1029414 3 barraclough 2014-08-15 11:57:13 -0700 Transmitting file data ............ Committed revision 172637. 236662 2014-08-15 11:48:12 -0700 2014-08-15 11:52:18 -0700 Fix 135987.1.patch text/plain 13521 barraclough SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjYzNCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDE0LTA4LTE1ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBkZS1QTEFURk9S TShDT0NPQSkgYSBjb3VwbGUgb2YgbWV0aG9kcyBpbiBwbHVnaW4gY29kZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1OTg3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGFzcyB0aHJvdWdoIHRoZSB2aXNp YmlsaXR5ICYgZm9jdXMgb24gYWxsIHBsYXRmb3JtcywgdG8gc2ltcGxpZnkgJiBhdm9pZAorICAg ICAgICBhbnkgd2VpcmQgaW5jb25zaXN0ZW5jaWVzIGJldHdlZW4gcGxhdGZvcm1zLgorCisgICAg ICAgICogUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpQbHVnaW5Db250cm9sbGVyUHJveHk6OndpbmRvd0ZvY3VzQ2hhbmdlZCk6CisgICAg ICAgIChXZWJLaXQ6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6d2luZG93VmlzaWJpbGl0eUNoYW5n ZWQpOgorICAgICAgICAqIFBsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5Lmg6Cisg ICAgICAgICogUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkubWVzc2FnZXMuaW46 CisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luQ29udHJvbGxlclByb3h5TWFjLm1t OgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Db250cm9sbGVyUHJveHk6OndpbmRvd0ZvY3VzQ2hh bmdlZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6 d2luZG93VmlzaWJpbGl0eUNoYW5nZWQpOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3Mv UGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5l dHNjYXBlUGx1Z2luOjp3aW5kb3dGb2N1c0NoYW5nZWQpOgorICAgICAgICAoV2ViS2l0OjpOZXRz Y2FwZVBsdWdpbjo6d2luZG93VmlzaWJpbGl0eUNoYW5nZWQpOgorICAgICAgICAqIFdlYlByb2Nl c3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oOgorICAgICAgICAqIFdlYlByb2Nl c3MvUGx1Z2lucy9QbHVnaW4uaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm94eTo6d2luZG93QW5kVmlld0Zy YW1lc0NoYW5nZWQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5o OgorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAg KFdlYktpdDo6UGx1Z2luVmlldzo6dmlld1N0YXRlRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYktp dDo6UGx1Z2luVmlldzo6cGxhdGZvcm1WaWV3U3RhdGVEaWRDaGFuZ2UpOiBEZWxldGVkLgorICAg ICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3Lmg6CisKIDIwMTQtMDgtMTUgIEdh dmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBw bHVnaW4gdmlzaWJpbGl0eSBpbml0aWFsaXphdGlvbgpJbmRleDogU291cmNlL1dlYktpdDIvUGx1 Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmNwcAkocmV2aXNp b24gMTcyNjI5KQorKysgU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9s bGVyUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MzQsNiArNDM0LDIyIEBAIHZvaWQgUGx1 Z2luQ29udHJvbGxlclByb3h5Ojp2aXNpYmlsaXR5RGkKICAgICBtX3BsdWdpbi0+dmlzaWJpbGl0 eURpZENoYW5nZShpc1Zpc2libGUpOwogfQogCit2b2lkIFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6 d2luZG93Rm9jdXNDaGFuZ2VkKGJvb2wgaGFzRm9jdXMpCit7CisgICAgQVNTRVJUKG1fcGx1Z2lu KTsKKyAgICBtX3BsdWdpbi0+d2luZG93Rm9jdXNDaGFuZ2VkKGhhc0ZvY3VzKTsKK30KKwordm9p ZCBQbHVnaW5Db250cm9sbGVyUHJveHk6OndpbmRvd1Zpc2liaWxpdHlDaGFuZ2VkKGJvb2wgaXNW aXNpYmxlKQoreworICAgIG1fcGx1Z2luLT53aW5kb3dWaXNpYmlsaXR5Q2hhbmdlZChpc1Zpc2li bGUpOworCisgICAgaWYgKGlzVmlzaWJsZSkKKyAgICAgICAgbV92aXNpYmxpdHlBY3Rpdml0eS5z dGFydCgpOworICAgIGVsc2UKKyAgICAgICAgbV92aXNpYmxpdHlBY3Rpdml0eS5zdG9wKCk7Cit9 CisKIHZvaWQgUGx1Z2luQ29udHJvbGxlclByb3h5OjpkaWRFdmFsdWF0ZUphdmFTY3JpcHQodWlu dDY0X3QgcmVxdWVzdElELCBjb25zdCBTdHJpbmcmIHJlc3VsdCkKIHsKICAgICBtX3BsdWdpbi0+ ZGlkRXZhbHVhdGVKYXZhU2NyaXB0KHJlcXVlc3RJRCwgcmVzdWx0KTsKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuaAko cmV2aXNpb24gMTcyNjI5KQorKysgU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5D b250cm9sbGVyUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMTQ5LDEwICsxNDksMTEgQEAgcHJp dmF0ZToKICAgICB2b2lkIGRpZFVwZGF0ZSgpOwogICAgIHZvaWQgZ2V0UGx1Z2luU2NyaXB0YWJs ZU5QT2JqZWN0KHVpbnQ2NF90JiBwbHVnaW5TY3JpcHRhYmxlTlBPYmplY3RJRCk7CiAKLSNpZiBQ TEFURk9STShDT0NPQSkKICAgICB2b2lkIHdpbmRvd0ZvY3VzQ2hhbmdlZChib29sKTsKLSAgICB2 b2lkIHdpbmRvd0FuZFZpZXdGcmFtZXNDaGFuZ2VkKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHdp bmRvd0ZyYW1lSW5TY3JlZW5Db29yZGluYXRlcywgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgdmll d0ZyYW1lSW5XaW5kb3dDb29yZGluYXRlcyk7CiAgICAgdm9pZCB3aW5kb3dWaXNpYmlsaXR5Q2hh bmdlZChib29sKTsKKworI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIHZvaWQgd2luZG93QW5kVmll d0ZyYW1lc0NoYW5nZWQoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgd2luZG93RnJhbWVJblNjcmVl bkNvb3JkaW5hdGVzLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB2aWV3RnJhbWVJbldpbmRvd0Nv b3JkaW5hdGVzKTsKICAgICB2b2lkIHNlbmRDb21wbGV4VGV4dElucHV0KGNvbnN0IFN0cmluZyYg dGV4dElucHV0KTsKICAgICB2b2lkIHNldExheWVySG9zdGluZ01vZGUodWludDMyX3QpOwogCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5t ZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1Bs dWdpbkNvbnRyb2xsZXJQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gMTcyNjAwKQorKysgU291 cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkubWVzc2FnZXMu aW4JKHdvcmtpbmcgY29weSkKQEAgLTk4LDE5ICs5OCwxOSBAQCBtZXNzYWdlcyAtPiBQbHVnaW5D b250cm9sbGVyUHJveHkgTGVnYWN5CiAgICAgIyBHZXQgYSByZWZlcmVuY2UgdG8gdGhlIHBsdWct aW4ncyBzY3JpcHRhYmxlIE5QT2JqZWN0LgogICAgIEdldFBsdWdpblNjcmlwdGFibGVOUE9iamVj dCgpIC0+ICh1aW50NjRfdCBwbHVnaW5TY3JpcHRhYmxlTlBPYmplY3RJRCkKIAorICAgICMgU2Vu dCB3aGVuIHRoZSBjb250YWluaW5nIE5TV2luZG93J3MgZm9jdXMgY2hhbmdlcworICAgIFdpbmRv d0ZvY3VzQ2hhbmdlZChib29sIGhhc0ZvY3VzKQorCisgICAgIyBTZW50IHdoZW4gdGhlIGNvbnRh aW5pbmcgTlNXaW5kb3cncyB2aXNpYmlsaXR5IGNoYW5nZXMKKyAgICBXaW5kb3dWaXNpYmlsaXR5 Q2hhbmdlZChib29sIGlzVmlzaWJsZSkKKwogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgICMgU2Vu ZCB0aGUgY29tcGxleCB0ZXh0IGlucHV0IHRvIHRoZSBwbHVnLWluLgogICAgIFNlbmRDb21wbGV4 VGV4dElucHV0KFN0cmluZyB0ZXh0SW5wdXQpCiAKLSAgICAjIFNlbnQgd2hlbiB0aGUgY29udGFp bmluZyBOU1dpbmRvdydzIGZvY3VzIGNoYW5nZXMKLSAgICBXaW5kb3dGb2N1c0NoYW5nZWQoYm9v bCBoYXNGb2N1cykKLQogICAgICMgU2VudCB3aGVuIHRoZSBjb250YWluaW5nIE5TV2luZG93IG9y IE5TVmlldyBmcmFtZSBjaGFuZ2VzCiAgICAgV2luZG93QW5kVmlld0ZyYW1lc0NoYW5nZWQoV2Vi Q29yZTo6SW50UmVjdCB3aW5kb3dGcmFtZUluU2NyZWVuQ29vcmRpbmF0ZXMsIFdlYkNvcmU6Oklu dFJlY3Qgdmlld0ZyYW1lSW5XaW5kb3dDb29yZGluYXRlcykKIAotICAgICMgU2VudCB3aGVuIHRo ZSBjb250YWluaW5nIE5TV2luZG93J3MgdmlzaWJpbGl0eSBjaGFuZ2VzCi0gICAgV2luZG93Vmlz aWJpbGl0eUNoYW5nZWQoYm9vbCBpc1Zpc2libGUpCi0KICAgICAjIFNlbnQgd2hlbiB0aGUgY29u dGFpbmluZyB3aW5kb3cncyBsYXllciBob3N0aW5nIG1vZGUgY2hhbmdlcwogICAgIFNldExheWVy SG9zdGluZ01vZGUodWludDMyX3QgbGF5ZXJIb3N0aW5nTW9kZSkKICNlbmRpZgpJbmRleDogU291 cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luQ29udHJvbGxlclByb3h5TWFjLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpbkNv bnRyb2xsZXJQcm94eU1hYy5tbQkocmV2aXNpb24gMTcyNjI5KQorKysgU291cmNlL1dlYktpdDIv UGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luQ29udHJvbGxlclByb3h5TWFjLm1tCSh3b3JraW5nIGNv cHkpCkBAIC05NCwyNSArOTQsMTEgQEAgdm9pZCBQbHVnaW5Db250cm9sbGVyUHJveHk6OnBsYXRm b3JtR2VvbQogICAgIFtDQVRyYW5zYWN0aW9uIGNvbW1pdF07CiB9CiAKLXZvaWQgUGx1Z2luQ29u dHJvbGxlclByb3h5Ojp3aW5kb3dGb2N1c0NoYW5nZWQoYm9vbCBoYXNGb2N1cykKLXsKLSAgICBt X3BsdWdpbi0+d2luZG93Rm9jdXNDaGFuZ2VkKGhhc0ZvY3VzKTsKLX0KLQogdm9pZCBQbHVnaW5D b250cm9sbGVyUHJveHk6OndpbmRvd0FuZFZpZXdGcmFtZXNDaGFuZ2VkKGNvbnN0IEludFJlY3Qm IHdpbmRvd0ZyYW1lSW5TY3JlZW5Db29yZGluYXRlcywgY29uc3QgSW50UmVjdCYgdmlld0ZyYW1l SW5XaW5kb3dDb29yZGluYXRlcykKIHsKICAgICBtX3BsdWdpbi0+d2luZG93QW5kVmlld0ZyYW1l c0NoYW5nZWQod2luZG93RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVzLCB2aWV3RnJhbWVJbldpbmRv d0Nvb3JkaW5hdGVzKTsKIH0KIAotdm9pZCBQbHVnaW5Db250cm9sbGVyUHJveHk6OndpbmRvd1Zp c2liaWxpdHlDaGFuZ2VkKGJvb2wgaXNWaXNpYmxlKQotewotICAgIG1fcGx1Z2luLT53aW5kb3dW aXNpYmlsaXR5Q2hhbmdlZChpc1Zpc2libGUpOwotICAgIGlmIChpc1Zpc2libGUpCi0gICAgICAg IG1fdmlzaWJsaXR5QWN0aXZpdHkuc3RhcnQoKTsKLSAgICBlbHNlCi0gICAgICAgIG1fdmlzaWJs aXR5QWN0aXZpdHkuc3RvcCgpOwotfQotCiB2b2lkIFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6c2Vu ZENvbXBsZXhUZXh0SW5wdXQoY29uc3QgU3RyaW5nJiB0ZXh0SW5wdXQpCiB7CiAgICAgbV9wbHVn aW4tPnNlbmRDb21wbGV4VGV4dElucHV0KHRleHRJbnB1dCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oCShyZXZpc2lvbiAxNzI2MDApCisrKyBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luLmgJKHdvcmtpbmcgY29weSkKQEAg LTIxOSwxNSArMjE5LDE1IEBAIHB1YmxpYzoKICAgICAvLyBHZXQgdGhlIE5QT2JqZWN0IHRoYXQg Y29ycmVzcG9uZHMgdG8gdGhlIHBsdWctaW4ncyBzY3JpcHRhYmxlIG9iamVjdC4gUmV0dXJucyBh IHJldGFpbmVkIG9iamVjdC4KICAgICB2aXJ0dWFsIE5QT2JqZWN0KiBwbHVnaW5TY3JpcHRhYmxl TlBPYmplY3QoKSA9IDA7CiAKLSNpZiBQTEFURk9STShDT0NPQSkKICAgICAvLyBUZWxscyB0aGUg cGx1Zy1pbiBhYm91dCB3aW5kb3cgZm9jdXMgY2hhbmdlcy4KICAgICB2aXJ0dWFsIHZvaWQgd2lu ZG93Rm9jdXNDaGFuZ2VkKGJvb2wpID0gMDsKLQotICAgIC8vIFRlbGxzIHRoZSBwbHVnLWluIGFi b3V0IHdpbmRvdyBhbmQgcGx1Zy1pbiBmcmFtZSBjaGFuZ2VzLgotICAgIHZpcnR1YWwgdm9pZCB3 aW5kb3dBbmRWaWV3RnJhbWVzQ2hhbmdlZChjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB3aW5kb3dG cmFtZUluU2NyZWVuQ29vcmRpbmF0ZXMsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHZpZXdGcmFt ZUluV2luZG93Q29vcmRpbmF0ZXMpID0gMDsKLQorICAgIAogICAgIC8vIFRlbGxzIHRoZSBwbHVn LWluIGFib3V0IHdpbmRvdyB2aXNpYmlsaXR5IGNoYW5nZXMuCiAgICAgdmlydHVhbCB2b2lkIHdp bmRvd1Zpc2liaWxpdHlDaGFuZ2VkKGJvb2wpID0gMDsKKyAgICAKKyNpZiBQTEFURk9STShDT0NP QSkKKyAgICAvLyBUZWxscyB0aGUgcGx1Zy1pbiBhYm91dCB3aW5kb3cgYW5kIHBsdWctaW4gZnJh bWUgY2hhbmdlcy4KKyAgICB2aXJ0dWFsIHZvaWQgd2luZG93QW5kVmlld0ZyYW1lc0NoYW5nZWQo Y29uc3QgV2ViQ29yZTo6SW50UmVjdCYgd2luZG93RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVzLCBj b25zdCBXZWJDb3JlOjpJbnRSZWN0JiB2aWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzKSA9IDA7 CiAKICAgICAvLyBHZXQgdGhlIHBlciBjb21wbGV4IHRleHQgaW5wdXQgaWRlbnRpZmllci4KICAg ICB2aXJ0dWFsIHVpbnQ2NF90IHBsdWdpbkNvbXBsZXhUZXh0SW5wdXRJZGVudGlmaWVyKCkgY29u c3QgPSAwOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblBy b3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv UGx1Z2luUHJveHkuY3BwCShyZXZpc2lvbiAxNzI2MDApCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00ODUsMjIg KzQ4NSwyMSBAQCBOUE9iamVjdCogUGx1Z2luUHJveHk6OnBsdWdpblNjcmlwdGFibGVOCiAgICAg cmV0dXJuIG1fY29ubmVjdGlvbi0+bnBSZW1vdGVPYmplY3RNYXAoKS0+Y3JlYXRlTlBPYmplY3RQ cm94eShwbHVnaW5TY3JpcHRhYmxlTlBPYmplY3RJRCwgdGhpcyk7CiB9CiAKLSNpZiBQTEFURk9S TShDT0NPQSkKIHZvaWQgUGx1Z2luUHJveHk6OndpbmRvd0ZvY3VzQ2hhbmdlZChib29sIGhhc0Zv Y3VzKQogewogICAgIG1fY29ubmVjdGlvbi0+Y29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpQ bHVnaW5Db250cm9sbGVyUHJveHk6OldpbmRvd0ZvY3VzQ2hhbmdlZChoYXNGb2N1cyksIG1fcGx1 Z2luSW5zdGFuY2VJRCk7CiB9CiAKLXZvaWQgUGx1Z2luUHJveHk6OndpbmRvd0FuZFZpZXdGcmFt ZXNDaGFuZ2VkKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHdpbmRvd0ZyYW1lSW5TY3JlZW5Db29y ZGluYXRlcywgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgdmlld0ZyYW1lSW5XaW5kb3dDb29yZGlu YXRlcykKLXsKLSAgICBtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6 UGx1Z2luQ29udHJvbGxlclByb3h5OjpXaW5kb3dBbmRWaWV3RnJhbWVzQ2hhbmdlZCh3aW5kb3dG cmFtZUluU2NyZWVuQ29vcmRpbmF0ZXMsIHZpZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMpLCBt X3BsdWdpbkluc3RhbmNlSUQpOwotfQotCiB2b2lkIFBsdWdpblByb3h5Ojp3aW5kb3dWaXNpYmls aXR5Q2hhbmdlZChib29sIGlzVmlzaWJsZSkKIHsKICAgICBtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rp b24oKS0+c2VuZChNZXNzYWdlczo6UGx1Z2luQ29udHJvbGxlclByb3h5OjpXaW5kb3dWaXNpYmls aXR5Q2hhbmdlZChpc1Zpc2libGUpLCBtX3BsdWdpbkluc3RhbmNlSUQpOwogfQogCisjaWYgUExB VEZPUk0oQ09DT0EpCit2b2lkIFBsdWdpblByb3h5Ojp3aW5kb3dBbmRWaWV3RnJhbWVzQ2hhbmdl ZChjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB3aW5kb3dGcmFtZUluU2NyZWVuQ29vcmRpbmF0ZXMs IGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHZpZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMpCit7 CisgICAgbV9jb25uZWN0aW9uLT5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OlBsdWdpbkNv bnRyb2xsZXJQcm94eTo6V2luZG93QW5kVmlld0ZyYW1lc0NoYW5nZWQod2luZG93RnJhbWVJblNj cmVlbkNvb3JkaW5hdGVzLCB2aWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzKSwgbV9wbHVnaW5J bnN0YW5jZUlEKTsKK30KIHVpbnQ2NF90IFBsdWdpblByb3h5OjpwbHVnaW5Db21wbGV4VGV4dElu cHV0SWRlbnRpZmllcigpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fcGx1Z2luSW5zdGFuY2VJRDsK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94 eS5oCShyZXZpc2lvbiAxNzI2MDApCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvUGx1Z2luUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMTEzLDEwICsxMTMsMTIgQEAgcHJp dmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlc1BhZ2VTY2FsZUZhY3RvcigpOwogICAgIAog ICAgIHZpcnR1YWwgTlBPYmplY3QqIHBsdWdpblNjcmlwdGFibGVOUE9iamVjdCgpOwotI2lmIFBM QVRGT1JNKENPQ09BKQorCiAgICAgdmlydHVhbCB2b2lkIHdpbmRvd0ZvY3VzQ2hhbmdlZChib29s KTsKLSAgICB2aXJ0dWFsIHZvaWQgd2luZG93QW5kVmlld0ZyYW1lc0NoYW5nZWQoY29uc3QgV2Vi Q29yZTo6SW50UmVjdCYgd2luZG93RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVzLCBjb25zdCBXZWJD b3JlOjpJbnRSZWN0JiB2aWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzKTsKICAgICB2aXJ0dWFs IHZvaWQgd2luZG93VmlzaWJpbGl0eUNoYW5nZWQoYm9vbCk7CisKKyNpZiBQTEFURk9STShDT0NP QSkKKyAgICB2aXJ0dWFsIHZvaWQgd2luZG93QW5kVmlld0ZyYW1lc0NoYW5nZWQoY29uc3QgV2Vi Q29yZTo6SW50UmVjdCYgd2luZG93RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVzLCBjb25zdCBXZWJD b3JlOjpJbnRSZWN0JiB2aWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzKTsKICAgICB2aXJ0dWFs IHVpbnQ2NF90IHBsdWdpbkNvbXBsZXhUZXh0SW5wdXRJZGVudGlmaWVyKCkgY29uc3Q7CiAgICAg dmlydHVhbCB2b2lkIHNlbmRDb21wbGV4VGV4dElucHV0KGNvbnN0IFN0cmluZyYgdGV4dElucHV0 KTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TGF5ZXJIb3N0aW5nTW9kZShMYXllckhvc3RpbmdNb2Rl KSBvdmVycmlkZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVn aW5WaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvUGx1Z2luVmlldy5jcHAJKHJldmlzaW9uIDE3MjYzNCkKKysrIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTA1LDE2 ICs1MDUsNiBAQCB2b2lkIFBsdWdpblZpZXc6OndlYlBhZ2VEZXN0cm95ZWQoKQogCiB2b2lkIFBs dWdpblZpZXc6OnZpZXdTdGF0ZURpZENoYW5nZShWaWV3U3RhdGU6OkZsYWdzIGNoYW5nZWQpCiB7 Ci0jaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgcGxhdGZvcm1WaWV3U3RhdGVEaWRDaGFuZ2UoY2hh bmdlZCk7Ci0jZWxzZQotICAgIFVOVVNFRF9QQVJBTShjaGFuZ2VkKTsKLSNlbmRpZgotfQotCi0j aWYgUExBVEZPUk0oQ09DT0EpCi12b2lkIFBsdWdpblZpZXc6OnBsYXRmb3JtVmlld1N0YXRlRGlk Q2hhbmdlKFZpZXdTdGF0ZTo6RmxhZ3MgY2hhbmdlZCkKLXsKICAgICBpZiAoIW1fcGx1Z2luIHx8 ICFtX2lzSW5pdGlhbGl6ZWQpCiAgICAgICAgIHJldHVybjsKIApAQCAtNTI0LDYgKzUxNCw3IEBA IHZvaWQgUGx1Z2luVmlldzo6cGxhdGZvcm1WaWV3U3RhdGVEaWRDaGEKICAgICAgICAgbV9wbHVn aW4tPndpbmRvd0ZvY3VzQ2hhbmdlZChtX3dlYlBhZ2UtPndpbmRvd0lzRm9jdXNlZCgpKTsKIH0K IAorI2lmIFBMQVRGT1JNKENPQ09BKQogdm9pZCBQbHVnaW5WaWV3OjpzZXREZXZpY2VTY2FsZUZh Y3RvcihmbG9hdCBzY2FsZUZhY3RvcikKIHsKICAgICBpZiAoIW1faXNJbml0aWFsaXplZCB8fCAh bV9wbHVnaW4pCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu Vmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9Q bHVnaW5WaWV3LmgJKHJldmlzaW9uIDE3MjYwMCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTc1LDcgKzc1LDYgQEAg cHVibGljOgogICAgIHZvaWQgc2V0TGF5ZXJIb3N0aW5nTW9kZShMYXllckhvc3RpbmdNb2RlKTsK IAogI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIHZvaWQgcGxhdGZvcm1WaWV3U3RhdGVEaWRDaGFu Z2UoV2ViQ29yZTo6Vmlld1N0YXRlOjpGbGFncyBjaGFuZ2VkKTsKICAgICB2b2lkIHNldERldmlj ZVNjYWxlRmFjdG9yKGZsb2F0KTsKICAgICB2b2lkIHdpbmRvd0FuZFZpZXdGcmFtZXNDaGFuZ2Vk KGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgd2luZG93RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVz LCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHZpZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMp OwogICAgIGJvb2wgc2VuZENvbXBsZXhUZXh0SW5wdXQodWludDY0X3QgcGx1Z2luQ29tcGxleFRl eHRJbnB1dElkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgdGV4dElucHV0KTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBl L05ldHNjYXBlUGx1Z2luLmNwcAkocmV2aXNpb24gMTcyNjAwKQorKysgU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTA3MSw2ICsxMDcxLDE4IEBAIGJvb2wgTmV0c2NhcGVQbHVnaW46OmNvbnZlcnRG cm9tUm9vdFZpZXcKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorI2lmICFQTEFURk9STShDT0NPQSkK KyAgICAKK3ZvaWQgTmV0c2NhcGVQbHVnaW46OndpbmRvd0ZvY3VzQ2hhbmdlZChib29sKQorewor fQorCit2b2lkIE5ldHNjYXBlUGx1Z2luOjp3aW5kb3dWaXNpYmlsaXR5Q2hhbmdlZChib29sKQor eworfQorCisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAvLyBFTkFC TEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCShyZXZp c2lvbiAxNzI2MDApCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2Nh cGUvTmV0c2NhcGVQbHVnaW4uaAkod29ya2luZyBjb3B5KQpAQCAtMjE5LDExICsyMTksMTIgQEAg cHJpdmF0ZToKICAgICB2aXJ0dWFsIHVuc2lnbmVkIGNvdW50RmluZE1hdGNoZXMoY29uc3QgU3Ry aW5nJiwgV2ViQ29yZTo6RmluZE9wdGlvbnMsIHVuc2lnbmVkIG1heE1hdGNoQ291bnQpIG92ZXJy aWRlOwogICAgIHZpcnR1YWwgYm9vbCBmaW5kU3RyaW5nKGNvbnN0IFN0cmluZyYsIFdlYkNvcmU6 OkZpbmRPcHRpb25zLCB1bnNpZ25lZCBtYXhNYXRjaENvdW50KSBvdmVycmlkZTsKIAotI2lmIFBM QVRGT1JNKENPQ09BKQogICAgIHZpcnR1YWwgdm9pZCB3aW5kb3dGb2N1c0NoYW5nZWQoYm9vbCk7 Ci0gICAgdmlydHVhbCB2b2lkIHdpbmRvd0FuZFZpZXdGcmFtZXNDaGFuZ2VkKGNvbnN0IFdlYkNv cmU6OkludFJlY3QmIHdpbmRvd0ZyYW1lSW5TY3JlZW5Db29yZGluYXRlcywgY29uc3QgV2ViQ29y ZTo6SW50UmVjdCYgdmlld0ZyYW1lSW5XaW5kb3dDb29yZGluYXRlcyk7CiAgICAgdmlydHVhbCB2 b2lkIHdpbmRvd1Zpc2liaWxpdHlDaGFuZ2VkKGJvb2wpOwogCisjaWYgUExBVEZPUk0oQ09DT0Ep CisgICAgdmlydHVhbCB2b2lkIHdpbmRvd0FuZFZpZXdGcmFtZXNDaGFuZ2VkKGNvbnN0IFdlYkNv cmU6OkludFJlY3QmIHdpbmRvd0ZyYW1lSW5TY3JlZW5Db29yZGluYXRlcywgY29uc3QgV2ViQ29y ZTo6SW50UmVjdCYgdmlld0ZyYW1lSW5XaW5kb3dDb29yZGluYXRlcyk7CisKICAgICB2aXJ0dWFs IHVpbnQ2NF90IHBsdWdpbkNvbXBsZXhUZXh0SW5wdXRJZGVudGlmaWVyKCkgY29uc3Q7CiAgICAg dmlydHVhbCB2b2lkIHNlbmRDb21wbGV4VGV4dElucHV0KGNvbnN0IFN0cmluZyYgdGV4dElucHV0 KTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TGF5ZXJIb3N0aW5nTW9kZShMYXllckhvc3RpbmdNb2Rl KSBvdmVycmlkZTsK