113269 2013-03-25 20:17:29 -0700 [BlackBerry] Scrolling up and down can cause the screen to flash black 2013-03-26 11:23:49 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 anilsson anilsson anilsson jpetsovits mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 863310 0 anilsson 2013-03-25 20:17:29 -0700 Various flaws in the code can conspire to make the screen cleared to black before rendering the web page. This only happens when the BackingStore is inactive, and the LayerTiler takes on the job of drawing the root layer. When tiles are missing, this makes the "checkerboard" effect especially noticeable since you see a black color where the tile should have been. It would be better to clear to the web page background color. PR 296106 863319 1 194991 anilsson 2013-03-25 20:40:27 -0700 Created attachment 194991 Patch 863718 2 194991 jpetsovits 2013-03-26 09:13:03 -0700 Comment on attachment 194991 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=194991&action=review Looks good to me, worthwhile improvements. > Source/WebKit/blackberry/Api/WebPage.cpp:6316 > + if (!m_mainFrame || !m_mainFrame->view()) > + return; With this early return, the BackingStore won't get color updates from WebSettings until a page is loaded. I don't think this makes a difference in practice as we wouldn't draw contents in that case anyways, but I thought I'd mention it since it's a change in program logic. (Just in case you have further thoughts on it.) 863719 3 jpetsovits 2013-03-26 09:14:03 -0700 (In reply to comment #2) > (From update of attachment 194991 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=194991&action=review > > Looks good to me, worthwhile improvements. > > > Source/WebKit/blackberry/Api/WebPage.cpp:6316 > > + if (!m_mainFrame || !m_mainFrame->view()) > > + return; > > With this early return, the BackingStore won't get color updates from WebSettings until a page is loaded. Correction; "until the main frame is created". Please excuse the inaccuracy. 863837 4 194991 rwlbuis 2013-03-26 10:58:47 -0700 Comment on attachment 194991 Patch LGTM. 863842 5 194991 anilsson 2013-03-26 11:02:19 -0700 Comment on attachment 194991 Patch Thanks Jakob and Rob! 863862 6 194991 webkit.review.bot 2013-03-26 11:23:45 -0700 Comment on attachment 194991 Patch Clearing flags on attachment: 194991 Committed r146911: <http://trac.webkit.org/changeset/146911> 863863 7 webkit.review.bot 2013-03-26 11:23:49 -0700 All reviewed patches have been landed. Closing bug. 194991 2013-03-25 20:40:27 -0700 2013-03-26 11:23:45 -0700 Patch bug-113269-20130326043610.patch text/plain 10386 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NzI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTc5MGRlMDEyZWZlNGE5 ZmFmNzFkYWVlM2RkMWQ3MzllYTcwYTQ4Ny4uMzIzMDk4ZTM4NDJkZDIwNGEwZTY5ODA2NzQzNGFk OWI4ZTAzZTJmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEzLTAzLTI1ICBBcnZp ZCBOaWxzc29uICA8YW5pbHNzb25AcmltLmNvbT4KIAorICAgICAgICBbQmxhY2tCZXJyeV0gU2Ny b2xsaW5nIHVwIGFuZCBkb3duIGNhbiBjYXVzZSB0aGUgc2NyZWVuIHRvIGZsYXNoIGJsYWNrCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTMyNjkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQUiAyOTYxMDYK KworICAgICAgICBUaGUgTGF5ZXJSZW5kZXJlciBzaG91bGQgbmV2ZXIgY2xlYXIgYmVmb3JlIGRy YXdpbmcgdGhlIGxheWVycywgZnJvbQorICAgICAgICBub3cgb24gdGhhdCdzIHRoZSByZXNwb25z aWJpbGl0eSBvZiB0aGUgY2FsbGVyLgorCisgICAgICAgIE9ubHkgbWFudWFsbHkgdGVzdGFibGUu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlcjo6c2V0Vmlld3BvcnQpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlckNsaWVudC5o OgorICAgICAgICAoTGF5ZXJSZW5kZXJlckNsaWVudCk6CisKKzIwMTMtMDMtMjUgIEFydmlkIE5p bHNzb24gIDxhbmlsc3NvbkByaW0uY29tPgorCiAgICAgICAgIFtCbGFja0JlcnJ5XSBXZWJPdmVy bGF5OjpwaXhlbFZpZXdwb3J0UmVjdCgpIHNob3VsZCByZXR1cm4gcGl4ZWwgdmlld3BvcnQgY29v cmRpbmF0ZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExMzI2MwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwppbmRleCA4MDgzZDE4OWExOWIw M2NjYzcyMjgyYjkyZTEzZjUzYjViOTE4MTFjLi45MDE4YmI4MzVhZGFhMzllOGViNGZmNzRjZDdk NTEwZjgxNjk5ZWMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0 NiBAQAogMjAxMy0wMy0yNSAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxzc29uQHJpbS5jb20+CiAKKyAg ICAgICAgW0JsYWNrQmVycnldIFNjcm9sbGluZyB1cCBhbmQgZG93biBjYW4gY2F1c2UgdGhlIHNj cmVlbiB0byBmbGFzaCBibGFjaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTEzMjY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUFIgMjk2MTA2CisKKyAgICAgICAgVmFyaW91cyBmbGF3cyBpbiB0aGUgY29k ZSBjb3VsZCBjb25zcGlyZSB0byBtYWtlIHRoZSBzY3JlZW4gY2xlYXJlZCB0bworICAgICAgICBi bGFjayBiZWZvcmUgcmVuZGVyaW5nIHRoZSB3ZWIgcGFnZS4gVGhpcyBvbmx5IGhhcHBlbmVkIHdo ZW4gdGhlCisgICAgICAgIEJhY2tpbmdTdG9yZSB3YXMgaW5hY3RpdmUsIGFuZCB0aGUgTGF5ZXJU aWxlciB0YWtlcyBvbiB0aGUgam9iIG9mCisgICAgICAgIGRyYXdpbmcgdGhlIHJvb3QgbGF5ZXIu IFdoZW4gdGlsZXMgYXJlIG1pc3NpbmcsIHRoaXMgbWFkZSB0aGUKKyAgICAgICAgImNoZWNrZXJi b2FyZCIgZWZmZWN0IGVzcGVjaWFsbHkgbm90aWNlYWJsZSBzaW5jZSBibGFjayBjb2xvciB3YXMg c2VlbgorICAgICAgICB3aGVyZSB0aGUgdGlsZSBzaG91bGQgaGF2ZSBiZWVuLiBJdCB3b3VsZCBi ZSBiZXR0ZXIgdG8gY2xlYXIgdG8gdGhlIHdlYgorICAgICAgICBwYWdlIGJhY2tncm91bmQgY29s b3IuCisKKyAgICAgICAgVGhpcyB3YXMgYWN0dWFsbHkgdGhlIGludGVudCBvZiB0aGUgY29kZSwg YnV0IHdoZW4gdGhlIGRvY3VtZW50CisgICAgICAgIGJhY2tncm91bmQgY29sb3Igd2FzIGludmFs aWQsIHdlIHdvdWxkIHN0aWxsIHVzZSBpdCBpbnN0ZWFkIG9mIHRoZQorICAgICAgICBiYWNrZ3Jv dW5kIGNvbG9yIGZyb20gc2V0dGluZ3MuIEFsc28sIHRoZSBMYXllclJlbmRlcmVyIHdvdWxkIGNs ZWFyIHRvCisgICAgICAgIGJsYWNrIHdoZW4gV2ViUGFnZUNvbXBvc2l0b3JQcml2YXRlOjpkcmF3 c1Jvb3RMYXllcigpIHdhcyB0cnVlLgorCisgICAgICAgIEZpeGVkIGJ5IGZhbGxpbmcgYmFjayB0 byB0aGUgc2V0dGluZ3MgYmFja2dyb3VuZCBjb2xvciB3aGVuIHRoZQorICAgICAgICBkb2N1bWVu dCBiYWNrZ3JvdW5kIGNvbG9yIGlzIGludmFsaWQsIGFuZCByZW1vdmluZyB0aGUgY2xlYXJpbmcg Y29kZQorICAgICAgICBmcm9tIHRoZSBMYXllclJlbmRlcmVyIGVudGlyZWx5LiBUaGUgYXBwcm9w cmlhdGUgY2xlYXIgYWxyZWFkeSBoYXBwZW5zCisgICAgICAgIG5lYXIgdGhlIGJlZ2lubmluZyBv ZiBCYWNraW5nU3RvcmVQcml2YXRlOjpibGl0VmlzaWJsZUNvbnRlbnRzKCkuCisKKyAgICAgICAg QWxzbyBzbGlnaHRseSBjbGVhbmVkIHVwIHRoZSBjb2RlIGZvciBtYW5hZ2luZyB0aGUgYmFja2dy b3VuZCBjb2xvci4KKworICAgICAgICAqIEFwaS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OnNldExvYWRTdGF0ZSk6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpkaWRDaGFuZ2VTZXR0aW5ncyk6Cisg ICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjp1cGRhdGVCYWNrZ3Jv dW5kQ29sb3IpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6V2ViUGFnZVByaXZhdGU6OmRvY3VtZW50QmFja2dyb3VuZENvbG9yKToKKyAgICAgICAgKiBB cGkvV2ViUGFnZUNvbXBvc2l0b3IuY3BwOgorICAgICAgICAqIEFwaS9XZWJQYWdlQ29tcG9zaXRv cl9wLmg6CisgICAgICAgIChXZWJQYWdlQ29tcG9zaXRvclByaXZhdGUpOgorICAgICAgICAqIEFw aS9XZWJQYWdlX3AuaDoKKyAgICAgICAgKFdlYlBhZ2VQcml2YXRlKToKKworMjAxMy0wMy0yNSAg QXJ2aWQgTmlsc3NvbiAgPGFuaWxzc29uQHJpbS5jb20+CisKICAgICAgICAgW0JsYWNrQmVycnld IFdlYk92ZXJsYXk6OnBpeGVsVmlld3BvcnRSZWN0KCkgc2hvdWxkIHJldHVybiBwaXhlbCB2aWV3 cG9ydCBjb29yZGluYXRlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTEzMjYzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXIuY3BwCmluZGV4IDJiMTBjNGUz ZDY1YTVkZTU1MWM1NTNjNTY5YTZhOWUxNzViZDA4MjcuLjRlNGM3ZDA0MDYxZjg1NzE5MjQ1YTMw N2RlZmZkYmVkMTI4MjcwMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclJlbmRlcmVyLmNwcApAQCAtMjkxLDEw ICsyOTEsNiBAQCB2b2lkIExheWVyUmVuZGVyZXI6OnNldFZpZXdwb3J0KGNvbnN0IEludFJlY3Qm IHRhcmdldFJlY3QsIGNvbnN0IEludFJlY3QmIGNsaXBSZQogI2VuZGlmCiAgICAgZ2xTY2lzc29y KG1fc2Npc3NvclJlY3QueCgpLCBtX3NjaXNzb3JSZWN0LnkoKSwgbV9zY2lzc29yUmVjdC53aWR0 aCgpLCBtX3NjaXNzb3JSZWN0LmhlaWdodCgpKTsKIAotICAgIGlmIChtX2NsaWVudC0+c2hvdWxk Q2xlYXJTdXJmYWNlQmVmb3JlQ29tcG9zaXRpbmcoKSkgewotICAgICAgICBnbENsZWFyQ29sb3Io MCwgMCwgMCwgMCk7Ci0gICAgICAgIGdsQ2xlYXIoR0xfQ09MT1JfQlVGRkVSX0JJVCk7Ci0gICAg fQogICAgIG1fc3RlbmNpbENsZWFyZWQgPSBmYWxzZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclJlbmRlcmVyQ2xpZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVu ZGVyZXJDbGllbnQuaAppbmRleCA0MWI3NGM2MGZlNjM0ZmRjMDBlM2VmMzg3MDVlYzFhMTk4NDQz NTlmLi5hNmUwNjU1ZTQyNTBjZWNlOGUzZTg5NzVmOWFlZmU1M2M1Mzc1YmVhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVy ZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2Jl cnJ5L0xheWVyUmVuZGVyZXJDbGllbnQuaApAQCAtMzksNyArMzksNiBAQCBwdWJsaWM6CiAKICAg ICB2aXJ0dWFsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6R0xFUzJDb250ZXh0KiBj b250ZXh0KCkgY29uc3QgPSAwOwogCi0gICAgdmlydHVhbCBib29sIHNob3VsZENsZWFyU3VyZmFj ZUJlZm9yZUNvbXBvc2l0aW5nKCkgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRDaGlsZFdp bmRvd3NVc2VEb2N1bWVudENvb3JkaW5hdGVzKCkgPSAwOwogfTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKaW5kZXggMmMwMzM4NGNkMDE0MjBhOTNiYzE1NGRkMDc1 ZGE5OGYxMmEyY2U3Ni4uM2I3OGNlYTA0ZWM2MjUyNWIzY2E3ZmU1NDI4MjhiMGYwYTVhMWMyMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCkBAIC0xMDQwLDkgKzEw NDAsNyBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpzZXRMb2FkU3RhdGUoTG9hZFN0YXRlIHN0YXRl KQogICAgICAgICBtX21haW5GcmFtZS0+ZG9jdW1lbnQoKS0+dXBkYXRlU3R5bGVJZk5lZWRlZCgp OwogCiAgICAgLy8gRGlzcGF0Y2ggdGhlIGJhY2tpbmdzdG9yZSBiYWNrZ3JvdW5kIGNvbG9yIGF0 IGltcG9ydGFudCBzdGF0ZSBjaGFuZ2VzLgotICAgIG1fYmFja2luZ1N0b3JlLT5kLT5zZXRXZWJQ YWdlQmFja2dyb3VuZENvbG9yKG1fbWFpbkZyYW1lICYmIG1fbWFpbkZyYW1lLT52aWV3KCkKLSAg ICAgICAgPyBtX21haW5GcmFtZS0+dmlldygpLT5kb2N1bWVudEJhY2tncm91bmRDb2xvcigpCi0g ICAgICAgIDogbV93ZWJTZXR0aW5ncy0+YmFja2dyb3VuZENvbG9yKCkpOworICAgIG1fYmFja2lu Z1N0b3JlLT5kLT5zZXRXZWJQYWdlQmFja2dyb3VuZENvbG9yKGRvY3VtZW50QmFja2dyb3VuZENv bG9yKCkpOwogCiAgICAgbV9sb2FkU3RhdGUgPSBzdGF0ZTsKIApAQCAtNTk3NiwxOCArNTk3NCw3 IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OmRpZENoYW5nZVNldHRpbmdzKFdlYlNldHRpbmdzKiB3 ZWJTZXR0aW5ncykKICAgICBjb3JlU2V0dGluZ3MtPnNldFdlYlNlY3VyaXR5RW5hYmxlZCghd2Vi U2V0dGluZ3MtPmFsbG93Q3Jvc3NTaXRlUmVxdWVzdHMoKSk7CiAgICAgY29yZVNldHRpbmdzLT5z ZXRBcHBseVBhZ2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcih3ZWJTZXR0aW5ncy0+YXBwbHlEZXZp Y2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcigpKTsKIAotICAgIGlmIChtX21haW5GcmFtZSAmJiBt X21haW5GcmFtZS0+dmlldygpKSB7Ci0gICAgICAgIENvbG9yIGJhY2tncm91bmRDb2xvcih3ZWJT ZXR0aW5ncy0+YmFja2dyb3VuZENvbG9yKCkpOwotICAgICAgICBtX21haW5GcmFtZS0+dmlldygp LT51cGRhdGVCYWNrZ3JvdW5kUmVjdXJzaXZlbHkoYmFja2dyb3VuZENvbG9yLCBiYWNrZ3JvdW5k Q29sb3IuaGFzQWxwaGEoKSk7Ci0KLSAgICAgICAgUGxhdGZvcm06OnVzZXJJbnRlcmZhY2VUaHJl YWRNZXNzYWdlQ2xpZW50KCktPmRpc3BhdGNoTWVzc2FnZSgKLSAgICAgICAgICAgIGNyZWF0ZU1l dGhvZENhbGxNZXNzYWdlKCZXZWJQYWdlUHJpdmF0ZTo6c2V0Q29tcG9zaXRvckJhY2tncm91bmRD b2xvciwgdGhpcywgYmFja2dyb3VuZENvbG9yKSk7Ci0gICAgfQotICAgIGlmIChtX2JhY2tpbmdT dG9yZSkgewotICAgICAgICBtX2JhY2tpbmdTdG9yZS0+ZC0+c2V0V2ViUGFnZUJhY2tncm91bmRD b2xvcihtX21haW5GcmFtZSAmJiBtX21haW5GcmFtZS0+dmlldygpCi0gICAgICAgICAgICA/IG1f bWFpbkZyYW1lLT52aWV3KCktPmRvY3VtZW50QmFja2dyb3VuZENvbG9yKCkKLSAgICAgICAgICAg IDogd2ViU2V0dGluZ3MtPmJhY2tncm91bmRDb2xvcigpKTsKLSAgICB9CisgICAgdXBkYXRlQmFj a2dyb3VuZENvbG9yKHdlYlNldHRpbmdzLT5iYWNrZ3JvdW5kQ29sb3IoKSk7CiAKICAgICBtX3Bh Z2UtPnNldERldmljZVNjYWxlRmFjdG9yKHdlYlNldHRpbmdzLT5kZXZpY2VQaXhlbFJhdGlvKCkp OwogfQpAQCAtNjMyMyw1ICs2MzEwLDMxIEBAIHZvaWQgV2ViUGFnZTo6YW5pbWF0ZVRvU2NhbGVB bmREb2N1bWVudFNjcm9sbFBvc2l0aW9uKGRvdWJsZSBkZXN0aW5hdGlvblpvb21TY2FsCiAgICAg ZC0+YW5pbWF0ZVRvU2NhbGVBbmREb2N1bWVudFNjcm9sbFBvc2l0aW9uKGRlc3RpbmF0aW9uWm9v bVNjYWxlLCBkZXN0aW5hdGlvblNjcm9sbFBvc2l0aW9uLCBzaG91bGRDb25zdHJhaW5TY3JvbGxp bmdUb0NvbnRlbnRFZGdlKTsKIH0KIAordm9pZCBXZWJQYWdlUHJpdmF0ZTo6dXBkYXRlQmFja2dy b3VuZENvbG9yKGNvbnN0IENvbG9yJiBiYWNrZ3JvdW5kQ29sb3IpCit7CisgICAgaWYgKCFtX21h aW5GcmFtZSB8fCAhbV9tYWluRnJhbWUtPnZpZXcoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAg bV9tYWluRnJhbWUtPnZpZXcoKS0+dXBkYXRlQmFja2dyb3VuZFJlY3Vyc2l2ZWx5KGJhY2tncm91 bmRDb2xvciwgYmFja2dyb3VuZENvbG9yLmhhc0FscGhhKCkpOworCisgICAgLy8gRklYTUU6IFRo ZSBCYWNraW5nU3RvcmUgdXNlcyB0aGUgZG9jdW1lbnQgYmFja2dyb3VuZCBjb2xvciBidXQgdGhl IFdlYlBhZ2VDb21wb3NpdG9yIGdldHMKKyAgICAvLyB0aGUgY29sb3IgZnJvbSBzZXR0aW5ncywg d2hpY2ggY2FuIGJlIGRpZmZlcmVudC4KKyAgICBQbGF0Zm9ybTo6dXNlckludGVyZmFjZVRocmVh ZE1lc3NhZ2VDbGllbnQoKS0+ZGlzcGF0Y2hNZXNzYWdlKAorICAgICAgICBjcmVhdGVNZXRob2RD YWxsTWVzc2FnZSgmV2ViUGFnZVByaXZhdGU6OnNldENvbXBvc2l0b3JCYWNrZ3JvdW5kQ29sb3Is IHRoaXMsIGJhY2tncm91bmRDb2xvcikpOworCisgICAgaWYgKG1fYmFja2luZ1N0b3JlKQorICAg ICAgICBtX2JhY2tpbmdTdG9yZS0+ZC0+c2V0V2ViUGFnZUJhY2tncm91bmRDb2xvcihkb2N1bWVu dEJhY2tncm91bmRDb2xvcigpKTsKK30KKworQ29sb3IgV2ViUGFnZVByaXZhdGU6OmRvY3VtZW50 QmFja2dyb3VuZENvbG9yKCkgY29uc3QKK3sKKyAgICBDb2xvciBjb2xvcjsKKyAgICBpZiAobV9t YWluRnJhbWUgJiYgbV9tYWluRnJhbWUtPnZpZXcoKSkKKyAgICAgICAgY29sb3IgPSBtX21haW5G cmFtZS0+dmlldygpLT5kb2N1bWVudEJhY2tncm91bmRDb2xvcigpOworICAgIGlmICghY29sb3Iu aXNWYWxpZCgpKQorICAgICAgICBjb2xvciA9IG1fd2ViU2V0dGluZ3MtPmJhY2tncm91bmRDb2xv cigpOworICAgIHJldHVybiBjb2xvcjsKK30KKwogfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yLmNwcAppbmRleCAwZmM0NWYyYmFmZGM5 NDhiNDM0M2E2NjcyYTliYzBjZmI5OTc3Yjk1Li5iYTQwOTIzNjk3NjFiNGI5MjNjYzdlZGM2NmQ3 NTQxODUyMTZiZjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlBhZ2VDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlBhZ2VDb21wb3NpdG9yLmNwcApAQCAtMjM2LDIwICsyMzYsNiBAQCB2b2lkIFdlYlBhZ2VDb21w b3NpdG9yUHJpdmF0ZTo6cmVsZWFzZUxheWVyUmVzb3VyY2VzKCkKICAgICAgICAgbV9sYXllclJl bmRlcmVyLT5yZWxlYXNlTGF5ZXJSZXNvdXJjZXMoKTsKIH0KIAotYm9vbCBXZWJQYWdlQ29tcG9z aXRvclByaXZhdGU6OnNob3VsZENsZWFyU3VyZmFjZUJlZm9yZUNvbXBvc2l0aW5nKCkKLXsKLSAg ICBpZiAobV9jbGllbnQpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIC8vIE5vcm1hbGx5 IHdlIHdvdWxkbid0IGNsZWFyLCBidXQgaW4gbGVnYWN5IG1vZGUgd2UgaGF2ZSBzb21lIG1vcmUg Y29tcGxleAotICAgIC8vIGxvZ2ljLgotICAgIGJvb2wgc2hvdWxkQ2xlYXIgPSBkcmF3c1Jvb3RM YXllcigpOwotICAgIGlmIChCYWNraW5nU3RvcmUqIGJhY2tpbmdTdG9yZSA9IG1fd2ViUGFnZS0+ bV9iYWNraW5nU3RvcmUpCi0gICAgICAgIHNob3VsZENsZWFyID0gc2hvdWxkQ2xlYXIgfHwgIWJh Y2tpbmdTdG9yZS0+ZC0+aXNPcGVuR0xDb21wb3NpdGluZygpOwotCi0gICAgcmV0dXJuIHNob3Vs ZENsZWFyOwotfQotCiBib29sIFdlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZTo6c2hvdWxkQ2hpbGRX aW5kb3dzVXNlRG9jdW1lbnRDb29yZGluYXRlcygpCiB7CiAgICAgcmV0dXJuIG1fY2hpbGRXaW5k b3dQbGFjZW1lbnQgPT0gV2ViUGFnZUNvbXBvc2l0b3I6OkRvY3VtZW50Q29vcmRpbmF0ZXM7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9y X3AuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNvbXBvc2l0b3JfcC5o CmluZGV4IGE0MDE5NTdlODVmZGJmNGFlNTIxNzRhZmIyYzA5YTk5YjAzZTNiMWIuLjU2ZDE4NTJk NzI3ZmEyNDkwYzAwZjUwMjc0ZWE5NjYxMjU2MmEyNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNvbXBvc2l0b3JfcC5oCisrKyBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNvbXBvc2l0b3JfcC5oCkBAIC0xMTQsNyArMTE0LDYg QEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCBhdHRhY2hPdmVybGF5cyhXZWJDb3JlOjpMYXll ckNvbXBvc2l0aW5nVGhyZWFkKiBvdmVybGF5Um9vdCwgV2ViUGFnZVByaXZhdGUqKTsKIAogICAg IC8vIExheWVyUmVuZGVyZXJDbGllbnQKLSAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkQ2xlYXJTdXJm YWNlQmVmb3JlQ29tcG9zaXRpbmcoKTsKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkQ2hpbGRXaW5k b3dzVXNlRG9jdW1lbnRDb29yZGluYXRlcygpOwogCiAgICAgLy8gQW5pbWF0aW9uRnJhbWVSYXRl Q2xpZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Vf cC5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaAppbmRleCA2MmUy ODIyZTY4NGRiYmE0NmVmOGIxNmQ0OWQzYjA2Y2FhYWRkOTExLi40MmRiZDA3MDc4N2FjZTVkZWMz NjFlMzEyYzcyNmExMTBjYzlkMjdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlBhZ2VfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi UGFnZV9wLmgKQEAgLTQ3Niw2ICs0NzYsOSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGFuaW1hdGVU b1NjYWxlQW5kRG9jdW1lbnRTY3JvbGxQb3NpdGlvbihkb3VibGUgZGVzdGluYXRpb25ab29tU2Nh bGUsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIGRlc3RpbmF0aW9uU2Nyb2xsUG9zaXRpb24s IGJvb2wgc2hvdWxkQ29uc3RyYWluU2Nyb2xsaW5nVG9Db250ZW50RWRnZSA9IHRydWUpOwogCisg ICAgdm9pZCB1cGRhdGVCYWNrZ3JvdW5kQ29sb3IoY29uc3QgV2ViQ29yZTo6Q29sb3ImIGJhY2tn cm91bmRDb2xvcik7CisgICAgV2ViQ29yZTo6Q29sb3IgZG9jdW1lbnRCYWNrZ3JvdW5kQ29sb3Io KSBjb25zdDsKKwogICAgIFdlYlBhZ2UqIG1fd2ViUGFnZTsKICAgICBXZWJQYWdlQ2xpZW50KiBt X2NsaWVudDsKICAgICBXZWJDb3JlOjpJbnNwZWN0b3JDbGllbnRCbGFja0JlcnJ5KiBtX2luc3Bl Y3RvckNsaWVudDsK