153239 2016-01-19 10:35:30 -0800 Enable API related to the video fullscreen layer in MediaPlayerPrivateMediaStreamAVFObjC for Mac. 2016-03-08 15:16:58 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 adachan adachan eric.carlson oldest_to_newest 1156636 0 adachan 2016-01-19 10:35:30 -0800 Enable API related to the video fullscreen layer in MediaPlayerPrivateMediaStreamAVFObjC for Mac. These API include: virtual void setVideoFullscreenLayer(PlatformLayer*) override; virtual void setVideoFullscreenFrame(FloatRect) override; virtual void setVideoFullscreenGravity(MediaPlayer::VideoGravity) override; virtual void setVideoFullscreenMode(MediaPlayer::VideoFullscreenMode) override; 1172125 1 273312 adachan 2016-03-08 12:06:54 -0800 Created attachment 273312 Patch 1172151 2 273319 adachan 2016-03-08 12:46:19 -0800 Created attachment 273319 Patch 1172238 3 adachan 2016-03-08 15:16:58 -0800 Committed: http://trac.webkit.org/changeset/197807 273312 2016-03-08 12:06:54 -0800 2016-03-08 12:46:17 -0800 Patch bug-153239-20160308120641.patch text/plain 7477 adachan U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3Nzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGRmYjc1M2E0YjdkMWFl ZDk4ZjNiODY0YmI3ZWNkYzFjMjk0NzBiNy4uOWM0MDE1Y2Q3YzUxMGRkOWJiM2Y1M2M5YzA5MDY5 N2Q1N2EwZDdkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE2LTAzLTA4ICBBZGEg Q2hhbiAgPGFkYWNoYW5AYXBwbGUuY29tPgorCisgICAgICAgIEVuYWJsZSBBUEkgcmVsYXRlZCB0 byB0aGUgdmlkZW8gZnVsbHNjcmVlbiBsYXllciBpbiBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0 cmVhbUFWRk9iakMgZm9yIE1hYy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1MzIzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJldXNlIFZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlciB0byBtYW5hZ2Ug bW92aW5nIHRoZSB2aWRlbyBsYXllciBiZXR3ZWVuIHRoZSBmdWxsc2NyZWVuCisgICAgICAgIGxh eWVyIGFuZCB0aGUgaW5saW5lIGxheWVyIGRlcGVuZGluZyBvbiB0aGUgY3VycmVudCBwcmVzZW50 YXRpb24gbW9kZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlh U3RyZWFtQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1l ZGlhU3RyZWFtQVZGT2JqQzo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDKToK KyAgICAgICAgQ3JlYXRlIG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyLgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpwbGF0Zm9ybUxh eWVyKToKKyAgICAgICAgUmV0dXJuIHRoZSB2aWRlbyBpbmxpbmUgbGF5ZXIgZnJvbSB0aGUgVmlk ZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQ cml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpjcmVhdGVQcmV2aWV3TGF5ZXJzKToKKyAgICAgICAg Q2FsbCBWaWRlb0Z1bGxzY3JlZW5MYXllck1hbmFnZXI6OnNldFZpZGVvTGF5ZXIoKSB3aXRoIHRo ZSBtX3ZpZGVvQmFja2dyb3VuZExheWVyLiBUbyBtYWtlIHN1cmUKKyAgICAgICAgdGhlIHByZXZp ZXcgbGF5ZXIgKGEgc3VibGF5ZXIgb2YgbV92aWRlb0JhY2tncm91bmRMYXllcikgcmVzaXplIGFj Y29yZGluZyB0byBhc3BlY3QgcmF0aW8sIHNldAorICAgICAgICBpdHMgY29udGVudHMgZ3Jhdml0 eSB0byBrQ0FHcmF2aXR5UmVzaXplQXNwZWN0LiBBbHNvLCBzZXQgaXRzIGF1dG9yZXNpemluZyBt YXNrIHNvIGl0J2xsIHJlc2l6ZQorICAgICAgICB3aXRoIGl0cyBzdXBlcmxheWVyLgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRWaWRl b0Z1bGxzY3JlZW5MYXllcik6CisgICAgICAgIENhbGwgVmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5h Z2VyOjpzZXRWaWRlb0Z1bGxzY3JlZW5MYXllcigpLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRWaWRlb0Z1bGxzY3JlZW5GcmFtZSk6 CisgICAgICAgIENhbGwgVmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyOjpzZXRWaWRlb0Z1bGxz Y3JlZW5GcmFtZSgpLgorCiAyMDE2LTAzLTA4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBhdHRlbXB0IHRvIGZpeCB0aGUgMzJiaXQgYnVpbGQg YWZ0ZXIgcjE5Nzc4Mi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2Jq Qy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMv TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLmgKaW5kZXggOTFhZTEwMjkyMDgw ZDQ5MWRhYWZhYTkyOWJkZmJjOWQwMTEwN2FjYy4uN2U0MjQwM2NlYWY4NTYyNjMyNDU3ZTcxZGYw ODI4NmU1ZDFmM2NkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpD LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLmgKQEAgLTQ2LDYgKzQ2LDEw IEBAIGNsYXNzIENsb2NrOwogY2xhc3MgTWVkaWFTb3VyY2VQcml2YXRlQ2xpZW50OwogY2xhc3Mg VmlkZW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbTsKIAorI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5B QkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKQorY2xhc3MgVmlkZW9GdWxsc2NyZWVuTGF5ZXJN YW5hZ2VyOworI2VuZGlmCisKIGNsYXNzIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZG T2JqQyA6IHB1YmxpYyBNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2UsIHB1YmxpYyBNZWRpYVN0 cmVhbVByaXZhdGU6Ok9ic2VydmVyIHsKIHB1YmxpYzoKICAgICBleHBsaWNpdCBNZWRpYVBsYXll clByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMoTWVkaWFQbGF5ZXIqKTsKQEAgLTE1NSw2ICsxNTks MTEgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZEFkZFRyYWNrKE1lZGlhU3RyZWFtVHJhY2tQcml2 YXRlJikgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaWRSZW1vdmVUcmFjayhNZWRpYVN0cmVhbVRyYWNr UHJpdmF0ZSYpIG92ZXJyaWRlOwogCisjaWYgUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoVklERU9f UFJFU0VOVEFUSU9OX01PREUpCisgICAgdm9pZCBzZXRWaWRlb0Z1bGxzY3JlZW5MYXllcihQbGF0 Zm9ybUxheWVyKikgb3ZlcnJpZGU7CisgICAgdm9pZCBzZXRWaWRlb0Z1bGxzY3JlZW5GcmFtZShG bG9hdFJlY3QpIG92ZXJyaWRlOworI2VuZGlmCisKICAgICBNZWRpYVBsYXllciogbV9wbGF5ZXIg eyBudWxscHRyIH07CiAgICAgV2Vha1B0ckZhY3Rvcnk8TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFT dHJlYW1BVkZPYmpDPiBtX3dlYWtQdHJGYWN0b3J5OwogICAgIFJlZlB0cjxNZWRpYVN0cmVhbVBy aXZhdGU+IG1fbWVkaWFTdHJlYW1Qcml2YXRlOwpAQCAtMTc1LDYgKzE4NCwxMCBAQCBwcml2YXRl OgogICAgIGJvb2wgbV9tdXRlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhdmVFdmVyUGxheWVk IHsgZmFsc2UgfTsKICAgICBib29sIG1fZW5kZWQgeyBmYWxzZSB9OworCisjaWYgUExBVEZPUk0o TUFDKSAmJiBFTkFCTEUoVklERU9fUFJFU0VOVEFUSU9OX01PREUpCisgICAgc3RkOjp1bmlxdWVf cHRyPFZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcj4gbV92aWRlb0Z1bGxzY3JlZW5MYXllck1h bmFnZXI7CisjZW5kaWYKIH07CiAgICAgCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRp YVN0cmVhbUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0KaW5k ZXggOGVlODkzOWFjNTBlY2I0ZjdjYWU1YTU0NTY0NWIzNDJlZDVjNTRmMS4uYTA0MWQ3MGE5NjRl YjJkZjhkZTFlN2U1ZDY4MTc2MTE2OTY5NzVjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVk aWFTdHJlYW1BVkZPYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5t bQpAQCAtNDIsNiArNDIsMTAgQEAKICNpbXBvcnQgPHd0Zi9NYWluVGhyZWFkLmg+CiAjaW1wb3J0 IDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAorI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJ REVPX1BSRVNFTlRBVElPTl9NT0RFKQorI2ltcG9ydCAiVmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5h Z2VyLmgiCisjZW5kaWYKKwogI3ByYWdtYSBtYXJrIC0gU29mdCBMaW5raW5nCiAKICNpbXBvcnQg IkNvcmVNZWRpYVNvZnRMaW5rLmgiCkBAIC01Nyw2ICs2MSw5IEBAIE1lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhU3RyZWFtQVZGT2JqQzo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpD KE1lZGlhCiAgICAgOiBtX3BsYXllcihwbGF5ZXIpCiAgICAgLCBtX3dlYWtQdHJGYWN0b3J5KHRo aXMpCiAgICAgLCBtX2Nsb2NrKENsb2NrOjpjcmVhdGUoKSkKKyNpZiBQTEFURk9STShNQUMpICYm IEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkKKyAgICAsIG1fdmlkZW9GdWxsc2NyZWVu TGF5ZXJNYW5hZ2VyKFZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcjo6Y3JlYXRlKCkpCisjZW5k aWYKIHsKICAgICBMT0coTWVkaWEsICJNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9i akM6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQyglcCkiLCB0aGlzKTsKIH0K QEAgLTE1Myw3ICsxNjAsMTEgQEAgUGxhdGZvcm1MYXllciogTWVkaWFQbGF5ZXJQcml2YXRlTWVk aWFTdHJlYW1BVkZPYmpDOjpwbGF0Zm9ybUxheWVyKCkgY29uc3QKICAgICBpZiAoIW1fdmlkZW9C YWNrZ3JvdW5kTGF5ZXIgfHwgbV9kaXNwbGF5TW9kZSA9PSBOb25lKQogICAgICAgICByZXR1cm4g bnVsbHB0cjsKIAorI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJREVPX1BSRVNFTlRBVElP Tl9NT0RFKQorICAgIHJldHVybiBtX3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlci0+dmlkZW9J bmxpbmVMYXllcigpOworI2Vsc2UKICAgICByZXR1cm4gbV92aWRlb0JhY2tncm91bmRMYXllci5n ZXQoKTsKKyNlbmRpZgogfQogCiBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6 OkRpc3BsYXlNb2RlIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6Y3VycmVu dERpc3BsYXlNb2RlKCkgY29uc3QKQEAgLTM5MSwxNyArNDAyLDIzIEBAIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpjcmVhdGVQcmV2aWV3TGF5ZXJzKCkKICAgICBp ZiAoIW1fdmlkZW9CYWNrZ3JvdW5kTGF5ZXIpIHsKICAgICAgICAgbV92aWRlb0JhY2tncm91bmRM YXllciA9IGFkb3B0TlMoW1tDQUxheWVyIGFsbG9jXSBpbml0XSk7CiAgICAgICAgIG1fdmlkZW9C YWNrZ3JvdW5kTGF5ZXIuZ2V0KCkubmFtZSA9IEAiTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJl YW1BVkZPYmpDIHByZXZpZXcgYmFja2dyb3VuZCBsYXllciI7CisKKyNpZiBQTEFURk9STShNQUMp ICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkKKyAgICAgICAgbV92aWRlb0Z1bGxz Y3JlZW5MYXllck1hbmFnZXItPnNldFZpZGVvTGF5ZXIobV92aWRlb0JhY2tncm91bmRMYXllci5n ZXQoKSwgc25hcHBlZEludFJlY3QobV9wbGF5ZXItPmNsaWVudCgpLm1lZGlhUGxheWVyQ29udGVu dEJveFJlY3QoKSkuc2l6ZSgpKTsKKyNlbmRpZgogICAgIH0KIAogICAgIGlmICghbV9wcmV2aWV3 TGF5ZXIpIHsKICAgICAgICAgbV9wcmV2aWV3TGF5ZXIgPSBtX21lZGlhU3RyZWFtUHJpdmF0ZS0+ cGxhdGZvcm1MYXllcigpOwogICAgICAgICBpZiAobV9wcmV2aWV3TGF5ZXIpIHsKLSAgICAgICAg ICAgIG1fcHJldmlld0xheWVyLmdldCgpLmNvbnRlbnRzR3Jhdml0eSA9IGtDQUdyYXZpdHlSZXNp emU7CisgICAgICAgICAgICBtX3ByZXZpZXdMYXllci5nZXQoKS5jb250ZW50c0dyYXZpdHkgPSBr Q0FHcmF2aXR5UmVzaXplQXNwZWN0OwogICAgICAgICAgICAgbV9wcmV2aWV3TGF5ZXIuZ2V0KCku YW5jaG9yUG9pbnQgPSBDR1BvaW50WmVybzsKICAgICAgICAgICAgIGlmICghbV9wbGF5aW5nKQog ICAgICAgICAgICAgICAgIG1fcHJldmlld0xheWVyLmdldCgpLmhpZGRlbiA9IHRydWU7CiAKICAg ICAgICAgICAgIFttX3ZpZGVvQmFja2dyb3VuZExheWVyIGFkZFN1YmxheWVyOm1fcHJldmlld0xh eWVyLmdldCgpXTsKKyAgICAgICAgICAgIFttX3ByZXZpZXdMYXllciBzZXRGcmFtZTpbbV92aWRl b0JhY2tncm91bmRMYXllciBib3VuZHNdXTsKKyAgICAgICAgICAgIFttX3ByZXZpZXdMYXllciBz ZXRBdXRvcmVzaXppbmdNYXNrOihrQ0FMYXllcldpZHRoU2l6YWJsZSB8IGtDQUxheWVySGVpZ2h0 U2l6YWJsZSldOwogICAgICAgICB9CiAgICAgfQogCkBAIC00NTQsNiArNDcxLDE4IEBAIHZvaWQg TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpkaWRSZW1vdmVUcmFjayhNZWRp YVN0cmVhbVRyYWNrUHJpdmF0CiAgICAgdXBkYXRlVHJhY2tzKCk7CiB9CiAKKyNpZiBQTEFURk9S TShNQUMpICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkKK3ZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRWaWRlb0Z1bGxzY3JlZW5MYXllcihQbGF0 Zm9ybUxheWVyICp2aWRlb0Z1bGxzY3JlZW5MYXllcikKK3sKKyAgICBtX3ZpZGVvRnVsbHNjcmVl bkxheWVyTWFuYWdlci0+c2V0VmlkZW9GdWxsc2NyZWVuTGF5ZXIodmlkZW9GdWxsc2NyZWVuTGF5 ZXIpOworfQorCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6c2V0 VmlkZW9GdWxsc2NyZWVuRnJhbWUoRmxvYXRSZWN0IGZyYW1lKQoreworICAgIG1fdmlkZW9GdWxs c2NyZWVuTGF5ZXJNYW5hZ2VyLT5zZXRWaWRlb0Z1bGxzY3JlZW5GcmFtZShmcmFtZSk7Cit9Cisj ZW5kaWYKKwogdGVtcGxhdGUgPHR5cGVuYW1lIFJlZlQsIHR5cGVuYW1lIFBhc3NSZWZUPgogdm9p ZCB1cGRhdGVUcmFja3NPZlR5cGUoSGFzaE1hcDxTdHJpbmcsIFJlZlQ+JiB0cmFja01hcCwgUmVh bHRpbWVNZWRpYVNvdXJjZTo6VHlwZSB0cmFja1R5cGUsIE1lZGlhU3RyZWFtVHJhY2tQcml2YXRl VmVjdG9yJiBjdXJyZW50VHJhY2tzLCBSZWZUICgqaXRlbUZhY3RvcnkpKE1lZGlhU3RyZWFtVHJh Y2tQcml2YXRlJiksIE1lZGlhUGxheWVyKiBwbGF5ZXIsIHZvaWQgKE1lZGlhUGxheWVyOjoqcmVt b3ZlZEZ1bmN0aW9uKShQYXNzUmVmVCksIHZvaWQgKE1lZGlhUGxheWVyOjoqYWRkZWRGdW5jdGlv bikoUGFzc1JlZlQpLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoUmVmVCwgaW50KT4gY29uZmlndXJlQ2Fs bGJhY2spCiB7Cg== 273319 2016-03-08 12:46:19 -0800 2016-03-08 14:30:02 -0800 Patch bug-153239-20160308124605.patch text/plain 7504 adachan U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3Nzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGRmYjc1M2E0YjdkMWFl ZDk4ZjNiODY0YmI3ZWNkYzFjMjk0NzBiNy4uOWM0MDE1Y2Q3YzUxMGRkOWJiM2Y1M2M5YzA5MDY5 N2Q1N2EwZDdkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE2LTAzLTA4ICBBZGEg Q2hhbiAgPGFkYWNoYW5AYXBwbGUuY29tPgorCisgICAgICAgIEVuYWJsZSBBUEkgcmVsYXRlZCB0 byB0aGUgdmlkZW8gZnVsbHNjcmVlbiBsYXllciBpbiBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0 cmVhbUFWRk9iakMgZm9yIE1hYy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1MzIzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJldXNlIFZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlciB0byBtYW5hZ2Ug bW92aW5nIHRoZSB2aWRlbyBsYXllciBiZXR3ZWVuIHRoZSBmdWxsc2NyZWVuCisgICAgICAgIGxh eWVyIGFuZCB0aGUgaW5saW5lIGxheWVyIGRlcGVuZGluZyBvbiB0aGUgY3VycmVudCBwcmVzZW50 YXRpb24gbW9kZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlh U3RyZWFtQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1l ZGlhU3RyZWFtQVZGT2JqQzo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDKToK KyAgICAgICAgQ3JlYXRlIG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyLgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpwbGF0Zm9ybUxh eWVyKToKKyAgICAgICAgUmV0dXJuIHRoZSB2aWRlbyBpbmxpbmUgbGF5ZXIgZnJvbSB0aGUgVmlk ZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQ cml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpjcmVhdGVQcmV2aWV3TGF5ZXJzKToKKyAgICAgICAg Q2FsbCBWaWRlb0Z1bGxzY3JlZW5MYXllck1hbmFnZXI6OnNldFZpZGVvTGF5ZXIoKSB3aXRoIHRo ZSBtX3ZpZGVvQmFja2dyb3VuZExheWVyLiBUbyBtYWtlIHN1cmUKKyAgICAgICAgdGhlIHByZXZp ZXcgbGF5ZXIgKGEgc3VibGF5ZXIgb2YgbV92aWRlb0JhY2tncm91bmRMYXllcikgcmVzaXplIGFj Y29yZGluZyB0byBhc3BlY3QgcmF0aW8sIHNldAorICAgICAgICBpdHMgY29udGVudHMgZ3Jhdml0 eSB0byBrQ0FHcmF2aXR5UmVzaXplQXNwZWN0LiBBbHNvLCBzZXQgaXRzIGF1dG9yZXNpemluZyBt YXNrIHNvIGl0J2xsIHJlc2l6ZQorICAgICAgICB3aXRoIGl0cyBzdXBlcmxheWVyLgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRWaWRl b0Z1bGxzY3JlZW5MYXllcik6CisgICAgICAgIENhbGwgVmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5h Z2VyOjpzZXRWaWRlb0Z1bGxzY3JlZW5MYXllcigpLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRWaWRlb0Z1bGxzY3JlZW5GcmFtZSk6 CisgICAgICAgIENhbGwgVmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyOjpzZXRWaWRlb0Z1bGxz Y3JlZW5GcmFtZSgpLgorCiAyMDE2LTAzLTA4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBhdHRlbXB0IHRvIGZpeCB0aGUgMzJiaXQgYnVpbGQg YWZ0ZXIgcjE5Nzc4Mi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2Jq Qy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMv TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLmgKaW5kZXggOTFhZTEwMjkyMDgw ZDQ5MWRhYWZhYTkyOWJkZmJjOWQwMTEwN2FjYy4uN2U0MjQwM2NlYWY4NTYyNjMyNDU3ZTcxZGYw ODI4NmU1ZDFmM2NkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpD LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLmgKQEAgLTQ2LDYgKzQ2LDEw IEBAIGNsYXNzIENsb2NrOwogY2xhc3MgTWVkaWFTb3VyY2VQcml2YXRlQ2xpZW50OwogY2xhc3Mg VmlkZW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbTsKIAorI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5B QkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKQorY2xhc3MgVmlkZW9GdWxsc2NyZWVuTGF5ZXJN YW5hZ2VyOworI2VuZGlmCisKIGNsYXNzIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZG T2JqQyA6IHB1YmxpYyBNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2UsIHB1YmxpYyBNZWRpYVN0 cmVhbVByaXZhdGU6Ok9ic2VydmVyIHsKIHB1YmxpYzoKICAgICBleHBsaWNpdCBNZWRpYVBsYXll clByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMoTWVkaWFQbGF5ZXIqKTsKQEAgLTE1NSw2ICsxNTks MTEgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZEFkZFRyYWNrKE1lZGlhU3RyZWFtVHJhY2tQcml2 YXRlJikgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaWRSZW1vdmVUcmFjayhNZWRpYVN0cmVhbVRyYWNr UHJpdmF0ZSYpIG92ZXJyaWRlOwogCisjaWYgUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoVklERU9f UFJFU0VOVEFUSU9OX01PREUpCisgICAgdm9pZCBzZXRWaWRlb0Z1bGxzY3JlZW5MYXllcihQbGF0 Zm9ybUxheWVyKikgb3ZlcnJpZGU7CisgICAgdm9pZCBzZXRWaWRlb0Z1bGxzY3JlZW5GcmFtZShG bG9hdFJlY3QpIG92ZXJyaWRlOworI2VuZGlmCisKICAgICBNZWRpYVBsYXllciogbV9wbGF5ZXIg eyBudWxscHRyIH07CiAgICAgV2Vha1B0ckZhY3Rvcnk8TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFT dHJlYW1BVkZPYmpDPiBtX3dlYWtQdHJGYWN0b3J5OwogICAgIFJlZlB0cjxNZWRpYVN0cmVhbVBy aXZhdGU+IG1fbWVkaWFTdHJlYW1Qcml2YXRlOwpAQCAtMTc1LDYgKzE4NCwxMCBAQCBwcml2YXRl OgogICAgIGJvb2wgbV9tdXRlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhdmVFdmVyUGxheWVk IHsgZmFsc2UgfTsKICAgICBib29sIG1fZW5kZWQgeyBmYWxzZSB9OworCisjaWYgUExBVEZPUk0o TUFDKSAmJiBFTkFCTEUoVklERU9fUFJFU0VOVEFUSU9OX01PREUpCisgICAgc3RkOjp1bmlxdWVf cHRyPFZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcj4gbV92aWRlb0Z1bGxzY3JlZW5MYXllck1h bmFnZXI7CisjZW5kaWYKIH07CiAgICAgCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRp YVN0cmVhbUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0KaW5k ZXggOGVlODkzOWFjNTBlY2I0ZjdjYWU1YTU0NTY0NWIzNDJlZDVjNTRmMS4uZDkyYTZjODJkYzk5 OTRjOWJhZDcyMzk3YWM3NzQ4YzJmZmRkYTQ0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVk aWFTdHJlYW1BVkZPYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5t bQpAQCAtNDIsNiArNDIsMTAgQEAKICNpbXBvcnQgPHd0Zi9NYWluVGhyZWFkLmg+CiAjaW1wb3J0 IDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAorI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJ REVPX1BSRVNFTlRBVElPTl9NT0RFKQorI2ltcG9ydCAiVmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5h Z2VyLmgiCisjZW5kaWYKKwogI3ByYWdtYSBtYXJrIC0gU29mdCBMaW5raW5nCiAKICNpbXBvcnQg IkNvcmVNZWRpYVNvZnRMaW5rLmgiCkBAIC01Nyw2ICs2MSw5IEBAIE1lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhU3RyZWFtQVZGT2JqQzo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpD KE1lZGlhCiAgICAgOiBtX3BsYXllcihwbGF5ZXIpCiAgICAgLCBtX3dlYWtQdHJGYWN0b3J5KHRo aXMpCiAgICAgLCBtX2Nsb2NrKENsb2NrOjpjcmVhdGUoKSkKKyNpZiBQTEFURk9STShNQUMpICYm IEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkKKyAgICAsIG1fdmlkZW9GdWxsc2NyZWVu TGF5ZXJNYW5hZ2VyKFZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcjo6Y3JlYXRlKCkpCisjZW5k aWYKIHsKICAgICBMT0coTWVkaWEsICJNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9i akM6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQyglcCkiLCB0aGlzKTsKIH0K QEAgLTE1Myw3ICsxNjAsMTEgQEAgUGxhdGZvcm1MYXllciogTWVkaWFQbGF5ZXJQcml2YXRlTWVk aWFTdHJlYW1BVkZPYmpDOjpwbGF0Zm9ybUxheWVyKCkgY29uc3QKICAgICBpZiAoIW1fdmlkZW9C YWNrZ3JvdW5kTGF5ZXIgfHwgbV9kaXNwbGF5TW9kZSA9PSBOb25lKQogICAgICAgICByZXR1cm4g bnVsbHB0cjsKIAorI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJREVPX1BSRVNFTlRBVElP Tl9NT0RFKQorICAgIHJldHVybiBtX3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlci0+dmlkZW9J bmxpbmVMYXllcigpOworI2Vsc2UKICAgICByZXR1cm4gbV92aWRlb0JhY2tncm91bmRMYXllci5n ZXQoKTsKKyNlbmRpZgogfQogCiBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6 OkRpc3BsYXlNb2RlIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6Y3VycmVu dERpc3BsYXlNb2RlKCkgY29uc3QKQEAgLTM5MSwxNyArNDAyLDI1IEBAIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpjcmVhdGVQcmV2aWV3TGF5ZXJzKCkKICAgICBp ZiAoIW1fdmlkZW9CYWNrZ3JvdW5kTGF5ZXIpIHsKICAgICAgICAgbV92aWRlb0JhY2tncm91bmRM YXllciA9IGFkb3B0TlMoW1tDQUxheWVyIGFsbG9jXSBpbml0XSk7CiAgICAgICAgIG1fdmlkZW9C YWNrZ3JvdW5kTGF5ZXIuZ2V0KCkubmFtZSA9IEAiTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJl YW1BVkZPYmpDIHByZXZpZXcgYmFja2dyb3VuZCBsYXllciI7CisKKyNpZiBQTEFURk9STShNQUMp ICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkKKyAgICAgICAgbV92aWRlb0Z1bGxz Y3JlZW5MYXllck1hbmFnZXItPnNldFZpZGVvTGF5ZXIobV92aWRlb0JhY2tncm91bmRMYXllci5n ZXQoKSwgc25hcHBlZEludFJlY3QobV9wbGF5ZXItPmNsaWVudCgpLm1lZGlhUGxheWVyQ29udGVu dEJveFJlY3QoKSkuc2l6ZSgpKTsKKyNlbmRpZgogICAgIH0KIAogICAgIGlmICghbV9wcmV2aWV3 TGF5ZXIpIHsKICAgICAgICAgbV9wcmV2aWV3TGF5ZXIgPSBtX21lZGlhU3RyZWFtUHJpdmF0ZS0+ cGxhdGZvcm1MYXllcigpOwogICAgICAgICBpZiAobV9wcmV2aWV3TGF5ZXIpIHsKLSAgICAgICAg ICAgIG1fcHJldmlld0xheWVyLmdldCgpLmNvbnRlbnRzR3Jhdml0eSA9IGtDQUdyYXZpdHlSZXNp emU7CisgICAgICAgICAgICBtX3ByZXZpZXdMYXllci5nZXQoKS5jb250ZW50c0dyYXZpdHkgPSBr Q0FHcmF2aXR5UmVzaXplQXNwZWN0OwogICAgICAgICAgICAgbV9wcmV2aWV3TGF5ZXIuZ2V0KCku YW5jaG9yUG9pbnQgPSBDR1BvaW50WmVybzsKICAgICAgICAgICAgIGlmICghbV9wbGF5aW5nKQog ICAgICAgICAgICAgICAgIG1fcHJldmlld0xheWVyLmdldCgpLmhpZGRlbiA9IHRydWU7CiAKICAg ICAgICAgICAgIFttX3ZpZGVvQmFja2dyb3VuZExheWVyIGFkZFN1YmxheWVyOm1fcHJldmlld0xh eWVyLmdldCgpXTsKKyNpZiBQTEFURk9STShNQUMpCisgICAgICAgICAgICBbbV9wcmV2aWV3TGF5 ZXIgc2V0RnJhbWU6W21fdmlkZW9CYWNrZ3JvdW5kTGF5ZXIgYm91bmRzXV07CisgICAgICAgICAg ICBbbV9wcmV2aWV3TGF5ZXIgc2V0QXV0b3Jlc2l6aW5nTWFzazooa0NBTGF5ZXJXaWR0aFNpemFi bGUgfCBrQ0FMYXllckhlaWdodFNpemFibGUpXTsKKyNlbmRpZgogICAgICAgICB9CiAgICAgfQog CkBAIC00NTQsNiArNDczLDE4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1B VkZPYmpDOjpkaWRSZW1vdmVUcmFjayhNZWRpYVN0cmVhbVRyYWNrUHJpdmF0CiAgICAgdXBkYXRl VHJhY2tzKCk7CiB9CiAKKyNpZiBQTEFURk9STShNQUMpICYmIEVOQUJMRShWSURFT19QUkVTRU5U QVRJT05fTU9ERSkKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpz ZXRWaWRlb0Z1bGxzY3JlZW5MYXllcihQbGF0Zm9ybUxheWVyICp2aWRlb0Z1bGxzY3JlZW5MYXll cikKK3sKKyAgICBtX3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlci0+c2V0VmlkZW9GdWxsc2Ny ZWVuTGF5ZXIodmlkZW9GdWxsc2NyZWVuTGF5ZXIpOworfQorCit2b2lkIE1lZGlhUGxheWVyUHJp dmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6c2V0VmlkZW9GdWxsc2NyZWVuRnJhbWUoRmxvYXRSZWN0 IGZyYW1lKQoreworICAgIG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyLT5zZXRWaWRlb0Z1 bGxzY3JlZW5GcmFtZShmcmFtZSk7Cit9CisjZW5kaWYKKwogdGVtcGxhdGUgPHR5cGVuYW1lIFJl ZlQsIHR5cGVuYW1lIFBhc3NSZWZUPgogdm9pZCB1cGRhdGVUcmFja3NPZlR5cGUoSGFzaE1hcDxT dHJpbmcsIFJlZlQ+JiB0cmFja01hcCwgUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZSB0cmFja1R5 cGUsIE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlVmVjdG9yJiBjdXJyZW50VHJhY2tzLCBSZWZUICgq aXRlbUZhY3RvcnkpKE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlJiksIE1lZGlhUGxheWVyKiBwbGF5 ZXIsIHZvaWQgKE1lZGlhUGxheWVyOjoqcmVtb3ZlZEZ1bmN0aW9uKShQYXNzUmVmVCksIHZvaWQg KE1lZGlhUGxheWVyOjoqYWRkZWRGdW5jdGlvbikoUGFzc1JlZlQpLCBzdGQ6OmZ1bmN0aW9uPHZv aWQoUmVmVCwgaW50KT4gY29uZmlndXJlQ2FsbGJhY2spCiB7Cg==