70615 2011-10-21 09:48:06 -0700 Flash of white when loading a page after a web process crash 2011-10-21 10:45:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 488442 0 andersca 2011-10-21 09:48:06 -0700 Flash of white when loading a page after a web process crash 488445 1 111977 andersca 2011-10-21 09:59:01 -0700 Created attachment 111977 Patch 488448 2 111977 aroben 2011-10-21 10:05:04 -0700 Comment on attachment 111977 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111977&action=review > Source/WebKit2/UIProcess/API/mac/WKView.mm:2075 > - (void)_didRelaunchProcess > { > - [self setNeedsDisplay:YES]; > } Can we remove this method entirely? > Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp:86 > void DrawingAreaImpl::setNeedsDisplay(const IntRect& rect) > { > + if (!m_isPaintingEnabled) > + return; > + > IntRect dirtyRect = rect; > dirtyRect.intersect(m_webPage->bounds()); Should we continue to accumulate a dirty region when painting is disabled so that the right area will be repainted when painting is reenabled? > Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp:109 > void DrawingAreaImpl::scroll(const IntRect& scrollRect, const IntSize& scrollOffset) > { > + if (!m_isPaintingEnabled) > + return; > + Similar question here. 488449 3 andersca 2011-10-21 10:06:19 -0700 (In reply to comment #2) > (From update of attachment 111977 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=111977&action=review > > > Source/WebKit2/UIProcess/API/mac/WKView.mm:2075 > > - (void)_didRelaunchProcess > > { > > - [self setNeedsDisplay:YES]; > > } > > Can we remove this method entirely? Maybe. > > Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp:86 > > void DrawingAreaImpl::setNeedsDisplay(const IntRect& rect) > > { > > + if (!m_isPaintingEnabled) > > + return; > > + > > IntRect dirtyRect = rect; > > dirtyRect.intersect(m_webPage->bounds()); > > Should we continue to accumulate a dirty region when painting is disabled so that the right area will be repainted when painting is reenabled? Nope - this is about disabling painting completely, not just suspending it. > > Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp:109 > > void DrawingAreaImpl::scroll(const IntRect& scrollRect, const IntSize& scrollOffset) > > { > > + if (!m_isPaintingEnabled) > > + return; > > + > > Similar question here. Similar answer here. 488464 4 111977 simon.fraser 2011-10-21 10:28:19 -0700 Comment on attachment 111977 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111977&action=review > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:251 > + m_drawingArea->setPaintingEnabled(true); I sure hope we don't ever add an early return between setPaintingEnabled(false) and here. 488477 5 andersca 2011-10-21 10:45:42 -0700 Committed r98113: <http://trac.webkit.org/changeset/98113> 111977 2011-10-21 09:59:01 -0700 2011-10-21 10:32:42 -0700 Patch bug-70615-20111021095901.patch text/plain 7883 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogOTgxMDMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBhY2ZjOTBmZjk4NzgwOTY2 YzRjOGUyN2QwNzg5MmI4MTIzODVmMTdmLi45MGNiMDQ2YWQ2MmVmNzBjYzM5NmEwOGU0MzI2YmVh ZWVmZGUzODJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMTAtMjEgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBGbGFzaCBvZiB3aGl0 ZSB3aGVuIGxvYWRpbmcgYSBwYWdlIGFmdGVyIGEgd2ViIHByb2Nlc3MgY3Jhc2gKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwNjE1CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8xMDMwNjkwNj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAg KC1bV0tWaWV3IF9wcm9jZXNzRGlkQ3Jhc2hdKToKKyAgICAgICAgKC1bV0tWaWV3IF9kaWRSZWxh dW5jaFByb2Nlc3NdKToKKyAgICAgICAgUmVtb3ZlIGNhbGxzIHRvIHNldE5lZWRzRGlzcGxheSBo ZXJlLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6cHJvY2Vzc0RpZENyYXNoKToKKyAgICAgICAgQ2FsbCBzZXRO ZWVkc0Rpc3BsYXksIGJ1dCBvbmx5IGlmIGNhbGxpbmcgb3V0IHRvIHRoZSBsb2FkZXIgY2xpZW50 IGRpZG4ndCByZWxhdW5jaCB0aGUgd2ViIHByb2Nlc3MuCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvRHJhd2luZ0FyZWEuaDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWE6OnNl dFBhaW50aW5nRW5hYmxlZCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdB cmVhSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhSW1wbDo6RHJhd2luZ0Fy ZWFJbXBsKToKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFJbXBsOjpzZXROZWVkc0Rpc3Bs YXkpOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYUltcGw6OnNjcm9sbCk6CisgICAgICAg IChXZWJLaXQ6OkRyYXdpbmdBcmVhSW1wbDo6c2V0UGFpbnRpbmdFbmFibGVkKToKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmg6CisgICAgICAgIEFkZCBhIHdh eSB0byBkaXNhYmxlIHBhaW50aW5nIGNvbXBsZXRlbHkgZm9yIGEgZHJhd2luZyBhcmVhLgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjpXZWJQYWdlKToKKyAgICAgICAgRGlzYWJsZSBwYWludGluZyB3aGlsZSBzZXR0 aW5nIHVwIHRoZSB3ZWIgcGFnZSwgb3RoZXJ3aXNlIHdlJ2xsIGdldCBwYWludCByZXF1ZXN0cyB3 aGVuIHdlIHNldCB0aGUKKyAgICAgICAgYWN0aXZlIHN0YXRlIG9mIHRoZSB3ZWIgcGFnZS4KKwog MjAxMS0xMC0yMSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFtRdF1bV0syXSBCdWlsZGZpeCBmb3IgbmV3ZXIgUXQ1LiBSZW1vdmUgZHVwbGljYXRlZCBk ZWZpbmVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tW aWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCmluZGV4 IDhhY2Q5MmE4ZDg2ZTVhMDY5NGFmNjQ4NTZlN2M2MTNmOTUxZTcwYzAuLmJmMjEyMWVkOWMxNTBh MmM5ZTUwZDY4MjE0ODIxMzM2NjE5M2VmZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL21hYy9XS1ZpZXcubW0KQEAgLTIwNjIsNyArMjA2Miw2IEBAIHN0YXRpYyB2b2lkIGRyYXdQ YWdlQmFja2dyb3VuZChDR0NvbnRleHRSZWYgY29udGV4dCwgV2ViUGFnZVByb3h5KiBwYWdlLCBj b25zdCBJCiAKIC0gKHZvaWQpX3Byb2Nlc3NEaWRDcmFzaAogewotICAgIFtzZWxmIHNldE5lZWRz RGlzcGxheTpZRVNdOwogICAgIFtzZWxmIF91cGRhdGVSZW1vdGVBY2Nlc3NpYmlsaXR5UmVnaXN0 cmF0aW9uOk5PXTsKIH0KIApAQCAtMjA3Myw3ICsyMDcyLDYgQEAgc3RhdGljIHZvaWQgZHJhd1Bh Z2VCYWNrZ3JvdW5kKENHQ29udGV4dFJlZiBjb250ZXh0LCBXZWJQYWdlUHJveHkqIHBhZ2UsIGNv bnN0IEkKIAogLSAodm9pZClfZGlkUmVsYXVuY2hQcm9jZXNzCiB7Ci0gICAgW3NlbGYgc2V0TmVl ZHNEaXNwbGF5OllFU107CiB9CiAKIC0gKHZvaWQpX3NldEN1cnNvcjooTlNDdXJzb3IgKiljdXJz b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggZjg1MDE0 ZjM2Mjk4NzFiMTlmMjEyMmFkNjdiNGU4NjdhYTM2MzVhNi4uMWYxNzljMDdhYjM0YTMxZGEzOWNl ZGIwOTU1OGI3MjY1MmJjOWM0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKQEAgLTMwMjcsNiArMzAyNywxNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cHJvY2Vz c0RpZENyYXNoKCkKICAgICBtX3BhZ2VDbGllbnQtPnByb2Nlc3NEaWRDcmFzaCgpOwogICAgIG1f bG9hZGVyQ2xpZW50LnByb2Nlc3NEaWRDcmFzaCh0aGlzKTsKIAorICAgIGlmICghbV9pc1ZhbGlk KSB7CisgICAgICAgIC8vIElmIHRoZSBjYWxsIG91dCB0byB0aGUgbG9hZGVyIGNsaWVudCBkaWRu J3QgY2F1c2UgdGhlIHdlYiBwcm9jZXNzIHRvIGJlIHJlbGF1bmNoZWQsIAorICAgICAgICAvLyB3 ZSdsbCBjYWxsIHNldE5lZWRzRGlzcGxheSBvbiB0aGUgdmlldyBzbyB0aGF0IHdlIHdvbid0IGhh dmUgdGhlIG9sZCBjb250ZW50cyBzaG93aW5nLgorICAgICAgICAvLyBJZiB0aGUgY2FsbCBkaWQg Y2F1c2UgdGhlIHdlYiBwcm9jZXNzIHRvIGJlIHJlbGF1bmNoZWQsIHdlJ2xsIGtlZXAgdGhlIG9s ZCBwYWdlIGNvbnRlbnRzIHNob3dpbmcKKyAgICAgICAgLy8gdW50aWwgdGhlIG5ldyB3ZWIgcHJv Y2VzcyBoYXMgcGFpbnRlZCBpdHMgY29udGVudHMuCisgICAgICAgIHNldFZpZXdOZWVkc0Rpc3Bs YXkoSW50UmVjdChJbnRQb2ludCgpLCB2aWV3U2l6ZSgpKSk7CisgICAgfQorCiAgICAgLy8gQ2Fu J3QgZXhwZWN0IERpZFJlY2VpdmVFdmVudCBub3RpZmljYXRpb25zIGZyb20gYSBjcmFzaGVkIHdl YiBwcm9jZXNzLgogICAgIG1fa2V5RXZlbnRRdWV1ZS5jbGVhcigpOwogICAgIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmggYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaAppbmRleCA5MzA2NTY4 YWYwNGE4ZjJiZWY0OTUyNTMxODU2M2JhMzA3NDQzZTk5Li4yYWM2OGEzZTkzMGY4NjdkMTY0MDYy YTRjNGI4ZmZkNDgwZTk1MDljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvRHJhd2luZ0FyZWEuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvRHJhd2luZ0FyZWEuaApAQCAtNzQsNiArNzQsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCB2b2lkIGRpZFVuaW5zdGFsbFBhZ2VPdmVybGF5KCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHNl dFBhZ2VPdmVybGF5TmVlZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKSB7IH0KIAor ICAgIHZpcnR1YWwgdm9pZCBzZXRQYWludGluZ0VuYWJsZWQoYm9vbCkgeyB9CisKICNpZiBVU0Uo QUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgdmlydHVhbCB2b2lkIHNldFJvb3RDb21wb3Np dGluZ0xheWVyKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqKSA9IDA7CiAgICAgdmlydHVhbCB2b2lk IHNjaGVkdWxlQ29tcG9zaXRpbmdMYXllclN5bmMoKSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCmluZGV4IDg3ZjFm YTVhZjg3NzgzYjc5NGM5Njg3MmFiNzNhYWZlMmFlZWRhYWYuLjVhZjI1M2I2ZmQyOWUyZDY4Njk2 OWIxMmVkYzM5YjgzZWZmNTk2NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCkBAIC01Niw2ICs1Niw3IEBAIERyYXdp bmdBcmVhSW1wbDo6fkRyYXdpbmdBcmVhSW1wbCgpCiBEcmF3aW5nQXJlYUltcGw6OkRyYXdpbmdB cmVhSW1wbChXZWJQYWdlKiB3ZWJQYWdlLCBjb25zdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz JiBwYXJhbWV0ZXJzKQogICAgIDogRHJhd2luZ0FyZWEoRHJhd2luZ0FyZWFUeXBlSW1wbCwgd2Vi UGFnZSkKICAgICAsIG1fYmFja2luZ1N0b3JlU3RhdGVJRCgwKQorICAgICwgbV9pc1BhaW50aW5n RW5hYmxlZCh0cnVlKQogICAgICwgbV9pblVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKGZhbHNlKQog ICAgICwgbV9zaG91bGRTZW5kRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUoZmFsc2UpCiAgICAg LCBtX2lzV2FpdGluZ0ZvckRpZFVwZGF0ZShmYWxzZSkKQEAgLTc4LDYgKzc5LDkgQEAgRHJhd2lu Z0FyZWFJbXBsOjpEcmF3aW5nQXJlYUltcGwoV2ViUGFnZSogd2ViUGFnZSwgY29uc3QgV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGUKIAogdm9pZCBEcmF3aW5nQXJlYUltcGw6OnNldE5lZWRzRGlzcGxh eShjb25zdCBJbnRSZWN0JiByZWN0KQogeworICAgIGlmICghbV9pc1BhaW50aW5nRW5hYmxlZCkK KyAgICAgICAgcmV0dXJuOworCiAgICAgSW50UmVjdCBkaXJ0eVJlY3QgPSByZWN0OwogICAgIGRp cnR5UmVjdC5pbnRlcnNlY3QobV93ZWJQYWdlLT5ib3VuZHMoKSk7CiAKQEAgLTEwMCw2ICsxMDQs OSBAQCB2b2lkIERyYXdpbmdBcmVhSW1wbDo6c2V0TmVlZHNEaXNwbGF5KGNvbnN0IEludFJlY3Qm IHJlY3QpCiAKIHZvaWQgRHJhd2luZ0FyZWFJbXBsOjpzY3JvbGwoY29uc3QgSW50UmVjdCYgc2Ny b2xsUmVjdCwgY29uc3QgSW50U2l6ZSYgc2Nyb2xsT2Zmc2V0KQogeworICAgIGlmICghbV9pc1Bh aW50aW5nRW5hYmxlZCkKKyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKG1fbGF5ZXJUcmVlSG9z dCkgewogICAgICAgICBBU1NFUlQobV9zY3JvbGxSZWN0LmlzRW1wdHkoKSk7CiAgICAgICAgIEFT U0VSVChtX3Njcm9sbE9mZnNldC5pc0VtcHR5KCkpOwpAQCAtMjI4LDYgKzIzNSwxMSBAQCB2b2lk IERyYXdpbmdBcmVhSW1wbDo6c2V0UGFnZU92ZXJsYXlOZWVkc0Rpc3BsYXkoY29uc3QgSW50UmVj dCYgcmVjdCkKICAgICBzZXROZWVkc0Rpc3BsYXkocmVjdCk7CiB9CiAKK3ZvaWQgRHJhd2luZ0Fy ZWFJbXBsOjpzZXRQYWludGluZ0VuYWJsZWQoYm9vbCBwYWludGluZ0VuYWJsZWQpCit7CisgICAg bV9pc1BhaW50aW5nRW5hYmxlZCA9IHBhaW50aW5nRW5hYmxlZDsKK30KKwogdm9pZCBEcmF3aW5n QXJlYUltcGw6OmxheWVySG9zdERpZEZsdXNoTGF5ZXJzKCkKIHsKICAgICBBU1NFUlQobV9sYXll clRyZWVIb3N0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9EcmF3aW5nQXJlYUltcGwuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9E cmF3aW5nQXJlYUltcGwuaAppbmRleCA1Y2E1NTQ4OTE3MGM0MDY4ZDc4ZWM0NGY4OGE5MWEyYzk3 MDc4ZjI5Li5mYWRhNzYzYTQwOGY4YjY0MWIyM2I1ZDA1M2EyMjA5NzFmNTE2NTlkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmgK KysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5o CkBAIC02Miw3ICs2Miw5IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRpZEluc3RhbGxQ YWdlT3ZlcmxheSgpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRVbmluc3RhbGxQYWdlT3ZlcmxheSgp OwogICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlT3ZlcmxheU5lZWRzRGlzcGxheShjb25zdCBXZWJD b3JlOjpJbnRSZWN0Jik7Ci0gICAgCisKKyAgICB2aXJ0dWFsIHZvaWQgc2V0UGFpbnRpbmdFbmFi bGVkKGJvb2wpOworCiAgICAgdmlydHVhbCB2b2lkIHNldFJvb3RDb21wb3NpdGluZ0xheWVyKFdl YkNvcmU6OkdyYXBoaWNzTGF5ZXIqKTsKICAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVDb21wb3Np dGluZ0xheWVyU3luYygpOwogICAgIHZpcnR1YWwgdm9pZCBzeW5jQ29tcG9zaXRpbmdMYXllcnMo KTsKQEAgLTEwMCw2ICsxMDIsOSBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OkludFJlY3QgbV9z Y3JvbGxSZWN0OwogICAgIFdlYkNvcmU6OkludFNpemUgbV9zY3JvbGxPZmZzZXQ7CiAKKyAgICAv LyBXaGV0aGVyIHBhaW50aW5nIGlzIGVuYWJsZWQuIElmIHBhaW50aW5nIGlzIGRpc2FibGVkLCBh bnkgY2FsbHMgdG8gc2V0TmVlZHNEaXNwbGF5IGFuZCBzY3JvbGwgYXJlIGlnbm9yZWQuCisgICAg Ym9vbCBtX2lzUGFpbnRpbmdFbmFibGVkOworCiAgICAgLy8gV2hldGhlciB3ZSdyZSBjdXJyZW50 bHkgcHJvY2Vzc2luZyBhbiBVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSBtZXNzYWdlLgogICAgIGJv b2wgbV9pblVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZTQ4ZDI2MjIwYmUxNmRiMDM1ZDQxMDEy ZDZlMDBiOTQ3MWY2NjY3ZC4uMzc0YTVlYjlhN2MwMGM4NzU4YzAyMTUwYWZiYWJlOTNkZWEzYzdk YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApA QCAtMjI4LDYgKzIyOCw4IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBjb25z dCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogICAgIHBsYXRmb3JtSW5p dGlhbGl6ZSgpOwogCiAgICAgbV9kcmF3aW5nQXJlYSA9IERyYXdpbmdBcmVhOjpjcmVhdGUodGhp cywgcGFyYW1ldGVycyk7CisgICAgbV9kcmF3aW5nQXJlYS0+c2V0UGFpbnRpbmdFbmFibGVkKGZh bHNlKTsKKwogICAgIG1fbWFpbkZyYW1lID0gV2ViRnJhbWU6OmNyZWF0ZU1haW5GcmFtZSh0aGlz KTsKIAogICAgIHNldERyYXdzQmFja2dyb3VuZChwYXJhbWV0ZXJzLmRyYXdzQmFja2dyb3VuZCk7 CkBAIC0yNDYsNiArMjQ4LDggQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNv bnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiAgICAgaWYgKCFwYXJh bWV0ZXJzLnNlc3Npb25TdGF0ZS5pc0VtcHR5KCkpCiAgICAgICAgIHJlc3RvcmVTZXNzaW9uKHBh cmFtZXRlcnMuc2Vzc2lvblN0YXRlKTsKIAorICAgIG1fZHJhd2luZ0FyZWEtPnNldFBhaW50aW5n RW5hYmxlZCh0cnVlKTsKKwogI2lmbmRlZiBOREVCVUcKICAgICB3ZWJQYWdlQ291bnRlci5pbmNy ZW1lbnQoKTsKICNlbmRpZgo=