61725 2011-05-30 03:48:15 -0700 [GTK] Implement JavaScript dialogs in MiniBrowser 2011-05-30 09:25:25 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned oldest_to_newest 412181 0 cgarcia 2011-05-30 03:48:15 -0700 runJavaScriptAlert, runJavaScriptConfirm and runJavaScriptPrompt are currently unimplemented in MiniBrowser. 412183 1 95332 cgarcia 2011-05-30 03:53:49 -0700 Created attachment 95332 Patch 412215 2 95332 mrobinson 2011-05-30 07:22:05 -0700 Comment on attachment 95332 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95332&action=review > Tools/MiniBrowser/gtk/BrowserWindow.c:191 > + char *buffer = (char *)g_malloc(length * sizeof(char)); You can omit sizeof(char) here. I'm pretty sure it's always one in C. Please put a space after the cast. > Tools/MiniBrowser/gtk/BrowserWindow.c:460 > + WKStringRef retval = (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) ? WKStringCreateWithUTF8CString(gtk_entry_get_text(GTK_ENTRY(entry))) : 0; -> returnValue 412254 3 cgarcia 2011-05-30 09:25:25 -0700 Committed r87690: <http://trac.webkit.org/changeset/87690> 95332 2011-05-30 03:53:49 -0700 2011-05-30 07:22:05 -0700 Patch wk2-js-dialogs.diff text/plain 6282 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5OGU2 NzczLi4yZmYzNTk5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDUtMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtHVEtdIEltcGxlbWVudCBKYXZhU2NyaXB0IGRpYWxvZ3MgaW4gTWlu aUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTYxNzI1CisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jOgorICAg ICAgICAoV0tTdHJpbmdHZXRDU3RyaW5nKTogSGVscGVyIGZ1bmN0aW9uIHRvIGdldCBhIFVURi04 IGMgc3RyaW5nIGZyb20KKyAgICAgICAgYSBXS1N0cmluZ1JlZi4KKyAgICAgICAgKFdLVVJMR2V0 Q1N0cmluZyk6IEhlbHBlciBmdW5jdGlvbiB0byBnZXQgYSBVVEYtOCBjIHN0cmluZyBmcm9tIGEK KyAgICAgICAgV0tVUkxSZWYuCisgICAgICAgIChicm93c2VyV2luZG93VXBkYXRlVVJMKTogVXBk YXRlIHRvIHVzZSBXS1VSTEdldENTdHJpbmcuCisgICAgICAgIChkaWRSZWNlaXZlVGl0bGVGb3JG cmFtZSk6IFVwZGF0ZSB0byB1c2UgV0tTdHJpbmdHZXRDU3RyaW5nLgorICAgICAgICAoY3JlYXRl TWVzc2FnZURpYWxvZyk6IENyZWF0ZSBhIEd0a01lc3NhZ2VEaWFsb2cuCisgICAgICAgIChydW5K YXZhU2NyaXB0QWxlcnQpOgorICAgICAgICAocnVuSmF2YVNjcmlwdENvbmZpcm0pOgorICAgICAg ICAocnVuSmF2YVNjcmlwdFByb21wdCk6CisgICAgICAgIChicm93c2VyV2luZG93VUlDbGllbnRJ bml0KToKKwogMjAxMS0wNS0yOSAgWXV0YSBLaXRhbXVyYSAgPHl1dGFrQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBLZW50IFRhbXVyYS4KZGlmZiAtLWdpdCBhL1Rvb2xzL01p bmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJv d3NlcldpbmRvdy5jCmluZGV4IDkwN2MzMjIuLjU3NmJjNzkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01p bmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3Rr L0Jyb3dzZXJXaW5kb3cuYwpAQCAtMTg1LDYgKzE4NSwyMiBAQCBzdGF0aWMgdm9pZCBicm93c2Vy X3dpbmRvd19jbGFzc19pbml0KEJyb3dzZXJXaW5kb3dDbGFzcyoga2xhc3MpCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdfUEFSQU1fUkVB RFdSSVRFIHwgR19QQVJBTV9DT05TVFJVQ1RfT05MWSkpOwogfQogCitzdGF0aWMgY2hhciogV0tT dHJpbmdHZXRDU3RyaW5nKFdLU3RyaW5nUmVmIHN0cmluZykKK3sKKyAgICBzaXplX3QgbGVuZ3Ro ID0gV0tTdHJpbmdHZXRNYXhpbXVtVVRGOENTdHJpbmdTaXplKHN0cmluZyk7CisgICAgY2hhciAq YnVmZmVyID0gKGNoYXIgKilnX21hbGxvYyhsZW5ndGggKiBzaXplb2YoY2hhcikpOworICAgIFdL U3RyaW5nR2V0VVRGOENTdHJpbmcoc3RyaW5nLCBidWZmZXIsIGxlbmd0aCk7CisgICAgcmV0dXJu IGJ1ZmZlcjsKK30KKworc3RhdGljIGNoYXIqIFdLVVJMR2V0Q1N0cmluZyhXS1VSTFJlZiB1cmwp Cit7CisgICAgV0tTdHJpbmdSZWYgdXJsU3RyaW5nID0gV0tVUkxDb3B5U3RyaW5nKHVybCk7Cisg ICAgY2hhciAqdXJsVGV4dCA9IFdLU3RyaW5nR2V0Q1N0cmluZyh1cmxTdHJpbmcpOworICAgIFdL UmVsZWFzZSh1cmxTdHJpbmcpOworICAgIHJldHVybiB1cmxUZXh0OworfQorCiBzdGF0aWMgdm9p ZCBicm93c2VyV2luZG93VXBkYXRlVGl0bGUoQnJvd3NlcldpbmRvdyogd2luZG93KQogewogICAg IEdTdHJpbmcgKnN0cmluZyA9IGdfc3RyaW5nX25ldyh3aW5kb3ctPnRpdGxlKTsKQEAgLTIyMCwx MyArMjM2LDkgQEAgc3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd1VwZGF0ZVVSTChCcm93c2VyV2lu ZG93KiB3aW5kb3csIFdLVVJMUmVmIHVybCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAg IFdLU3RyaW5nUmVmIHVybFN0cmluZyA9IFdLVVJMQ29weVN0cmluZyh1cmwpOwotICAgIHNpemVf dCBsZW5ndGggPSBXS1N0cmluZ0dldE1heGltdW1VVEY4Q1N0cmluZ1NpemUodXJsU3RyaW5nKTsK LSAgICBjaGFyKiBidWZmZXIgPSAoY2hhciAqKWdfbWFsbG9jKGxlbmd0aCAqIHNpemVvZihjaGFy KSk7Ci0gICAgV0tTdHJpbmdHZXRVVEY4Q1N0cmluZyh1cmxTdHJpbmcsIGJ1ZmZlciwgbGVuZ3Ro KTsKLSAgICBndGtfZW50cnlfc2V0X3RleHQoR1RLX0VOVFJZKHdpbmRvdy0+dXJpRW50cnkpLCBi dWZmZXIpOwotICAgIGdfZnJlZShidWZmZXIpOwotICAgIFdLUmVsZWFzZSh1cmxTdHJpbmcpOwor ICAgIGNoYXIgKnVybFRleHQgPSBXS1VSTEdldENTdHJpbmcodXJsKTsKKyAgICBndGtfZW50cnlf c2V0X3RleHQoR1RLX0VOVFJZKHdpbmRvdy0+dXJpRW50cnkpLCB1cmxUZXh0KTsKKyAgICBnX2Zy ZWUodXJsVGV4dCk7CiB9CiAKIC8vIExvYWRlciBjbGllbnQuCkBAIC0zMDAsMTEgKzMxMiw5IEBA IHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVUaXRsZUZvckZyYW1lKFdLUGFnZVJlZiBwYWdlLCBXS1N0 cmluZ1JlZiB0aXRsZSwgV0tGcmFtZVJlCiAgICAgaWYgKCFXS0ZyYW1lSXNNYWluRnJhbWUoZnJh bWUpKQogICAgICAgICByZXR1cm47CiAKLSAgICBzaXplX3QgbGVuZ3RoID0gV0tTdHJpbmdHZXRN YXhpbXVtVVRGOENTdHJpbmdTaXplKHRpdGxlKTsKLSAgICBjaGFyKiBidWZmZXIgPSAoY2hhciAq KWdfbWFsbG9jKGxlbmd0aCAqIHNpemVvZihjaGFyKSk7Ci0gICAgV0tTdHJpbmdHZXRVVEY4Q1N0 cmluZyh0aXRsZSwgYnVmZmVyLCBsZW5ndGgpOwotICAgIGJyb3dzZXJXaW5kb3dTZXRUaXRsZShC Uk9XU0VSX1dJTkRPVyhjbGllbnRJbmZvKSwgYnVmZmVyKTsKLSAgICBnX2ZyZWUoYnVmZmVyKTsK KyAgICBjaGFyICp0aXRsZVRleHQgPSBXS1N0cmluZ0dldENTdHJpbmcodGl0bGUpOworICAgIGJy b3dzZXJXaW5kb3dTZXRUaXRsZShCUk9XU0VSX1dJTkRPVyhjbGllbnRJbmZvKSwgdGl0bGVUZXh0 KTsKKyAgICBnX2ZyZWUodGl0bGVUZXh0KTsKIH0KIAogc3RhdGljIHZvaWQgZGlkRmlyc3RMYXlv dXRGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tUeXBlUmVmIHVz ZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQpAQCAtNDAwLDggKzQxMCw1NyBAQCBzdGF0 aWMgdm9pZCBjbG9zZVBhZ2UoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8p CiAgICAgZ3RrX3dpZGdldF9kZXN0cm95KEdUS19XSURHRVQoY2xpZW50SW5mbykpOwogfQogCitz dGF0aWMgR3RrV2lkZ2V0KiBjcmVhdGVNZXNzYWdlRGlhbG9nKEd0a1dpbmRvdyAqcGFyZW50LCBH dGtNZXNzYWdlVHlwZSB0eXBlLCBHdGtCdXR0b25zVHlwZSBidXR0b25zLCBnaW50IGRlZmF1bHRS ZXNwb25zZSwgV0tTdHJpbmdSZWYgbWVzc2FnZSwgV0tGcmFtZVJlZiBmcmFtZSkKK3sKKyAgICBj aGFyICptZXNzYWdlVGV4dCA9IFdLU3RyaW5nR2V0Q1N0cmluZyhtZXNzYWdlKTsKKyAgICBHdGtX aWRnZXQgKmRpYWxvZyA9IGd0a19tZXNzYWdlX2RpYWxvZ19uZXcocGFyZW50LCBHVEtfRElBTE9H X0RFU1RST1lfV0lUSF9QQVJFTlQsIHR5cGUsIGJ1dHRvbnMsICIlcyIsIG1lc3NhZ2VUZXh0KTsK KyAgICBnX2ZyZWUobWVzc2FnZVRleHQpOworCisgICAgV0tVUkxSZWYgdXJsID0gV0tGcmFtZUNv cHlVUkwoZnJhbWUpOworICAgIGNoYXIgKnVybFRleHQgPSBXS1VSTEdldENTdHJpbmcodXJsKTsK KyAgICBXS1JlbGVhc2UodXJsKTsKKyAgICBnY2hhciAqdGl0bGUgPSBnX3N0cmR1cF9wcmludGYo IkphdmFTY3JpcHQgLSAlcyIsIHVybFRleHQpOworICAgIGdfZnJlZSh1cmxUZXh0KTsKKyAgICBn dGtfd2luZG93X3NldF90aXRsZShHVEtfV0lORE9XKGRpYWxvZyksIHRpdGxlKTsKKyAgICBnX2Zy ZWUodGl0bGUpOworCisgICAgZ3RrX2RpYWxvZ19zZXRfZGVmYXVsdF9yZXNwb25zZShHVEtfRElB TE9HKGRpYWxvZyksIGRlZmF1bHRSZXNwb25zZSk7CisKKyAgICByZXR1cm4gZGlhbG9nOworfQor CiBzdGF0aWMgdm9pZCBydW5KYXZhU2NyaXB0QWxlcnQoV0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5n UmVmIG1lc3NhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pCiB7 CisgICAgR3RrV2lkZ2V0ICpkaWFsb2cgPSBjcmVhdGVNZXNzYWdlRGlhbG9nKEdUS19XSU5ET1co Y2xpZW50SW5mbyksIEdUS19NRVNTQUdFX1dBUk5JTkcsIEdUS19CVVRUT05TX0NMT1NFLCBHVEtf UkVTUE9OU0VfQ0xPU0UsIG1lc3NhZ2UsIGZyYW1lKTsKKyAgICBndGtfZGlhbG9nX3J1bihHVEtf RElBTE9HKGRpYWxvZykpOworICAgIGd0a193aWRnZXRfZGVzdHJveShkaWFsb2cpOworfQorCitz dGF0aWMgYm9vbCBydW5KYXZhU2NyaXB0Q29uZmlybShXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdS ZWYgbWVzc2FnZSwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3sK KyAgICBHdGtXaWRnZXQgKmRpYWxvZyA9IGNyZWF0ZU1lc3NhZ2VEaWFsb2coR1RLX1dJTkRPVyhj bGllbnRJbmZvKSwgR1RLX01FU1NBR0VfUVVFU1RJT04sIEdUS19CVVRUT05TX09LX0NBTkNFTCwg R1RLX1JFU1BPTlNFX09LLCBtZXNzYWdlLCBmcmFtZSk7CisgICAgYm9vbCByZXR2YWwgPSAoZ3Rr X2RpYWxvZ19ydW4oR1RLX0RJQUxPRyhkaWFsb2cpKSA9PSBHVEtfUkVTUE9OU0VfT0spOworICAg IGd0a193aWRnZXRfZGVzdHJveShkaWFsb2cpOworCisgICAgcmV0dXJuIHJldHZhbDsKK30KKwor c3RhdGljIFdLU3RyaW5nUmVmIHJ1bkphdmFTY3JpcHRQcm9tcHQoV0tQYWdlUmVmIHBhZ2UsIFdL U3RyaW5nUmVmIG1lc3NhZ2UsIFdLU3RyaW5nUmVmIGRlZmF1bHRWYWx1ZSwgV0tGcmFtZVJlZiBm cmFtZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3sKKyAgICBHdGtXaWRnZXQgKmRpYWxvZyA9 IGNyZWF0ZU1lc3NhZ2VEaWFsb2coR1RLX1dJTkRPVyhjbGllbnRJbmZvKSwgR1RLX01FU1NBR0Vf UVVFU1RJT04sIEdUS19CVVRUT05TX09LX0NBTkNFTCwgR1RLX1JFU1BPTlNFX09LLCBtZXNzYWdl LCBmcmFtZSk7CisKKyAgICBHdGtXaWRnZXQgKmVudHJ5ID0gZ3RrX2VudHJ5X25ldygpOworICAg IGNoYXIgKnZhbHVlID0gV0tTdHJpbmdHZXRDU3RyaW5nKGRlZmF1bHRWYWx1ZSk7CisgICAgZ3Rr X2VudHJ5X3NldF90ZXh0KEdUS19FTlRSWShlbnRyeSksIHZhbHVlKTsKKyAgICBnX2ZyZWUodmFs dWUpOworICAgIGd0a19jb250YWluZXJfYWRkKEdUS19DT05UQUlORVIoZ3RrX2RpYWxvZ19nZXRf Y29udGVudF9hcmVhKEdUS19ESUFMT0coZGlhbG9nKSkpLCBlbnRyeSk7CisgICAgZ3RrX2VudHJ5 X3NldF9hY3RpdmF0ZXNfZGVmYXVsdChHVEtfRU5UUlkoZW50cnkpLCBUUlVFKTsKKyAgICBndGtf d2lkZ2V0X3Nob3coZW50cnkpOworCisgICAgV0tTdHJpbmdSZWYgcmV0dmFsID0gKGd0a19kaWFs b2dfcnVuKEdUS19ESUFMT0coZGlhbG9nKSkgPT0gR1RLX1JFU1BPTlNFX09LKSA/IFdLU3RyaW5n Q3JlYXRlV2l0aFVURjhDU3RyaW5nKGd0a19lbnRyeV9nZXRfdGV4dChHVEtfRU5UUlkoZW50cnkp KSkgOiAwOworICAgIGd0a193aWRnZXRfZGVzdHJveShkaWFsb2cpOworCisgICAgcmV0dXJuIHJl dHZhbDsKIH0KIAogc3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd1VJQ2xpZW50SW5pdChCcm93c2Vy V2luZG93ICp3aW5kb3cpCkBAIC00MTYsOCArNDc1LDggQEAgc3RhdGljIHZvaWQgYnJvd3Nlcldp bmRvd1VJQ2xpZW50SW5pdChCcm93c2VyV2luZG93ICp3aW5kb3cpCiAgICAgICAgIDAsICAgICAg LyogZm9jdXMgKi8KICAgICAgICAgMCwgICAgICAvKiB1bmZvY3VzICovCiAgICAgICAgIHJ1bkph dmFTY3JpcHRBbGVydCwKLSAgICAgICAgMCwgICAgICAvKiBydW5KYXZhU2NyaXB0Q29uZmlybSAq LwotICAgICAgICAwLCAgICAgIC8qIHJ1bkphdmFTY3JpcHRQcm9tcHQgKi8KKyAgICAgICAgcnVu SmF2YVNjcmlwdENvbmZpcm0sCisgICAgICAgIHJ1bkphdmFTY3JpcHRQcm9tcHQsCiAgICAgICAg IDAsICAgICAgLyogc2V0U3RhdHVzVGV4dCAqLwogICAgICAgICAwLCAgICAgIC8qIG1vdXNlRGlk TW92ZU92ZXJFbGVtZW50ICovCiAgICAgICAgIDAsICAgICAgLyogbWlzc2luZ1BsdWdpbkJ1dHRv bkNsaWNrZWQgKi8K