145595 2015-06-02 23:07:03 -0700 [GTK] Add editor mode to MiniBrowser 2015-06-07 23:38:43 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned pnormand svillar tpopela zan oldest_to_newest 1099076 0 cgarcia 2015-06-02 23:07:03 -0700 It loads an empty editable web view with an edit toolbar. It makes easier to test the editor, editing commands and input methods. 1099082 1 254155 cgarcia 2015-06-02 23:12:07 -0700 Created attachment 254155 Patch I made it a mode of MB instead of a new tool because that way we can share a lot of code, including the settings dialog and search bar. I've added an edit toolbar with some of the editing commands. For now, the buttons don't update their state according to the editor state, because we don't have API for that yet. 1100311 2 cgarcia 2015-06-07 23:38:43 -0700 Committed r185312: <http://trac.webkit.org/changeset/185312> 254155 2015-06-02 23:12:07 -0700 2015-06-02 23:22:13 -0700 Patch mb-editor.diff text/plain 10216 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1NTc1 ZGRiLi43ZDkzYWFhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTUtMDYtMDIgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEFkZCBlZGl0b3IgbW9kZSB0 byBNaW5pQnJvd3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQ1NTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgSXQgbG9hZHMgYW4gZW1wdHkgZWRpdGFibGUgd2ViIHZpZXcgd2l0aCBhbiBlZGl0IHRv b2xiYXIuIEl0IG1ha2VzCisgICAgICAgIGVhc2llciB0byB0ZXN0IHRoZSBlZGl0b3IsIGVkaXRp bmcgY29tbWFuZHMgYW5kIGlucHV0IG1ldGhvZHMuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9n dGsvQnJvd3NlcldpbmRvdy5jOgorICAgICAgICAoZWRpdGluZ0NvbW1hbmRDYWxsYmFjayk6Cisg ICAgICAgIChicm93c2VyV2luZG93U2V0dXBFZGl0b3JUb29sYmFyKToKKyAgICAgICAgKGJyb3dz ZXJXaW5kb3dDb25zdHJ1Y3RlZCk6CisgICAgICAgICogTWluaUJyb3dzZXIvZ3RrL21haW4uYzoK KyAgICAgICAgKGNyZWF0ZUJyb3dzZXJXaW5kb3cpOgorCiAyMDE1LTA1LTI3ICBEZWFuIEphY2tz b24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBpbWcuY3VycmVudFNyYyBwcm9ibGVtIGlu IHN0cmljdCBtb2RlIHdpdGggb2xkIHBpY3R1cmVmaWxsCmRpZmYgLS1naXQgYS9Ub29scy9NaW5p QnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dz ZXJXaW5kb3cuYwppbmRleCAzZGEzMTRmLi45MGZjYjM1IDEwMDY0NAotLS0gYS9Ub29scy9NaW5p QnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9C cm93c2VyV2luZG93LmMKQEAgLTY5MSw2ICs2OTEsMTIgQEAgc3RhdGljIGdib29sZWFuIHRvZ2ds ZUZ1bGxTY3JlZW4oQnJvd3NlcldpbmRvdyAqd2luZG93LCBncG9pbnRlciB1c2VyX2RhdGEpCiAg ICAgcmV0dXJuIFRSVUU7CiB9CiAKK3N0YXRpYyB2b2lkIGVkaXRpbmdDb21tYW5kQ2FsbGJhY2so R3RrV2lkZ2V0KndpZGdldCwgQnJvd3NlcldpbmRvdyAqd2luZG93KQoreworICAgIHdlYmtpdF93 ZWJfdmlld19leGVjdXRlX2VkaXRpbmdfY29tbWFuZCh3aW5kb3ctPndlYlZpZXcsIGd0a193aWRn ZXRfZ2V0X25hbWUod2lkZ2V0KSk7Cit9CisKKwogc3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd0Zp bmFsaXplKEdPYmplY3QgKmdPYmplY3QpCiB7CiAgICAgQnJvd3NlcldpbmRvdyAqd2luZG93ID0g QlJPV1NFUl9XSU5ET1coZ09iamVjdCk7CkBAIC03NDIsNiArNzQ4LDExOCBAQCBzdGF0aWMgdm9p ZCBicm93c2VyV2luZG93U2V0UHJvcGVydHkoR09iamVjdCAqb2JqZWN0LCBndWludCBwcm9wSWQs IGNvbnN0IEdWYWx1ZQogICAgIH0KIH0KIAorc3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd1NldHVw RWRpdG9yVG9vbGJhcihCcm93c2VyV2luZG93ICp3aW5kb3cpCit7CisgICAgR3RrV2lkZ2V0ICp0 b29sYmFyID0gZ3RrX3Rvb2xiYXJfbmV3KCk7CisgICAgZ3RrX29yaWVudGFibGVfc2V0X29yaWVu dGF0aW9uKEdUS19PUklFTlRBQkxFKHRvb2xiYXIpLCBHVEtfT1JJRU5UQVRJT05fSE9SSVpPTlRB TCk7CisgICAgZ3RrX3Rvb2xiYXJfc2V0X3N0eWxlKEdUS19UT09MQkFSKHRvb2xiYXIpLCBHVEtf VE9PTEJBUl9CT1RIX0hPUklaKTsKKworICAgIEd0a1Rvb2xJdGVtICppdGVtID0gZ3RrX3RvZ2ds ZV90b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayhHVEtfU1RPQ0tfQk9MRCk7CisgICAgZ3RrX3dp ZGdldF9zZXRfbmFtZShHVEtfV0lER0VUKGl0ZW0pLCAiQm9sZCIpOworICAgIGdfc2lnbmFsX2Nv bm5lY3QoR19PQkpFQ1QoaXRlbSksICJ0b2dnbGVkIiwgR19DQUxMQkFDSyhlZGl0aW5nQ29tbWFu ZENhbGxiYWNrKSwgd2luZG93KTsKKyAgICBndGtfdG9vbGJhcl9pbnNlcnQoR1RLX1RPT0xCQVIo dG9vbGJhciksIGl0ZW0sIC0xKTsKKyAgICBndGtfd2lkZ2V0X3Nob3coR1RLX1dJREdFVChpdGVt KSk7CisKKyAgICBpdGVtID0gZ3RrX3RvZ2dsZV90b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayhH VEtfU1RPQ0tfSVRBTElDKTsKKyAgICBndGtfd2lkZ2V0X3NldF9uYW1lKEdUS19XSURHRVQoaXRl bSksICJJdGFsaWMiKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KEdfT0JKRUNUKGl0ZW0pLCAidG9n Z2xlZCIsIEdfQ0FMTEJBQ0soZWRpdGluZ0NvbW1hbmRDYWxsYmFjayksIHdpbmRvdyk7CisgICAg Z3RrX3Rvb2xiYXJfaW5zZXJ0KEdUS19UT09MQkFSKHRvb2xiYXIpLCBpdGVtLCAtMSk7CisgICAg Z3RrX3dpZGdldF9zaG93KEdUS19XSURHRVQoaXRlbSkpOworCisgICAgaXRlbSA9IGd0a190b2dn bGVfdG9vbF9idXR0b25fbmV3X2Zyb21fc3RvY2soR1RLX1NUT0NLX1VOREVSTElORSk7CisgICAg Z3RrX3dpZGdldF9zZXRfbmFtZShHVEtfV0lER0VUKGl0ZW0pLCAiVW5kZXJsaW5lIik7CisgICAg Z19zaWduYWxfY29ubmVjdChHX09CSkVDVChpdGVtKSwgInRvZ2dsZWQiLCBHX0NBTExCQUNLKGVk aXRpbmdDb21tYW5kQ2FsbGJhY2spLCB3aW5kb3cpOworICAgIGd0a190b29sYmFyX2luc2VydChH VEtfVE9PTEJBUih0b29sYmFyKSwgaXRlbSwgLTEpOworICAgIGd0a193aWRnZXRfc2hvdyhHVEtf V0lER0VUKGl0ZW0pKTsKKworICAgIGl0ZW0gPSBndGtfdG9nZ2xlX3Rvb2xfYnV0dG9uX25ld19m cm9tX3N0b2NrKEdUS19TVE9DS19TVFJJS0VUSFJPVUdIKTsKKyAgICBndGtfd2lkZ2V0X3NldF9u YW1lKEdUS19XSURHRVQoaXRlbSksICJTdHJpa2V0aHJvdWdoIik7CisgICAgZ19zaWduYWxfY29u bmVjdChHX09CSkVDVChpdGVtKSwgInRvZ2dsZWQiLCBHX0NBTExCQUNLKGVkaXRpbmdDb21tYW5k Q2FsbGJhY2spLCB3aW5kb3cpOworICAgIGd0a190b29sYmFyX2luc2VydChHVEtfVE9PTEJBUih0 b29sYmFyKSwgaXRlbSwgLTEpOworICAgIGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKGl0ZW0p KTsKKworICAgIGl0ZW0gPSBndGtfc2VwYXJhdG9yX3Rvb2xfaXRlbV9uZXcoKTsKKyAgICBndGtf dG9vbGJhcl9pbnNlcnQoR1RLX1RPT0xCQVIodG9vbGJhciksIGl0ZW0sIC0xKTsKKyAgICBndGtf d2lkZ2V0X3Nob3coR1RLX1dJREdFVChpdGVtKSk7CisKKyAgICBpdGVtID0gZ3RrX3Rvb2xfYnV0 dG9uX25ld19mcm9tX3N0b2NrKEdUS19TVE9DS19DVVQpOworICAgIGd0a193aWRnZXRfc2V0X25h bWUoR1RLX1dJREdFVChpdGVtKSwgV0VCS0lUX0VESVRJTkdfQ09NTUFORF9DVVQpOworICAgIGdf c2lnbmFsX2Nvbm5lY3QoR19PQkpFQ1QoaXRlbSksICJjbGlja2VkIiwgR19DQUxMQkFDSyhlZGl0 aW5nQ29tbWFuZENhbGxiYWNrKSwgd2luZG93KTsKKyAgICBndGtfdG9vbGJhcl9pbnNlcnQoR1RL X1RPT0xCQVIodG9vbGJhciksIGl0ZW0sIC0xKTsKKyAgICBndGtfd2lkZ2V0X3Nob3coR1RLX1dJ REdFVChpdGVtKSk7CisKKyAgICBpdGVtID0gZ3RrX3Rvb2xfYnV0dG9uX25ld19mcm9tX3N0b2Nr KEdUS19TVE9DS19DT1BZKTsKKyAgICBndGtfd2lkZ2V0X3NldF9uYW1lKEdUS19XSURHRVQoaXRl bSksIFdFQktJVF9FRElUSU5HX0NPTU1BTkRfQ09QWSk7CisgICAgZ19zaWduYWxfY29ubmVjdChH X09CSkVDVChpdGVtKSwgImNsaWNrZWQiLCBHX0NBTExCQUNLKGVkaXRpbmdDb21tYW5kQ2FsbGJh Y2spLCB3aW5kb3cpOworICAgIGd0a190b29sYmFyX2luc2VydChHVEtfVE9PTEJBUih0b29sYmFy KSwgaXRlbSwgLTEpOworICAgIGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKGl0ZW0pKTsKKwor ICAgIGl0ZW0gPSBndGtfdG9vbF9idXR0b25fbmV3X2Zyb21fc3RvY2soR1RLX1NUT0NLX1BBU1RF KTsKKyAgICBndGtfd2lkZ2V0X3NldF9uYW1lKEdUS19XSURHRVQoaXRlbSksIFdFQktJVF9FRElU SU5HX0NPTU1BTkRfUEFTVEUpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QoR19PQkpFQ1QoaXRlbSks ICJjbGlja2VkIiwgR19DQUxMQkFDSyhlZGl0aW5nQ29tbWFuZENhbGxiYWNrKSwgd2luZG93KTsK KyAgICBndGtfdG9vbGJhcl9pbnNlcnQoR1RLX1RPT0xCQVIodG9vbGJhciksIGl0ZW0sIC0xKTsK KyAgICBndGtfd2lkZ2V0X3Nob3coR1RLX1dJREdFVChpdGVtKSk7CisKKyAgICBpdGVtID0gZ3Rr X3NlcGFyYXRvcl90b29sX2l0ZW1fbmV3KCk7CisgICAgZ3RrX3Rvb2xiYXJfaW5zZXJ0KEdUS19U T09MQkFSKHRvb2xiYXIpLCBpdGVtLCAtMSk7CisgICAgZ3RrX3dpZGdldF9zaG93KEdUS19XSURH RVQoaXRlbSkpOworCisgICAgaXRlbSA9IGd0a190b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayhH VEtfU1RPQ0tfVU5ETyk7CisgICAgZ3RrX3dpZGdldF9zZXRfbmFtZShHVEtfV0lER0VUKGl0ZW0p LCBXRUJLSVRfRURJVElOR19DT01NQU5EX1VORE8pOworICAgIGdfc2lnbmFsX2Nvbm5lY3QoR19P QkpFQ1QoaXRlbSksICJjbGlja2VkIiwgR19DQUxMQkFDSyhlZGl0aW5nQ29tbWFuZENhbGxiYWNr KSwgd2luZG93KTsKKyAgICBndGtfdG9vbGJhcl9pbnNlcnQoR1RLX1RPT0xCQVIodG9vbGJhciks IGl0ZW0sIC0xKTsKKyAgICBndGtfd2lkZ2V0X3Nob3coR1RLX1dJREdFVChpdGVtKSk7CisKKyAg ICBpdGVtID0gZ3RrX3Rvb2xfYnV0dG9uX25ld19mcm9tX3N0b2NrKEdUS19TVE9DS19SRURPKTsK KyAgICBndGtfd2lkZ2V0X3NldF9uYW1lKEdUS19XSURHRVQoaXRlbSksIFdFQktJVF9FRElUSU5H X0NPTU1BTkRfUkVETyk7CisgICAgZ19zaWduYWxfY29ubmVjdChHX09CSkVDVChpdGVtKSwgImNs aWNrZWQiLCBHX0NBTExCQUNLKGVkaXRpbmdDb21tYW5kQ2FsbGJhY2spLCB3aW5kb3cpOworICAg IGd0a190b29sYmFyX2luc2VydChHVEtfVE9PTEJBUih0b29sYmFyKSwgaXRlbSwgLTEpOworICAg IGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKGl0ZW0pKTsKKworICAgIGl0ZW0gPSBndGtfc2Vw YXJhdG9yX3Rvb2xfaXRlbV9uZXcoKTsKKyAgICBndGtfdG9vbGJhcl9pbnNlcnQoR1RLX1RPT0xC QVIodG9vbGJhciksIGl0ZW0sIC0xKTsKKyAgICBndGtfd2lkZ2V0X3Nob3coR1RLX1dJREdFVChp dGVtKSk7CisKKyAgICBpdGVtID0gZ3RrX3JhZGlvX3Rvb2xfYnV0dG9uX25ld19mcm9tX3N0b2Nr KE5VTEwsIEdUS19TVE9DS19KVVNUSUZZX0xFRlQpOworICAgIEdTTGlzdCAqanVzdGlmeVJhZGlv R3JvdXAgPSBndGtfcmFkaW9fdG9vbF9idXR0b25fZ2V0X2dyb3VwKEdUS19SQURJT19UT09MX0JV VFRPTihpdGVtKSk7CisgICAgZ3RrX3dpZGdldF9zZXRfbmFtZShHVEtfV0lER0VUKGl0ZW0pLCAi SnVzdGlmeUxlZnQiKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KEdfT0JKRUNUKGl0ZW0pLCAidG9n Z2xlZCIsIEdfQ0FMTEJBQ0soZWRpdGluZ0NvbW1hbmRDYWxsYmFjayksIHdpbmRvdyk7CisgICAg Z3RrX3Rvb2xiYXJfaW5zZXJ0KEdUS19UT09MQkFSKHRvb2xiYXIpLCBpdGVtLCAtMSk7CisgICAg Z3RrX3dpZGdldF9zaG93KEdUS19XSURHRVQoaXRlbSkpOworCisgICAgaXRlbSA9IGd0a19yYWRp b190b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayhqdXN0aWZ5UmFkaW9Hcm91cCwgR1RLX1NUT0NL X0pVU1RJRllfQ0VOVEVSKTsKKyAgICBqdXN0aWZ5UmFkaW9Hcm91cCA9IGd0a19yYWRpb190b29s X2J1dHRvbl9nZXRfZ3JvdXAoR1RLX1JBRElPX1RPT0xfQlVUVE9OKGl0ZW0pKTsKKyAgICBndGtf d2lkZ2V0X3NldF9uYW1lKEdUS19XSURHRVQoaXRlbSksICJKdXN0aWZ5Q2VudGVyIik7CisgICAg Z19zaWduYWxfY29ubmVjdChHX09CSkVDVChpdGVtKSwgInRvZ2dsZWQiLCBHX0NBTExCQUNLKGVk aXRpbmdDb21tYW5kQ2FsbGJhY2spLCB3aW5kb3cpOworICAgIGd0a190b29sYmFyX2luc2VydChH VEtfVE9PTEJBUih0b29sYmFyKSwgaXRlbSwgLTEpOworICAgIGd0a193aWRnZXRfc2hvdyhHVEtf V0lER0VUKGl0ZW0pKTsKKworICAgIGl0ZW0gPSBndGtfcmFkaW9fdG9vbF9idXR0b25fbmV3X2Zy b21fc3RvY2soanVzdGlmeVJhZGlvR3JvdXAsIEdUS19TVE9DS19KVVNUSUZZX1JJR0hUKTsKKyAg ICBndGtfd2lkZ2V0X3NldF9uYW1lKEdUS19XSURHRVQoaXRlbSksICJKdXN0aWZ5UmlnaHQiKTsK KyAgICBnX3NpZ25hbF9jb25uZWN0KEdfT0JKRUNUKGl0ZW0pLCAidG9nZ2xlZCIsIEdfQ0FMTEJB Q0soZWRpdGluZ0NvbW1hbmRDYWxsYmFjayksIHdpbmRvdyk7CisgICAgZ3RrX3Rvb2xiYXJfaW5z ZXJ0KEdUS19UT09MQkFSKHRvb2xiYXIpLCBpdGVtLCAtMSk7CisgICAgZ3RrX3dpZGdldF9zaG93 KEdUS19XSURHRVQoaXRlbSkpOworCisgICAgaXRlbSA9IGd0a19zZXBhcmF0b3JfdG9vbF9pdGVt X25ldygpOworICAgIGd0a190b29sYmFyX2luc2VydChHVEtfVE9PTEJBUih0b29sYmFyKSwgaXRl bSwgLTEpOworICAgIGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKGl0ZW0pKTsKKworICAgIGl0 ZW0gPSBndGtfdG9vbF9idXR0b25fbmV3X2Zyb21fc3RvY2soR1RLX1NUT0NLX0lOREVOVCk7Cisg ICAgZ3RrX3dpZGdldF9zZXRfbmFtZShHVEtfV0lER0VUKGl0ZW0pLCAiSW5kZW50Iik7CisgICAg Z19zaWduYWxfY29ubmVjdChHX09CSkVDVChpdGVtKSwgImNsaWNrZWQiLCBHX0NBTExCQUNLKGVk aXRpbmdDb21tYW5kQ2FsbGJhY2spLCB3aW5kb3cpOworICAgIGd0a190b29sYmFyX2luc2VydChH VEtfVE9PTEJBUih0b29sYmFyKSwgaXRlbSwgLTEpOworICAgIGd0a193aWRnZXRfc2hvdyhHVEtf V0lER0VUKGl0ZW0pKTsKKworICAgIGl0ZW0gPSBndGtfdG9vbF9idXR0b25fbmV3X2Zyb21fc3Rv Y2soR1RLX1NUT0NLX1VOSU5ERU5UKTsKKyAgICBndGtfd2lkZ2V0X3NldF9uYW1lKEdUS19XSURH RVQoaXRlbSksICJPdXRkZW50Iik7CisgICAgZ19zaWduYWxfY29ubmVjdChHX09CSkVDVChpdGVt KSwgImNsaWNrZWQiLCBHX0NBTExCQUNLKGVkaXRpbmdDb21tYW5kQ2FsbGJhY2spLCB3aW5kb3cp OworICAgIGd0a190b29sYmFyX2luc2VydChHVEtfVE9PTEJBUih0b29sYmFyKSwgaXRlbSwgLTEp OworICAgIGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKGl0ZW0pKTsKKworICAgIGd0a19ib3hf cGFja19zdGFydChHVEtfQk9YKHdpbmRvdy0+bWFpbkJveCksIHRvb2xiYXIsIEZBTFNFLCBGQUxT RSwgMCk7CisgICAgZ3RrX3dpZGdldF9zaG93KHRvb2xiYXIpOworfQorCiBzdGF0aWMgdm9pZCBi cm93c2VyX3dpbmRvd19pbml0KEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHsKICAgICBnX2F0b21p Y19pbnRfaW5jKCZ3aW5kb3dDb3VudCk7CkBAIC04ODYsNiArMTAwNCw4IEBAIHN0YXRpYyB2b2lk IGJyb3dzZXJXaW5kb3dDb25zdHJ1Y3RlZChHT2JqZWN0ICpnT2JqZWN0KQogICAgIEJyb3dzZXJX aW5kb3cgKndpbmRvdyA9IEJST1dTRVJfV0lORE9XKGdPYmplY3QpOwogCiAgICAgYnJvd3Nlcldp bmRvd1VwZGF0ZVpvb21BY3Rpb25zKHdpbmRvdyk7CisgICAgaWYgKHdlYmtpdF93ZWJfdmlld19p c19lZGl0YWJsZSh3aW5kb3ctPndlYlZpZXcpKQorICAgICAgICBicm93c2VyV2luZG93U2V0dXBF ZGl0b3JUb29sYmFyKHdpbmRvdyk7CiAKICAgICBnX3NpZ25hbF9jb25uZWN0KHdpbmRvdy0+d2Vi VmlldywgIm5vdGlmeTo6dXJpIiwgR19DQUxMQkFDSyh3ZWJWaWV3VVJJQ2hhbmdlZCksIHdpbmRv dyk7CiAgICAgZ19zaWduYWxfY29ubmVjdCh3aW5kb3ctPndlYlZpZXcsICJub3RpZnk6OmVzdGlt YXRlZC1sb2FkLXByb2dyZXNzIiwgR19DQUxMQkFDSyh3ZWJWaWV3TG9hZFByb2dyZXNzQ2hhbmdl ZCksIHdpbmRvdyk7CkBAIC05NDAsNiArMTA2MCw5IEBAIHN0YXRpYyB2b2lkIGJyb3dzZXJXaW5k b3dDb25zdHJ1Y3RlZChHT2JqZWN0ICpnT2JqZWN0KQogICAgIGd0a193aWRnZXRfc2V0X25vX3No b3dfYWxsKHdpbmRvdy0+ZnVsbFNjcmVlbk1lc3NhZ2VMYWJlbCwgVFJVRSk7CiAgICAgZ3RrX292 ZXJsYXlfYWRkX292ZXJsYXkoR1RLX09WRVJMQVkob3ZlcmxheSksIHdpbmRvdy0+ZnVsbFNjcmVl bk1lc3NhZ2VMYWJlbCk7CiAgICAgZ3RrX3dpZGdldF9zaG93KEdUS19XSURHRVQod2luZG93LT53 ZWJWaWV3KSk7CisKKyAgICBpZiAod2Via2l0X3dlYl92aWV3X2lzX2VkaXRhYmxlKHdpbmRvdy0+ d2ViVmlldykpCisgICAgICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWwod2luZG93LT53ZWJW aWV3LCAiPGh0bWw+PC9odG1sPiIsIE5VTEwpOwogfQogCiBzdGF0aWMgdm9pZCBicm93c2VyX3dp bmRvd19jbGFzc19pbml0KEJyb3dzZXJXaW5kb3dDbGFzcyAqa2xhc3MpCmRpZmYgLS1naXQgYS9U b29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL21haW4u YwppbmRleCBhNDU2YWM2Li5mNWY2ZTE3IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9n dGsvbWFpbi5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMKQEAgLTM4LDYgKzM4 LDcgQEAKIHN0YXRpYyBjb25zdCBnY2hhciAqKnVyaUFyZ3VtZW50cyA9IE5VTEw7CiBzdGF0aWMg Y29uc3QgY2hhciAqbWluaUJyb3dzZXJBYm91dFNjaGVtZSA9ICJtaW5pYnJvd3Nlci1hYm91dCI7 CiBzdGF0aWMgR2RrUkdCQSAqYmFja2dyb3VuZENvbG9yOworc3RhdGljIGdib29sZWFuIGVkaXRv ck1vZGU7CiAKIHR5cGVkZWYgZW51bSB7CiAgICAgTUlOSV9CUk9XU0VSX0VSUk9SX0lOVkFMSURf QUJPVVRfUEFUSApAQCAtNjAsMTYgKzYxLDIwIEBAIHN0YXRpYyBnY2hhciAqYXJndW1lbnRUb1VS TChjb25zdCBjaGFyICpmaWxlbmFtZSkKIHN0YXRpYyB2b2lkIGNyZWF0ZUJyb3dzZXJXaW5kb3co Y29uc3QgZ2NoYXIgKnVyaSwgV2ViS2l0U2V0dGluZ3MgKndlYmtpdFNldHRpbmdzKQogewogICAg IEd0a1dpZGdldCAqd2ViVmlldyA9IHdlYmtpdF93ZWJfdmlld19uZXcoKTsKKyAgICBpZiAoZWRp dG9yTW9kZSkKKyAgICAgICAgd2Via2l0X3dlYl92aWV3X3NldF9lZGl0YWJsZShXRUJLSVRfV0VC X1ZJRVcod2ViVmlldyksIFRSVUUpOwogICAgIEd0a1dpZGdldCAqbWFpbldpbmRvdyA9IGJyb3dz ZXJfd2luZG93X25ldyhXRUJLSVRfV0VCX1ZJRVcod2ViVmlldyksIE5VTEwpOwogICAgIGlmIChi YWNrZ3JvdW5kQ29sb3IpCiAgICAgICAgIGJyb3dzZXJfd2luZG93X3NldF9iYWNrZ3JvdW5kX2Nv bG9yKEJST1dTRVJfV0lORE9XKG1haW5XaW5kb3cpLCBiYWNrZ3JvdW5kQ29sb3IpOwotICAgIGdj aGFyICp1cmwgPSBhcmd1bWVudFRvVVJMKHVyaSk7CiAKICAgICBpZiAod2Via2l0U2V0dGluZ3Mp CiAgICAgICAgIHdlYmtpdF93ZWJfdmlld19zZXRfc2V0dGluZ3MoV0VCS0lUX1dFQl9WSUVXKHdl YlZpZXcpLCB3ZWJraXRTZXR0aW5ncyk7CiAKLSAgICBicm93c2VyX3dpbmRvd19sb2FkX3VyaShC Uk9XU0VSX1dJTkRPVyhtYWluV2luZG93KSwgdXJsKTsKLSAgICBnX2ZyZWUodXJsKTsKKyAgICBp ZiAoIWVkaXRvck1vZGUpIHsKKyAgICAgICAgZ2NoYXIgKnVybCA9IGFyZ3VtZW50VG9VUkwodXJp KTsKKyAgICAgICAgYnJvd3Nlcl93aW5kb3dfbG9hZF91cmkoQlJPV1NFUl9XSU5ET1cobWFpbldp bmRvdyksIHVybCk7CisgICAgICAgIGdfZnJlZSh1cmwpOworICAgIH0KIAogICAgIGd0a193aWRn ZXRfZ3JhYl9mb2N1cyh3ZWJWaWV3KTsKICAgICBndGtfd2lkZ2V0X3Nob3cobWFpbldpbmRvdyk7 CkBAIC05MCw2ICs5NSw3IEBAIHN0YXRpYyBnYm9vbGVhbiBwYXJzZUJhY2tncm91bmRDb2xvcihj b25zdCBjaGFyICpvcHRpb25OYW1lLCBjb25zdCBjaGFyICp2YWx1ZSwKIHN0YXRpYyBjb25zdCBH T3B0aW9uRW50cnkgY29tbWFuZExpbmVPcHRpb25zW10gPQogewogICAgIHsgImJnLWNvbG9yIiwg MCwgMCwgR19PUFRJT05fQVJHX0NBTExCQUNLLCBwYXJzZUJhY2tncm91bmRDb2xvciwgIkJhY2tn cm91bmQgY29sb3IiLCBOVUxMIH0sCisgICAgeyAiZWRpdG9yLW1vZGUiLCAnZScsIDAsIEdfT1BU SU9OX0FSR19OT05FLCAmZWRpdG9yTW9kZSwgIlJ1biBpbiBlZGl0b3IgbW9kZSIsIE5VTEwgfSwK ICAgICB7IEdfT1BUSU9OX1JFTUFJTklORywgMCwgMCwgR19PUFRJT05fQVJHX0ZJTEVOQU1FX0FS UkFZLCAmdXJpQXJndW1lbnRzLCAwLCAiW1VSTOKApl0iIH0sCiAgICAgeyAwLCAwLCAwLCAwLCAw LCAwLCAwIH0KIH07Cg==