135412 2014-07-30 00:57:05 -0700 [GTK] REGRESSION(r171742): Test /webkit2/WebKitWebView/disallow-modal-dialogs fails 2014-07-30 03:53:00 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk, Regression P2 Normal --- 1 cgarcia webkit-unassigned aperez berto commit-queue gustavo mrobinson pnormand svillar oldest_to_newest 1025685 0 cgarcia 2014-07-30 00:57:05 -0700 ERROR:../../Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp:455:void testWebViewDisallowModalDialogs(ModalDialogsTest*, gconstpointer): assertion failed (events.size() == 0): (4 == 0) The problem is that WebPageProxy::setUIClient() calls setCanRunModal() with the value of m_uiClient->canRunModal() which is always true for us. We override that manually by calling setCanRunModal() depending on the WebKitSettings. In r171742, webkitWebViewUpdateSettings(), the method that overrides setCanRunModal(), was moved before attachUIClientToView(), so the value set by WebPageProxy::setUIClient() is the last one and take precedence. We need to make sure webkitWebViewUpdateSettings() is always called after attachUIClientToView(). 1025686 1 235736 cgarcia 2014-07-30 01:00:02 -0700 Created attachment 235736 Patch 1025687 2 commit-queue 2014-07-30 01:02:34 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1025697 3 cgarcia 2014-07-30 03:53:00 -0700 Committed r171796: <http://trac.webkit.org/changeset/171796> 235736 2014-07-30 01:00:02 -0700 2014-07-30 03:32:31 -0700 Patch wk2-allow-modal-dialogs.diff text/plain 2601 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmMGZmZmI3Li4yM2UwMGI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTQtMDctMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFJFR1JFU1NJT04ocjE3MTc0Mik6IFRlc3QgL3dlYmtpdDIvV2Vi S2l0V2ViVmlldy9kaXNhbGxvdy1tb2RhbC1kaWFsb2dzIGZhaWxzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU0MTIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcHJvYmxlbSBpcyB0aGF0IFdlYlBh Z2VQcm94eTo6c2V0VUlDbGllbnQoKSBjYWxscworICAgICAgICBzZXRDYW5SdW5Nb2RhbCgpIHdp dGggdGhlIHZhbHVlIG9mIG1fdWlDbGllbnQtPmNhblJ1bk1vZGFsKCkgd2hpY2gKKyAgICAgICAg aXMgYWx3YXlzIHRydWUgZm9yIHVzLiBXZSBvdmVycmlkZSB0aGF0IG1hbnVhbGx5IGJ5IGNhbGxp bmcKKyAgICAgICAgc2V0Q2FuUnVuTW9kYWwoKSBkZXBlbmRpbmcgb24gdGhlIFdlYktpdFNldHRp bmdzLiBJbiByMTcxNzQyLAorICAgICAgICB3ZWJraXRXZWJWaWV3VXBkYXRlU2V0dGluZ3MoKSwg dGhlIG1ldGhvZCB0aGF0IG92ZXJyaWRlcworICAgICAgICBzZXRDYW5SdW5Nb2RhbCgpLCB3YXMg bW92ZWQgYmVmb3JlIGF0dGFjaFVJQ2xpZW50VG9WaWV3KCksIHNvIHRoZQorICAgICAgICB2YWx1 ZSBzZXQgYnkgV2ViUGFnZVByb3h5OjpzZXRVSUNsaWVudCgpIGlzIHRoZSBsYXN0IG9uZSBhbmQg dGFrZXMKKyAgICAgICAgcHJlY2VkZW5jZS4gV2UgbmVlZCB0byBtYWtlIHN1cmUgd2Via2l0V2Vi Vmlld1VwZGF0ZVNldHRpbmdzKCkgaXMKKyAgICAgICAgYWx3YXlzIGNhbGxlZCBhZnRlciBhdHRh Y2hVSUNsaWVudFRvVmlldygpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlldy5jcHA6CisgICAgICAgICh3ZWJraXRXZWJWaWV3Q29uc3RydWN0ZWQpOiBNb3ZlIHdl YmtpdFdlYlZpZXdVcGRhdGVTZXR0aW5ncygpCisgICAgICAgIGNhbGwgYWZ0ZXIgYXR0YWNoVUlD bGllbnRUb1ZpZXcoKSBhbmQgYWRkIGEgY29tbWVudCB0byBub3QgZm9yZ2V0CisgICAgICAgIGFi b3V0IGl0IGFnYWluLgorCiAyMDE0LTA3LTI5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj aWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBSZW1vdmUgV2ViS2l0Q2VydGlmaWNhdGVJ bmZvIGZyb20gV2ViS2l0MkdUSysgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCmluZGV4IGY5Y2FjMjkuLmE4ZGY0YmMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3Bw CkBAIC00OTYsNyArNDk2LDYgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0NvbnN0cnVjdGVk KEdPYmplY3QqIG9iamVjdCkKICAgICAvLyBUaGUgcmVsYXRlZCB2aWV3IGlzIG9ubHkgdmFsaWQg ZHVyaW5nIHRoZSBjb25zdHJ1Y3Rpb24uCiAgICAgcHJpdi0+cmVsYXRlZFZpZXcgPSBudWxscHRy OwogCi0gICAgd2Via2l0V2ViVmlld1VwZGF0ZVNldHRpbmdzKHdlYlZpZXcpOwogICAgIHdlYmtp dFdlYlZpZXdCYXNlU2V0RG93bmxvYWRSZXF1ZXN0SGFuZGxlcihXRUJLSVRfV0VCX1ZJRVdfQkFT RSh3ZWJWaWV3KSwgd2Via2l0V2ViVmlld0hhbmRsZURvd25sb2FkUmVxdWVzdCk7CiAKICAgICBh dHRhY2hMb2FkZXJDbGllbnRUb1ZpZXcod2ViVmlldyk7CkBAIC01MDYsNiArNTA1LDEwIEBAIHN0 YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdDb25zdHJ1Y3RlZChHT2JqZWN0KiBvYmplY3QpCiAgICAg YXR0YWNoQ29udGV4dE1lbnVDbGllbnRUb1ZpZXcod2ViVmlldyk7CiAgICAgYXR0YWNoRm9ybUNs aWVudFRvVmlldyh3ZWJWaWV3KTsKIAorICAgIC8vIFRoaXMgbmVlZHMgdG8gYmUgYWZ0ZXIgYXR0 YWNoVUlDbGllbnRUb1ZpZXcoKSBiZWNhdXNlIFdlYlBhZ2VQcm94eTo6c2V0VUlDbGllbnQoKSBj YWxscyBzZXRDYW5SdW5Nb2RhbCgpIHdpdGggdHJ1ZS4KKyAgICAvLyBTZWUgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTQxMi4KKyAgICB3ZWJraXRXZWJWaWV3VXBk YXRlU2V0dGluZ3Mod2ViVmlldyk7CisKICAgICBwcml2LT5iYWNrRm9yd2FyZExpc3QgPSBhZG9w dEdSZWYod2Via2l0QmFja0ZvcndhcmRMaXN0Q3JlYXRlKCZnZXRQYWdlKHdlYlZpZXcpLT5iYWNr Rm9yd2FyZExpc3QoKSkpOwogICAgIHByaXYtPndpbmRvd1Byb3BlcnRpZXMgPSBhZG9wdEdSZWYo d2Via2l0V2luZG93UHJvcGVydGllc0NyZWF0ZSgpKTsKIH0K