86349 2012-05-14 03:23:16 -0700 Web Inspector: Esc should revert the colorpicker-modifed color to the original 2012-05-14 04:41:23 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 622785 0 apavlov 2012-05-14 03:23:16 -0700 1. Start editing color 2. Make an accidental modification 3. Hit Esc to cancel editing Expected: editing canceled Actual: editing persisted. Upstreaming http://code.google.com/p/chromium/issues/detail?id=128010 622786 1 141679 apavlov 2012-05-14 03:28:54 -0700 Created attachment 141679 Patch 622822 2 141679 vsevik 2012-05-14 04:19:58 -0700 Comment on attachment 141679 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141679&action=review > Source/WebCore/inspector/front-end/Spectrum.js:422 > + this.dispatchEventToListeners(WebInspector.Spectrum.Events.Hidden, !!cancelEdit); Maybe invert this value? > Source/WebCore/inspector/front-end/Spectrum.js:433 > + this.hide(event.keyIdentifier === "U+001B"); Maybe use two ifs? 622831 3 apavlov 2012-05-14 04:41:23 -0700 Committed r116933: <http://trac.webkit.org/changeset/116933> 141679 2012-05-14 03:28:54 -0700 2012-05-14 04:19:58 -0700 Patch bug-86349-20120514142852.patch text/plain 4747 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2OTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTUyZTM0NDEyYzYyZWMw N2Y1ZTUyYTZiMmJhNzc1MDdkZmQxNzc4Mi4uOTIwZmQ5NDc4OGEwNmY0MTJiZWZkYmE0Zjk3NGVl ZTNjY2YwOTkyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTE0ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogRXNjIHNob3VsZCByZXZlcnQgdGhlIGNvbG9ycGlja2VyLW1vZGlmZWQgY29sb3IgdG8g dGhlIG9yaWdpbmFsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04NjM0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEEgYm9vbGVhbiBwYXJhbWV0ZXIgaGFzIGJlZW4gYWRkZWQgdG8gdGhlIFNwZWN0cnVtJ3Mg aGlkZSgpIG1ldGhvZCB0byBkZW5vdGUgdGhlIHBpY2tlciBjYW5jZWxsYXRpb24sCisgICAgICAg IHdoaWNoIGdldHMgcGFzc2VkIGludG8gdGhlICJIaWRkZW4iIGV2ZW50IGxpc3RlbmVycy4gU3R5 bGVzU2lkZWJhclBhbmUgaXMgbWFkZSB0byByZW1lbWJlciB0aGUgb3JpZ2luYWwgcHJvcGVydHkg dmFsdWUKKyAgICAgICAgd2hlbiB0aGUgcGlja2VyIGlzIG9wZW5lZCwgYW5kIHJlc3RvcmUgaXQg aWYgdGhlIGNvbG9yIHBpY2tlciBpcyBjYW5jZWxsZWQuCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1NwZWN0cnVtLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwZWN0cnVtLnBy b3RvdHlwZS5oaWRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGVjdHJ1bS5wcm90b3R5cGUu X29uS2V5RG93bik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFy UGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQu cHJvdG90eXBlLnVwZGF0ZVRpdGxlLik6CisKIDIwMTItMDUtMTQgIE1PUklUQSBIYWppbWUgIDxt b3JyaXRhQGdvb2dsZS5jb20+CiAKICAgICAgICAgU2hvdWxkIGhhdmUgTm9kZTo6aW5EZXRhY2go KSBmb3IgYXNzZXJ0aW9uIHB1cnBvc2VzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TcGVjdHJ1bS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU3BlY3RydW0uanMKaW5kZXggMGMxYjgxNGQ4YjY3OTNhOGI3MDQwODBlNDNiMDZj ZGY3NWQ3YmFkNi4uNTdlMGU2M2E2NDNkNDM1YTY3N2FiOWEzY2Y2MWQ3OTI5ODllMDZmMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TcGVjdHJ1bS5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NwZWN0cnVtLmpzCkBAIC00 MDksMTQgKzQwOSwxNyBAQCBXZWJJbnNwZWN0b3IuU3BlY3RydW0ucHJvdG90eXBlID0gewogICAg ICAgICBXZWJJbnNwZWN0b3Iuc2V0Q3VycmVudEZvY3VzRWxlbWVudCh0aGlzLl9jb250YWluZXJF bGVtZW50KTsKICAgICB9LAogCi0gICAgaGlkZTogZnVuY3Rpb24oKQorICAgIC8qKgorICAgICAq IEBwYXJhbSB7Ym9vbGVhbj19IGNhbmNlbEVkaXQKKyAgICAgKi8KKyAgICBoaWRlOiBmdW5jdGlv bihjYW5jZWxFZGl0KQogICAgIHsKICAgICAgICAgdGhpcy5fcG9wb3Zlci5oaWRlKCk7CiAKICAg ICAgICAgZG9jdW1lbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcy5faGlk ZVByb3h5LCBmYWxzZSk7CiAgICAgICAgIHdpbmRvdy5yZW1vdmVFdmVudExpc3RlbmVyKCJibHVy IiwgdGhpcy5faGlkZVByb3h5LCBmYWxzZSk7CiAKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNwZWN0cnVtLkV2ZW50cy5IaWRkZW4pOworICAgICAg ICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU3BlY3RydW0uRXZl bnRzLkhpZGRlbiwgISFjYW5jZWxFZGl0KTsKIAogICAgICAgICBXZWJJbnNwZWN0b3Iuc2V0Q3Vy cmVudEZvY3VzRWxlbWVudCh0aGlzLl9wcmV2aW91c0ZvY3VzRWxlbWVudCk7CiAgICAgICAgIGRl bGV0ZSB0aGlzLl9wcmV2aW91c0ZvY3VzRWxlbWVudDsKQEAgLTQyNyw3ICs0MzAsNyBAQCBXZWJJ bnNwZWN0b3IuU3BlY3RydW0ucHJvdG90eXBlID0gewogICAgIF9vbktleURvd246IGZ1bmN0aW9u KGV2ZW50KQogICAgIHsKICAgICAgICAgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIgPT09ICJFbnRl ciIgfHwgZXZlbnQua2V5SWRlbnRpZmllciA9PT0gIlUrMDAxQiIpIHsgLy8gRXNjYXBlIGtleQot ICAgICAgICAgICAgdGhpcy5oaWRlKCk7CisgICAgICAgICAgICB0aGlzLmhpZGUoZXZlbnQua2V5 SWRlbnRpZmllciA9PT0gIlUrMDAxQiIpOwogICAgICAgICAgICAgZXZlbnQuY29uc3VtZSh0cnVl KTsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCmluZGV4IDI2YTNmYjgxODA2OGFkYzcx NmI5Nzk3MzMxZTNjNTc3ODQyYjc2NjAuLmY1ZjQ5MGViY2Y0MThiNDIyZGY2NTY0ZjA2OTQxZWEy NTM0NGI4ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U3R5bGVzU2lkZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwpAQCAtMTc3NCwxNCArMTc3NCwxNyBAQCBXZWJJbnNw ZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg ICAgICAgICAgc2VsZi5hcHBseVN0eWxlVGV4dChuYW1lRWxlbWVudC50ZXh0Q29udGVudCArICI6 ICIgKyB2YWx1ZUVsZW1lbnQudGV4dENvbnRlbnQsIGZhbHNlLCBmYWxzZSwgZmFsc2UpOwogICAg ICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgIGZ1bmN0aW9uIHNwZWN0cnVtSGlkZGVu KCkKKyAgICAgICAgICAgICAgICBmdW5jdGlvbiBzcGVjdHJ1bUhpZGRlbihldmVudCkKICAgICAg ICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgIHNjcm9sbGVyRWxlbWVudC5yZW1vdmVF dmVudExpc3RlbmVyKCJzY3JvbGwiLCByZXBvc2l0aW9uU3BlY3RydW0sIGZhbHNlKTsKLSAgICAg ICAgICAgICAgICAgICAgc2VsZi5hcHBseVN0eWxlVGV4dChuYW1lRWxlbWVudC50ZXh0Q29udGVu dCArICI6ICIgKyB2YWx1ZUVsZW1lbnQudGV4dENvbnRlbnQsIHRydWUsIHRydWUsIGZhbHNlKTsK KyAgICAgICAgICAgICAgICAgICAgdmFyIGNhbmNlbEVkaXQgPSBldmVudC5kYXRhOworICAgICAg ICAgICAgICAgICAgICB2YXIgcHJvcGVydHlUZXh0ID0gY2FuY2VsRWRpdCAmJiBzZWxmLm9yaWdp bmFsUHJvcGVydHlUZXh0ID8gc2VsZi5vcmlnaW5hbFByb3BlcnR5VGV4dCA6IChuYW1lRWxlbWVu dC50ZXh0Q29udGVudCArICI6ICIgKyB2YWx1ZUVsZW1lbnQudGV4dENvbnRlbnQpOworICAgICAg ICAgICAgICAgICAgICBzZWxmLmFwcGx5U3R5bGVUZXh0KHByb3BlcnR5VGV4dCwgdHJ1ZSwgdHJ1 ZSwgZmFsc2UpOwogICAgICAgICAgICAgICAgICAgICBzcGVjdHJ1bS5yZW1vdmVFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5TcGVjdHJ1bS5FdmVudHMuQ29sb3JDaGFuZ2VkLCBzcGVjdHJ1bUNo YW5nZWQpOwogICAgICAgICAgICAgICAgICAgICBzcGVjdHJ1bS5yZW1vdmVFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5TcGVjdHJ1bS5FdmVudHMuSGlkZGVuLCBzcGVjdHJ1bUhpZGRlbik7CiAK ICAgICAgICAgICAgICAgICAgICAgZGVsZXRlIHNlbGYuX3BhcmVudFBhbmUuX2lzRWRpdGluZ1N0 eWxlOworICAgICAgICAgICAgICAgICAgICBkZWxldGUgc2VsZi5vcmlnaW5hbFByb3BlcnR5VGV4 dDsKICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICBmdW5jdGlvbiByZXBvc2l0 aW9uU3BlY3RydW0oKQpAQCAtMTgwMCw2ICsxODAzLDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJv cGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgICAgICAgICAgICAg IGlmICh2aXNpYmxlKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3BlY3RydW0uZGlz cGxheVRleHQgPSBjb2xvci50b1N0cmluZyhmb3JtYXQpOworICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNlbGYub3JpZ2luYWxQcm9wZXJ0eVRleHQgPSBzZWxmLnByb3BlcnR5LnByb3BlcnR5 VGV4dDsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9wYXJlbnRQYW5lLl9pc0Vk aXRpbmdTdHlsZSA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3BlY3RydW0u YWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU3BlY3RydW0uRXZlbnRzLkNvbG9yQ2hhbmdl ZCwgc3BlY3RydW1DaGFuZ2VkKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzcGVjdHJ1 bS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TcGVjdHJ1bS5FdmVudHMuSGlkZGVuLCBz cGVjdHJ1bUhpZGRlbik7Cg==