159036 2016-06-22 13:10:00 -0700 Mail snapshot has black webview in multitasking switcher 2016-06-22 13:40:12 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca barraclough cdumez simon.fraser oldest_to_newest 1204639 0 thorton 2016-06-22 13:10:00 -0700 Mail snapshot has black webview in multitasking switcher 1204640 1 281866 thorton 2016-06-22 13:10:14 -0700 Created attachment 281866 Patch 1204644 2 281866 simon.fraser 2016-06-22 13:18:06 -0700 Comment on attachment 281866 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=281866&action=review > Source/WebKit2/ChangeLog:18 > + UIKit suggested instead waiting for the window context teardown notification, > + which does indeed seem to fire after the snapshotting is complete. I have a small > + change to WebCore::IOSurface and RemoteLayerBackingStore that makes the problem > + much more reproducible, and this fixes it perfectly, while the layers still > + eventually end up being made volatile. A bit too much story-telling here. > Source/WebKit2/UIProcess/ApplicationStateTracker.mm:76 > -ApplicationStateTracker::ApplicationStateTracker(UIView *view, SEL didEnterBackgroundSelector, SEL willEnterForegroundSelector) > +ApplicationStateTracker::ApplicationStateTracker(UIView *view, SEL didEnterBackgroundSelector, SEL didFinishSnapshottingAfterEnteringBackgroundSelector, SEL willEnterForegroundSelector) Why all this selector magic, rather than just an Obj-C protocol or something? 1204648 3 thorton 2016-06-22 13:40:12 -0700 http://trac.webkit.org/changeset/202347 281866 2016-06-22 13:10:14 -0700 2016-06-22 13:18:06 -0700 Patch bug-159036-20160622131006.patch text/plain 14248 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyMjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGNiYWJkMjgzMDAwZDMw MGM5YmM3NDYxZGI4MmQ5ZTNjM2FkNGI5Zi4uYzNhOGFiNDY1MzRiYzlkOWJiMTFjOTYwY2U4OTM2 M2I3MTYzNDFjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDE2LTA2LTIyICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIE1haWwgc25hcHNo b3QgaGFzIGJsYWNrIHdlYnZpZXcgaW4gbXVsdGl0YXNraW5nIHN3aXRjaGVyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTkwMzYKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzI1OTcyOTM4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoZXJlIGlzIGEgd2luZG93IG9mIHRpbWUgYmV0d2VlbiBhbiBhcHBs aWNhdGlvbiBnb2luZyBpbnRvIHRoZSBiYWNrZ3JvdW5kCisgICAgICAgIGFuZCBTcHJpbmdCb2Fy ZCdzIHNuYXBzaG90dGluZyBtZWNoYW5pc20gY29tcGxldGluZyB3aGVyZSBpdCBpcyBwb3NzaWJs ZQorICAgICAgICAodGhvdWdoIGRpZmZpY3VsdCwgdGltaW5nLXdpc2UpIGZvciBSZW1vdGVMYXll ckJhY2tpbmdTdG9yZUNvbGxlY3Rpb24gdG8KKyAgICAgICAgbWFrZSBzdGlsbC1uZWVkZWQgc3Vy ZmFjZXMgdm9sYXRpbGUgKGFuZCwgZXZlbiB3b3JzZSwgZm9yIHRoZW0gdG8gZ2V0IGVtcHRpZWQp LgorCisgICAgICAgIFVJS2l0IHN1Z2dlc3RlZCBpbnN0ZWFkIHdhaXRpbmcgZm9yIHRoZSB3aW5k b3cgY29udGV4dCB0ZWFyZG93biBub3RpZmljYXRpb24sCisgICAgICAgIHdoaWNoIGRvZXMgaW5k ZWVkIHNlZW0gdG8gZmlyZSBhZnRlciB0aGUgc25hcHNob3R0aW5nIGlzIGNvbXBsZXRlLiBJIGhh dmUgYSBzbWFsbAorICAgICAgICBjaGFuZ2UgdG8gV2ViQ29yZTo6SU9TdXJmYWNlIGFuZCBSZW1v dGVMYXllckJhY2tpbmdTdG9yZSB0aGF0IG1ha2VzIHRoZSBwcm9ibGVtCisgICAgICAgIG11Y2gg bW9yZSByZXByb2R1Y2libGUsIGFuZCB0aGlzIGZpeGVzIGl0IHBlcmZlY3RseSwgd2hpbGUgdGhl IGxheWVycyBzdGlsbAorICAgICAgICBldmVudHVhbGx5IGVuZCB1cCBiZWluZyBtYWRlIHZvbGF0 aWxlLgorCisgICAgICAgIFRoaXMgbWF5IGhhdmUgdGhlIGNvbnZlbmllbnQgc2lkZSBlZmZlY3Qg b2YgbWFraW5nIHRoZSB2b2xhdGlsaXR5IHRpbWVyCisgICAgICAgIHJlcGVhdCBmZXdlciB0aW1l cyBpbiBnZW5lcmFsIChiZWNhdXNlIGl0IGlzIG5vdyBzdGFydGVkIGNsb3NlciB0byB0aGUKKyAg ICAgICAgbGFzdCB0aW1lIHRoYXQgdGhlIHN1cmZhY2VzIHdpbGwgYmUgaW4tdXNlKS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BcHBsaWNhdGlvblN0YXRlVHJhY2tlci5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9BcHBsaWNhdGlvblN0YXRlVHJhY2tlci5tbToKKyAgICAgICAgKFdlYktpdDo6QXBw bGljYXRpb25TdGF0ZVRyYWNrZXI6OkFwcGxpY2F0aW9uU3RhdGVUcmFja2VyKToKKyAgICAgICAg KFdlYktpdDo6QXBwbGljYXRpb25TdGF0ZVRyYWNrZXI6On5BcHBsaWNhdGlvblN0YXRlVHJhY2tl cik6CisgICAgICAgIChXZWJLaXQ6OkFwcGxpY2F0aW9uU3RhdGVUcmFja2VyOjphcHBsaWNhdGlv bkRpZEZpbmlzaFNuYXBzaG90dGluZ0FmdGVyRW50ZXJpbmdCYWNrZ3JvdW5kKToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3Lm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGRpZE1vdmVUb1dpbmRvd10p OgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9hcHBsaWNhdGlvbkRpZEZpbmlzaFNuYXBzaG90 dGluZ0FmdGVyRW50ZXJpbmdCYWNrZ3JvdW5kXSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9X S1BERlZpZXcubW06CisgICAgICAgICgtW1dLUERGVmlldyBkaWRNb3ZlVG9XaW5kb3ddKToKKyAg ICAgICAgKC1bV0tQREZWaWV3IF9hcHBsaWNhdGlvbkRpZEZpbmlzaFNuYXBzaG90dGluZ0FmdGVy RW50ZXJpbmdCYWNrZ3JvdW5kXSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJv eHlJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6YXBwbGljYXRpb25EaWRG aW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dyb3VuZCk6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dl YlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmFwcGxpY2F0aW9uRGlkRW50 ZXJCYWNrZ3JvdW5kKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6YXBwbGljYXRpb25EaWRG aW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dyb3VuZCk6CisKIDIwMTYtMDYtMjEg IEFtaXIgQWxhdmkgIDxhYWxhdmlAYXBwbGUuY29tPgogCiAgICAgICAgIFVwc3RyZWFtIFdLSFRU UENvb2tpZXNGb3JVUkwgZnJvbSBXZWJLaXRTeXN0ZW1JbnRlcmZhY2UgdG8gT3BlblNvdXJjZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFj a2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXBwbGljYXRpb25TdGF0ZVRyYWNrZXIu aAppbmRleCA1YWY0OWRmZGFjMWI0Njk3ZjBhMjBkYTViMjZlMTEwY2IxYzc4OTlmLi40MDM0MWMw ZDkyNGYyYjY1NTE0NzkxZDQ1Y2FiODExMWZkODJjZjI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQXBwbGljYXRpb25TdGF0ZVRyYWNrZXIuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQXBwbGljYXRpb25TdGF0ZVRyYWNrZXIuaApAQCAtMzksMTcgKzM5LDE5 IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBBcHBsaWNhdGlvblN0YXRlVHJhY2tlciB7 CiBwdWJsaWM6Ci0gICAgQXBwbGljYXRpb25TdGF0ZVRyYWNrZXIoVUlWaWV3ICosIFNFTCBkaWRF bnRlckJhY2tncm91bmRTZWxlY3RvciwgU0VMIHdpbGxFbnRlckZvcmVncm91bmRTZWxlY3Rvcik7 CisgICAgQXBwbGljYXRpb25TdGF0ZVRyYWNrZXIoVUlWaWV3ICosIFNFTCBkaWRFbnRlckJhY2tn cm91bmRTZWxlY3RvciwgU0VMIGRpZEZpbmlzaFNuYXBzaG90dGluZ0FmdGVyRW50ZXJpbmdCYWNr Z3JvdW5kU2VsZWN0b3IsIFNFTCB3aWxsRW50ZXJGb3JlZ3JvdW5kU2VsZWN0b3IpOwogICAgIH5B cHBsaWNhdGlvblN0YXRlVHJhY2tlcigpOwogCiAgICAgYm9vbCBpc0luQmFja2dyb3VuZCgpIGNv bnN0IHsgcmV0dXJuIG1faXNJbkJhY2tncm91bmQ7IH0KIAogcHJpdmF0ZToKICAgICB2b2lkIGFw cGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKCk7CisgICAgdm9pZCBhcHBsaWNhdGlvbkRpZEZp bmlzaFNuYXBzaG90dGluZ0FmdGVyRW50ZXJpbmdCYWNrZ3JvdW5kKCk7CiAgICAgdm9pZCBhcHBs aWNhdGlvbldpbGxFbnRlckZvcmVncm91bmQoKTsKIAogICAgIFdlYWtPYmpDUHRyPFVJVmlldz4g bV92aWV3OwogICAgIFNFTCBtX2RpZEVudGVyQmFja2dyb3VuZFNlbGVjdG9yOworICAgIFNFTCBt X2RpZEZpbmlzaFNuYXBzaG90dGluZ0FmdGVyRW50ZXJpbmdCYWNrZ3JvdW5kU2VsZWN0b3I7CiAg ICAgU0VMIG1fd2lsbEVudGVyRm9yZWdyb3VuZFNlbGVjdG9yOwogCiAgICAgYm9vbCBtX2lzSW5C YWNrZ3JvdW5kOwpAQCAtNTksNiArNjEsNyBAQCBwcml2YXRlOgogICAgIFJldGFpblB0cjxCS1NB cHBsaWNhdGlvblN0YXRlTW9uaXRvcj4gbV9hcHBsaWNhdGlvblN0YXRlTW9uaXRvcjsKIAogICAg IGlkIG1fZGlkRW50ZXJCYWNrZ3JvdW5kT2JzZXJ2ZXI7CisgICAgaWQgbV9kaWRGaW5pc2hTbmFw c2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dyb3VuZE9ic2VydmVyOwogICAgIGlkIG1fd2lsbEVu dGVyRm9yZWdyb3VuZE9ic2VydmVyOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLm1tCmluZGV4IDZkNTVkMjM0YzM5ODkzMTVh Y2E4NTAyNTFiOGE5NjM0NmVjYTg4YWYuLjUzNTljMDUxZTI5ZDE3NzBmMWJhODY1NzhjNTUxNDgy YWU0MmJiN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BcHBsaWNhdGlv blN0YXRlVHJhY2tlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXBwbGljYXRp b25TdGF0ZVRyYWNrZXIubW0KQEAgLTczLDI1ICs3MywzMiBAQCBzdGF0aWMgYm9vbCBpc0JhY2tn cm91bmRTdGF0ZShCS1NBcHBsaWNhdGlvblN0YXRlIHN0YXRlKQogICAgIH0KIH0KIAotQXBwbGlj YXRpb25TdGF0ZVRyYWNrZXI6OkFwcGxpY2F0aW9uU3RhdGVUcmFja2VyKFVJVmlldyAqdmlldywg U0VMIGRpZEVudGVyQmFja2dyb3VuZFNlbGVjdG9yLCBTRUwgd2lsbEVudGVyRm9yZWdyb3VuZFNl bGVjdG9yKQorQXBwbGljYXRpb25TdGF0ZVRyYWNrZXI6OkFwcGxpY2F0aW9uU3RhdGVUcmFja2Vy KFVJVmlldyAqdmlldywgU0VMIGRpZEVudGVyQmFja2dyb3VuZFNlbGVjdG9yLCBTRUwgZGlkRmlu aXNoU25hcHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmRTZWxlY3RvciwgU0VMIHdpbGxF bnRlckZvcmVncm91bmRTZWxlY3RvcikKICAgICA6IG1fdmlldyh2aWV3KQogICAgICwgbV9kaWRF bnRlckJhY2tncm91bmRTZWxlY3RvcihkaWRFbnRlckJhY2tncm91bmRTZWxlY3RvcikKKyAgICAs IG1fZGlkRmluaXNoU25hcHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmRTZWxlY3Rvcihk aWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dyb3VuZFNlbGVjdG9yKQogICAg ICwgbV93aWxsRW50ZXJGb3JlZ3JvdW5kU2VsZWN0b3Iod2lsbEVudGVyRm9yZWdyb3VuZFNlbGVj dG9yKQogICAgICwgbV9pc0luQmFja2dyb3VuZCh0cnVlKQogICAgICwgbV93ZWFrUHRyRmFjdG9y eSh0aGlzKQogICAgICwgbV9kaWRFbnRlckJhY2tncm91bmRPYnNlcnZlcihudWxscHRyKQorICAg ICwgbV9kaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dyb3VuZE9ic2VydmVy KG51bGxwdHIpCiAgICAgLCBtX3dpbGxFbnRlckZvcmVncm91bmRPYnNlcnZlcihudWxscHRyKQog ewogICAgIEFTU0VSVChbbV92aWV3LmdldCgpIHJlc3BvbmRzVG9TZWxlY3RvcjptX2RpZEVudGVy QmFja2dyb3VuZFNlbGVjdG9yXSk7CisgICAgQVNTRVJUKFttX3ZpZXcuZ2V0KCkgcmVzcG9uZHNU b1NlbGVjdG9yOm1fZGlkRmluaXNoU25hcHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmRT ZWxlY3Rvcl0pOwogICAgIEFTU0VSVChbbV92aWV3LmdldCgpIHJlc3BvbmRzVG9TZWxlY3Rvcjpt X3dpbGxFbnRlckZvcmVncm91bmRTZWxlY3Rvcl0pOwogCiAgICAgVUlXaW5kb3cgKndpbmRvdyA9 IFttX3ZpZXcuZ2V0KCkgd2luZG93XTsKICAgICBBU1NFUlQod2luZG93KTsKIAorICAgIE5TTm90 aWZpY2F0aW9uQ2VudGVyICpub3RpZmljYXRpb25DZW50ZXIgPSBbTlNOb3RpZmljYXRpb25DZW50 ZXIgZGVmYXVsdENlbnRlcl07CisgICAgbV9kaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVy aW5nQmFja2dyb3VuZE9ic2VydmVyID0gW25vdGlmaWNhdGlvbkNlbnRlciBhZGRPYnNlcnZlckZv ck5hbWU6QCJfVUlXaW5kb3dXaWxsRGVzdHJveVdpbmRvd0NvbnRleHROb3RpZmljYXRpb24iIG9i amVjdDp3aW5kb3cgcXVldWU6bmlsIHVzaW5nQmxvY2s6W3RoaXNdKE5TTm90aWZpY2F0aW9uICop IHsKKyAgICAgICAgYXBwbGljYXRpb25EaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5n QmFja2dyb3VuZCgpOworICAgIH1dOworCiAgICAgc3dpdGNoIChhcHBsaWNhdGlvblR5cGUod2lu ZG93KSkgewogICAgIGNhc2UgQXBwbGljYXRpb25UeXBlOjpBcHBsaWNhdGlvbjogewogICAgICAg ICBVSUFwcGxpY2F0aW9uICphcHBsaWNhdGlvbiA9IFtVSUFwcGxpY2F0aW9uIHNoYXJlZEFwcGxp Y2F0aW9uXTsKLSAgICAgICAgTlNOb3RpZmljYXRpb25DZW50ZXIgKm5vdGlmaWNhdGlvbkNlbnRl ciA9IFtOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXTsKIAogICAgICAgICBtX2lz SW5CYWNrZ3JvdW5kID0gYXBwbGljYXRpb24uYXBwbGljYXRpb25TdGF0ZSA9PSBVSUFwcGxpY2F0 aW9uU3RhdGVCYWNrZ3JvdW5kOwogCkBAIC0xMjUsNyArMTMyLDYgQEAgQXBwbGljYXRpb25TdGF0 ZVRyYWNrZXI6OkFwcGxpY2F0aW9uU3RhdGVUcmFja2VyKFVJVmlldyAqdmlldywgU0VMIGRpZEVu dGVyQmFja2cKICAgICAgICAgYXV0byBhcHBsaWNhdGlvblN0YXRlTW9uaXRvciA9IGFkb3B0TlMo W1tCS1NBcHBsaWNhdGlvblN0YXRlTW9uaXRvciBhbGxvY10gaW5pdF0pOwogICAgICAgICBtX2lz SW5CYWNrZ3JvdW5kID0gaXNCYWNrZ3JvdW5kU3RhdGUoW21fYXBwbGljYXRpb25TdGF0ZU1vbml0 b3IgbW9zdEVsZXZhdGVkQXBwbGljYXRpb25TdGF0ZUZvclBJRDphcHBsaWNhdGlvblBJRF0pOwog Ci0gICAgICAgIE5TTm90aWZpY2F0aW9uQ2VudGVyICpub3RpZmljYXRpb25DZW50ZXIgPSBbTlNO b3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl07CiAgICAgICAgIG1fZGlkRW50ZXJCYWNr Z3JvdW5kT2JzZXJ2ZXIgPSBbbm90aWZpY2F0aW9uQ2VudGVyIGFkZE9ic2VydmVyRm9yTmFtZTpA Il9VSVZpZXdTZXJ2aWNlSG9zdERpZEVudGVyQmFja2dyb3VuZE5vdGlmaWNhdGlvbiIgb2JqZWN0 OnNlcnZpY2VWaWV3Q29udHJvbGxlciBxdWV1ZTpuaWwgdXNpbmdCbG9jazpbdGhpc10oTlNOb3Rp ZmljYXRpb24gKikgewogICAgICAgICAgICAgYXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91bmQo KTsKICAgICAgICAgfV07CkBAIC0xNzQsNiArMTgwLDcgQEAgQXBwbGljYXRpb25TdGF0ZVRyYWNr ZXI6On5BcHBsaWNhdGlvblN0YXRlVHJhY2tlcigpCiAKICAgICBOU05vdGlmaWNhdGlvbkNlbnRl ciAqbm90aWZpY2F0aW9uQ2VudGVyID0gW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50 ZXJdOwogICAgIFtub3RpZmljYXRpb25DZW50ZXIgcmVtb3ZlT2JzZXJ2ZXI6bV9kaWRFbnRlckJh Y2tncm91bmRPYnNlcnZlcl07CisgICAgW25vdGlmaWNhdGlvbkNlbnRlciByZW1vdmVPYnNlcnZl cjptX2RpZEZpbmlzaFNuYXBzaG90dGluZ0FmdGVyRW50ZXJpbmdCYWNrZ3JvdW5kT2JzZXJ2ZXJd OwogICAgIFtub3RpZmljYXRpb25DZW50ZXIgcmVtb3ZlT2JzZXJ2ZXI6bV93aWxsRW50ZXJGb3Jl Z3JvdW5kT2JzZXJ2ZXJdOwogfQogCkBAIC0xODUsNiArMTkyLDEyIEBAIHZvaWQgQXBwbGljYXRp b25TdGF0ZVRyYWNrZXI6OmFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKCkKICAgICAgICAg d3RmT2JqY01zZ1NlbmQ8dm9pZD4odmlldy5nZXQoKSwgbV9kaWRFbnRlckJhY2tncm91bmRTZWxl Y3Rvcik7CiB9CiAKK3ZvaWQgQXBwbGljYXRpb25TdGF0ZVRyYWNrZXI6OmFwcGxpY2F0aW9uRGlk RmluaXNoU25hcHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmQoKQoreworICAgIGlmIChh dXRvIHZpZXcgPSBtX3ZpZXcuZ2V0KCkpCisgICAgICAgIHd0Zk9iamNNc2dTZW5kPHZvaWQ+KHZp ZXcuZ2V0KCksIG1fZGlkRmluaXNoU25hcHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmRT ZWxlY3Rvcik7Cit9CisKIHZvaWQgQXBwbGljYXRpb25TdGF0ZVRyYWNrZXI6OmFwcGxpY2F0aW9u V2lsbEVudGVyRm9yZWdyb3VuZCgpCiB7CiAgICAgbV9pc0luQmFja2dyb3VuZCA9IGZhbHNlOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDY0ZjQ4NjRmNDJhZjZk MjA2OTBkMDc2NDljOWY0MTRjN2ZmOTE1YzYuLjc2MmVmZWQ0ZTcyNDU1ODljYjhhOTljODY0NDhl ODRhZjlhMDhhZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAg LTUxMSw2ICs1MTEsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRBc3Npc3RlZE5vZGVWYWx1ZUFz TnVtYmVyKGRvdWJsZSk7CiAgICAgdm9pZCBzZXRBc3Npc3RlZE5vZGVTZWxlY3RlZEluZGV4KHVp bnQzMl90IGluZGV4LCBib29sIGFsbG93TXVsdGlwbGVTZWxlY3Rpb24gPSBmYWxzZSk7CiAgICAg dm9pZCBhcHBsaWNhdGlvbkRpZEVudGVyQmFja2dyb3VuZCgpOworICAgIHZvaWQgYXBwbGljYXRp b25EaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dyb3VuZCgpOwogICAgIHZv aWQgYXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kKCk7CiAgICAgdm9pZCBhcHBsaWNhdGlv bldpbGxSZXNpZ25BY3RpdmUoKTsKICAgICB2b2lkIGFwcGxpY2F0aW9uRGlkQmVjb21lQWN0aXZl KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0KaW5k ZXggMWY3ZmQ3ZThhODUwNGQzZDY1N2U5Njg0ZDc4Y2E0OWQ2ODM0YzI5Mi4uNWYwOGQwM2NiZDZk YTVkMWFjNTc1NWQwNjJkNDU1NDBlOTQ2YzIyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQpAQCAtMjg0LDcgKzI4NCw3IEBAIHByaXZhdGU6CiAg ICAgICAgIHJldHVybjsKIAogICAgIEFTU0VSVCghX2FwcGxpY2F0aW9uU3RhdGVUcmFja2VyKTsK LSAgICBfYXBwbGljYXRpb25TdGF0ZVRyYWNrZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEFwcGxpY2F0 aW9uU3RhdGVUcmFja2VyPihzZWxmLCBAc2VsZWN0b3IoX2FwcGxpY2F0aW9uRGlkRW50ZXJCYWNr Z3JvdW5kKSwgQHNlbGVjdG9yKF9hcHBsaWNhdGlvbldpbGxFbnRlckZvcmVncm91bmQpKTsKKyAg ICBfYXBwbGljYXRpb25TdGF0ZVRyYWNrZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEFwcGxpY2F0aW9u U3RhdGVUcmFja2VyPihzZWxmLCBAc2VsZWN0b3IoX2FwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3Jv dW5kKSwgQHNlbGVjdG9yKF9hcHBsaWNhdGlvbkRpZEZpbmlzaFNuYXBzaG90dGluZ0FmdGVyRW50 ZXJpbmdCYWNrZ3JvdW5kKSwgQHNlbGVjdG9yKF9hcHBsaWNhdGlvbldpbGxFbnRlckZvcmVncm91 bmQpKTsKIH0KIAogLSAoV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyICopYnJvd3NpbmdDb250 ZXh0Q29udHJvbGxlcgpAQCAtNjAxLDYgKzYwMSwxMSBAQCBzdGF0aWMgdm9pZCBzdG9yZUFjY2Vz c2liaWxpdHlSZW1vdGVDb25uZWN0aW9uSW5mb3JtYXRpb24oaWQgZWxlbWVudCwgcGlkX3QgcGlk LAogICAgIF9wYWdlLT52aWV3U3RhdGVEaWRDaGFuZ2UoVmlld1N0YXRlOjpBbGxGbGFncyAmIH5W aWV3U3RhdGU6OklzSW5XaW5kb3cpOwogfQogCistICh2b2lkKV9hcHBsaWNhdGlvbkRpZEZpbmlz aFNuYXBzaG90dGluZ0FmdGVyRW50ZXJpbmdCYWNrZ3JvdW5kCit7CisgICAgX3BhZ2UtPmFwcGxp Y2F0aW9uRGlkRmluaXNoU25hcHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmQoKTsKK30K KwogLSAodm9pZClfYXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kCiB7CiAgICAgX3BhZ2Ut PmFwcGxpY2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL1dLUERGVmlldy5tbQppbmRleCA3OTM3NjQ2OTNmZjUyODk1ODYyMDIwZjQ3OWIzY2Ux MGNjNjNlOWU2Li44ODQzYmM4ZTkwOWM2NzBkZjg0ZWRkYjkxZmIxMDRlZjNjMWZmZWIwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQpAQCAtODY0LDcgKzg2NCw3 IEBAIHN0YXRpYyBOU1N0cmluZ0NvbXBhcmVPcHRpb25zIHN0cmluZ0NvbXBhcmVPcHRpb25zKF9X S0ZpbmRPcHRpb25zIG9wdGlvbnMpCiAgICAgICAgIHJldHVybjsKIAogICAgIEFTU0VSVCghX2Fw cGxpY2F0aW9uU3RhdGVUcmFja2VyKTsKLSAgICBfYXBwbGljYXRpb25TdGF0ZVRyYWNrZXIgPSBz dGQ6Om1ha2VfdW5pcXVlPEFwcGxpY2F0aW9uU3RhdGVUcmFja2VyPihzZWxmLCBAc2VsZWN0b3Io X2FwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKSwgQHNlbGVjdG9yKF9hcHBsaWNhdGlvbldp bGxFbnRlckZvcmVncm91bmQpKTsKKyAgICBfYXBwbGljYXRpb25TdGF0ZVRyYWNrZXIgPSBzdGQ6 Om1ha2VfdW5pcXVlPEFwcGxpY2F0aW9uU3RhdGVUcmFja2VyPihzZWxmLCBAc2VsZWN0b3IoX2Fw cGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKSwgQHNlbGVjdG9yKF9hcHBsaWNhdGlvbkRpZEZp bmlzaFNuYXBzaG90dGluZ0FmdGVyRW50ZXJpbmdCYWNrZ3JvdW5kKSwgQHNlbGVjdG9yKF9hcHBs aWNhdGlvbldpbGxFbnRlckZvcmVncm91bmQpKTsKIH0KIAogLSAoQk9PTClpc0JhY2tncm91bmQK QEAgLTg4MSw2ICs4ODEsMTEgQEAgc3RhdGljIE5TU3RyaW5nQ29tcGFyZU9wdGlvbnMgc3RyaW5n Q29tcGFyZU9wdGlvbnMoX1dLRmluZE9wdGlvbnMgb3B0aW9ucykKICAgICBfd2ViVmlldy0+X3Bh Z2UtPnZpZXdTdGF0ZURpZENoYW5nZShWaWV3U3RhdGU6OkFsbEZsYWdzICYgflZpZXdTdGF0ZTo6 SXNJbldpbmRvdyk7CiB9CiAKKy0gKHZvaWQpX2FwcGxpY2F0aW9uRGlkRmluaXNoU25hcHNob3R0 aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmQKK3sKKyAgICBfd2ViVmlldy0+X3BhZ2UtPmFwcGxp Y2F0aW9uRGlkRmluaXNoU25hcHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmQoKTsKK30K KwogLSAodm9pZClfYXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kCiB7CiAgICAgX3dlYlZp ZXctPl9wYWdlLT5hcHBsaWNhdGlvbldpbGxFbnRlckZvcmVncm91bmQoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KaW5kZXggMjE2ZWE3NzQ1 NDRlYzI1YjYxNTVlY2ZiMjVkMjQyMTk1ODVlNjU1My4uNGE2NmJmZmI3MmE0MDhlMjRkZTc5NzEy MDgzNDgxMjM5Zjc3NWRlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lv cy9XZWJQYWdlUHJveHlJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X ZWJQYWdlUHJveHlJT1MubW0KQEAgLTY0MCw2ICs2NDAsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OmFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKCkKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OkFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKGlzU3VzcGVuZGVk VW5kZXJMb2NrKSwgbV9wYWdlSUQpOwogfQogCit2b2lkIFdlYlBhZ2VQcm94eTo6YXBwbGljYXRp b25EaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dyb3VuZCgpCit7CisgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpBcHBsaWNhdGlvbkRpZEZpbmlzaFNu YXBzaG90dGluZ0FmdGVyRW50ZXJpbmdCYWNrZ3JvdW5kKCksIG1fcGFnZUlEKTsKK30KKwogdm9p ZCBXZWJQYWdlUHJveHk6OmFwcGxpY2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZCgpCiB7CiAgICAg Ym9vbCBpc1N1c3BlbmRlZFVuZGVyTG9jayA9IFtVSUFwcCBpc1N1c3BlbmRlZFVuZGVyTG9ja107 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5o IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCBiZTgy YTBmMDgwMTcwZDEzYTQ5NmU5ODhlODA1NTM3MzQ1MTc3ODZlLi4xNzM3OTZlNmYwYWUwMGRiNTEy YWJhNzY1NTkxMDVlYmFhZTQ1NDFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmgKQEAgLTgxOSw2ICs4MTksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCB3aWxs U3RhcnRVc2VyVHJpZ2dlcmVkWm9vbWluZygpOwogICAgIHZvaWQgYXBwbGljYXRpb25XaWxsUmVz aWduQWN0aXZlKCk7CiAgICAgdm9pZCBhcHBsaWNhdGlvbkRpZEVudGVyQmFja2dyb3VuZChib29s IGlzU3VzcGVuZGVkVW5kZXJMb2NrKTsKKyAgICB2b2lkIGFwcGxpY2F0aW9uRGlkRmluaXNoU25h cHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmQoKTsKICAgICB2b2lkIGFwcGxpY2F0aW9u V2lsbEVudGVyRm9yZWdyb3VuZChib29sIGlzU3VzcGVuZGVkVW5kZXJMb2NrKTsKICAgICB2b2lk IGFwcGxpY2F0aW9uRGlkQmVjb21lQWN0aXZlKCk7CiAgICAgdm9pZCB6b29tVG9SZWN0KFdlYkNv cmU6OkZsb2F0UmVjdCwgZG91YmxlIG1pbmltdW1TY2FsZSwgZG91YmxlIG1heGltdW1TY2FsZSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5t ZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1l c3NhZ2VzLmluCmluZGV4IDhkYzRkMGRmODBlZjczYjVhNWU5ODMyYWU2YjViZDg4ZjRjYWJkYmIu LjgwMTRiYmZmY2FhMWJhNjU0ZDM2NTRiMjNiNTEwN2ExNzc3YWY4MWUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCkBA IC04Niw2ICs4Niw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgTGVnYWN5UmVjZWl2ZXIgewogICAg IFNldEFzc2lzdGVkTm9kZVNlbGVjdGVkSW5kZXgodWludDMyX3QgaW5kZXgsIGJvb2wgYWxsb3dN dWx0aXBsZVNlbGVjdGlvbikKICAgICBBcHBsaWNhdGlvbldpbGxSZXNpZ25BY3RpdmUoKQogICAg IEFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKGJvb2wgaXNTdXNwZW5kZWRVbmRlckxvY2sp CisgICAgQXBwbGljYXRpb25EaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dy b3VuZCgpCiAgICAgQXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kKGJvb2wgaXNTdXNwZW5k ZWRVbmRlckxvY2spCiAgICAgQXBwbGljYXRpb25EaWRCZWNvbWVBY3RpdmUoKQogICAgIENvbnRl bnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2UoU3RyaW5nIGNvbnRlbnRTaXplQ2F0ZWdvcnkpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1Mu bW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0K aW5kZXggZWY4ZGE3YTk3NjRmMGU3N2FjOTQ1ZWEyYmFiODg2YWViYzIyYmQ0Ni4uNGY5NDVmODQz MmZmZWI5Y2NiNGM2MmQzNmQwZTY3YzE4NDUyZWE4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMjk3OCw2ICsyOTc4 LDEwIEBAIHZvaWQgV2ViUGFnZTo6YXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91bmQoYm9vbCBp c1N1c3BlbmRlZFVuZGVyTG9jaykKIAogICAgIG1faXNTdXNwZW5kZWRVbmRlckxvY2sgPSBpc1N1 c3BlbmRlZFVuZGVyTG9jazsKICAgICBzZXRMYXllclRyZWVTdGF0ZUlzRnJvemVuKHRydWUpOwor fQorCit2b2lkIFdlYlBhZ2U6OmFwcGxpY2F0aW9uRGlkRmluaXNoU25hcHNob3R0aW5nQWZ0ZXJF bnRlcmluZ0JhY2tncm91bmQoKQorewogICAgIG1hcmtMYXllcnNWb2xhdGlsZSgpOwogfQogCg==