83364 2012-04-06 06:21:47 -0700 Web Inspector: remove url from the saved urls map before the save action. 2012-04-06 08:04:48 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 597330 0 pfeldman 2012-04-06 06:21:47 -0700 URL gets added back upon successful save anyways, but if user chooses cancel saving, we stop bugging him with the save-as dialog. 597331 1 136016 pfeldman 2012-04-06 06:24:24 -0700 Created attachment 136016 Patch 597361 2 pfeldman 2012-04-06 08:04:48 -0700 Committed r113435: <http://trac.webkit.org/changeset/113435> 136016 2012-04-06 06:24:24 -0700 2012-04-06 07:12:53 -0700 Patch bug-83364-20120406172421.patch text/plain 6917 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNDI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWU4ZmY3NmI1NTQ3NzMy NzI2Y2FlZTAyMTM1NDU1Zjk4MzQ4ZjY4MS4uZTAyM2I1MTE4ZDA3MjMxYzUwZGUxZWU2NGI1YTFk ZmU5MTk5YjE5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA0LTA2ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlbW92ZSB1cmwgZnJvbSB0aGUgc2F2ZWQgdXJscyBtYXAgYmVmb3JlIHRoZSBzYXZlIGFj dGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgz MzY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVVJM IGdldHMgYWRkZWQgYmFjayB1cG9uIHN1Y2Nlc3NmdWwgc2F2ZSBhbnl3YXlzLCBidXQgaWYgdXNl ciBjaG9vc2VzIGNhbmNlbCBzYXZpbmcsCisgICAgICAgIHdlIHN0b3AgYnVnZ2luZyBoaW0gd2l0 aCB0aGUgc2F2ZS1hcyBkaWFsb2cuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05l dHdvcmtQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90 b3R5cGUuX2V4cG9ydEFsbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcu cHJvdG90eXBlLl9leHBvcnRSZXNvdXJjZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZXNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNl VHJlZUVsZW1lbnQucHJvdG90eXBlLl9hcHBlbmRTYXZlQXNBY3Rpb24uZG9TYXZlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVJldmlzaW9uVHJlZUVsZW1lbnQucHJvdG90eXBlLl9o YW5kbGVDb250ZXh0TWVudUV2ZW50LmRvU2F2ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9UZXh0Vmlld2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIucHJv dG90eXBlLl9jb250ZXh0TWVudSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5w cm90b3R5cGUuX2NvbW1pdEVkaXRpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv VGltZWxpbmVNb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLnBy b3RvdHlwZS5zYXZlVG9GaWxlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qczoKKwogMjAxMi0wNC0wNiAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGhpZGUgcG9wb3ZlciBvbiBtb3VzZW91dCBm cm9tIGFuY2hvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9OZXR3b3JrUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05l dHdvcmtQYW5lbC5qcwppbmRleCBhZjU5MGQyNDYyNTA4YTZiOGEwMjI5ZmIwYmMxOGExNDQwZmFj Mzk4Li4xZTg3MzFjMjQxNWM5NzQ0MmQ0NGQwZTU4ZWZmODZjZDE5MTEyMzBlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpAQCAt OTk5LDEzICs5OTksMTMgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIGxvZzogKG5ldyBXZWJJbnNwZWN0b3IuSEFSTG9nKHRoaXMuX3Jlc291 cmNlcykpLmJ1aWxkKCkKICAgICAgICAgfTsKICAgICAgICAgCi0gICAgICAgIEluc3BlY3RvckZy b250ZW5kSG9zdC5zYXZlKFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlRG9tYWluICsgIi5oYXIi LCBKU09OLnN0cmluZ2lmeShoYXJBcmNoaXZlLCBudWxsLCAyKSwgdHJ1ZSk7CisgICAgICAgIFdl Ykluc3BlY3Rvci5zYXZlKFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlRG9tYWluICsgIi5oYXIi LCBKU09OLnN0cmluZ2lmeShoYXJBcmNoaXZlLCBudWxsLCAyKSwgdHJ1ZSk7CiAgICAgfSwKIAog ICAgIF9leHBvcnRSZXNvdXJjZTogZnVuY3Rpb24ocmVzb3VyY2UpCiAgICAgewogICAgICAgICB2 YXIgaGFyID0gKG5ldyBXZWJJbnNwZWN0b3IuSEFSRW50cnkocmVzb3VyY2UpKS5idWlsZCgpOwot ICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3Quc2F2ZShyZXNvdXJjZS5kaXNwbGF5TmFtZSAr ICIuaGFyIiwgSlNPTi5zdHJpbmdpZnkoaGFyLCBudWxsLCAyKSwgdHJ1ZSk7CisgICAgICAgIFdl Ykluc3BlY3Rvci5zYXZlKHJlc291cmNlLmRpc3BsYXlOYW1lICsgIi5oYXIiLCBKU09OLnN0cmlu Z2lmeShoYXIsIG51bGwsIDIpLCB0cnVlKTsKICAgICB9LAogCiAgICAgX2NsZWFyQnJvd3NlckNh Y2hlOiBmdW5jdGlvbihldmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IGRhNTFiMTY5Y2M3MjE4MDk5ZDQ5NTY2 OTk3ZmM5ZWQ5OTE3MWVhYzEuLjhjZmFmMzllMjFjMDRkMzUzNjFlOTc3ZWJjMjkwMWQ2Zjc3ZmVm ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2VzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZXNQYW5lbC5qcwpAQCAtMTI3OCw3ICsxMjc4LDcgQEAgV2ViSW5zcGVjdG9yLkZyYW1lUmVz b3VyY2VUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgZnVuY3Rpb24gZG9TYXZl KGZvcmNlU2F2ZUFzLCBjb250ZW50KQogICAgICAgICB7Ci0gICAgICAgICAgICBJbnNwZWN0b3JG cm9udGVuZEhvc3Quc2F2ZSh0aGlzLl9yZXNvdXJjZS51cmwsIGNvbnRlbnQsIGZvcmNlU2F2ZUFz KTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zYXZlKHRoaXMuX3Jlc291cmNlLnVybCwgY29u dGVudCwgZm9yY2VTYXZlQXMpOwogICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24gc2F2ZShm b3JjZVNhdmVBcykKQEAgLTIwNjMsNyArMjA2Myw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVJl dmlzaW9uVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICBpZiAoSW5zcGVjdG9yRnJv bnRlbmRIb3N0LmNhblNhdmUoKSkgewogICAgICAgICAgICAgZnVuY3Rpb24gZG9TYXZlKGZvcmNl U2F2ZUFzLCBjb250ZW50KQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIEluc3BlY3Rv ckZyb250ZW5kSG9zdC5zYXZlKHRoaXMuX3JldmlzaW9uLnJlc291cmNlLnVybCwgY29udGVudCwg Zm9yY2VTYXZlQXMpOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zYXZlKHRoaXMuX3Jl dmlzaW9uLnJlc291cmNlLnVybCwgY29udGVudCwgZm9yY2VTYXZlQXMpOwogICAgICAgICAgICAg fQogCiAgICAgICAgICAgICBmdW5jdGlvbiBzYXZlKGZvcmNlU2F2ZUFzKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCmluZGV4IGY1ZmZhYWI1 YTc4OTUzNzJlZDVhNGFmZGVkNWZkOWRkOGE4MjkzMGUuLmM1NjZjYzMwZjlhMGE0ZWZmNjAyNjU4 MTEzYjRmM2I3MGI3NWI0MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGV4dFZpZXdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1RleHRWaWV3ZXIuanMKQEAgLTI5MSw4ICsyOTEsOCBAQCBXZWJJbnNwZWN0b3IuVGV4 dFZpZXdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5wb3B1bGF0 ZVRleHRBcmVhQ29udGV4dE1lbnUoY29udGV4dE1lbnUsIHRhcmdldCAmJiB0YXJnZXQubGluZU51 bWJlcik7CiAgICAgICAgIH0KICAgICAgICAgaWYgKHRoaXMuX3VybCkgewotICAgICAgICAgICAg Y29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNhdmUiKSwgSW5z cGVjdG9yRnJvbnRlbmRIb3N0LnNhdmUuYmluZChJbnNwZWN0b3JGcm9udGVuZEhvc3QsIHRoaXMu X3VybCwgdGhpcy5fdGV4dE1vZGVsLnRleHQsIGZhbHNlKSk7Ci0gICAgICAgICAgICBjb250ZXh0 TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93 ZXJDYXNlTWVudVRpdGxlcygpID8gIlNhdmUgYXMuLi4iIDogIlNhdmUgQXMuLi4iKSwgSW5zcGVj dG9yRnJvbnRlbmRIb3N0LnNhdmUuYmluZChJbnNwZWN0b3JGcm9udGVuZEhvc3QsIHRoaXMuX3Vy bCwgdGhpcy5fdGV4dE1vZGVsLnRleHQsIHRydWUpKTsKKyAgICAgICAgICAgIGNvbnRleHRNZW51 LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTYXZlIiksIFdlYkluc3BlY3Rvci5z YXZlLmJpbmQoV2ViSW5zcGVjdG9yLCB0aGlzLl91cmwsIHRoaXMuX3RleHRNb2RlbC50ZXh0LCBm YWxzZSkpOworICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJTYXZlIGFz Li4uIiA6ICJTYXZlIEFzLi4uIiksIFdlYkluc3BlY3Rvci5zYXZlLmJpbmQoV2ViSW5zcGVjdG9y LCB0aGlzLl91cmwsIHRoaXMuX3RleHRNb2RlbC50ZXh0LCB0cnVlKSk7CiAgICAgICAgIH0KIAog ICAgICAgICBjb250ZXh0TWVudS5zaG93KGV2ZW50KTsKQEAgLTMwNSw3ICszMDUsNyBAQCBXZWJJ bnNwZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhpcy5fZGVsZWdh dGUuY29tbWl0RWRpdGluZygpOwogICAgICAgICBpZiAodGhpcy5fdXJsICYmIFdlYkluc3BlY3Rv ci5pc1VSTFNhdmVkKHRoaXMuX3VybCkpCi0gICAgICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhv c3Quc2F2ZSh0aGlzLl91cmwsIHRoaXMuX3RleHRNb2RlbC50ZXh0LCBmYWxzZSk7CisgICAgICAg ICAgICBXZWJJbnNwZWN0b3Iuc2F2ZSh0aGlzLl91cmwsIHRoaXMuX3RleHRNb2RlbC50ZXh0LCBm YWxzZSk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVNb2RlbC5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVNb2RlbC5qcwppbmRleCAzZjM5OGNl NWJmNGVjZmRlZDFhNmU1ZmIwMGUwMTQ1OTk5ZmZjZjE1Li5hMDQ1Y2QxMzBjNGRlOTVhOWYwZjZk YzEyNTI2ODU2ODNiNDE4Mjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1RpbWVsaW5lTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9UaW1lbGluZU1vZGVsLmpzCkBAIC0yMDMsNyArMjAzLDcgQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lTW9kZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBub3cgPSBuZXcg RGF0ZSgpOwogICAgICAgICB2YXIgZmlsZU5hbWUgPSAiVGltZWxpbmVSYXdEYXRhLSIgKyBub3cu dG9JU084NjAxQ29tcGFjdCgpICsgIi5qc29uIjsKLSAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRI b3N0LnNhdmUoZmlsZU5hbWUsIHJlY29yZHMuam9pbigiLFxuIiksIHRydWUpOworICAgICAgICBX ZWJJbnNwZWN0b3Iuc2F2ZShmaWxlTmFtZSwgcmVjb3Jkcy5qb2luKCIsXG4iKSwgdHJ1ZSk7CiAg ICAgfSwKIAogICAgIHJlc2V0OiBmdW5jdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDdmYTZlMzNmMTE4MDY0NjRlNGE4ZjY0 ODU3ZDQwMjM0NjE5MTRiMzQuLjQyOWI4NTlkYTc3NjY5NDc0NDcwN2U5Y2YzOWE4YjQxNWYyNDdj YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVj dG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmpzCkBAIC0xMDIxLDYgKzEwMjEsMTYgQEAgV2ViSW5zcGVjdG9yLl90b29sYmFySXRlbUNsaWNr ZWQgPSBmdW5jdGlvbihldmVudCkKICAgICBXZWJJbnNwZWN0b3IuaW5zcGVjdG9yVmlldy5zZXRD dXJyZW50UGFuZWwodG9vbGJhckl0ZW0ucGFuZWwpOwogfQogCitXZWJJbnNwZWN0b3Iuc2F2ZSA9 IGZ1bmN0aW9uKHVybCwgY29udGVudCwgZm9yY2VTYXZlQXMpCit7CisgICAgLy8gUmVtb3ZlIHRo aXMgdXJsIGZyb20gdGhlIHNhdmVkIFVSTHMgd2hpbGUgaXQgaXMgYmVpbmcgc2F2ZWQuCisgICAg dmFyIHNhdmVkVVJMcyA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5zYXZlZFVSTHMuZ2V0KCk7Cisg ICAgZGVsZXRlIHNhdmVkVVJMc1t1cmxdOworICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5zYXZl ZFVSTHMuc2V0KHNhdmVkVVJMcyk7CisKKyAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3Quc2F2ZSh1 cmwsIGNvbnRlbnQsIGZvcmNlU2F2ZUFzKTsKK30KKwogV2ViSW5zcGVjdG9yLnNhdmVkVVJMID0g ZnVuY3Rpb24odXJsKQogewogICAgIHZhciBzYXZlZFVSTHMgPSBXZWJJbnNwZWN0b3Iuc2V0dGlu Z3Muc2F2ZWRVUkxzLmdldCgpOwo=