78337 2012-02-10 01:17:08 -0800 Web Inspector: FileSelector should not depend on DebuggerPresentationModel. 2012-02-10 01:34:54 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 553935 0 vsevik 2012-02-10 01:17:08 -0800 FileSelector should not depend on DebuggerPresentationModel. 553946 1 126475 vsevik 2012-02-10 01:28:54 -0800 Created attachment 126475 Patch 553947 2 vsevik 2012-02-10 01:34:54 -0800 Committed r107384: <http://trac.webkit.org/changeset/107384> 126475 2012-02-10 01:28:54 -0800 2012-02-10 01:29:16 -0800 Patch bug-78337-20120210132852.patch text/plain 6462 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGE3NzdlMDQ4OTEwMmZm MzlhYjlkYTFjMTk5ODU3OGQ4NmYyYzZhZC4uNjRlNzA4NWE1M2ExYzJlN2VmODcwNzA3ZDUwMWE4 OTEyMjQyNjA0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTAyLTEwICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEZpbGVTZWxlY3RvciBzaG91bGQgbm90IGRlcGVuZCBvbiBEZWJ1Z2dlclByZXNlbnRhdGlv bk1vZGVsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzgzMzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRz TmF2aWdhdG9yLnByb3RvdHlwZS5fc2hvd1NjcmlwdEZvbGRlcnNTZXR0aW5nQ2hhbmdlZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5wcm90b3R5cGUucmVzZXQpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3Jlc2V0KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRmlsZVNlbGVjdG9yLnByb3RvdHlwZS5yZXBsYWNlVUlT b3VyY2VDb2Rlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkZpbGVTZWxl Y3Rvci5wcm90b3R5cGUucmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5l bC5Db21ib0JveEZpbGVTZWxlY3Rvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsLkNvbWJvQm94RmlsZVNlbGVjdG9yLnByb3RvdHlwZS5yZXNldCk6CisKIDIwMTItMDItMDkg IFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZp ZXdlZCBmb2xsb3d1cCBmb3IgcjEwNzIzNS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qcwppbmRleCBhMWU4MjcwMjBiOGMx ZThlMDg2NzQyMjFlOGE4NzU5NzNhNmY1MDc2Li4wNjI3YWViZDUyOTk1ZDEwN2Q4NjRjYjk2Y2Rl NWE3MTIwYmFhYzkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzCkBAIC0zMSwxNSArMzEsMTMgQEAKICAqIEBleHRl bmRzIHtXZWJJbnNwZWN0b3IuT2JqZWN0fQogICogQGNvbnN0cnVjdG9yCiAgKi8KLVdlYkluc3Bl Y3Rvci5TY3JpcHRzTmF2aWdhdG9yID0gZnVuY3Rpb24ocHJlc2VudGF0aW9uTW9kZWwpCitXZWJJ bnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvciA9IGZ1bmN0aW9uKCkKIHsKICAgICBXZWJJbnNwZWN0 b3IuT2JqZWN0LmNhbGwodGhpcyk7CiAgICAgCiAgICAgdGhpcy5fdGFiYmVkUGFuZSA9IG5ldyBX ZWJJbnNwZWN0b3IuVGFiYmVkUGFuZSgpOwogICAgIHRoaXMuX3RhYmJlZFBhbmUuc2hyaW5rYWJs ZVRhYnMgPSB0cnVlOwogCi0gICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwgPSBwcmVzZW50YXRp b25Nb2RlbDsKLQogICAgIHRoaXMuX3RhYmJlZFBhbmUuZWxlbWVudC5pZCA9ICJzY3JpcHRzLW5h dmlnYXRvci10YWJiZWQtcGFuZSI7CiAgICAgCiAgICAgdGhpcy5fdGFiYmVkUGFuZS5lbGVtZW50 LnRhYkluZGV4ID0gMDsKQEAgLTcxLDkgKzY5LDYgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZp Z2F0b3IgPSBmdW5jdGlvbihwcmVzZW50YXRpb25Nb2RlbCkKICAgICB0aGlzLl9zY3JpcHRUcmVl RWxlbWVudHNCeVVJU291cmNlQ29kZSA9IG5ldyBNYXAoKTsKICAgICAKICAgICBXZWJJbnNwZWN0 b3Iuc2V0dGluZ3Muc2hvd1NjcmlwdEZvbGRlcnMuYWRkQ2hhbmdlTGlzdGVuZXIodGhpcy5fc2hv d1NjcmlwdEZvbGRlcnNTZXR0aW5nQ2hhbmdlZC5iaW5kKHRoaXMpKTsKLSAgICAKLSAgICBXZWJJ bnNwZWN0b3IuZGVidWdnZXJNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1 Z2dlck1vZGVsLkV2ZW50cy5EZWJ1Z2dlcldhc0Rpc2FibGVkLCB0aGlzLl9yZXNldCwgdGhpcyk7 Ci0gICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuRGVidWdnZXJSZXNldCwgdGhpcy5f cmVzZXQsIHRoaXMpOwogfQogCiBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5TY3JpcHRz VGFiID0gInNjcmlwdHMiOwpAQCAtMjI4LDE0ICsyMjMsMTQgQEAgV2ViSW5zcGVjdG9yLlNjcmlw dHNOYXZpZ2F0b3IucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIHVpU291cmNlQ29k ZXMgPSB0aGlzLl9uYXZpZ2F0b3JTY3JpcHRzVHJlZS5zY3JpcHRUcmVlRWxlbWVudHMoKTsKICAg ICAgICAgdWlTb3VyY2VDb2RlcyA9IHVpU291cmNlQ29kZXMuY29uY2F0KHRoaXMuX25hdmlnYXRv ckNvbnRlbnRTY3JpcHRzVHJlZS5zY3JpcHRUcmVlRWxlbWVudHMoKSk7Ci0gICAgICAgIHRoaXMu X3Jlc2V0KCk7CisgICAgICAgIHRoaXMucmVzZXQoKTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7 IGkgPCB1aVNvdXJjZUNvZGVzLmxlbmd0aDsgKytpKQogICAgICAgICAgICAgdGhpcy5hZGRVSVNv dXJjZUNvZGUodWlTb3VyY2VDb2Rlc1tpXSk7CiAgICAgICAgIAogICAgICAgICB0aGlzLnJldmVh bFVJU291cmNlQ29kZSh0aGlzLl9sYXN0U2VsZWN0ZWRVSVNvdXJjZUNvZGUpOwogICAgIH0sCiAg ICAgCi0gICAgX3Jlc2V0OiBmdW5jdGlvbigpCisgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7 CiAgICAgICAgIHRoaXMuX25hdmlnYXRvclNjcmlwdHNUcmVlLnN0b3BTZWFyY2goKTsKICAgICAg ICAgdGhpcy5fbmF2aWdhdG9yU2NyaXB0c1RyZWUucmVtb3ZlQ2hpbGRyZW4oKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXgg ODJmZDc4ZTM2YTA5Zjc2ZWYzNDhlMjlhMDEzNzVlOTRiN2I4NDIzNy4uZmJmMzkwZDc0NDg1Y2E4 OTJjMDkwN2YwMjJiNjI5MTllNzg1ZTAzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTcwLDcgKzcwLDcgQEAgV2ViSW5z cGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKHByZXNlbnRhdGlvbk1vZGVsKQogICAgICAg ICB0aGlzLmVkaXRvclZpZXcubWluaW1hbE1haW5XaWR0aFBlcmNlbnQgPSBtaW5pbWFsVmlld3ND b250YWluZXJXaWR0aFBlcmNlbnQ7CiAgICAgICAgIHRoaXMuZWRpdG9yVmlldy5zaG93KHRoaXMu c3BsaXRWaWV3Lm1haW5FbGVtZW50KTsKIAotICAgICAgICB0aGlzLl9uYXZpZ2F0b3IgPSBuZXcg V2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IodGhpcy5fcHJlc2VudGF0aW9uTW9kZWwpOwor ICAgICAgICB0aGlzLl9uYXZpZ2F0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0 b3IoKTsKICAgICAgICAgdGhpcy5fbmF2aWdhdG9yVmlldyA9IHRoaXMuX25hdmlnYXRvci52aWV3 OwogICAgICAgICB0aGlzLl9maWxlU2VsZWN0b3IgPSB0aGlzLl9uYXZpZ2F0b3I7CiAgICAgICAg IHRoaXMuX2ZpbGVTZWxlY3Rvci5zaG93KHRoaXMuZWRpdG9yVmlldy5zaWRlYmFyRWxlbWVudCk7 CkBAIC04NSw3ICs4NSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbihw cmVzZW50YXRpb25Nb2RlbCkKICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5zZXR0aW5ncy5uYXZp Z2F0b3JIaWRkZW4uZ2V0KCkpCiAgICAgICAgICAgICB0aGlzLl90b2dnbGVOYXZpZ2F0b3IoKTsK ICAgICB9IGVsc2UgewotICAgICAgICB0aGlzLl9maWxlU2VsZWN0b3IgPSBuZXcgV2ViSW5zcGVj dG9yLlNjcmlwdHNQYW5lbC5Db21ib0JveEZpbGVTZWxlY3Rvcih0aGlzLl9wcmVzZW50YXRpb25N b2RlbCk7CisgICAgICAgIHRoaXMuX2ZpbGVTZWxlY3RvciA9IG5ldyBXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsLkNvbWJvQm94RmlsZVNlbGVjdG9yKCk7CiAgICAgICAgIHRoaXMuX2ZpbGVTZWxl Y3Rvci5zaG93KHRoaXMuc3BsaXRWaWV3Lm1haW5FbGVtZW50KTsKIAogICAgICAgICB0aGlzLl9l ZGl0b3JDb250YWluZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5TaW5nbGVGaWxl RWRpdG9yQ29udGFpbmVyKHRoaXMpOwpAQCAtNDA4LDYgKzQwOCw3IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9kZWJ1Z2dlclJlc3VtZWQo KTsKIAogICAgICAgICBkZWxldGUgdGhpcy5fY3VycmVudFVJU291cmNlQ29kZTsKKyAgICAgICAg dGhpcy5fZmlsZVNlbGVjdG9yLnJlc2V0KCk7CiAgICAgICAgIHRoaXMuX2VkaXRvckNvbnRhaW5l ci5yZXNldCgpOwogICAgICAgICB0aGlzLl91cGRhdGVTY3JpcHRWaWV3U3RhdHVzQmFySXRlbXMo KTsKIApAQCAtMTE3NCw3ICsxMTc1LDkgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5GaWxl U2VsZWN0b3IucHJvdG90eXBlID0gewogICAgICAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGU+fSBvbGRVSVNvdXJjZUNvZGVMaXN0CiAgICAgICogQHBhcmFtIHtBcnJh eS48V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZT59IHVpU291cmNlQ29kZUxpc3QKICAgICAgKi8K LSAgICByZXBsYWNlVUlTb3VyY2VDb2RlczogZnVuY3Rpb24ob2xkVUlTb3VyY2VDb2RlTGlzdCwg dWlTb3VyY2VDb2RlTGlzdCkgeyB9CisgICAgcmVwbGFjZVVJU291cmNlQ29kZXM6IGZ1bmN0aW9u KG9sZFVJU291cmNlQ29kZUxpc3QsIHVpU291cmNlQ29kZUxpc3QpIHsgfSwKKyAgICAKKyAgICBy ZXNldDogZnVuY3Rpb24oKSB7IH0KIH0KIAogLyoqCkBAIC0xMjQxLDE1ICsxMjQ0LDEyIEBAIFdl Ykluc3BlY3Rvci5FZGl0b3JDb250YWluZXJEZWxlZ2F0ZS5wcm90b3R5cGUgPSB7CiAgKiBAZXh0 ZW5kcyB7V2ViSW5zcGVjdG9yLk9iamVjdH0KICAqIEBjb25zdHJ1Y3RvcgogICovCi1XZWJJbnNw ZWN0b3IuU2NyaXB0c1BhbmVsLkNvbWJvQm94RmlsZVNlbGVjdG9yID0gZnVuY3Rpb24ocHJlc2Vu dGF0aW9uTW9kZWwpCitXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkNvbWJvQm94RmlsZVNlbGVj dG9yID0gZnVuY3Rpb24oKQogewogICAgIFdlYkluc3BlY3Rvci5PYmplY3QuY2FsbCh0aGlzKTsK ICAgICB0aGlzLmVkaXRvclRvb2xiYXIgPSB0aGlzLl9jcmVhdGVFZGl0b3JUb29sYmFyKCk7CiAg ICAgCi0gICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwgPSBwcmVzZW50YXRpb25Nb2RlbDsKICAg ICBXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hvd1NjcmlwdEZvbGRlcnMuYWRkQ2hhbmdlTGlzdGVu ZXIodGhpcy5fc2hvd1NjcmlwdEZvbGRlcnNTZXR0aW5nQ2hhbmdlZC5iaW5kKHRoaXMpKTsKLSAg ICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5EZWJ1Z2dlcldhc0Rpc2FibGVkLCB0aGlzLl9yZXNldCwg dGhpcyk7Ci0gICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuRGVidWdnZXJSZXNldCwg dGhpcy5fcmVzZXQsIHRoaXMpOwogICAgIAogICAgIHRoaXMuX2JhY2tGb3J3YXJkTGlzdCA9IFtd OwogfQpAQCAtMTM4Nyw3ICsxMzg3LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5Db21i b0JveEZpbGVTZWxlY3Rvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogICAgIAot ICAgIF9yZXNldDogZnVuY3Rpb24oKQorICAgIHJlc2V0OiBmdW5jdGlvbigpCiAgICAgewogICAg ICAgICB0aGlzLl9iYWNrRm9yd2FyZExpc3QgPSBbXTsKICAgICAgICAgdGhpcy5fY3VycmVudEJh Y2tGb3J3YXJkSW5kZXggPSAtMTsK