131891 2014-04-19 12:07:16 -0700 [UI-side compositing] Implement blend modes 2014-04-19 15:27:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser dino krit simon.fraser thorton webkit-bug-importer oldest_to_newest 1002234 0 simon.fraser 2014-04-19 12:07:16 -0700 [UI-side compositing] Implement blend modes 1002235 1 simon.fraser 2014-04-19 12:08:11 -0700 <rdar://problem/16490085> 1002236 2 229738 simon.fraser 2014-04-19 12:13:00 -0700 Created attachment 229738 Patch 1002249 3 229738 thorton 2014-04-19 13:10:11 -0700 Comment on attachment 229738 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229738&action=review > Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm:31 > +#import "PlatformCALayerMac.h" Sorting?! > Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h:83 > + CustomBehaviorChanged = 1 << 20 30, not 20. 1002295 4 simon.fraser 2014-04-19 15:27:50 -0700 http://trac.webkit.org/changeset/167553 229738 2014-04-19 12:13:00 -0700 2014-04-19 13:10:10 -0700 Patch bug-131891-20140419121238.patch text/plain 21678 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTUwZTc1M2YzODIxZWRl YTQyZWZhNDE2ZmRjODY3ODFlZjc2NTdmMi4uNjNhYjRiYWRjNGNjOThjZTg4MzAzMjU3NGYwYmIw MGE3NGZjNTM5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE0LTA0LTE5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtVSS1zaWRlIGNv bXBvc2l0aW5nXSBJbXBsZW1lbnQgYmxlbmQgbW9kZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTg5MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MTY0OTAwODU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW1wbGVtZW50IGJsZW5kIG1vZGVzIHdpdGggVUktc2lkZSBjb21wb3NpdGluZy4KKyAgICAg ICAgCisgICAgICAgIFBsYXRmb3JtQ0FMYXllcjo6c2V0QmxlbmRNb2RlKCkgYmVjb21lcyBwdXJl IHZpcnR1YWwsIGFuZCBvdmVycmlkZGVuIGluCisgICAgICAgIFBsYXRmb3JtQ0FMYXllck1hYyBh bmQgUGxhdGZvcm1DQUxheWVyUmVtb3RlLgorICAgICAgICBQbGF0Zm9ybUNBRmlsdGVyczo6c2V0 QmxlbmRpbmdGaWx0ZXJzT25MYXllcigpIG5vdyB0YWtlcyBhIHJhdyBwbGF0Zm9ybQorICAgICAg ICBsYXllciwgc28gaXQgY2FuIGJlIGNhbGxlZCBmcm9tIHRoZSBVSSBwcm9jZXNzIG9uIGEgQ0FM YXllciouCisgICAgICAgIAorICAgICAgICBGaXggYW4gaXNzdWUgd2l0aCBHcmFwaGljc0xheWVy Q0E6OkxheWVyQ2hhbmdlIGZsYWdzLiAxIDw8IDMxIHNoaWZ0cworICAgICAgICBhIHNpZ25lZCBp bnRlZ2VyLCBzbyBpdCBlbmRlZCB1cCBzZXR0aW5nIGFsbCB0aGUgaGlnaCBiaXRzIGluIG1fdW5j b21taXR0ZWRDaGFuZ2VzLAorICAgICAgICBjYXVzaW5nIHVzIHRvIHB1c2ggYmxlbmQgbW9kZXMg dG8gdGhlIFVJIHByb2Nlc3MgZm9yIGV2ZXJ5IGxheWVyLiBGaXggYnkgc2hpZnRpbmcKKyAgICAg ICAgYW4gdW5zaWduZWQgbG9uZyBsb25nICgxTExVIDw8IDMxKS4gVGhpcyBzaG91bGQgYWxzbyBm aXggYSBidWlsZCB3YXJuaW5nIG9uIFdpbmRvd3MuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5p bjoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBRmlsdGVycy5oOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllci5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2NhL21hYy9QbGF0Zm9ybUNBRmlsdGVyc01hYy5tbToKKyAgICAgICAg KFBsYXRmb3JtQ0FGaWx0ZXJzOjpzZXRCbGVuZGluZ0ZpbHRlcnNPbkxheWVyKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLmg6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5tbToKKyAgICAg ICAgKFBsYXRmb3JtQ0FMYXllck1hYzo6c2V0RmlsdGVycyk6CisgICAgICAgIChQbGF0Zm9ybUNB TGF5ZXJNYWM6OnNldEJsZW5kTW9kZSk6CisgICAgICAgIChQbGF0Zm9ybUNBTGF5ZXI6OnNldEJs ZW5kTW9kZSk6IERlbGV0ZWQuCisKIDIwMTQtMDQtMTggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZy YXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlICdvdmVycmlkZScgaW4gR3JhcGhpY3NMYXll ckNBCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKaW5kZXggNDYxZmQ2MTc4Y2Y5ZWRjNTQ4YTMxYzdjM2RkYjVjMDA0MjBhMjcy Ny4uOTBmMGUzZmYxNmRmOTZiNzViNjM1NDAzNzJiZGVlZmY0YzgzNzA4ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpA QCAtMSw1ICsxLDM2IEBACiAyMDE0LTA0LTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJA YXBwbGUuY29tPgogCisgICAgICAgIFtVSS1zaWRlIGNvbXBvc2l0aW5nXSBJbXBsZW1lbnQgYmxl bmQgbW9kZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzMTg5MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTY0OTAwODU+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IGJsZW5kIG1vZGVz IHdpdGggVUktc2lkZSBjb21wb3NpdGluZy4KKyAgICAgICAgCisgICAgICAgIFBsYXRmb3JtQ0FM YXllcjo6c2V0QmxlbmRNb2RlKCkgYmVjb21lcyBwdXJlIHZpcnR1YWwsIGFuZCBvdmVycmlkZGVu IGluCisgICAgICAgIFBsYXRmb3JtQ0FMYXllck1hYyBhbmQgUGxhdGZvcm1DQUxheWVyUmVtb3Rl LgorICAgICAgICBQbGF0Zm9ybUNBRmlsdGVyczo6c2V0QmxlbmRpbmdGaWx0ZXJzT25MYXllcigp IG5vdyB0YWtlcyBhIHJhdyBwbGF0Zm9ybQorICAgICAgICBsYXllciwgc28gaXQgY2FuIGJlIGNh bGxlZCBmcm9tIHRoZSBVSSBwcm9jZXNzIG9uIGEgQ0FMYXllciouCisgICAgICAgIAorICAgICAg ICBBZGQgQmxlbmRNb2RlIHRvIExheWVyUHJvcGVydGllcywgYW5kIGluaXRpYWxpemUsIGVuY29k ZSBhbmQgZGVjb2RlIGl0LAorICAgICAgICBhcyB3ZWxsIGFzIGFkZGluZyBkdW1waW5nIHN1cHBv cnQgZm9yIGJsZW5kIG1vZGVzLgorICAgICAgICAKKyAgICAgICAgKiBTaGFyZWQvbWFjL1JlbW90 ZUxheWVyVHJlZVByb3BlcnR5QXBwbGllci5tbToKKyAgICAgICAgKFdlYktpdDo6YXBwbHlQcm9w ZXJ0aWVzVG9MYXllcik6CisgICAgICAgICogU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFu c2FjdGlvbi5oOgorICAgICAgICAqIFNoYXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rp b24ubW06CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpMYXll clByb3BlcnRpZXM6OkxheWVyUHJvcGVydGllcyk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxh eWVyVHJlZVRyYW5zYWN0aW9uOjpMYXllclByb3BlcnRpZXM6OmVuY29kZSk6CisgICAgICAgIChX ZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpMYXllclByb3BlcnRpZXM6OmRlY29k ZSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVRleHRTdHJlYW06Om9wZXJhdG9y PDwpOgorICAgICAgICAoV2ViS2l0OjpkdW1wQ2hhbmdlZExheWVycyk6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuY3BwOgorICAgICAgICAo V2ViS2l0OjpQbGF0Zm9ybUNBTGF5ZXJSZW1vdGU6OnNldEJsZW5kTW9kZSk6CisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuaDoKKworMjAxNC0w NC0xOSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBb aU9TIFdLMl0gRnV6enkgbGF5ZXJzIG9uIHNpdGVzIHVzaW5nIHBlcnNwZWN0aXZlIGFuZCB0cmFu c2Zvcm1zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzE4NzMKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2NTQwNTc2PgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5p bgppbmRleCBmODAwMjU0NWVkMDEwYmQ2MDU0NjcxZWY2YjBiNzYwOTRjYTEzODRiLi44YWE5Yjkw YzA2ZTRmNDJjOWQwM2RiN2ZiMjM5NjdjYjRhOTdkY2VlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpA QCAtNzM2LDYgKzczNiw3IEBAIF9fWk43V2ViQ29yZTE3TW91c2VSZWxhdGVkRXZlbnQ3b2Zmc2V0 WEV2CiBfX1pON1dlYkNvcmUxN01vdXNlUmVsYXRlZEV2ZW50N29mZnNldFlFdgogX19aTjdXZWJD b3JlMTdQbGF0Zm9ybUNBRmlsdGVyczE3c2V0RmlsdGVyc09uTGF5ZXJFUDdDQUxheWVyUktOU18x NkZpbHRlck9wZXJhdGlvbnNFCiBfX1pON1dlYkNvcmUxN1BsYXRmb3JtQ0FGaWx0ZXJzMjNmaWx0 ZXJWYWx1ZUZvck9wZXJhdGlvbkVQS05TXzE1RmlsdGVyT3BlcmF0aW9uRWkKK19fWk43V2ViQ29y ZTE3UGxhdGZvcm1DQUZpbHRlcnMyNXNldEJsZW5kaW5nRmlsdGVyc09uTGF5ZXJFUDdDQUxheWVy TlNfOUJsZW5kTW9kZUUKIF9fWk43V2ViQ29yZTE3U1FMaXRlVHJhbnNhY3Rpb241YmVnaW5Fdgog X19aTjdXZWJDb3JlMTdTUUxpdGVUcmFuc2FjdGlvbjZjb21taXRFdgogX19aTjdXZWJDb3JlMTdT UUxpdGVUcmFuc2FjdGlvbjhyb2xsYmFja0V2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5oCmluZGV4IGVmMjdkNjUxODRhMjgx MzljNGJiNDhjNmI3MjdjMDBiMmEzZTQ2NzYuLmQ4OGE2ZTUyMTE5YTY0NGZmYmM4YTE3ODhmODUx YjMzNDBmODcxY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NhL0dyYXBoaWNzTGF5ZXJDQS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5oCkBAIC00MjQsMzkgKzQyNCwzOSBAQCBwcml2YXRlOgog ICAgIAogICAgIGVudW0gTGF5ZXJDaGFuZ2UgewogICAgICAgICBOb0NoYW5nZSA9IDAsCi0gICAg ICAgIE5hbWVDaGFuZ2VkID0gMSA8PCAxLAotICAgICAgICBDaGlsZHJlbkNoYW5nZWQgPSAxIDw8 IDIsIC8vIGFsc28gdXNlZCBmb3IgY29udGVudCBsYXllciwgYW5kIHByZXNlcnZlcy0zZCwgYW5k IHNpemUgaWYgdGlsaW5nIGNoYW5nZXM/Ci0gICAgICAgIEdlb21ldHJ5Q2hhbmdlZCA9IDEgPDwg MywKLSAgICAgICAgVHJhbnNmb3JtQ2hhbmdlZCA9IDEgPDwgNCwKLSAgICAgICAgQ2hpbGRyZW5U cmFuc2Zvcm1DaGFuZ2VkID0gMSA8PCA1LAotICAgICAgICBQcmVzZXJ2ZXMzRENoYW5nZWQgPSAx IDw8IDYsCi0gICAgICAgIE1hc2tzVG9Cb3VuZHNDaGFuZ2VkID0gMSA8PCA3LAotICAgICAgICBE cmF3c0NvbnRlbnRDaGFuZ2VkID0gMSA8PCA4LAotICAgICAgICBCYWNrZ3JvdW5kQ29sb3JDaGFu Z2VkID0gMSA8PCA5LAotICAgICAgICBDb250ZW50c09wYXF1ZUNoYW5nZWQgPSAxIDw8IDEwLAot ICAgICAgICBCYWNrZmFjZVZpc2liaWxpdHlDaGFuZ2VkID0gMSA8PCAxMSwKLSAgICAgICAgT3Bh Y2l0eUNoYW5nZWQgPSAxIDw8IDEyLAotICAgICAgICBBbmltYXRpb25DaGFuZ2VkID0gMSA8PCAx MywKLSAgICAgICAgRGlydHlSZWN0c0NoYW5nZWQgPSAxIDw8IDE0LAotICAgICAgICBDb250ZW50 c0ltYWdlQ2hhbmdlZCA9IDEgPDwgMTUsCi0gICAgICAgIENvbnRlbnRzTWVkaWFMYXllckNoYW5n ZWQgPSAxIDw8IDE2LAotICAgICAgICBDb250ZW50c0NhbnZhc0xheWVyQ2hhbmdlZCA9IDEgPDwg MTcsCi0gICAgICAgIENvbnRlbnRzQ29sb3JMYXllckNoYW5nZWQgPSAxIDw8IDE4LAotICAgICAg ICBDb250ZW50c1JlY3RzQ2hhbmdlZCA9IDEgPDwgMTksCi0gICAgICAgIE1hc2tMYXllckNoYW5n ZWQgPSAxIDw8IDIwLAotICAgICAgICBSZXBsaWNhdGVkTGF5ZXJDaGFuZ2VkID0gMSA8PCAyMSwK LSAgICAgICAgQ29udGVudHNOZWVkc0Rpc3BsYXkgPSAxIDw8IDIyLAotICAgICAgICBBY2NlbGVy YXRlc0RyYXdpbmdDaGFuZ2VkID0gMSA8PCAyMywKLSAgICAgICAgQ29udGVudHNTY2FsZUNoYW5n ZWQgPSAxIDw8IDI0LAotICAgICAgICBDb250ZW50c1Zpc2liaWxpdHlDaGFuZ2VkID0gMSA8PCAy NSwKLSAgICAgICAgVmlzaWJsZVJlY3RDaGFuZ2VkID0gMSA8PCAyNiwKLSAgICAgICAgRmlsdGVy c0NoYW5nZWQgPSAxIDw8IDI3LAotICAgICAgICBUaWxpbmdBcmVhQ2hhbmdlZCA9IDEgPDwgMjgs Ci0gICAgICAgIFRpbGVzQWRkZWQgPSAxIDwgMjksCi0gICAgICAgIERlYnVnSW5kaWNhdG9yc0No YW5nZWQgPSAxIDw8IDMwLAotICAgICAgICBDdXN0b21BcHBlYXJhbmNlQ2hhbmdlZCA9IDEgPDwg MzEsCi0gICAgICAgIEN1c3RvbUJlaGF2aW9yQ2hhbmdlZCA9IDEgPDwgMzIsCi0gICAgICAgIEJs ZW5kTW9kZUNoYW5nZWQgPSAxIDw8IDMzCisgICAgICAgIE5hbWVDaGFuZ2VkID0gMUxMVSA8PCAx LAorICAgICAgICBDaGlsZHJlbkNoYW5nZWQgPSAxTExVIDw8IDIsIC8vIGFsc28gdXNlZCBmb3Ig Y29udGVudCBsYXllciwgYW5kIHByZXNlcnZlcy0zZCwgYW5kIHNpemUgaWYgdGlsaW5nIGNoYW5n ZXM/CisgICAgICAgIEdlb21ldHJ5Q2hhbmdlZCA9IDFMTFUgPDwgMywKKyAgICAgICAgVHJhbnNm b3JtQ2hhbmdlZCA9IDFMTFUgPDwgNCwKKyAgICAgICAgQ2hpbGRyZW5UcmFuc2Zvcm1DaGFuZ2Vk ID0gMUxMVSA8PCA1LAorICAgICAgICBQcmVzZXJ2ZXMzRENoYW5nZWQgPSAxTExVIDw8IDYsCisg ICAgICAgIE1hc2tzVG9Cb3VuZHNDaGFuZ2VkID0gMUxMVSA8PCA3LAorICAgICAgICBEcmF3c0Nv bnRlbnRDaGFuZ2VkID0gMUxMVSA8PCA4LAorICAgICAgICBCYWNrZ3JvdW5kQ29sb3JDaGFuZ2Vk ID0gMUxMVSA8PCA5LAorICAgICAgICBDb250ZW50c09wYXF1ZUNoYW5nZWQgPSAxTExVIDw8IDEw LAorICAgICAgICBCYWNrZmFjZVZpc2liaWxpdHlDaGFuZ2VkID0gMUxMVSA8PCAxMSwKKyAgICAg ICAgT3BhY2l0eUNoYW5nZWQgPSAxTExVIDw8IDEyLAorICAgICAgICBBbmltYXRpb25DaGFuZ2Vk ID0gMUxMVSA8PCAxMywKKyAgICAgICAgRGlydHlSZWN0c0NoYW5nZWQgPSAxTExVIDw8IDE0LAor ICAgICAgICBDb250ZW50c0ltYWdlQ2hhbmdlZCA9IDFMTFUgPDwgMTUsCisgICAgICAgIENvbnRl bnRzTWVkaWFMYXllckNoYW5nZWQgPSAxTExVIDw8IDE2LAorICAgICAgICBDb250ZW50c0NhbnZh c0xheWVyQ2hhbmdlZCA9IDFMTFUgPDwgMTcsCisgICAgICAgIENvbnRlbnRzQ29sb3JMYXllckNo YW5nZWQgPSAxTExVIDw8IDE4LAorICAgICAgICBDb250ZW50c1JlY3RzQ2hhbmdlZCA9IDFMTFUg PDwgMTksCisgICAgICAgIE1hc2tMYXllckNoYW5nZWQgPSAxTExVIDw8IDIwLAorICAgICAgICBS ZXBsaWNhdGVkTGF5ZXJDaGFuZ2VkID0gMUxMVSA8PCAyMSwKKyAgICAgICAgQ29udGVudHNOZWVk c0Rpc3BsYXkgPSAxTExVIDw8IDIyLAorICAgICAgICBBY2NlbGVyYXRlc0RyYXdpbmdDaGFuZ2Vk ID0gMUxMVSA8PCAyMywKKyAgICAgICAgQ29udGVudHNTY2FsZUNoYW5nZWQgPSAxTExVIDw8IDI0 LAorICAgICAgICBDb250ZW50c1Zpc2liaWxpdHlDaGFuZ2VkID0gMUxMVSA8PCAyNSwKKyAgICAg ICAgVmlzaWJsZVJlY3RDaGFuZ2VkID0gMUxMVSA8PCAyNiwKKyAgICAgICAgRmlsdGVyc0NoYW5n ZWQgPSAxTExVIDw8IDI3LAorICAgICAgICBUaWxpbmdBcmVhQ2hhbmdlZCA9IDFMTFUgPDwgMjgs CisgICAgICAgIFRpbGVzQWRkZWQgPSAxTExVIDwgMjksCisgICAgICAgIERlYnVnSW5kaWNhdG9y c0NoYW5nZWQgPSAxTExVIDw8IDMwLAorICAgICAgICBDdXN0b21BcHBlYXJhbmNlQ2hhbmdlZCA9 IDFMTFUgPDwgMzEsCisgICAgICAgIEN1c3RvbUJlaGF2aW9yQ2hhbmdlZCA9IDFMTFUgPDwgMzIs CisgICAgICAgIEJsZW5kTW9kZUNoYW5nZWQgPSAxTExVIDw8IDMzCiAgICAgfTsKICAgICB0eXBl ZGVmIHVpbnQ2NF90IExheWVyQ2hhbmdlRmxhZ3M7CiAgICAgZW51bSBTY2hlZHVsZUZsdXNoT3JO b3QgeyBTY2hlZHVsZUZsdXNoLCBEb250U2NoZWR1bGVGbHVzaCB9OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUZpbHRlcnMuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FGaWx0ZXJzLmgKaW5k ZXggZDBhNGYwZGY4YTlmZDgzYzdkNTIwODNmZWE2NTI0NTlhYzg4Yjk5Ni4uMWFlMTg1MTI2MjVm NDgxYzNmYjk4ZGE5YzFjYmJlZDU4YmNhMWQ5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUZpbHRlcnMuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBRmlsdGVycy5oCkBAIC00OCw3ICs0 OCw3IEBAIGNsYXNzIFBsYXRmb3JtQ0FMYXllcjsKIGNsYXNzIFBsYXRmb3JtQ0FGaWx0ZXJzIHsK IHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCBzZXRGaWx0ZXJzT25MYXllcihQbGF0Zm9ybUxheWVy KiwgY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYpOwotICAgIHN0YXRpYyB2b2lkIHNldEJsZW5kaW5n RmlsdGVyc09uTGF5ZXIoUGxhdGZvcm1DQUxheWVyKiwgY29uc3QgQmxlbmRNb2RlKTsKKyAgICBz dGF0aWMgdm9pZCBzZXRCbGVuZGluZ0ZpbHRlcnNPbkxheWVyKFBsYXRmb3JtTGF5ZXIqLCBjb25z dCBCbGVuZE1vZGUpOwogICAgIHN0YXRpYyBpbnQgbnVtQW5pbWF0ZWRGaWx0ZXJQcm9wZXJ0aWVz KEZpbHRlck9wZXJhdGlvbjo6T3BlcmF0aW9uVHlwZSk7CiAgICAgc3RhdGljIGNvbnN0IGNoYXIq IGFuaW1hdGVkRmlsdGVyUHJvcGVydHlOYW1lKEZpbHRlck9wZXJhdGlvbjo6T3BlcmF0aW9uVHlw ZSwgaW50IGludGVybmFsRmlsdGVyUHJvcGVydHlJbmRleCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllci5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmgKaW5kZXggMWUw MDY4MzA0MTY2ZTU1NzE0ZGUyY2YyYzA0ODhmZWRmNDI5MDhmNy4uZThiMmZlZWVjM2E4Nzg0NzVk MTgxOTMwZGViZjVjNmVjMTk3MzYxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmgKQEAgLTE4Myw3ICsxODMsNyBAQCBw dWJsaWM6CiAjZW5kaWYKIAogI2lmIEVOQUJMRShDU1NfQ09NUE9TSVRJTkcpCi0gICAgdm9pZCBz ZXRCbGVuZE1vZGUoQmxlbmRNb2RlKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0QmxlbmRNb2RlKEJs ZW5kTW9kZSkgPSAwOwogI2VuZGlmCiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0TmFtZShjb25zdCBT dHJpbmcmKSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS9tYWMvUGxhdGZvcm1DQUZpbHRlcnNNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUZpbHRlcnNNYWMubW0KaW5kZXggMGQwYzg2YWU0 MWJlOTI1M2I0YWJhYTY0ZmJmYmQxMWFhYjgyZDMwNi4uYzZjOWEzMDFmNjk1ODAzYmZjYWRjMzFi ZTM0MTk5NzI2NjAwMTdhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FGaWx0ZXJzTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9QbGF0Zm9ybUNBRmlsdGVyc01hYy5tbQpAQCAtMjgs MjQgKzI4LDIzIEBACiAjaWYgRU5BQkxFKENTU19GSUxURVJTKQogCiAjaW1wb3J0ICJQbGF0Zm9y bUNBRmlsdGVycy5oIgotCisjaW1wb3J0ICJQbGF0Zm9ybUNBTGF5ZXJNYWMuaCIKICNpbXBvcnQg IkJsb2NrRXhjZXB0aW9ucy5oIgogI2ltcG9ydCAiRmxvYXRDb252ZXJzaW9uLmgiCiAjaW1wb3J0 ICJMZW5ndGhGdW5jdGlvbnMuaCIgLy8gVGhpcyBpcyBhIGxheWVyaW5nIHZpb2xhdGlvbi4KICNp bXBvcnQgIlBsYXRmb3JtQ0FGaWx0ZXJzTWFjLmgiCi0jaW1wb3J0ICJQbGF0Zm9ybUNBTGF5ZXJN YWMuaCIKICNpbXBvcnQgPFF1YXJ0ekNvcmUvUXVhcnR6Q29yZS5oPgogCiB1c2luZyBuYW1lc3Bh Y2UgV2ViQ29yZTsKIAogLy8gRklYTUU6IFNob3VsZCBzaGFyZSB0aGVzZSB2YWx1ZXMgd2l0aCBG aWx0ZXJFZmZlY3RSZW5kZXJlcjo6YnVpbGQoKSAoaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc2MDA4KS4KLXN0YXRpYyBkb3VibGUgc2VwaWFGdWxsQ29uc3RhbnRzWzNd WzNdID0geworc3RhdGljIGNvbnN0IGRvdWJsZSBzZXBpYUZ1bGxDb25zdGFudHNbM11bM10gPSB7 CiAgICAgeyAwLjM5MywgMC43NjksIDAuMTg5IH0sCiAgICAgeyAwLjM0OSwgMC42ODYsIDAuMTY4 IH0sCiAgICAgeyAwLjI3MiwgMC41MzQsIDAuMTMxIH0KIH07CiAKLXN0YXRpYyBkb3VibGUgc2Vw aWFOb25lQ29uc3RhbnRzWzNdWzNdID0geworc3RhdGljIGNvbnN0IGRvdWJsZSBzZXBpYU5vbmVD b25zdGFudHNbM11bM10gPSB7CiAgICAgeyAxLCAwLCAwIH0sCiAgICAgeyAwLCAxLCAwIH0sCiAg ICAgeyAwLCAwLCAxIH0KQEAgLTUzOCwxMSArNTM3LDkgQEAgUmV0YWluUHRyPE5TVmFsdWU+IFBs YXRmb3JtQ0FGaWx0ZXJzOjpjb2xvck1hdHJpeFZhbHVlRm9yRmlsdGVyKEZpbHRlck9wZXJhdGlv bjoKIH0KICNlbmRpZgogCi12b2lkIFBsYXRmb3JtQ0FGaWx0ZXJzOjpzZXRCbGVuZGluZ0ZpbHRl cnNPbkxheWVyKFBsYXRmb3JtQ0FMYXllciogcGxhdGZvcm1DQUxheWVyLCBjb25zdCBCbGVuZE1v ZGUgYmxlbmRNb2RlKQordm9pZCBQbGF0Zm9ybUNBRmlsdGVyczo6c2V0QmxlbmRpbmdGaWx0ZXJz T25MYXllcihQbGF0Zm9ybUxheWVyKiBsYXllciwgY29uc3QgQmxlbmRNb2RlIGJsZW5kTW9kZSkK IHsKICNpZiBVU0VfQ0FfRklMVEVSUwotICAgIENBTGF5ZXIqIGxheWVyID0gcGxhdGZvcm1DQUxh eWVyLT5wbGF0Zm9ybUxheWVyKCk7Ci0KICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlMK IAogICAgIENBRmlsdGVyKiBmaWx0ZXIgPSBuaWw7CkBAIC01OTUsOSArNTkyLDggQEAgdm9pZCBQ bGF0Zm9ybUNBRmlsdGVyczo6c2V0QmxlbmRpbmdGaWx0ZXJzT25MYXllcihQbGF0Zm9ybUNBTGF5 ZXIqIHBsYXRmb3JtQ0FMYXkKICAgICBbbGF5ZXIgc2V0Q29tcG9zaXRpbmdGaWx0ZXI6ZmlsdGVy XTsKIAogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlMKLQogI2Vsc2UKLSAgICBVTlVTRURf UEFSQU0ocGxhdGZvcm1DQUxheWVyKTsKKyAgICBVTlVTRURfUEFSQU0obGF5ZXIpOwogICAgIFVO VVNFRF9QQVJBTShibGVuZE1vZGUpOwogI2VuZGlmCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLmgK aW5kZXggZmRkOGZlMTA0NTUwNWIxYjU3ZjY4Yjc2ODYzM2Y0NjNmODhiMzQ0Yi4uZGZiMGY0YjFj OGZlYTFkOWE3YzdmOTVmYzZkNWVjM2NjNDAxN2JhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMu aApAQCAtMTIyLDYgKzEyMiwxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGNvcHlGaWx0 ZXJzRnJvbShjb25zdCBQbGF0Zm9ybUNBTGF5ZXIqKSBvdmVycmlkZTsKICNlbmRpZgogCisjaWYg RU5BQkxFKENTU19DT01QT1NJVElORykKKyAgICB2aXJ0dWFsIHZvaWQgc2V0QmxlbmRNb2RlKEJs ZW5kTW9kZSkgb3ZlcnJpZGU7CisjZW5kaWYKKwogICAgIHZpcnR1YWwgdm9pZCBzZXROYW1lKGNv bnN0IFN0cmluZyYpIG92ZXJyaWRlOwogCiAgICAgdmlydHVhbCB2b2lkIHNldFNwZWVkKGZsb2F0 KSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLm1tCmluZGV4IGVlODc4NDg2Y2E3NjQ5 M2QxMzIyNDE1ZWZhZjE4MGZjMzZjMGYxYjIuLmZlOGY3YWZjMDU0MmNiZGNkOWVjMWRmMDRmYzBi MmViZTUzYTUyZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5tbQpAQCAtNjQzLDcgKzY0Myw3 IEBAIHZvaWQgUGxhdGZvcm1DQUxheWVyTWFjOjpzZXRPcGFjaXR5KGZsb2F0IHZhbHVlKQogI2lm IEVOQUJMRShDU1NfRklMVEVSUykKIHZvaWQgUGxhdGZvcm1DQUxheWVyTWFjOjpzZXRGaWx0ZXJz KGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIGZpbHRlcnMpCiB7Ci0gICAgUGxhdGZvcm1DQUZpbHRl cnM6OnNldEZpbHRlcnNPbkxheWVyKHRoaXMtPnBsYXRmb3JtTGF5ZXIoKSwgZmlsdGVycyk7Cisg ICAgUGxhdGZvcm1DQUZpbHRlcnM6OnNldEZpbHRlcnNPbkxheWVyKHBsYXRmb3JtTGF5ZXIoKSwg ZmlsdGVycyk7CiB9CiAKIHZvaWQgUGxhdGZvcm1DQUxheWVyTWFjOjpjb3B5RmlsdGVyc0Zyb20o Y29uc3QgUGxhdGZvcm1DQUxheWVyKiBzb3VyY2VMYXllcikKQEAgLTY3OSw5ICs2NzksOSBAQCBi b29sIFBsYXRmb3JtQ0FMYXllck1hYzo6ZmlsdGVyc0NhbkJlQ29tcG9zaXRlZChjb25zdCBGaWx0 ZXJPcGVyYXRpb25zJiBmaWx0ZXJzKQogI2VuZGlmCiAKICNpZiBFTkFCTEUoQ1NTX0NPTVBPU0lU SU5HKQotdm9pZCBQbGF0Zm9ybUNBTGF5ZXI6OnNldEJsZW5kTW9kZShCbGVuZE1vZGUgYmxlbmRN b2RlKQordm9pZCBQbGF0Zm9ybUNBTGF5ZXJNYWM6OnNldEJsZW5kTW9kZShCbGVuZE1vZGUgYmxl bmRNb2RlKQogewotICAgIFBsYXRmb3JtQ0FGaWx0ZXJzOjpzZXRCbGVuZGluZ0ZpbHRlcnNPbkxh eWVyKHRoaXMsIGJsZW5kTW9kZSk7CisgICAgUGxhdGZvcm1DQUZpbHRlcnM6OnNldEJsZW5kaW5n RmlsdGVyc09uTGF5ZXIocGxhdGZvcm1MYXllcigpLCBibGVuZE1vZGUpOwogfQogI2VuZGlmCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlUHJv cGVydHlBcHBsaWVyLm1tIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRy ZWVQcm9wZXJ0eUFwcGxpZXIubW0KaW5kZXggN2Y3NDE3N2U2ODRmMGU3YTYxNjE2Mjg1ZTc3MDE4 YjA4YWVmZmFhNC4uOWMzYjUyNDk1ZGIyZDcwYmJmYjZmNzRlYWFiMzIzOTc0NGJlZDczNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVQcm9wZXJ0 eUFwcGxpZXIubW0KKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRy ZWVQcm9wZXJ0eUFwcGxpZXIubW0KQEAgLTE3OCw2ICsxNzgsOSBAQCBzdGF0aWMgdm9pZCBhcHBs eVByb3BlcnRpZXNUb0xheWVyKENBTGF5ZXIgKmxheWVyLCBSZW1vdGVMYXllclRyZWVIb3N0KiBs YXllclRyZQogICAgIGlmIChwcm9wZXJ0aWVzLmNoYW5nZWRQcm9wZXJ0aWVzICYgUmVtb3RlTGF5 ZXJUcmVlVHJhbnNhY3Rpb246Ok1hZ25pZmljYXRpb25GaWx0ZXJDaGFuZ2VkKQogICAgICAgICBs YXllci5tYWduaWZpY2F0aW9uRmlsdGVyID0gdG9DQUZpbHRlclR5cGUocHJvcGVydGllcy5tYWdu aWZpY2F0aW9uRmlsdGVyKTsKIAorICAgIGlmIChwcm9wZXJ0aWVzLmNoYW5nZWRQcm9wZXJ0aWVz ICYgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkJsZW5kTW9kZUNoYW5nZWQpCisgICAgICAg IFBsYXRmb3JtQ0FGaWx0ZXJzOjpzZXRCbGVuZGluZ0ZpbHRlcnNPbkxheWVyKGxheWVyLCBwcm9w ZXJ0aWVzLmJsZW5kTW9kZSk7CisKICAgICBpZiAocHJvcGVydGllcy5jaGFuZ2VkUHJvcGVydGll cyAmIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpTcGVlZENoYW5nZWQpCiAgICAgICAgIGxh eWVyLnNwZWVkID0gcHJvcGVydGllcy5zcGVlZDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5oIGIvU291cmNlL1dlYktp dDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5oCmluZGV4IDVkOTkyZGQw YjUwMzU0NzBmMzBhMWE4OGE3ZTk1NTYzZWY5NjgzZWEuLjQ2MTY5MDIxMzA3OGUxYzlkMjFjMDEy MTRhNTM4Yjc5ZmJmMWI1ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMv UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv bWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLmgKQEAgLTcyLDE0ICs3MiwxNSBAQCBwdWJs aWM6CiAgICAgICAgIENvbnRlbnRzU2NhbGVDaGFuZ2VkID0gMSA8PCAxOSwKICAgICAgICAgTWlu aWZpY2F0aW9uRmlsdGVyQ2hhbmdlZCA9IDEgPDwgMjAsCiAgICAgICAgIE1hZ25pZmljYXRpb25G aWx0ZXJDaGFuZ2VkID0gMSA8PCAyMSwKLSAgICAgICAgU3BlZWRDaGFuZ2VkID0gMSA8PCAyMiwK LSAgICAgICAgVGltZU9mZnNldENoYW5nZWQgPSAxIDw8IDIzLAotICAgICAgICBCYWNraW5nU3Rv cmVDaGFuZ2VkID0gMSA8PCAyNCwKLSAgICAgICAgRmlsdGVyc0NoYW5nZWQgPSAxIDw8IDI1LAot ICAgICAgICBBbmltYXRpb25zQ2hhbmdlZCA9IDEgPDwgMjYsCi0gICAgICAgIEVkZ2VBbnRpYWxp YXNpbmdNYXNrQ2hhbmdlZCA9IDEgPDwgMjcsCi0gICAgICAgIEN1c3RvbUFwcGVhcmFuY2VDaGFu Z2VkID0gMSA8PCAyOCwKLSAgICAgICAgQ3VzdG9tQmVoYXZpb3JDaGFuZ2VkID0gMSA8PCAyOQor ICAgICAgICBCbGVuZE1vZGVDaGFuZ2VkID0gMSA8PCAyMiwKKyAgICAgICAgU3BlZWRDaGFuZ2Vk ID0gMSA8PCAyMywKKyAgICAgICAgVGltZU9mZnNldENoYW5nZWQgPSAxIDw8IDI0LAorICAgICAg ICBCYWNraW5nU3RvcmVDaGFuZ2VkID0gMSA8PCAyNSwKKyAgICAgICAgRmlsdGVyc0NoYW5nZWQg PSAxIDw8IDI2LAorICAgICAgICBBbmltYXRpb25zQ2hhbmdlZCA9IDEgPDwgMjcsCisgICAgICAg IEVkZ2VBbnRpYWxpYXNpbmdNYXNrQ2hhbmdlZCA9IDEgPDwgMjgsCisgICAgICAgIEN1c3RvbUFw cGVhcmFuY2VDaGFuZ2VkID0gMSA8PCAyOSwKKyAgICAgICAgQ3VzdG9tQmVoYXZpb3JDaGFuZ2Vk ID0gMSA8PCAyMAogICAgIH07CiAgICAgdHlwZWRlZiB1bnNpZ25lZCBMYXllckNoYW5nZTsKIApA QCAtMTQzLDYgKzE0NCw3IEBAIHB1YmxpYzoKICAgICAgICAgV2ViQ29yZTo6R3JhcGhpY3NMYXll cjo6Q3VzdG9tQmVoYXZpb3IgY3VzdG9tQmVoYXZpb3I7CiAgICAgICAgIFdlYkNvcmU6OlBsYXRm b3JtQ0FMYXllcjo6RmlsdGVyVHlwZSBtaW5pZmljYXRpb25GaWx0ZXI7CiAgICAgICAgIFdlYkNv cmU6OlBsYXRmb3JtQ0FMYXllcjo6RmlsdGVyVHlwZSBtYWduaWZpY2F0aW9uRmlsdGVyOworICAg ICAgICBXZWJDb3JlOjpCbGVuZE1vZGUgYmxlbmRNb2RlOwogICAgICAgICBib29sIGhpZGRlbjsK ICAgICAgICAgYm9vbCBnZW9tZXRyeUZsaXBwZWQ7CiAgICAgICAgIGJvb2wgZG91YmxlU2lkZWQ7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRy YW5zYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVU cmFuc2FjdGlvbi5tbQppbmRleCA5NWVlOTIxOGUxNmE5ZWE5YzhhZjU5M2MxNTM3MDMyY2Q2ODcw NzkxLi4zNjlkY2EzN2U1MDlhOGRiY2Y2MjAwYjg2MWIwOTRhYzJkZmFhM2FiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rp b24ubW0KQEAgLTkzLDYgKzkzLDcgQEAgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVy UHJvcGVydGllczo6TGF5ZXJQcm9wZXJ0aWVzKCkKICAgICAsIGN1c3RvbUJlaGF2aW9yKEdyYXBo aWNzTGF5ZXI6Ok5vQ3VzdG9tQmVoYXZpb3IpCiAgICAgLCBtaW5pZmljYXRpb25GaWx0ZXIoUGxh dGZvcm1DQUxheWVyOjpGaWx0ZXJUeXBlOjpMaW5lYXIpCiAgICAgLCBtYWduaWZpY2F0aW9uRmls dGVyKFBsYXRmb3JtQ0FMYXllcjo6RmlsdGVyVHlwZTo6TGluZWFyKQorICAgICwgYmxlbmRNb2Rl KEJsZW5kTW9kZU5vcm1hbCkKICAgICAsIGhpZGRlbihmYWxzZSkKICAgICAsIGdlb21ldHJ5Rmxp cHBlZChmYWxzZSkKICAgICAsIGRvdWJsZVNpZGVkKHRydWUpCkBAIC0xMjUsNiArMTI2LDcgQEAg UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVyUHJvcGVydGllczo6TGF5ZXJQcm9wZXJ0 aWVzKGNvbnN0IExheWVyUHJvcGVydGkKICAgICAsIGN1c3RvbUJlaGF2aW9yKG90aGVyLmN1c3Rv bUJlaGF2aW9yKQogICAgICwgbWluaWZpY2F0aW9uRmlsdGVyKG90aGVyLm1pbmlmaWNhdGlvbkZp bHRlcikKICAgICAsIG1hZ25pZmljYXRpb25GaWx0ZXIob3RoZXIubWFnbmlmaWNhdGlvbkZpbHRl cikKKyAgICAsIGJsZW5kTW9kZShvdGhlci5ibGVuZE1vZGUpCiAgICAgLCBoaWRkZW4ob3RoZXIu aGlkZGVuKQogICAgICwgZ2VvbWV0cnlGbGlwcGVkKG90aGVyLmdlb21ldHJ5RmxpcHBlZCkKICAg ICAsIGRvdWJsZVNpZGVkKG90aGVyLmRvdWJsZVNpZGVkKQpAQCAtMjE2LDYgKzIxOCw5IEBAIHZv aWQgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVyUHJvcGVydGllczo6ZW5jb2RlKElQ Qzo6QXJndW1lbnRFbmNvZGVyJiBlCiAgICAgaWYgKGNoYW5nZWRQcm9wZXJ0aWVzICYgTWFnbmlm aWNhdGlvbkZpbHRlckNoYW5nZWQpCiAgICAgICAgIGVuY29kZXIuZW5jb2RlRW51bShtYWduaWZp Y2F0aW9uRmlsdGVyKTsKIAorICAgIGlmIChjaGFuZ2VkUHJvcGVydGllcyAmIEJsZW5kTW9kZUNo YW5nZWQpCisgICAgICAgIGVuY29kZXIuZW5jb2RlRW51bShibGVuZE1vZGUpOworCiAgICAgaWYg KGNoYW5nZWRQcm9wZXJ0aWVzICYgU3BlZWRDaGFuZ2VkKQogICAgICAgICBlbmNvZGVyIDw8IHNw ZWVkOwogCkBAIC0zNzEsNiArMzc2LDExIEBAIGJvb2wgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rp b246OkxheWVyUHJvcGVydGllczo6ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkCiAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCisgICAgaWYgKHJlc3VsdC5jaGFuZ2VkUHJv cGVydGllcyAmIEJsZW5kTW9kZUNoYW5nZWQpIHsKKyAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29k ZUVudW0ocmVzdWx0LmJsZW5kTW9kZSkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg fQorCiAgICAgaWYgKHJlc3VsdC5jaGFuZ2VkUHJvcGVydGllcyAmIFNwZWVkQ2hhbmdlZCkgewog ICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5zcGVlZCkpCiAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CkBAIC01NjcsNiArNTc3LDcgQEAgcHVibGljOgogICAgIFJlbW90ZUxheWVy VHJlZVRleHRTdHJlYW0mIG9wZXJhdG9yPDwoY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYpOwogICAg IFJlbW90ZUxheWVyVHJlZVRleHRTdHJlYW0mIG9wZXJhdG9yPDwoY29uc3QgUGxhdGZvcm1DQUFu aW1hdGlvblJlbW90ZTo6UHJvcGVydGllcyYpOwogICAgIFJlbW90ZUxheWVyVHJlZVRleHRTdHJl YW0mIG9wZXJhdG9yPDwoY29uc3QgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUmKTsKKyAgICBSZW1v dGVMYXllclRyZWVUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KEJsZW5kTW9kZSk7CiAgICAgUmVtb3Rl TGF5ZXJUcmVlVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChQbGF0Zm9ybUNBQW5pbWF0aW9uOjpBbmlt YXRpb25UeXBlKTsKICAgICBSZW1vdGVMYXllclRyZWVUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFBs YXRmb3JtQ0FBbmltYXRpb246OkZpbGxNb2RlVHlwZSk7CiAgICAgUmVtb3RlTGF5ZXJUcmVlVGV4 dFN0cmVhbSYgb3BlcmF0b3I8PChQbGF0Zm9ybUNBQW5pbWF0aW9uOjpWYWx1ZUZ1bmN0aW9uVHlw ZSk7CkBAIC03MTQsNyArNzI1LDMxIEBAIFJlbW90ZUxheWVyVHJlZVRleHRTdHJlYW0mIFJlbW90 ZUxheWVyVHJlZVRleHRTdHJlYW06Om9wZXJhdG9yPDwoY29uc3QgRmlsdGVyT3BlCiAgICAgfQog ICAgIHJldHVybiB0czsKIH0KLSAgICAKKworUmVtb3RlTGF5ZXJUcmVlVGV4dFN0cmVhbSYgUmVt b3RlTGF5ZXJUcmVlVGV4dFN0cmVhbTo6b3BlcmF0b3I8PChCbGVuZE1vZGUgYmxlbmRNb2RlKQor eworICAgIFJlbW90ZUxheWVyVHJlZVRleHRTdHJlYW0mIHRzID0gKnRoaXM7CisgICAgc3dpdGNo IChibGVuZE1vZGUpIHsKKyAgICBjYXNlIEJsZW5kTW9kZU5vcm1hbDogdHMgPDwgIm5vcm1hbCI7 IGJyZWFrOworICAgIGNhc2UgQmxlbmRNb2RlTXVsdGlwbHk6IHRzIDw8ICJtdWx0aXBseSI7IGJy ZWFrOworICAgIGNhc2UgQmxlbmRNb2RlU2NyZWVuOiB0cyA8PCAic2NyZWVuIjsgYnJlYWs7Cisg ICAgY2FzZSBCbGVuZE1vZGVPdmVybGF5OiB0cyA8PCAib3ZlcmxheSI7IGJyZWFrOworICAgIGNh c2UgQmxlbmRNb2RlRGFya2VuOiB0cyA8PCAiZGFya2VuIjsgYnJlYWs7CisgICAgY2FzZSBCbGVu ZE1vZGVMaWdodGVuOiB0cyA8PCAibGlnaHRlbiI7IGJyZWFrOworICAgIGNhc2UgQmxlbmRNb2Rl Q29sb3JEb2RnZTogdHMgPDwgImNvbG9yLWRvZGdlIjsgYnJlYWs7CisgICAgY2FzZSBCbGVuZE1v ZGVDb2xvckJ1cm46IHRzIDw8ICJjb2xvci1idXJuIjsgYnJlYWs7CisgICAgY2FzZSBCbGVuZE1v ZGVIYXJkTGlnaHQ6IHRzIDw8ICJoYXJkLWxpZ2h0IjsgYnJlYWs7CisgICAgY2FzZSBCbGVuZE1v ZGVTb2Z0TGlnaHQ6IHRzIDw8ICJzb2Z0LWxpZ2h0IjsgYnJlYWs7CisgICAgY2FzZSBCbGVuZE1v ZGVEaWZmZXJlbmNlOiB0cyA8PCAiZGlmZmVyZW5jZSI7IGJyZWFrOworICAgIGNhc2UgQmxlbmRN b2RlRXhjbHVzaW9uOiB0cyA8PCAiZXhjbHVzaW9uIjsgYnJlYWs7CisgICAgY2FzZSBCbGVuZE1v ZGVIdWU6IHRzIDw8ICJodWUiOyBicmVhazsKKyAgICBjYXNlIEJsZW5kTW9kZVNhdHVyYXRpb246 IHRzIDw8ICJzYXR1cmF0aW9uIjsgYnJlYWs7CisgICAgY2FzZSBCbGVuZE1vZGVDb2xvcjogdHMg PDwgImNvbG9yIjsgYnJlYWs7CisgICAgY2FzZSBCbGVuZE1vZGVMdW1pbm9zaXR5OiB0cyA8PCAi bHVtaW5vc2l0eSI7IGJyZWFrOworICAgIH0KKyAgICByZXR1cm4gdHM7Cit9CisKIFJlbW90ZUxh eWVyVHJlZVRleHRTdHJlYW0mIFJlbW90ZUxheWVyVHJlZVRleHRTdHJlYW06Om9wZXJhdG9yPDwo UGxhdGZvcm1DQUFuaW1hdGlvbjo6QW5pbWF0aW9uVHlwZSB0eXBlKQogewogICAgIFJlbW90ZUxh eWVyVHJlZVRleHRTdHJlYW0mIHRzID0gKnRoaXM7CkBAIC0xMDE4LDYgKzEwNTMsOSBAQCBzdGF0 aWMgdm9pZCBkdW1wQ2hhbmdlZExheWVycyhSZW1vdGVMYXllclRyZWVUZXh0U3RyZWFtJiB0cywg Y29uc3QgUmVtb3RlTGF5ZXJUcgogICAgICAgICBpZiAobGF5ZXJQcm9wZXJ0aWVzLmNoYW5nZWRQ cm9wZXJ0aWVzICYgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246Ok1hZ25pZmljYXRpb25GaWx0 ZXJDaGFuZ2VkKQogICAgICAgICAgICAgZHVtcFByb3BlcnR5KHRzLCAibWFnbmlmaWNhdGlvbkZp bHRlciIsIGxheWVyUHJvcGVydGllcy5tYWduaWZpY2F0aW9uRmlsdGVyKTsKIAorICAgICAgICBp ZiAobGF5ZXJQcm9wZXJ0aWVzLmNoYW5nZWRQcm9wZXJ0aWVzICYgUmVtb3RlTGF5ZXJUcmVlVHJh bnNhY3Rpb246OkJsZW5kTW9kZUNoYW5nZWQpCisgICAgICAgICAgICBkdW1wUHJvcGVydHkodHMs ICJibGVuZE1vZGUiLCBsYXllclByb3BlcnRpZXMuYmxlbmRNb2RlKTsKKwogICAgICAgICBpZiAo bGF5ZXJQcm9wZXJ0aWVzLmNoYW5nZWRQcm9wZXJ0aWVzICYgUmVtb3RlTGF5ZXJUcmVlVHJhbnNh Y3Rpb246OlNwZWVkQ2hhbmdlZCkKICAgICAgICAgICAgIGR1bXBQcm9wZXJ0eSh0cywgInNwZWVk IiwgbGF5ZXJQcm9wZXJ0aWVzLnNwZWVkKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuY3BwIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuY3Bw CmluZGV4IGZmODc5ZGM3M2I1MWU1OGFkY2NhOTE3MDFiNGNmMjE1Njk5YjE5NzguLjViNGRmMjM5 YThmODZlYWFjZjFkYTM0NGM0OTQ0M2U5MzNlMGM2OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxheWVyUmVtb3RlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FMYXllclJl bW90ZS5jcHAKQEAgLTUyOCw2ICs1MjgsMTQgQEAgdm9pZCBQbGF0Zm9ybUNBTGF5ZXJSZW1vdGU6 OmNvcHlGaWx0ZXJzRnJvbShjb25zdCBQbGF0Zm9ybUNBTGF5ZXIqIHNvdXJjZUxheWVyKQogICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCisjaWYgRU5BQkxFKENTU19DT01QT1NJVElORykK K3ZvaWQgUGxhdGZvcm1DQUxheWVyUmVtb3RlOjpzZXRCbGVuZE1vZGUoQmxlbmRNb2RlIGJsZW5k TW9kZSkKK3sKKyAgICBtX3Byb3BlcnRpZXMuYmxlbmRNb2RlID0gYmxlbmRNb2RlOworICAgIG1f cHJvcGVydGllcy5ub3RlUHJvcGVydGllc0NoYW5nZWQoUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rp b246OkJsZW5kTW9kZUNoYW5nZWQpOworfQorI2VuZGlmCisKIGJvb2wgUGxhdGZvcm1DQUxheWVy UmVtb3RlOjpmaWx0ZXJzQ2FuQmVDb21wb3NpdGVkKGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIGZp bHRlcnMpCiB7CiAgICAgcmV0dXJuIFBsYXRmb3JtQ0FMYXllck1hYzo6ZmlsdGVyc0NhbkJlQ29t cG9zaXRlZChmaWx0ZXJzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxheWVyUmVtb3RlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FMYXllclJlbW90ZS5oCmluZGV4IDY1MzFlNDZm NjRmNTJkZjZiMTY1OTE4YzVjNTQ4YzZkMGEzMTFkOGIuLjE2N2IxOGI4ZmJmZjYzNzNmMTkyODc2 YmEzNDBmZGY5YzI2M2YzN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxheWVyUmVtb3RlLmgKKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuaApAQCAtMTI0LDYg KzEyNCwxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGNvcHlGaWx0ZXJzRnJvbShjb25z dCBXZWJDb3JlOjpQbGF0Zm9ybUNBTGF5ZXIqKSBvdmVycmlkZTsKICNlbmRpZgogCisjaWYgRU5B QkxFKENTU19DT01QT1NJVElORykKKyAgICB2aXJ0dWFsIHZvaWQgc2V0QmxlbmRNb2RlKFdlYkNv cmU6OkJsZW5kTW9kZSkgb3ZlcnJpZGU7CisjZW5kaWYKKwogICAgIHZpcnR1YWwgdm9pZCBzZXRO YW1lKGNvbnN0IFN0cmluZyYpIG92ZXJyaWRlOwogCiAgICAgdmlydHVhbCB2b2lkIHNldFNwZWVk KGZsb2F0KSBvdmVycmlkZTsK