86447 2012-05-14 23:43:12 -0700 [BlackBerry] Enhance an API of BackingStore::drawContents 2012-05-15 23:44:09 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 logingx webkit-unassigned manyoso rwlbuis tonikitoo webkit.review.bot oldest_to_newest 623700 0 logingx 2012-05-14 23:43:12 -0700 Enhance the current APIs by adding parameters of id and destination contentSize, Because chrome browser may want different contents from the same webview at different times. 623732 1 141873 logingx 2012-05-15 00:14:43 -0700 Created attachment 141873 Patch 624058 2 141873 tonikitoo 2012-05-15 07:22:51 -0700 Comment on attachment 141873 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141873&action=review Maybe Adam could review it, but there are some nitpicks to get fixed before landing. > Source/WebKit/blackberry/Api/BackingStore.cpp:2219 > + const BlackBerry::Platform::IntRect& contentsRect, > + const BlackBerry::Platform::IntSize& destinationSize) const BlackBerry:: is unneeded here. > Source/WebKit/blackberry/Api/BackingStore.cpp:2842 > +void BackingStore::drawContents(BlackBerry::Platform::Graphics::Drawable* drawable, const BlackBerry::Platform::IntRect& contentsRect, const BlackBerry::Platform::IntSize& destinationSize) Ditto. 624942 3 142138 logingx 2012-05-15 21:18:45 -0700 Created attachment 142138 Patch 625026 4 142138 webkit.review.bot 2012-05-15 23:44:05 -0700 Comment on attachment 142138 Patch Clearing flags on attachment: 142138 Committed r117223: <http://trac.webkit.org/changeset/117223> 625027 5 webkit.review.bot 2012-05-15 23:44:09 -0700 All reviewed patches have been landed. Closing bug. 141873 2012-05-15 00:14:43 -0700 2012-05-15 21:18:22 -0700 Patch bug-86447-20120515151440.patch text/plain 5878 logingx U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MDM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA3ZGVjYTI0MjBmNTJjNmFjNWUwMWY4MmMyMDhhOTJiNTdhZjk2YjNkLi5hNWQyM2U4MTAw NjAyMWRmMTcwOGI5NmM0YzNkMDEzZTgzNTI1MzllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMi0wNS0xNSAgQ2hyaXMgR3VhbiAgPGNocmlzLmd1 YW5AdG9yY2htb2JpbGUuY29tLmNuPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBFbmhhbmNlIGFu IEFQSSBvZiBCYWNraW5nU3RvcmU6OmRyYXdDb250ZW50cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODY0NDcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmhhbmNlIHRoZSBjdXJyZW50IEFQSXMgYnkgYWRk aW5nIHBhcmFtZXRlcnMgb2YgaWQgYW5kIGRlc3RpbmF0aW9uCisgICAgICAgIGNvbnRlbnRTaXpl LCBiZWNhdXNlIGNocm9tZSBicm93c2VyIG1heSB3YW50IGRpZmZlcmVudCBjb250ZW50cyBmcm9t CisgICAgICAgIHRoZSBzYW1lIHdlYnZpZXcgYXQgZGlmZmVyZW50IHRpbWVzLgorCisgICAgICAg ICogQXBpL0JhY2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJh Y2tpbmdTdG9yZVByaXZhdGU6OnJlbmRlckNvbnRlbnRzKToKKyAgICAgICAgKEJsYWNrQmVycnk6 OldlYktpdDo6QmFja2luZ1N0b3JlOjpkcmF3Q29udGVudHMpOgorICAgICAgICAqIEFwaS9CYWNr aW5nU3RvcmUuaDoKKyAgICAgICAgKiBBcGkvQmFja2luZ1N0b3JlX3AuaDoKKyAgICAgICAgKEJh Y2tpbmdTdG9yZVByaXZhdGUpOgorCiAyMDEyLTA1LTE0ICBKYWNreSBKaWFuZyAgPHpoYWppYW5n QHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEFTU0VSVCBmYWlsdXJlIGluIEZyYW1l Vmlldzo6cGFpbnRDb250ZW50cyB3aGVuIHJlZmxlc2hpbmcgd3d3LnRoZXN0YXIuY29tL2lwaG9u ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUu Y3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuY3BwCmluZGV4 IGYyNzE4MDhjYzBiMmFiMThlYjc5NDkzYTI1NjMwZWQ1MzEzNWM0OGUuLjk1Y2MyMDBlZmFhMTAy YjZhOTk2OGFjNmI4YTAwZTkzOTI2MjI0ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKQEAgLTIyMTUsOCArMjIxNSw4IEBAIFBsYXRmb3JtOjpJ bnRSZWN0IEJhY2tpbmdTdG9yZVByaXZhdGU6OnRpbGVSZWN0KCkKIH0KIAogdm9pZCBCYWNraW5n U3RvcmVQcml2YXRlOjpyZW5kZXJDb250ZW50cyhCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhp Y3M6OkRyYXdhYmxlKiBkcmF3YWJsZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZG91YmxlIHNjYWxlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgY29udGVudHNSZWN0KSBjb25zdAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6SW50UmVjdCYgY29udGVudHNSZWN0LAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6SW50U2l6ZSYgZGVz dGluYXRpb25TaXplKSBjb25zdAogewogICAgIGlmICghZHJhd2FibGUgfHwgY29udGVudHNSZWN0 LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjIzMCwxNyArMjIzMCwxOSBAQCB2b2lk IEJhY2tpbmdTdG9yZVByaXZhdGU6OnJlbmRlckNvbnRlbnRzKEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpHcmFwaGljczo6RHJhd2FibAogCiAgICAgV2ViQ29yZTo6SW50UmVjdCB0cmFuc2Zvcm1lZENv bnRlbnRzUmVjdChjb250ZW50c1JlY3QueCgpLCBjb250ZW50c1JlY3QueSgpLCBjb250ZW50c1Jl Y3Qud2lkdGgoKSwgY29udGVudHNSZWN0LmhlaWdodCgpKTsKIAotICAgIGlmIChzY2FsZSAhPSAx LjApIHsKKyAgICBmbG9hdCB3aWR0aFNjYWxlID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGRlc3RpbmF0 aW9uU2l6ZS53aWR0aCgpKSAvIGNvbnRlbnRzUmVjdC53aWR0aCgpOworICAgIGZsb2F0IGhlaWdo dFNjYWxlID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGRlc3RpbmF0aW9uU2l6ZS5oZWlnaHQoKSkgLyBj b250ZW50c1JlY3QuaGVpZ2h0KCk7CisKKyAgICBpZiAod2lkdGhTY2FsZSAhPSAxLjAgJiYgaGVp Z2h0U2NhbGUgIT0gMS4wKSB7CiAgICAgICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IG1hdHJpeDsK LSAgICAgICAgbWF0cml4LnNjYWxlKDEuMCAvIHNjYWxlKTsKKyAgICAgICAgbWF0cml4LnNjYWxl Tm9uVW5pZm9ybSgxLjAgLyB3aWR0aFNjYWxlLCAxLjAgLyBoZWlnaHRTY2FsZSk7CiAgICAgICAg IHRyYW5zZm9ybWVkQ29udGVudHNSZWN0ID0gbWF0cml4Lm1hcFJlY3QodHJhbnNmb3JtZWRDb250 ZW50c1JlY3QpOwogCiAgICAgICAgIC8vIFdlIGV4dHJhY3QgZnJvbSB0aGUgY29udGVudHNSZWN0 IGJ1dCBkcmF3IGEgc2xpZ2h0bHkgbGFyZ2VyIHJlZ2lvbiB0aGFuCiAgICAgICAgIC8vIHdlIHdl cmUgdG9sZCB0bywgaW4gb3JkZXIgdG8gYXZvaWQgcGl4ZWxzIGJlaW5nIHJlbmRlcmVkIG9ubHkg cGFydGlhbGx5LgotICAgICAgICBjb25zdCBpbnQgYXRMZWFzdE9uZURldmljZVBpeGVsID0gc3Rh dGljX2Nhc3Q8aW50PihjZWlsZigxLjAgLyBzY2FsZSkpOworICAgICAgICBjb25zdCBpbnQgYXRM ZWFzdE9uZURldmljZVBpeGVsID0gc3RhdGljX2Nhc3Q8aW50PihjZWlsZihzdGQ6Om1heCgxLjAg LyB3aWR0aFNjYWxlLCAxLjAgLyBoZWlnaHRTY2FsZSkpKTsKICAgICAgICAgdHJhbnNmb3JtZWRD b250ZW50c1JlY3QuaW5mbGF0ZShhdExlYXN0T25lRGV2aWNlUGl4ZWwpOwotCi0gICAgICAgIGdy YXBoaWNzQ29udGV4dC5zY2FsZShGbG9hdFNpemUoc2NhbGUsIHNjYWxlKSk7CisgICAgICAgIGdy YXBoaWNzQ29udGV4dC5zY2FsZShGbG9hdFNpemUod2lkdGhTY2FsZSwgaGVpZ2h0U2NhbGUpKTsK ICAgICB9CiAKICAgICBncmFwaGljc0NvbnRleHQuY2xpcCh0cmFuc2Zvcm1lZENvbnRlbnRzUmVj dCk7CkBAIC0yODM3LDkgKzI4MzksOSBAQCBQbGF0Zm9ybTo6R3JhcGhpY3M6OkJ1ZmZlciogQmFj a2luZ1N0b3JlUHJpdmF0ZTo6YnVmZmVyKCkgY29uc3QKICAgICByZXR1cm4gMDsKIH0KIAotdm9p ZCBCYWNraW5nU3RvcmU6OmRyYXdDb250ZW50cyhCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhp Y3M6OkRyYXdhYmxlKiBkcmF3YWJsZSwgZG91YmxlIHNjYWxlLCBjb25zdCBQbGF0Zm9ybTo6SW50 UmVjdCYgY29udGVudHNSZWN0KQordm9pZCBCYWNraW5nU3RvcmU6OmRyYXdDb250ZW50cyhCbGFj a0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OkRyYXdhYmxlKiBkcmF3YWJsZSwgY29uc3QgQmxh Y2tCZXJyeTo6UGxhdGZvcm06OkludFJlY3QmIGNvbnRlbnRzUmVjdCwgY29uc3QgQmxhY2tCZXJy eTo6UGxhdGZvcm06OkludFNpemUmIGRlc3RpbmF0aW9uU2l6ZSkKIHsKLSAgICBkLT5yZW5kZXJD b250ZW50cyhkcmF3YWJsZSwgc2NhbGUsIGNvbnRlbnRzUmVjdCk7CisgICAgZC0+cmVuZGVyQ29u dGVudHMoZHJhd2FibGUsIGNvbnRlbnRzUmVjdCwgZGVzdGluYXRpb25TaXplKTsKIH0KIAogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuaCBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmgKaW5kZXggY2FmNWIz ZWQwM2Q4MDdhN2I2NDdlM2MyNDgxOTg2ZjFhY2RlZjI1NS4uYTkxYzQxYTBjMWM3MTFlZGJlY2Rl YzBhMWFiYWYyNmI1NjExY2NkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L0FwaS9CYWNraW5nU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0Jh Y2tpbmdTdG9yZS5oCkBAIC03OCw3ICs3OCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGNyZWF0ZUJh Y2tpbmdTdG9yZU1lbW9yeSgpOwogICAgIHZvaWQgcmVsZWFzZUJhY2tpbmdTdG9yZU1lbW9yeSgp OwogCi0gICAgdm9pZCBkcmF3Q29udGVudHMoQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNz OjpEcmF3YWJsZSosIGRvdWJsZSAvKnNjYWxlKi8sIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpJbnRSZWN0Jik7CisgICAgdm9pZCBkcmF3Q29udGVudHMoQmxhY2tCZXJyeTo6UGxhdGZvcm06 OkdyYXBoaWNzOjpEcmF3YWJsZSosIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpJbnRSZWN0 JiwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkludFNpemUmKTsKIAogcHJpdmF0ZToKICAg ICBmcmllbmQgY2xhc3MgQmxhY2tCZXJyeTo6V2ViS2l0OjpCYWNraW5nU3RvcmVDbGllbnQ7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZV9wLmgg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZV9wLmgKaW5kZXggMjRl OTQ2NTliMjQ5OTQ1NzYzNjU2ODM5MWMzMTZmYmVlYWIwMWRlNy4uOTEwNjg2OTUyYmVjMWUwMTlm MjcwNjY1NDhkNGRkYmM2Mjg0NDA4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvQmFja2luZ1N0b3JlX3AuaApAQCAtMjk1LDcgKzI5NSw3IEBAIHB1YmxpYzoKIAogICAgIC8v IFRoaXMgdGFrZXMgdHJhbnNmb3JtZWQgY29udGVudHMgY29vcmRpbmF0ZXMuCiAgICAgdm9pZCBy ZW5kZXJDb250ZW50cyhCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OkJ1ZmZlciosIGNv bnN0IFBsYXRmb3JtOjpJbnRQb2ludCYgc3VyZmFjZU9mZnNldCwgY29uc3QgUGxhdGZvcm06Oklu dFJlY3QmIGNvbnRlbnRzUmVjdCkgY29uc3Q7Ci0gICAgdm9pZCByZW5kZXJDb250ZW50cyhCbGFj a0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OkRyYXdhYmxlKiAvKmRyYXdhYmxlKi8sIGRvdWJs ZSAvKnNjYWxlKi8sIGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiAvKmNvbnRlbnRzUmVjdCovKSBj b25zdDsKKyAgICB2b2lkIHJlbmRlckNvbnRlbnRzKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFw aGljczo6RHJhd2FibGUqIC8qZHJhd2FibGUqLywgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06 OkludFJlY3QmIC8qY29udGVudHNSZWN0Ki8sIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpJ bnRTaXplJiAvKmRlc3RpbmF0aW9uU2l6ZSovKSBjb25zdDsKIAogICAgIHZvaWQgYmxpdFRvV2lu ZG93KGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiBkc3RSZWN0LCBjb25zdCBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6R3JhcGhpY3M6OkJ1ZmZlciogc3JjQnVmZmVyLCBjb25zdCBQbGF0Zm9ybTo6SW50 UmVjdCYgc3JjUmVjdCwgYm9vbCBibGVuZCwgdW5zaWduZWQgY2hhciBnbG9iYWxBbHBoYSk7CiAg ICAgdm9pZCBjaGVja2VyV2luZG93KGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiBkc3RSZWN0LCBj b25zdCBQbGF0Zm9ybTo6SW50UG9pbnQmIGNvbnRlbnRzT3JpZ2luLCBkb3VibGUgY29udGVudHNT Y2FsZSk7Cg== 142138 2012-05-15 21:18:45 -0700 2012-05-15 23:44:04 -0700 Patch bug-86447-20120516121843.patch text/plain 5867 logingx U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA4MGZmODk2MTQxYmI0NGNiYTlkM2Q5ZWFiZjk2NTdiZmVjZWZkZjhhLi5jY2YyMzY3ZDZh OGIzOWY4YTZmNzYzNWJjZjk3N2JkMWMwMTFhMzdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMi0wNS0xNSAgQ2hyaXMgR3VhbiAgPGNocmlzLmd1 YW5AdG9yY2htb2JpbGUuY29tLmNuPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBFbmhhbmNlIGFu IEFQSSBvZiBCYWNraW5nU3RvcmU6OmRyYXdDb250ZW50cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODY0NDcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmhhbmNlIHRoZSBjdXJyZW50IEFQSXMgYnkgYWRk aW5nIHBhcmFtZXRlcnMgb2YgaWQgYW5kIGRlc3RpbmF0aW9uCisgICAgICAgIGNvbnRlbnRTaXpl LCBiZWNhdXNlIGNocm9tZSBicm93c2VyIG1heSB3YW50IGRpZmZlcmVudCBjb250ZW50cyBmcm9t CisgICAgICAgIHRoZSBzYW1lIHdlYnZpZXcgYXQgZGlmZmVyZW50IHRpbWVzLgorCisgICAgICAg ICogQXBpL0JhY2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJh Y2tpbmdTdG9yZVByaXZhdGU6OnJlbmRlckNvbnRlbnRzKToKKyAgICAgICAgKEJsYWNrQmVycnk6 OldlYktpdDo6QmFja2luZ1N0b3JlOjpkcmF3Q29udGVudHMpOgorICAgICAgICAqIEFwaS9CYWNr aW5nU3RvcmUuaDoKKyAgICAgICAgKiBBcGkvQmFja2luZ1N0b3JlX3AuaDoKKyAgICAgICAgKEJh Y2tpbmdTdG9yZVByaXZhdGUpOgorCiAyMDEyLTA1LTE1ICBNYXggRmVpbCAgPG1mZWlsQHJpbS5j b20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEVuYWJsZSB0aGUgRnVsbHNjcmVlbiBBUEkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcCBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcAppbmRleCBmMjcx ODA4Y2MwYjJhYjE4ZWI3OTQ5M2EyNTYzMGVkNTMxMzVjNDhlLi4wOTJmZTRjNzgwOWQxZDgyNmE3 MmI2ZDQ4NDYwZGViODM1NmUwYzkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9CYWNraW5nU3RvcmUuY3BwCkBAIC0yMjE0LDkgKzIyMTQsOSBAQCBQbGF0Zm9ybTo6SW50UmVj dCBCYWNraW5nU3RvcmVQcml2YXRlOjp0aWxlUmVjdCgpCiAgICAgcmV0dXJuIFBsYXRmb3JtOjpJ bnRSZWN0KDAsIDAsIHRpbGVXaWR0aCgpLCB0aWxlSGVpZ2h0KCkpOwogfQogCi12b2lkIEJhY2tp bmdTdG9yZVByaXZhdGU6OnJlbmRlckNvbnRlbnRzKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFw aGljczo6RHJhd2FibGUqIGRyYXdhYmxlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBkb3VibGUgc2NhbGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiBjb250ZW50c1JlY3QpIGNvbnN0Cit2 b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6OnJlbmRlckNvbnRlbnRzKFBsYXRmb3JtOjpHcmFwaGlj czo6RHJhd2FibGUqIGRyYXdhYmxlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgY29udGVudHNSZWN0LAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBQbGF0Zm9ybTo6SW50U2l6ZSYg ZGVzdGluYXRpb25TaXplKSBjb25zdAogewogICAgIGlmICghZHJhd2FibGUgfHwgY29udGVudHNS ZWN0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjIzMCwxNyArMjIzMCwxOSBAQCB2 b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6OnJlbmRlckNvbnRlbnRzKEJsYWNrQmVycnk6OlBsYXRm b3JtOjpHcmFwaGljczo6RHJhd2FibAogCiAgICAgV2ViQ29yZTo6SW50UmVjdCB0cmFuc2Zvcm1l ZENvbnRlbnRzUmVjdChjb250ZW50c1JlY3QueCgpLCBjb250ZW50c1JlY3QueSgpLCBjb250ZW50 c1JlY3Qud2lkdGgoKSwgY29udGVudHNSZWN0LmhlaWdodCgpKTsKIAotICAgIGlmIChzY2FsZSAh PSAxLjApIHsKKyAgICBmbG9hdCB3aWR0aFNjYWxlID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGRlc3Rp bmF0aW9uU2l6ZS53aWR0aCgpKSAvIGNvbnRlbnRzUmVjdC53aWR0aCgpOworICAgIGZsb2F0IGhl aWdodFNjYWxlID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGRlc3RpbmF0aW9uU2l6ZS5oZWlnaHQoKSkg LyBjb250ZW50c1JlY3QuaGVpZ2h0KCk7CisKKyAgICBpZiAod2lkdGhTY2FsZSAhPSAxLjAgJiYg aGVpZ2h0U2NhbGUgIT0gMS4wKSB7CiAgICAgICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IG1hdHJp eDsKLSAgICAgICAgbWF0cml4LnNjYWxlKDEuMCAvIHNjYWxlKTsKKyAgICAgICAgbWF0cml4LnNj YWxlTm9uVW5pZm9ybSgxLjAgLyB3aWR0aFNjYWxlLCAxLjAgLyBoZWlnaHRTY2FsZSk7CiAgICAg ICAgIHRyYW5zZm9ybWVkQ29udGVudHNSZWN0ID0gbWF0cml4Lm1hcFJlY3QodHJhbnNmb3JtZWRD b250ZW50c1JlY3QpOwogCiAgICAgICAgIC8vIFdlIGV4dHJhY3QgZnJvbSB0aGUgY29udGVudHNS ZWN0IGJ1dCBkcmF3IGEgc2xpZ2h0bHkgbGFyZ2VyIHJlZ2lvbiB0aGFuCiAgICAgICAgIC8vIHdl IHdlcmUgdG9sZCB0bywgaW4gb3JkZXIgdG8gYXZvaWQgcGl4ZWxzIGJlaW5nIHJlbmRlcmVkIG9u bHkgcGFydGlhbGx5LgotICAgICAgICBjb25zdCBpbnQgYXRMZWFzdE9uZURldmljZVBpeGVsID0g c3RhdGljX2Nhc3Q8aW50PihjZWlsZigxLjAgLyBzY2FsZSkpOworICAgICAgICBjb25zdCBpbnQg YXRMZWFzdE9uZURldmljZVBpeGVsID0gc3RhdGljX2Nhc3Q8aW50PihjZWlsZihzdGQ6Om1heCgx LjAgLyB3aWR0aFNjYWxlLCAxLjAgLyBoZWlnaHRTY2FsZSkpKTsKICAgICAgICAgdHJhbnNmb3Jt ZWRDb250ZW50c1JlY3QuaW5mbGF0ZShhdExlYXN0T25lRGV2aWNlUGl4ZWwpOwotCi0gICAgICAg IGdyYXBoaWNzQ29udGV4dC5zY2FsZShGbG9hdFNpemUoc2NhbGUsIHNjYWxlKSk7CisgICAgICAg IGdyYXBoaWNzQ29udGV4dC5zY2FsZShGbG9hdFNpemUod2lkdGhTY2FsZSwgaGVpZ2h0U2NhbGUp KTsKICAgICB9CiAKICAgICBncmFwaGljc0NvbnRleHQuY2xpcCh0cmFuc2Zvcm1lZENvbnRlbnRz UmVjdCk7CkBAIC0yODM3LDkgKzI4MzksOSBAQCBQbGF0Zm9ybTo6R3JhcGhpY3M6OkJ1ZmZlciog QmFja2luZ1N0b3JlUHJpdmF0ZTo6YnVmZmVyKCkgY29uc3QKICAgICByZXR1cm4gMDsKIH0KIAot dm9pZCBCYWNraW5nU3RvcmU6OmRyYXdDb250ZW50cyhCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3Jh cGhpY3M6OkRyYXdhYmxlKiBkcmF3YWJsZSwgZG91YmxlIHNjYWxlLCBjb25zdCBQbGF0Zm9ybTo6 SW50UmVjdCYgY29udGVudHNSZWN0KQordm9pZCBCYWNraW5nU3RvcmU6OmRyYXdDb250ZW50cyhQ bGF0Zm9ybTo6R3JhcGhpY3M6OkRyYXdhYmxlKiBkcmF3YWJsZSwgY29uc3QgUGxhdGZvcm06Oklu dFJlY3QmIGNvbnRlbnRzUmVjdCwgY29uc3QgUGxhdGZvcm06OkludFNpemUmIGRlc3RpbmF0aW9u U2l6ZSkKIHsKLSAgICBkLT5yZW5kZXJDb250ZW50cyhkcmF3YWJsZSwgc2NhbGUsIGNvbnRlbnRz UmVjdCk7CisgICAgZC0+cmVuZGVyQ29udGVudHMoZHJhd2FibGUsIGNvbnRlbnRzUmVjdCwgZGVz dGluYXRpb25TaXplKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9CYWNraW5nU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFj a2luZ1N0b3JlLmgKaW5kZXggY2FmNWIzZWQwM2Q4MDdhN2I2NDdlM2MyNDgxOTg2ZjFhY2RlZjI1 NS4uYjUyYTE4MmNiZmZjYjcwZDhjZWUwYjk1ODFhZTQxMDUxZTUzNjBhYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5oCkBAIC03OCw3ICs3OCw3IEBAIHB1 YmxpYzoKICAgICB2b2lkIGNyZWF0ZUJhY2tpbmdTdG9yZU1lbW9yeSgpOwogICAgIHZvaWQgcmVs ZWFzZUJhY2tpbmdTdG9yZU1lbW9yeSgpOwogCi0gICAgdm9pZCBkcmF3Q29udGVudHMoQmxhY2tC ZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpEcmF3YWJsZSosIGRvdWJsZSAvKnNjYWxlKi8sIGNv bnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpJbnRSZWN0Jik7CisgICAgdm9pZCBkcmF3Q29udGVu dHMoUGxhdGZvcm06OkdyYXBoaWNzOjpEcmF3YWJsZSosIGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0 JiAvKmNvbnRlbnRzUmVjdCovLCBjb25zdCBQbGF0Zm9ybTo6SW50U2l6ZSYgLypkZXN0aW5hdGlv blNpemUqLyk7CiAKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIEJsYWNrQmVycnk6OldlYktp dDo6QmFja2luZ1N0b3JlQ2xpZW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9C YWNraW5nU3RvcmVfcC5oCmluZGV4IDI0ZTk0NjU5YjI0OTk0NTc2MzY1NjgzOTFjMzE2ZmJlZWFi MDFkZTcuLmZhODBhMzE5YWFkOGQ1Y2ZlMTgyZTQwZDE3NTBhMWRhM2Y2MTBhYjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlX3AuaAorKysgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZV9wLmgKQEAgLTI5NSw3ICsy OTUsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBUaGlzIHRha2VzIHRyYW5zZm9ybWVkIGNvbnRlbnRz IGNvb3JkaW5hdGVzLgogICAgIHZvaWQgcmVuZGVyQ29udGVudHMoQmxhY2tCZXJyeTo6UGxhdGZv cm06OkdyYXBoaWNzOjpCdWZmZXIqLCBjb25zdCBQbGF0Zm9ybTo6SW50UG9pbnQmIHN1cmZhY2VP ZmZzZXQsIGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiBjb250ZW50c1JlY3QpIGNvbnN0OwotICAg IHZvaWQgcmVuZGVyQ29udGVudHMoQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpEcmF3 YWJsZSogLypkcmF3YWJsZSovLCBkb3VibGUgLypzY2FsZSovLCBjb25zdCBQbGF0Zm9ybTo6SW50 UmVjdCYgLypjb250ZW50c1JlY3QqLykgY29uc3Q7CisgICAgdm9pZCByZW5kZXJDb250ZW50cyhQ bGF0Zm9ybTo6R3JhcGhpY3M6OkRyYXdhYmxlKiAvKmRyYXdhYmxlKi8sIGNvbnN0IFBsYXRmb3Jt OjpJbnRSZWN0JiAvKmNvbnRlbnRzUmVjdCovLCBjb25zdCBQbGF0Zm9ybTo6SW50U2l6ZSYgLypk ZXN0aW5hdGlvblNpemUqLykgY29uc3Q7CiAKICAgICB2b2lkIGJsaXRUb1dpbmRvdyhjb25zdCBQ bGF0Zm9ybTo6SW50UmVjdCYgZHN0UmVjdCwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06Okdy YXBoaWNzOjpCdWZmZXIqIHNyY0J1ZmZlciwgY29uc3QgUGxhdGZvcm06OkludFJlY3QmIHNyY1Jl Y3QsIGJvb2wgYmxlbmQsIHVuc2lnbmVkIGNoYXIgZ2xvYmFsQWxwaGEpOwogICAgIHZvaWQgY2hl Y2tlcldpbmRvdyhjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgZHN0UmVjdCwgY29uc3QgUGxhdGZv cm06OkludFBvaW50JiBjb250ZW50c09yaWdpbiwgZG91YmxlIGNvbnRlbnRzU2NhbGUpOwo=