80557 2012-03-07 17:55:06 -0800 [Qt WK2] Remove duplicate code related to dialog handling in QQuickWebView 2012-03-08 08:05:24 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dinu.jacob webkit-unassigned hausmann menard webkit.review.bot zoltan oldest_to_newest 573427 0 dinu.jacob 2012-03-07 17:55:06 -0800 Common code related to starting QtDialogRunner can be moved into a separate function. 573430 1 130741 dinu.jacob 2012-03-07 17:58:34 -0800 Created attachment 130741 Patch 573839 2 130741 webkit.review.bot 2012-03-08 08:05:20 -0800 Comment on attachment 130741 Patch Clearing flags on attachment: 130741 Committed r110169: <http://trac.webkit.org/changeset/110169> 573840 3 webkit.review.bot 2012-03-08 08:05:24 -0800 All reviewed patches have been landed. Closing bug. 130741 2012-03-07 17:58:34 -0800 2012-03-08 08:05:19 -0800 Patch 80557.patch text/plain 6143 dinu.jacob ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzZjFjZDRjLi41ODI3ZWQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUg QEAKIDIwMTItMDMtMDcgIERpbnUgSmFjb2IgIDxkaW51LmphY29iQG5va2lhLmNvbT4KIAorICAg ICAgICBbUXQgV0syXSBSZW1vdmUgZHVwbGljYXRlIGNvZGUgcmVsYXRlZCB0byBkaWFsb2cgaGFu ZGxpbmcgaW4gUVF1aWNrV2ViVmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODA1NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNb3ZlIGNvbW1vbiBjb2RlIHJlbGF0ZWQgdG8gcnVubmluZyBRdERpYWxv Z1J1bm5lciBpbnRvIGEgc2VwYXJhdGUgZnVuY3Rpb24KKyAKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6 OnJ1bkphdmFTY3JpcHRBbGVydCk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6cnVu SmF2YVNjcmlwdENvbmZpcm0pOgorICAgICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6OnJ1bkph dmFTY3JpcHRQcm9tcHQpOgorICAgICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6OmhhbmRsZUF1 dGhlbnRpY2F0aW9uUmVxdWlyZWRSZXF1ZXN0KToKKyAgICAgICAgKFFRdWlja1dlYlZpZXdQcml2 YXRlOjpoYW5kbGVQcm94eUF1dGhlbnRpY2F0aW9uUmVxdWlyZWRSZXF1ZXN0KToKKyAgICAgICAg KFFRdWlja1dlYlZpZXdQcml2YXRlOjpoYW5kbGVDZXJ0aWZpY2F0ZVZlcmlmaWNhdGlvblJlcXVl c3QpOgorICAgICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6OmV4ZWNEaWFsb2dSdW5uZXIpOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaDoKKyAgICAgICAg KFFRdWlja1dlYlZpZXdQcml2YXRlKToKKworMjAxMi0wMy0wNyAgRGludSBKYWNvYiAgPGRpbnUu amFjb2JAbm9raWEuY29tPgorCiAgICAgICAgIFtRdF0gQXV0aGVudGljYXRpb24gZGlhbG9nIGRv ZXMgbm90IHdvcmsKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTc5NzM4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cXF1aWNrd2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlj a3dlYnZpZXcuY3BwCmluZGV4IDliM2E4YjguLmY5MTliZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcApAQCAtMjMsNyArMjMsNiBA QAogCiAjaW5jbHVkZSAiRG93bmxvYWRQcm94eS5oIgogI2luY2x1ZGUgIkRyYXdpbmdBcmVhUHJv eHlJbXBsLmgiCi0jaW5jbHVkZSAiUXREaWFsb2dSdW5uZXIuaCIKICNpbmNsdWRlICJRdERvd25s b2FkTWFuYWdlci5oIgogI2luY2x1ZGUgIlF0V2ViQ29udGV4dC5oIgogI2luY2x1ZGUgIlF0V2Vi SWNvbkRhdGFiYXNlQ2xpZW50LmgiCkBAIC0yNjUsMTQgKzI2NCw4IEBAIHZvaWQgUVF1aWNrV2Vi Vmlld1ByaXZhdGU6OnJ1bkphdmFTY3JpcHRBbGVydChjb25zdCBRU3RyaW5nJiBhbGVydFRleHQp CiAgICAgUXREaWFsb2dSdW5uZXIgZGlhbG9nUnVubmVyOwogICAgIGlmICghZGlhbG9nUnVubmVy LmluaXRGb3JBbGVydChhbGVydERpYWxvZywgcSwgYWxlcnRUZXh0KSkKICAgICAgICAgcmV0dXJu OwotICAgIHNldFZpZXdJbkF0dGFjaGVkUHJvcGVydGllcyhkaWFsb2dSdW5uZXIuZGlhbG9nKCkp OwotCi0gICAgZGlzYWJsZU1vdXNlRXZlbnRzKCk7Ci0gICAgbV9kaWFsb2dSdW5uZXJBY3RpdmUg PSB0cnVlOwogCi0gICAgZGlhbG9nUnVubmVyLmV4ZWMoKTsKLSAgICBtX2RpYWxvZ1J1bm5lckFj dGl2ZSA9IGZhbHNlOwotICAgIGVuYWJsZU1vdXNlRXZlbnRzKCk7CisgICAgZXhlY0RpYWxvZ1J1 bm5lcihkaWFsb2dSdW5uZXIpOwogfQogCiBib29sIFFRdWlja1dlYlZpZXdQcml2YXRlOjpydW5K YXZhU2NyaXB0Q29uZmlybShjb25zdCBRU3RyaW5nJiBtZXNzYWdlKQpAQCAtMjg0LDE0ICsyNzcs OCBAQCBib29sIFFRdWlja1dlYlZpZXdQcml2YXRlOjpydW5KYXZhU2NyaXB0Q29uZmlybShjb25z dCBRU3RyaW5nJiBtZXNzYWdlKQogICAgIFF0RGlhbG9nUnVubmVyIGRpYWxvZ1J1bm5lcjsKICAg ICBpZiAoIWRpYWxvZ1J1bm5lci5pbml0Rm9yQ29uZmlybShjb25maXJtRGlhbG9nLCBxLCBtZXNz YWdlKSkKICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgc2V0Vmlld0luQXR0YWNoZWRQcm9wZXJ0 aWVzKGRpYWxvZ1J1bm5lci5kaWFsb2coKSk7Ci0KLSAgICBkaXNhYmxlTW91c2VFdmVudHMoKTsK LSAgICBtX2RpYWxvZ1J1bm5lckFjdGl2ZSA9IHRydWU7CiAKLSAgICBkaWFsb2dSdW5uZXIuZXhl YygpOwotICAgIG1fZGlhbG9nUnVubmVyQWN0aXZlID0gZmFsc2U7Ci0gICAgZW5hYmxlTW91c2VF dmVudHMoKTsKKyAgICBleGVjRGlhbG9nUnVubmVyKGRpYWxvZ1J1bm5lcik7CiAKICAgICByZXR1 cm4gZGlhbG9nUnVubmVyLndhc0FjY2VwdGVkKCk7CiB9CkBAIC0zMDksMTQgKzI5Niw4IEBAIFFT dHJpbmcgUVF1aWNrV2ViVmlld1ByaXZhdGU6OnJ1bkphdmFTY3JpcHRQcm9tcHQoY29uc3QgUVN0 cmluZyYgbWVzc2FnZSwgY29uc3QKICAgICAgICAgb2sgPSB0cnVlOwogICAgICAgICByZXR1cm4g ZGVmYXVsdFZhbHVlOwogICAgIH0KLSAgICBzZXRWaWV3SW5BdHRhY2hlZFByb3BlcnRpZXMoZGlh bG9nUnVubmVyLmRpYWxvZygpKTsKIAotICAgIGRpc2FibGVNb3VzZUV2ZW50cygpOwotICAgIG1f ZGlhbG9nUnVubmVyQWN0aXZlID0gdHJ1ZTsKLQotICAgIGRpYWxvZ1J1bm5lci5leGVjKCk7Ci0g ICAgbV9kaWFsb2dSdW5uZXJBY3RpdmUgPSBmYWxzZTsKLSAgICBlbmFibGVNb3VzZUV2ZW50cygp OworICAgIGV4ZWNEaWFsb2dSdW5uZXIoZGlhbG9nUnVubmVyKTsKIAogICAgIG9rID0gZGlhbG9n UnVubmVyLndhc0FjY2VwdGVkKCk7CiAgICAgcmV0dXJuIGRpYWxvZ1J1bm5lci5yZXN1bHQoKTsK QEAgLTMzMiwxNCArMzEzLDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6aGFuZGxlQXV0 aGVudGljYXRpb25SZXF1aXJlZFJlcXVlc3QoY29uc3QgUVN0cmluZyYgaG8KICAgICBpZiAoIWRp YWxvZ1J1bm5lci5pbml0Rm9yQXV0aGVudGljYXRpb24oYXV0aGVudGljYXRpb25EaWFsb2csIHEs IGhvc3RuYW1lLCByZWFsbSwgcHJlZmlsbGVkVXNlcm5hbWUpKQogICAgICAgICByZXR1cm47CiAK LSAgICBzZXRWaWV3SW5BdHRhY2hlZFByb3BlcnRpZXMoZGlhbG9nUnVubmVyLmRpYWxvZygpKTsK LQotICAgIGRpc2FibGVNb3VzZUV2ZW50cygpOwotICAgIG1fZGlhbG9nUnVubmVyQWN0aXZlID0g dHJ1ZTsKLQotICAgIGRpYWxvZ1J1bm5lci5leGVjKCk7Ci0gICAgbV9kaWFsb2dSdW5uZXJBY3Rp dmUgPSBmYWxzZTsKLSAgICBlbmFibGVNb3VzZUV2ZW50cygpOworICAgIGV4ZWNEaWFsb2dSdW5u ZXIoZGlhbG9nUnVubmVyKTsKIAogICAgIHVzZXJuYW1lID0gZGlhbG9nUnVubmVyLnVzZXJuYW1l KCk7CiAgICAgcGFzc3dvcmQgPSBkaWFsb2dSdW5uZXIucGFzc3dvcmQoKTsKQEAgLTM1NSwxMyAr MzI5LDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6aGFuZGxlUHJveHlBdXRoZW50aWNh dGlvblJlcXVpcmVkUmVxdWVzdChjb25zdCBRU3RyaW4KICAgICBpZiAoIWRpYWxvZ1J1bm5lci5p bml0Rm9yUHJveHlBdXRoZW50aWNhdGlvbihwcm94eUF1dGhlbnRpY2F0aW9uRGlhbG9nLCBxLCBo b3N0bmFtZSwgcG9ydCwgcHJlZmlsbGVkVXNlcm5hbWUpKQogICAgICAgICByZXR1cm47CiAKLSAg ICBzZXRWaWV3SW5BdHRhY2hlZFByb3BlcnRpZXMoZGlhbG9nUnVubmVyLmRpYWxvZygpKTsKLSAg ICBkaXNhYmxlTW91c2VFdmVudHMoKTsKLSAgICBtX2RpYWxvZ1J1bm5lckFjdGl2ZSA9IHRydWU7 Ci0KLSAgICBkaWFsb2dSdW5uZXIuZXhlYygpOwotICAgIG1fZGlhbG9nUnVubmVyQWN0aXZlID0g ZmFsc2U7Ci0gICAgZW5hYmxlTW91c2VFdmVudHMoKTsKKyAgICBleGVjRGlhbG9nUnVubmVyKGRp YWxvZ1J1bm5lcik7CiAKICAgICB1c2VybmFtZSA9IGRpYWxvZ1J1bm5lci51c2VybmFtZSgpOwog ICAgIHBhc3N3b3JkID0gZGlhbG9nUnVubmVyLnBhc3N3b3JkKCk7CkBAIC0zNzcsNiArMzQ1LDEz IEBAIGJvb2wgUVF1aWNrV2ViVmlld1ByaXZhdGU6OmhhbmRsZUNlcnRpZmljYXRlVmVyaWZpY2F0 aW9uUmVxdWVzdChjb25zdCBRU3RyaW5nJiBoCiAgICAgaWYgKCFkaWFsb2dSdW5uZXIuaW5pdEZv ckNlcnRpZmljYXRlVmVyaWZpY2F0aW9uKGNlcnRpZmljYXRlVmVyaWZpY2F0aW9uRGlhbG9nLCBx LCBob3N0bmFtZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIGV4ZWNEaWFsb2dSdW5u ZXIoZGlhbG9nUnVubmVyKTsKKworICAgIHJldHVybiBkaWFsb2dSdW5uZXIud2FzQWNjZXB0ZWQo KTsKK30KKwordm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6ZXhlY0RpYWxvZ1J1bm5lcihRdERp YWxvZ1J1bm5lciYgZGlhbG9nUnVubmVyKQorewogICAgIHNldFZpZXdJbkF0dGFjaGVkUHJvcGVy dGllcyhkaWFsb2dSdW5uZXIuZGlhbG9nKCkpOwogCiAgICAgZGlzYWJsZU1vdXNlRXZlbnRzKCk7 CkBAIC0zODUsOCArMzYwLDYgQEAgYm9vbCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6aGFuZGxlQ2Vy dGlmaWNhdGVWZXJpZmljYXRpb25SZXF1ZXN0KGNvbnN0IFFTdHJpbmcmIGgKICAgICBkaWFsb2dS dW5uZXIuZXhlYygpOwogICAgIG1fZGlhbG9nUnVubmVyQWN0aXZlID0gZmFsc2U7CiAgICAgZW5h YmxlTW91c2VFdmVudHMoKTsKLQotICAgIHJldHVybiBkaWFsb2dSdW5uZXIud2FzQWNjZXB0ZWQo KTsKIH0KIAogdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6Y2hvb3NlRmlsZXMoV0tPcGVuUGFu ZWxSZXN1bHRMaXN0ZW5lclJlZiBsaXN0ZW5lclJlZiwgY29uc3QgUVN0cmluZ0xpc3QmIHNlbGVj dGVkRmlsZU5hbWVzLCBRdFdlYlBhZ2VVSUNsaWVudDo6RmlsZUNob29zZXJUeXBlIHR5cGUpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdf cF9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9w LmgKaW5kZXggYjE0MTljNC4uMmMzNjFkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaApAQCAtMjIsNiArMjIsNyBAQAogI2Rl ZmluZSBxcXVpY2t3ZWJ2aWV3X3BfcF9oCiAKICNpbmNsdWRlICJEcmF3aW5nQXJlYVByb3h5Lmgi CisjaW5jbHVkZSAiUXREaWFsb2dSdW5uZXIuaCIKICNpbmNsdWRlICJRdEZsaWNrUHJvdmlkZXIu aCIKICNpbmNsdWRlICJRdFBhZ2VDbGllbnQuaCIKICNpbmNsdWRlICJRdFZpZXdwb3J0SW50ZXJh Y3Rpb25FbmdpbmUuaCIKQEAgLTEwOCw2ICsxMDksOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYW5k bGVDZXJ0aWZpY2F0ZVZlcmlmaWNhdGlvblJlcXVlc3QoY29uc3QgUVN0cmluZyYgaG9zdG5hbWUp OwogICAgIHZvaWQgaGFuZGxlUHJveHlBdXRoZW50aWNhdGlvblJlcXVpcmVkUmVxdWVzdChjb25z dCBRU3RyaW5nJiBob3N0bmFtZSwgdWludDE2X3QgcG9ydCwgY29uc3QgUVN0cmluZyYgcHJlZmls bGVkVXNlcm5hbWUsIFFTdHJpbmcmIHVzZXJuYW1lLCBRU3RyaW5nJiBwYXNzd29yZCk7CiAKKyAg ICB2b2lkIGV4ZWNEaWFsb2dSdW5uZXIoUXREaWFsb2dSdW5uZXImKTsKKwogICAgIHZvaWQgc2V0 UmVuZGVyVG9PZmZzY3JlZW5CdWZmZXIoYm9vbCBlbmFibGUpIHsgbV9yZW5kZXJUb09mZnNjcmVl bkJ1ZmZlciA9IGVuYWJsZTsgfQogICAgIHZvaWQgc2V0Vmlld0luQXR0YWNoZWRQcm9wZXJ0aWVz KFFPYmplY3QqKTsKICAgICB2b2lkIHNldEljb24oY29uc3QgUVVybCYpOwo=