153201 2016-01-17 23:25:17 -0800 [GTK] Add support to load/save session in MiniBrowser 2016-01-19 05:16:19 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned lforschler oldest_to_newest 1156363 0 cgarcia 2016-01-17 23:25:17 -0800 It makes it easier to test the new webview session API. 1156364 1 269211 cgarcia 2016-01-17 23:30:05 -0800 Created attachment 269211 Patch 1156594 2 cgarcia 2016-01-19 05:16:19 -0800 Committed r195286: <http://trac.webkit.org/changeset/195286> 269211 2016-01-17 23:30:05 -0800 2016-01-18 06:27:06 -0800 Patch mb-session-state.diff text/plain 7383 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmMDg4 YjU3Li41NDNlMjdlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTYtMDEtMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEFkZCBzdXBwb3J0IHRvIGxv YWQvc2F2ZSBzZXNzaW9uIGluIE1pbmlCcm93c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTMyMDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJdCBtYWtlcyBpdCBlYXNpZXIgdG8gdGVzdCB0aGUgbmV3 IFdlYlZpZXcgc2Vzc2lvbiBBUEkuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3Nl cldpbmRvdy5jOgorICAgICAgICAoYnJvd3NlcldpbmRvd0ZpbmFsaXplKTogRnJlZSB0aGUgc2Vz c2lvbiBmaWxlIHBhdGguCisgICAgICAgIChicm93c2VyV2luZG93U2F2ZVNlc3Npb24pOiBTYXZl IHRoZSBjdXJyZW50IFdlYlZpZXcgc2Vzc2lvbiBpZgorICAgICAgICB0aGVyZSdzIGEgc2Vzc2lv biBmaWxlIHBhdGguCisgICAgICAgIChicm93c2VyV2luZG93RGVsZXRlRXZlbnQpOiBDYWxsIGJy b3dzZXJXaW5kb3dTYXZlU2Vzc2lvbigpLgorICAgICAgICAoYnJvd3Nlcl93aW5kb3dfbG9hZF9z ZXNzaW9uKTogVHJ5IHRvIGxvYWQgdGhlIHNlc3Npb24gZnJvbSB0aGUKKyAgICAgICAgZ2l2ZW4g ZmlsZSBwYXRoLCBvdGhlcndpc2UgZmFsbCBiYWNrIHRvIGhvbWVwYWdlIGFuZCBrZWVwIHRoZQor ICAgICAgICBzZXNzaW9uIGZpbGUgdG8gc2F2ZSB0aGUgc2Vzc2lvbiBvbiB3aW5kb3cgY2xvc2Uu CisgICAgICAgICogTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuaDoKKyAgICAgICAgKiBN aW5pQnJvd3Nlci9ndGsvbWFpbi5jOgorICAgICAgICAoY3JlYXRlQnJvd3NlcldpbmRvdyk6IFBh c3MgdGhlIGdpdmVuIHNlc3Npb24gZmlsZSBwYXRoIHdoZW4KKyAgICAgICAgc2hvdWxkTG9hZFNl c3Npb24gaXMgVFJVRS4KKyAgICAgICAgKG1haW4pOiBPbmx5IGFsbG93IHRvIHJlc3RvcmUvc2F2 ZSBzZXNzaW9uIHdoZW4gTWluaUJyb3dzZXIgaXMKKyAgICAgICAgbGF1bmNoZWQgd2l0aG91dCBV UkwgYXJndW1lbnRzLgorCiAyMDE2LTAxLTE2ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVs ZEBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIFRleHRSdW46OmFsbG93c1JvdW5kaW5nSGFj a3MoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYyBi L1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKaW5kZXggYWEyZjY1YS4uMWY3 M2Y2ZiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwor KysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCkBAIC03MSw2ICs3MSw3 IEBAIHN0cnVjdCBfQnJvd3NlcldpbmRvdyB7CiAgICAgR3RrV2luZG93ICpwYXJlbnRXaW5kb3c7 CiAgICAgZ3VpbnQgZnVsbFNjcmVlbk1lc3NhZ2VMYWJlbElkOwogICAgIGd1aW50IHJlc2V0RW50 cnlQcm9ncmVzc1RpbWVvdXRJZDsKKyAgICBnY2hhciAqc2Vzc2lvbkZpbGU7CiB9OwogCiBzdHJ1 Y3QgX0Jyb3dzZXJXaW5kb3dDbGFzcyB7CkBAIC03NzksNiArNzgwLDggQEAgc3RhdGljIHZvaWQg YnJvd3NlcldpbmRvd0ZpbmFsaXplKEdPYmplY3QgKmdPYmplY3QpCiAgICAgaWYgKHdpbmRvdy0+ cmVzZXRFbnRyeVByb2dyZXNzVGltZW91dElkKQogICAgICAgICBnX3NvdXJjZV9yZW1vdmUod2lu ZG93LT5yZXNldEVudHJ5UHJvZ3Jlc3NUaW1lb3V0SWQpOwogCisgICAgZ19mcmVlKHdpbmRvdy0+ c2Vzc2lvbkZpbGUpOworCiAgICAgR19PQkpFQ1RfQ0xBU1MoYnJvd3Nlcl93aW5kb3dfcGFyZW50 X2NsYXNzKS0+ZmluYWxpemUoZ09iamVjdCk7CiAKICAgICBpZiAoZ19hdG9taWNfaW50X2RlY19h bmRfdGVzdCgmd2luZG93Q291bnQpKQpAQCAtMTE1MSw5ICsxMTU0LDIyIEBAIHN0YXRpYyB2b2lk IGJyb3dzZXJXaW5kb3dDb25zdHJ1Y3RlZChHT2JqZWN0ICpnT2JqZWN0KQogICAgICAgICB3ZWJr aXRfd2ViX3ZpZXdfbG9hZF9odG1sKHdpbmRvdy0+d2ViVmlldywgIjxodG1sPjwvaHRtbD4iLCAi ZmlsZTovLy8iKTsKIH0KIAorc3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd1NhdmVTZXNzaW9uKEJy b3dzZXJXaW5kb3cgKndpbmRvdykKK3sKKyAgICBpZiAoIXdpbmRvdy0+c2Vzc2lvbkZpbGUpCisg ICAgICAgIHJldHVybjsKKworICAgIFdlYktpdFdlYlZpZXdTZXNzaW9uU3RhdGUgKnN0YXRlID0g d2Via2l0X3dlYl92aWV3X2dldF9zZXNzaW9uX3N0YXRlKHdpbmRvdy0+d2ViVmlldyk7CisgICAg R0J5dGVzICpieXRlcyA9IHdlYmtpdF93ZWJfdmlld19zZXNzaW9uX3N0YXRlX3NlcmlhbGl6ZShz dGF0ZSk7CisgICAgd2Via2l0X3dlYl92aWV3X3Nlc3Npb25fc3RhdGVfdW5yZWYoc3RhdGUpOwor ICAgIGdfZmlsZV9zZXRfY29udGVudHMod2luZG93LT5zZXNzaW9uRmlsZSwgZ19ieXRlc19nZXRf ZGF0YShieXRlcywgTlVMTCksIGdfYnl0ZXNfZ2V0X3NpemUoYnl0ZXMpLCBOVUxMKTsKKyAgICBn X2J5dGVzX3VucmVmKGJ5dGVzKTsKK30KKwogc3RhdGljIGdib29sZWFuIGJyb3dzZXJXaW5kb3dE ZWxldGVFdmVudChHdGtXaWRnZXQgKndpZGdldCwgR2RrRXZlbnRBbnkqIGV2ZW50KQogewogICAg IEJyb3dzZXJXaW5kb3cgKndpbmRvdyA9IEJST1dTRVJfV0lORE9XKHdpZGdldCk7CisgICAgYnJv d3NlcldpbmRvd1NhdmVTZXNzaW9uKHdpbmRvdyk7CiAgICAgd2Via2l0X3dlYl92aWV3X3RyeV9j bG9zZSh3aW5kb3ctPndlYlZpZXcpOwogICAgIHJldHVybiBUUlVFOwogfQpAQCAtMTIxNyw2ICsx MjMzLDM0IEBAIHZvaWQgYnJvd3Nlcl93aW5kb3dfbG9hZF91cmkoQnJvd3NlcldpbmRvdyAqd2lu ZG93LCBjb25zdCBjaGFyICp1cmkpCiAgICAgd2Via2l0X3dlYl92aWV3X3J1bl9qYXZhc2NyaXB0 KHdpbmRvdy0+d2ViVmlldywgc3Ryc3RyKHVyaSwgImphdmFzY3JpcHQ6IiksIE5VTEwsIE5VTEws IE5VTEwpOwogfQogCit2b2lkIGJyb3dzZXJfd2luZG93X2xvYWRfc2Vzc2lvbihCcm93c2VyV2lu ZG93ICp3aW5kb3csIGNvbnN0IGNoYXIgKnNlc3Npb25GaWxlKQoreworICAgIGdfcmV0dXJuX2lm X2ZhaWwoQlJPV1NFUl9JU19XSU5ET1cod2luZG93KSk7CisgICAgZ19yZXR1cm5faWZfZmFpbChz ZXNzaW9uRmlsZSk7CisKKyAgICB3aW5kb3ctPnNlc3Npb25GaWxlID0gZ19zdHJkdXAoc2Vzc2lv bkZpbGUpOworICAgIGdjaGFyICpkYXRhID0gTlVMTDsKKyAgICBnc2l6ZSBkYXRhTGVuZ3RoOwor ICAgIGlmIChnX2ZpbGVfZ2V0X2NvbnRlbnRzKHNlc3Npb25GaWxlLCAmZGF0YSwgJmRhdGFMZW5n dGgsIE5VTEwpKSB7CisgICAgICAgIEdCeXRlcyAqYnl0ZXMgPSBnX2J5dGVzX25ld190YWtlKGRh dGEsIGRhdGFMZW5ndGgpOworICAgICAgICBXZWJLaXRXZWJWaWV3U2Vzc2lvblN0YXRlICpzdGF0 ZSA9IHdlYmtpdF93ZWJfdmlld19zZXNzaW9uX3N0YXRlX25ldyhieXRlcyk7CisgICAgICAgIGdf Ynl0ZXNfdW5yZWYoYnl0ZXMpOworCisgICAgICAgIGlmIChzdGF0ZSkgeworICAgICAgICAgICAg d2Via2l0X3dlYl92aWV3X3Jlc3RvcmVfc2Vzc2lvbl9zdGF0ZSh3aW5kb3ctPndlYlZpZXcsIHN0 YXRlKTsKKyAgICAgICAgICAgIHdlYmtpdF93ZWJfdmlld19zZXNzaW9uX3N0YXRlX3VucmVmKHN0 YXRlKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIFdlYktpdEJhY2tGb3J3YXJkTGlzdCAqYmZM aXN0ID0gd2Via2l0X3dlYl92aWV3X2dldF9iYWNrX2ZvcndhcmRfbGlzdCh3aW5kb3ctPndlYlZp ZXcpOworICAgIFdlYktpdEJhY2tGb3J3YXJkTGlzdEl0ZW0gKml0ZW0gPSB3ZWJraXRfYmFja19m b3J3YXJkX2xpc3RfZ2V0X2N1cnJlbnRfaXRlbShiZkxpc3QpOworICAgIGlmIChpdGVtKQorICAg ICAgICB3ZWJraXRfd2ViX3ZpZXdfZ29fdG9fYmFja19mb3J3YXJkX2xpc3RfaXRlbSh3aW5kb3ct PndlYlZpZXcsIGl0ZW0pOworICAgIGVsc2UKKyAgICAgICAgd2Via2l0X3dlYl92aWV3X2xvYWRf dXJpKHdpbmRvdy0+d2ViVmlldywgQlJPV1NFUl9ERUZBVUxUX1VSTCk7CisKK30KKwogdm9pZCBi cm93c2VyX3dpbmRvd19zZXRfYmFja2dyb3VuZF9jb2xvcihCcm93c2VyV2luZG93ICp3aW5kb3cs IEdka1JHQkEgKnJnYmEpCiB7CiAgICAgZ19yZXR1cm5faWZfZmFpbChCUk9XU0VSX0lTX1dJTkRP Vyh3aW5kb3cpKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2lu ZG93LmggYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5oCmluZGV4IGQwNjFl NDAuLjk3YWU3YjkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2lu ZG93LmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuaApAQCAtNDcs NiArNDcsNyBAQCBHVHlwZSBicm93c2VyX3dpbmRvd19nZXRfdHlwZSh2b2lkKTsKIEd0a1dpZGdl dCogYnJvd3Nlcl93aW5kb3dfbmV3KFdlYktpdFdlYlZpZXcqLCBHdGtXaW5kb3cqKTsKIFdlYktp dFdlYlZpZXcqIGJyb3dzZXJfd2luZG93X2dldF92aWV3KEJyb3dzZXJXaW5kb3cqKTsKIHZvaWQg YnJvd3Nlcl93aW5kb3dfbG9hZF91cmkoQnJvd3NlcldpbmRvdyAqLCBjb25zdCBjaGFyICp1cmkp Owordm9pZCBicm93c2VyX3dpbmRvd19sb2FkX3Nlc3Npb24oQnJvd3NlcldpbmRvdyAqLCBjb25z dCBjaGFyICpzZXNzaW9uRmlsZSk7CiB2b2lkIGJyb3dzZXJfd2luZG93X3NldF9iYWNrZ3JvdW5k X2NvbG9yKEJyb3dzZXJXaW5kb3cqLCBHZGtSR0JBKik7CiAKIEdfRU5EX0RFQ0xTCmRpZmYgLS1n aXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3Rr L21haW4uYwppbmRleCBmNWY2ZTE3Li4zZjgzYjU1IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJv d3Nlci9ndGsvbWFpbi5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMKQEAgLTM5 LDYgKzM5LDcgQEAgc3RhdGljIGNvbnN0IGdjaGFyICoqdXJpQXJndW1lbnRzID0gTlVMTDsKIHN0 YXRpYyBjb25zdCBjaGFyICptaW5pQnJvd3NlckFib3V0U2NoZW1lID0gIm1pbmlicm93c2VyLWFi b3V0IjsKIHN0YXRpYyBHZGtSR0JBICpiYWNrZ3JvdW5kQ29sb3I7CiBzdGF0aWMgZ2Jvb2xlYW4g ZWRpdG9yTW9kZTsKK3N0YXRpYyBjb25zdCBjaGFyICpzZXNzaW9uRmlsZTsKIAogdHlwZWRlZiBl bnVtIHsKICAgICBNSU5JX0JST1dTRVJfRVJST1JfSU5WQUxJRF9BQk9VVF9QQVRICkBAIC01OCw3 ICs1OSw3IEBAIHN0YXRpYyBnY2hhciAqYXJndW1lbnRUb1VSTChjb25zdCBjaGFyICpmaWxlbmFt ZSkKICAgICByZXR1cm4gZmlsZVVSTDsKIH0KIAotc3RhdGljIHZvaWQgY3JlYXRlQnJvd3Nlcldp bmRvdyhjb25zdCBnY2hhciAqdXJpLCBXZWJLaXRTZXR0aW5ncyAqd2Via2l0U2V0dGluZ3MpCitz dGF0aWMgdm9pZCBjcmVhdGVCcm93c2VyV2luZG93KGNvbnN0IGdjaGFyICp1cmksIFdlYktpdFNl dHRpbmdzICp3ZWJraXRTZXR0aW5ncywgZ2Jvb2xlYW4gc2hvdWxkTG9hZFNlc3Npb24pCiB7CiAg ICAgR3RrV2lkZ2V0ICp3ZWJWaWV3ID0gd2Via2l0X3dlYl92aWV3X25ldygpOwogICAgIGlmIChl ZGl0b3JNb2RlKQpAQCAtNzEsOSArNzIsMTMgQEAgc3RhdGljIHZvaWQgY3JlYXRlQnJvd3Nlcldp bmRvdyhjb25zdCBnY2hhciAqdXJpLCBXZWJLaXRTZXR0aW5ncyAqd2Via2l0U2V0dGluZ3MKICAg ICAgICAgd2Via2l0X3dlYl92aWV3X3NldF9zZXR0aW5ncyhXRUJLSVRfV0VCX1ZJRVcod2ViVmll dyksIHdlYmtpdFNldHRpbmdzKTsKIAogICAgIGlmICghZWRpdG9yTW9kZSkgewotICAgICAgICBn Y2hhciAqdXJsID0gYXJndW1lbnRUb1VSTCh1cmkpOwotICAgICAgICBicm93c2VyX3dpbmRvd19s b2FkX3VyaShCUk9XU0VSX1dJTkRPVyhtYWluV2luZG93KSwgdXJsKTsKLSAgICAgICAgZ19mcmVl KHVybCk7CisgICAgICAgIGlmIChzaG91bGRMb2FkU2Vzc2lvbiAmJiBzZXNzaW9uRmlsZSkKKyAg ICAgICAgICAgIGJyb3dzZXJfd2luZG93X2xvYWRfc2Vzc2lvbihCUk9XU0VSX1dJTkRPVyhtYWlu V2luZG93KSwgc2Vzc2lvbkZpbGUpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGdjaGFy ICp1cmwgPSBhcmd1bWVudFRvVVJMKHVyaSk7CisgICAgICAgICAgICBicm93c2VyX3dpbmRvd19s b2FkX3VyaShCUk9XU0VSX1dJTkRPVyhtYWluV2luZG93KSwgdXJsKTsKKyAgICAgICAgICAgIGdf ZnJlZSh1cmwpOworICAgICAgICB9CiAgICAgfQogCiAgICAgZ3RrX3dpZGdldF9ncmFiX2ZvY3Vz KHdlYlZpZXcpOwpAQCAtOTYsNiArMTAxLDcgQEAgc3RhdGljIGNvbnN0IEdPcHRpb25FbnRyeSBj b21tYW5kTGluZU9wdGlvbnNbXSA9CiB7CiAgICAgeyAiYmctY29sb3IiLCAwLCAwLCBHX09QVElP Tl9BUkdfQ0FMTEJBQ0ssIHBhcnNlQmFja2dyb3VuZENvbG9yLCAiQmFja2dyb3VuZCBjb2xvciIs IE5VTEwgfSwKICAgICB7ICJlZGl0b3ItbW9kZSIsICdlJywgMCwgR19PUFRJT05fQVJHX05PTkUs ICZlZGl0b3JNb2RlLCAiUnVuIGluIGVkaXRvciBtb2RlIiwgTlVMTCB9LAorICAgIHsgInNlc3Np b24tZmlsZSIsICdzJywgMCwgR19PUFRJT05fQVJHX0ZJTEVOQU1FLCAmc2Vzc2lvbkZpbGUsICJT ZXNzaW9uIGZpbGUiLCAiRklMRSIgfSwKICAgICB7IEdfT1BUSU9OX1JFTUFJTklORywgMCwgMCwg R19PUFRJT05fQVJHX0ZJTEVOQU1FX0FSUkFZLCAmdXJpQXJndW1lbnRzLCAwLCAiW1VSTOKApl0i IH0sCiAgICAgeyAwLCAwLCAwLCAwLCAwLCAwLCAwIH0KIH07CkBAIC0yOTksOSArMzA1LDkgQEAg aW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAgICAgICAgaW50IGk7CiAKICAgICAg ICAgZm9yIChpID0gMDsgdXJpQXJndW1lbnRzW2ldOyBpKyspCi0gICAgICAgICAgICBjcmVhdGVC cm93c2VyV2luZG93KHVyaUFyZ3VtZW50c1tpXSwgd2Via2l0U2V0dGluZ3MpOworICAgICAgICAg ICAgY3JlYXRlQnJvd3NlcldpbmRvdyh1cmlBcmd1bWVudHNbaV0sIHdlYmtpdFNldHRpbmdzLCBG QUxTRSk7CiAgICAgfSBlbHNlCi0gICAgICAgIGNyZWF0ZUJyb3dzZXJXaW5kb3coQlJPV1NFUl9E RUZBVUxUX1VSTCwgd2Via2l0U2V0dGluZ3MpOworICAgICAgICBjcmVhdGVCcm93c2VyV2luZG93 KEJST1dTRVJfREVGQVVMVF9VUkwsIHdlYmtpdFNldHRpbmdzLCBUUlVFKTsKIAogICAgIGdfY2xl YXJfb2JqZWN0KCZ3ZWJraXRTZXR0aW5ncyk7CiAK