51686 2010-12-28 13:16:59 -0800 [GTK] Closing a window during an onload event can trigger serious GLib warnings 2010-12-28 17:07:34 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned gustavo svillar xan.lopez oldest_to_newest 327321 0 mrobinson 2010-12-28 13:16:59 -0800 This can be seen by looking at the stderr output of fast/dom/Window/window-early-properties-stderr.txt: GSettings schema not found - settings will not be used or saved. GSettings schema not found - settings will not be used or saved. GSettings schema not found - settings will not be used or saved. instance with invalid (NULL) class pointer g_signal_emit_by_name: assertion `G_TYPE_CHECK_INSTANCE (instance)' failed 327331 1 77573 mrobinson 2010-12-28 13:37:53 -0800 Created attachment 77573 Patch for this issue 327338 2 77573 xan.lopez 2010-12-28 13:44:14 -0800 Comment on attachment 77573 Patch for this issue View in context: https://bugs.webkit.org/attachment.cgi?id=77573&action=review > WebKit/gtk/ChangeLog:13 > + If this were the problem just reffing the view before emitting the signal would be enough; from our talk I understand that it must survive for a while after this function is finished, which is different. Am I wrong? > WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:255 > + gboolean isHandled = FALSE; No need to initialize this, and perhaps you could call it 'dummy'. > WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:267 > Aren't you checking for m_closeSoonTimer right before? > WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:268 > + m_webView->priv->corePage->setGroupName(""); And this? > WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:272 > + // signal, but our caller my need to send more signals web view. For 'more signals web view'? Missing 'to the'? 327399 3 77573 mrobinson 2010-12-28 15:04:50 -0800 Comment on attachment 77573 Patch for this issue View in context: https://bugs.webkit.org/attachment.cgi?id=77573&action=review Thanks for the review! >> WebKit/gtk/ChangeLog:13 >> + > > If this were the problem just reffing the view before emitting the signal would be enough; from our talk I understand that it must survive for a while after this function is finished, which is different. Am I wrong? I think my entry doesn't explain the problem fully. close-web-view essentially kills the view (because the client may remove the last reference), but the caller (FrameLoader) depends on the view still existing. >> WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:255 >> + gboolean isHandled = FALSE; > > No need to initialize this, and perhaps you could call it 'dummy'. I'm fine with removing the initialization (I prefer to initialize things unconditionally), but I think isHandled better explains what it is and why I'm ignoring it. >> WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:267 >> > > Aren't you checking for m_closeSoonTimer right before? Oh right. I separated the check out after adding it to line 263 and forgot to remove the old one. Thanks! >> WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:268 >> + m_webView->priv->corePage->setGroupName(""); > > And this? It's necessary so that JavaScript can't find the page. It originates from the other ports. I'll leave a comment. >> WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:272 >> + // signal, but our caller my need to send more signals web view. For > > 'more signals web view'? Missing 'to the'? Oh yeah. Should be "more signals to the web view" 327401 4 77583 mrobinson 2010-12-28 15:13:08 -0800 Created attachment 77583 Patch wit Xan's suggestions 327432 5 mrobinson 2010-12-28 16:40:07 -0800 Committed r74731: <http://trac.webkit.org/changeset/74731> 77573 2010-12-28 13:37:53 -0800 2010-12-28 15:13:05 -0800 Patch for this issue bug-51686-20101228133751.patch text/plain 3788 mrobinson ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggZDVlZmQ4MmUzYmY2YTVkZjQ2NGM1YTNiM2FmOWM5MzEzNDFhMWJmYi4uYTRkZDA5MzBi NGFlZjlkYTU0MTJkNjIzM2VmOGU3MDhiYTFlMTM0MCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAx MC0xMi0yOCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gQ2xvc2luZyBh IHdpbmRvdyBkdXJpbmcgYW4gb25sb2FkIGV2ZW50IGNhbiB0cmlnZ2VyIHNlcmlvdXMgR0xpYiB3 YXJuaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTE2ODYKKworICAgICAgICBEb24ndCBlbWl0IHRoZSBjbG9zZS13ZWItdmlldyBzaWduYWwgaW1t ZWRpYXRlbHkgZHVyaW5nIGV4ZWN1dGlvbiBvZiBjbG9zZVdpbmRvd1Nvb24uCisgICAgICAgIFRo ZSBzaWduYWwgaGFuZGxlciBtYXkgY2hvb3NlIHRvIGRlc3Ryb3kgdGhlIHdlYiB2aWV3IHdoaWxl IGhhbmRsaW5nIHRoYXQgc2lnbmFsLAorICAgICAgICB3aGljaCBtYXkgcmVtb3ZlIHRoZSBsYXN0 IHJlZmVyZW5jZSB0byB0aGUgd2ViIHZpZXcuIEluc3RlYWQsIGxldCB0aGUgY2FsbGVyIGZpbmlz aAorICAgICAgICBleGVjdXRpbmcgYW5kIGVtaXQgdGhlIHNpZ25hbCBhZnRlciBhIDAgbGVuZ3Ro IHRpbWVvdXQuIFRoaXMgbWF0Y2hlcyB0aGUgYmVoYXZpb3Igb24KKyAgICAgICAgV2luZG93cy4K KworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHA6CisgICAgICAg IChXZWJLaXQ6OkNocm9tZUNsaWVudDo6Q2hyb21lQ2xpZW50KTogSW5pdGlhbGl6ZSB0aGUgdGlt ZXIgaWQuCisgICAgICAgIChXZWJLaXQ6OmVtaXRDbG9zZVdlYlZpZXdTaWduYWxMYXRlcik6IENh bGxiYWNrIGZvciB0aGUgdGltZXIuCisgICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudDo6Y2xv c2VXaW5kb3dTb29uKTogRG8gdGhlIGFjdHVhbCBzaWduYWwgaW52b2NhdGlvbiBhZnRlcgorICAg ICAgICB0aGUgY2FsbGVyIGZpbmlzaGVzIGl0cyB0YXNrcy4KKyAgICAgICAgKiBXZWJDb3JlU3Vw cG9ydC9DaHJvbWVDbGllbnRHdGsuaDogQWRkIGEgbmV3IG1lbWJlciBmb3IgdGhlIHRpbWVyIGlk LiBXZQorICAgICAgICBjYW4gdXNlIHRoaXMgdG8gcHJldmVudCBlbWl0dGluZyB0aGUgY2xvc2Ut d2ViLXZpZXcgc2lnbmFsIHR3aWNlLgorCiAyMDEwLTEyLTI3ICBNYXJ0aW4gUm9iaW5zb24gIDxt cm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2Eu CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5j cHAgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAKaW5kZXgg MTJmNGYxNGIyYzEwZTJlZmM0MzUyMGRhN2VkZmJhMmNlZDQxODZkNS4uOGM3NWNhZGUzMGMyOWZh YTQzOTVhODZjODJlZmM1M2NjMzIzZWU4YSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9XZWJDb3Jl U3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwCisrKyBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBv cnQvQ2hyb21lQ2xpZW50R3RrLmNwcApAQCAtNzAsNiArNzAsNyBAQCBuYW1lc3BhY2UgV2ViS2l0 IHsKIAogQ2hyb21lQ2xpZW50OjpDaHJvbWVDbGllbnQoV2ViS2l0V2ViVmlldyogd2ViVmlldykK ICAgICA6IG1fd2ViVmlldyh3ZWJWaWV3KQorICAgICwgbV9jbG9zZVNvb25UaW1lcigwKQogewog ICAgIEFTU0VSVChtX3dlYlZpZXcpOwogfQpAQCAtMjQ5LDE5ICsyNTAsMzEgQEAgdm9pZCBDaHJv bWVDbGllbnQ6OnNldFJlc2l6YWJsZShib29sKQogICAgIC8vIElnbm9yZWQgZm9yIG5vdwogfQog CitzdGF0aWMgZ2Jvb2xlYW4gZW1pdENsb3NlV2ViVmlld1NpZ25hbExhdGVyKFdlYktpdFdlYlZp ZXcqIHZpZXcpCit7CisgICAgZ2Jvb2xlYW4gaXNIYW5kbGVkID0gRkFMU0U7CisgICAgZ19zaWdu YWxfZW1pdF9ieV9uYW1lKHZpZXcsICJjbG9zZS13ZWItdmlldyIsICZpc0hhbmRsZWQpOworICAg IHJldHVybiBGQUxTRTsKK30KKwogdm9pZCBDaHJvbWVDbGllbnQ6OmNsb3NlV2luZG93U29vbigp CiB7CiAgICAgLy8gV2UgbWF5IG5vdCBoYXZlIGEgV2ViVmlldyBhcyBjcmVhdGUtd2ViLXZpZXcg Y2FuIHJldHVybiBOVUxMLgotICAgIGlmICghbV93ZWJWaWV3KQorICAgIGlmICghbV93ZWJWaWV3 IHx8IG1fY2xvc2VTb29uVGltZXIpCisgICAgICAgIHJldHVybjsKKyAgICBpZiAobV9jbG9zZVNv b25UaW1lcikgLy8gRG9uJ3QgY2FsbCBjbG9zZS13ZWItdmlldyBtb3JlIHRoYW4gb25jZS4KICAg ICAgICAgcmV0dXJuOwogCisgICAgbV93ZWJWaWV3LT5wcml2LT5jb3JlUGFnZS0+c2V0R3JvdXBO YW1lKCIiKTsKICAgICB3ZWJraXRfd2ViX3ZpZXdfc3RvcF9sb2FkaW5nKG1fd2ViVmlldyk7CiAK LSAgICBnYm9vbGVhbiBpc0hhbmRsZWQgPSBmYWxzZTsKLSAgICBnX3NpZ25hbF9lbWl0X2J5X25h bWUobV93ZWJWaWV3LCAiY2xvc2Utd2ViLXZpZXciLCAmaXNIYW5kbGVkKTsKLQotICAgIGlmIChp c0hhbmRsZWQpCi0gICAgICAgIHJldHVybjsKKyAgICAvLyBDbGllbnRzIGNvbW1vbmx5IGRlc3Ry b3kgdGhlIHdlYiB2aWV3IGR1cmluZyB0aGUgY2xvc2Utd2ViLXZpZXcKKyAgICAvLyBzaWduYWws IGJ1dCBvdXIgY2FsbGVyIG15IG5lZWQgdG8gc2VuZCBtb3JlIHNpZ25hbHMgd2ViIHZpZXcuIEZv cgorICAgIC8vIGluc3RhbmNlLCBpZiB0aGlzIGhhcHBlbmVkIGluIHRoZSBvbmxvYWQgaGFuZGxl ciwgaXQgd2lsbCBuZWVkIHRvCisgICAgLy8gY2FsbCBGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0 Y2hEaWRIYW5kbGVPbmxvYWRFdmVudHMuIEluc3RlYWQgb2YKKyAgICAvLyBmaXJpbmcgdGhlIGNs b3NlLXdlYi12aWV3IHNpZ25hbCBub3csIGZpcmUgaXQgYWZ0ZXIgdGhlIGNhbGxlcgorICAgIC8v IGZpbmlzaGVzLiBUaGlzIHNlZW1zIHRvIG1hdGNoIHRoZSBNYWMvV2luZG93cyBwb3J0IGJlaGF2 aW9yLgorICAgIG1fY2xvc2VTb29uVGltZXIgPSBnX3RpbWVvdXRfYWRkKDAsIHJlaW50ZXJwcmV0 X2Nhc3Q8R1NvdXJjZUZ1bmM+KGVtaXRDbG9zZVdlYlZpZXdTaWduYWxMYXRlciksIG1fd2ViVmll dyk7CiB9CiAKIGJvb2wgQ2hyb21lQ2xpZW50OjpjYW5UYWtlRm9jdXMoRm9jdXNEaXJlY3Rpb24p CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5o IGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuaAppbmRleCBlOWYx YzgzN2I2MGYzMmU2ZTlmN2QwMTgyNjU5NzFlODE1YWZlNmE2Li5kNjA3YzU0NTlmODk3MTUyM2Fm MjIwNmZiMDBmODk4OWFkNWQ2YWIzIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBw b3J0L0Nocm9tZUNsaWVudEd0ay5oCisrKyBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hy b21lQ2xpZW50R3RrLmgKQEAgLTE1NCw2ICsxNTQsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICAg ICBwcml2YXRlOgogICAgICAgICBXZWJLaXRXZWJWaWV3KiBtX3dlYlZpZXc7CiAgICAgICAgIFdl YkNvcmU6OktVUkwgbV9ob3ZlcmVkTGlua1VSTDsKKyAgICAgICAgdW5zaWduZWQgaW50IG1fY2xv c2VTb29uVGltZXI7CiAgICAgfTsKIH0KIAo= 77583 2010-12-28 15:13:08 -0800 2010-12-28 17:07:34 -0800 Patch wit Xan's suggestions bug-51686-20101228151307.patch text/plain 4325 mrobinson ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggZDVlZmQ4MmUzYmY2YTVkZjQ2NGM1YTNiM2FmOWM5MzEzNDFhMWJmYi4uMWI5MTJkOTg4 NThmMDZmNWQwYWViYmYzOTViOWYwMTgwZjg0Njg4NiAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAx MC0xMi0yOCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gQ2xvc2luZyBh IHdpbmRvdyBkdXJpbmcgYW4gb25sb2FkIGV2ZW50IGNhbiB0cmlnZ2VyIHNlcmlvdXMgR0xpYiB3 YXJuaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTE2ODYKKworICAgICAgICBEb24ndCBlbWl0IHRoZSBjbG9zZS13ZWItdmlldyBzaWduYWwgaW1t ZWRpYXRlbHkgZHVyaW5nIGV4ZWN1dGlvbiBvZiBjbG9zZVdpbmRvd1Nvb24uCisgICAgICAgIFRo ZSBzaWduYWwgaGFuZGxlciBtYXkgY2hvb3NlIHRvIGRlc3Ryb3kgdGhlIHdlYiB2aWV3IHdoaWxl IGhhbmRsaW5nIHRoYXQgc2lnbmFsLAorICAgICAgICB3aGljaCBtYXkgcmVtb3ZlIHRoZSBsYXN0 IHJlZmVyZW5jZSB0byB0aGUgd2ViIHZpZXcuIEZyYW1lTG9hZGVyQ2xpZW50IGRlcGVuZHMgb24g dGhlCisgICAgICAgIHZpZXcgc3RpbGwgZXhpc3RpbmcgdGhvdWdoLiBJbnN0ZWFkLCBsZXQgdGhl IGNhbGxlciBmaW5pc2ggZXhlY3V0aW5nIGFuZCBlbWl0IHRoZSBzaWduYWwKKyAgICAgICAgYWZ0 ZXIgYSAwIGxlbmd0aCB0aW1lb3V0LiBUaGlzIG1hdGNoZXMgdGhlIGJlaGF2aW9yIG9uIHRoZSBX aW5kb3dzIGFuZCBNYWMgcG9ydHMuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVD bGllbnRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OkNocm9tZUNsaWVu dCk6IEluaXRpYWxpemUgdGhlIHRpbWVyIGlkLgorICAgICAgICAoV2ViS2l0OjplbWl0Q2xvc2VX ZWJWaWV3U2lnbmFsTGF0ZXIpOiBDYWxsYmFjayBmb3IgdGhlIHRpbWVyLgorICAgICAgICAoV2Vi S2l0OjpDaHJvbWVDbGllbnQ6OmNsb3NlV2luZG93U29vbik6IERvIHRoZSBhY3R1YWwgc2lnbmFs IGludm9jYXRpb24gYWZ0ZXIKKyAgICAgICAgdGhlIGNhbGxlciBmaW5pc2hlcyBpdHMgdGFza3Mu CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmg6IEFkZCBhIG5ldyBt ZW1iZXIgZm9yIHRoZSB0aW1lciBpZC4gV2UKKyAgICAgICAgY2FuIHVzZSB0aGlzIHRvIHByZXZl bnQgZW1pdHRpbmcgdGhlIGNsb3NlLXdlYi12aWV3IHNpZ25hbCB0d2ljZS4KKwogMjAxMC0xMi0y NyAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9XZWJDb3JlU3Vw cG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJv bWVDbGllbnRHdGsuY3BwCmluZGV4IDEyZjRmMTRiMmMxMGUyZWZjNDM1MjBkYTdlZGZiYTJjZWQ0 MTg2ZDUuLjc5MTBjN2FjNzhmMjQ2NDIzMzc3ZmQ4ZjZiZDViMzA3NzRjMTY0OWQgMTAwNjQ0Ci0t LSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcAorKysgYi9X ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAKQEAgLTcwLDYgKzcw LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIENocm9tZUNsaWVudDo6Q2hyb21lQ2xpZW50KFdl YktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgOiBtX3dlYlZpZXcod2ViVmlldykKKyAgICAsIG1f Y2xvc2VTb29uVGltZXIoMCkKIHsKICAgICBBU1NFUlQobV93ZWJWaWV3KTsKIH0KQEAgLTI0OSwx OSArMjUwLDM3IEBAIHZvaWQgQ2hyb21lQ2xpZW50OjpzZXRSZXNpemFibGUoYm9vbCkKICAgICAv LyBJZ25vcmVkIGZvciBub3cKIH0KIAorc3RhdGljIGdib29sZWFuIGVtaXRDbG9zZVdlYlZpZXdT aWduYWxMYXRlcihXZWJLaXRXZWJWaWV3KiB2aWV3KQoreworICAgIGdib29sZWFuIGlzSGFuZGxl ZDsKKyAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUodmlldywgImNsb3NlLXdlYi12aWV3IiwgJmlz SGFuZGxlZCk7CisgICAgcmV0dXJuIEZBTFNFOworfQorCiB2b2lkIENocm9tZUNsaWVudDo6Y2xv c2VXaW5kb3dTb29uKCkKIHsKICAgICAvLyBXZSBtYXkgbm90IGhhdmUgYSBXZWJWaWV3IGFzIGNy ZWF0ZS13ZWItdmlldyBjYW4gcmV0dXJuIE5VTEwuCiAgICAgaWYgKCFtX3dlYlZpZXcpCiAgICAg ICAgIHJldHVybjsKKyAgICBpZiAobV9jbG9zZVNvb25UaW1lcikgLy8gRG9uJ3QgY2FsbCBjbG9z ZS13ZWItdmlldyBtb3JlIHRoYW4gb25jZS4KKyAgICAgICAgcmV0dXJuOwogCi0gICAgd2Via2l0 X3dlYl92aWV3X3N0b3BfbG9hZGluZyhtX3dlYlZpZXcpOworICAgIC8vIFdlIG5lZWQgdG8gcmVt b3ZlIHRoZSBwYXJlbnQgV2ViVmlldyBmcm9tIFdlYlZpZXdTZXRzIGhlcmUsIGJlZm9yZSBpdCBh Y3R1YWxseQorICAgIC8vIGNsb3NlcywgdG8gbWFrZSBzdXJlIHRoYXQgSmF2YVNjcmlwdCBjb2Rl IHRoYXQgZXhlY3V0ZXMgYmVmb3JlIGl0IGNsb3NlcworICAgIC8vIGNhbid0IGZpbmQgaXQuIE90 aGVyd2lzZSwgd2luZG93Lm9wZW4gd2lsbCBzZWxlY3QgYSBjbG9zZWQgV2ViVmlldyBpbnN0ZWFk IG9mIAorICAgIC8vIG9wZW5pbmcgYSBuZXcgb25lIDxyZGFyOi8vcHJvYmxlbS8zNTcyNTg1Pi4K KyAgICBtX3dlYlZpZXctPnByaXYtPmNvcmVQYWdlLT5zZXRHcm91cE5hbWUoIiIpOwogCi0gICAg Z2Jvb2xlYW4gaXNIYW5kbGVkID0gZmFsc2U7Ci0gICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKG1f d2ViVmlldywgImNsb3NlLXdlYi12aWV3IiwgJmlzSGFuZGxlZCk7CisgICAgLy8gV2UgYWxzbyBu ZWVkIHRvIHN0b3AgdGhlIGxvYWQgdG8gcHJldmVudCBmdXJ0aGVyIHBhcnNpbmcgb3IgSmF2YVNj cmlwdCBleGVjdXRpb24KKyAgICAvLyBhZnRlciB0aGUgd2luZG93IGhhcyB0b3JuIGRvd24gPHJk YXI6Ly9wcm9ibGVtLzQxNjE2NjA+LgorICAgIHdlYmtpdF93ZWJfdmlld19zdG9wX2xvYWRpbmco bV93ZWJWaWV3KTsKIAotICAgIGlmIChpc0hhbmRsZWQpCi0gICAgICAgIHJldHVybjsKKyAgICAv LyBDbGllbnRzIGNvbW1vbmx5IGRlc3Ryb3kgdGhlIHdlYiB2aWV3IGR1cmluZyB0aGUgY2xvc2Ut d2ViLXZpZXcgc2lnbmFsLCBidXQgb3VyIGNhbGxlcgorICAgIC8vIG1heSBuZWVkIHRvIHNlbmQg bW9yZSBzaWduYWxzIHRvIHRoZSB3ZWIgdmlldy4gRm9yIGluc3RhbmNlLCBpZiB0aGlzIGhhcHBl bmVkIGluIHRoZQorICAgIC8vIG9ubG9hZCBoYW5kbGVyLCBpdCB3aWxsIG5lZWQgdG8gY2FsbCBG cmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRIYW5kbGVPbmxvYWRFdmVudHMuCisgICAgLy8g SW5zdGVhZCBvZiBmaXJpbmcgdGhlIGNsb3NlLXdlYi12aWV3IHNpZ25hbCBub3csIGZpcmUgaXQg YWZ0ZXIgdGhlIGNhbGxlciBmaW5pc2hlcy4KKyAgICAvLyBUaGlzIHNlZW1zIHRvIG1hdGNoIHRo ZSBNYWMvV2luZG93cyBwb3J0IGJlaGF2aW9yLgorICAgIG1fY2xvc2VTb29uVGltZXIgPSBnX3Rp bWVvdXRfYWRkKDAsIHJlaW50ZXJwcmV0X2Nhc3Q8R1NvdXJjZUZ1bmM+KGVtaXRDbG9zZVdlYlZp ZXdTaWduYWxMYXRlciksIG1fd2ViVmlldyk7CiB9CiAKIGJvb2wgQ2hyb21lQ2xpZW50OjpjYW5U YWtlRm9jdXMoRm9jdXNEaXJlY3Rpb24pCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVT dXBwb3J0L0Nocm9tZUNsaWVudEd0ay5oIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJv bWVDbGllbnRHdGsuaAppbmRleCBlOWYxYzgzN2I2MGYzMmU2ZTlmN2QwMTgyNjU5NzFlODE1YWZl NmE2Li5kNjA3YzU0NTlmODk3MTUyM2FmMjIwNmZiMDBmODk4OWFkNWQ2YWIzIDEwMDY0NAotLS0g YS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5oCisrKyBiL1dlYktp dC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmgKQEAgLTE1NCw2ICsxNTQsNyBA QCBuYW1lc3BhY2UgV2ViS2l0IHsKICAgICBwcml2YXRlOgogICAgICAgICBXZWJLaXRXZWJWaWV3 KiBtX3dlYlZpZXc7CiAgICAgICAgIFdlYkNvcmU6OktVUkwgbV9ob3ZlcmVkTGlua1VSTDsKKyAg ICAgICAgdW5zaWduZWQgaW50IG1fY2xvc2VTb29uVGltZXI7CiAgICAgfTsKIH0KIAo=