97331 2012-09-21 05:43:23 -0700 Web Inspector: [Canvas] set CanvasAgent in InstrumentingAgents upon calling enable command 2012-09-24 08:47:03 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 97203 0 aandrey aandrey apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 725443 0 aandrey 2012-09-21 05:43:23 -0700 We should set CanvasAgent in InstrumentingAgents from enable() command and remove from disable(), instead of doing this in constructor and destructor. Patch to follow. 726677 1 165386 aandrey 2012-09-24 08:19:11 -0700 Created attachment 165386 Patch 726714 2 165386 webkit.review.bot 2012-09-24 08:47:00 -0700 Comment on attachment 165386 Patch Clearing flags on attachment: 165386 Committed r129374: <http://trac.webkit.org/changeset/129374> 726715 3 webkit.review.bot 2012-09-24 08:47:03 -0700 All reviewed patches have been landed. Closing bug. 165386 2012-09-24 08:19:11 -0700 2012-09-24 08:47:00 -0700 Patch bug-97331-20120924191831.patch text/plain 5643 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2YzNjYxYTg2YzlhN2Y1 NDMwODdiYmI2YzkwZjIxZjUzMDU5MDAzYS4uMzViMTc1YTkwYjM5MDllYzY2MzFlNzM2MTE5NGM4 NzliNjIzNTk2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA5LTI0ICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDYW52YXNdIHNldCBDYW52YXNBZ2VudCBpbiBJbnN0cnVtZW50aW5nQWdlbnRzIHVwb24g Y2FsbGluZyBlbmFibGUgY29tbWFuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9OTczMzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXZSBzaG91bGQgc2V0IENhbnZhc0FnZW50IGluIEluc3RydW1lbnRpbmdB Z2VudHMgZnJvbSBlbmFibGUoKSBjb21tYW5kIGFuZCByZW1vdmUgZnJvbSBkaXNhYmxlKCksIGlu c3RlYWQgb2YgZG9pbmcgdGhpcyBpbiBjb25zdHJ1Y3RvciBhbmQgZGVzdHJ1Y3Rvci4KKworICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDYW52YXNBZ2VudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JDYW52YXNBZ2VudDo6SW5zcGVjdG9yQ2FudmFzQWdlbnQpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2FudmFzQWdlbnQ6On5JbnNwZWN0b3JDYW52YXNBZ2VudCk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDYW52YXNBZ2VudDo6cmVzdG9yZSk6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDYW52YXNBZ2VudDo6ZW5hYmxlKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckNhbnZhc0FnZW50OjpkaXNhYmxlKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yQ2FudmFzQWdlbnQuaDoKKyAgICAgICAgKEluc3BlY3RvckNhbnZhc0FnZW50 KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ2FudmFzSW5zdHJ1bWVudGF0aW9uLmg6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndyYXBDYW52YXMy RFJlbmRlcmluZ0NvbnRleHRGb3JJbnN0cnVtZW50YXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3cmFwV2ViR0xSZW5kZXJpbmdDb250ZXh0Rm9ySW5z dHJ1bWVudGF0aW9uKToKKwogMjAxMi0wOS0yNCAgUGV0ZXIgUnliaW4gIDxwZXRlci5yeWJpbkBn bWFpbC5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogZG9uJ3QgYWxsb3cgZXhjZXB0aW9u IGluIGZyb250LWVuZCB3aGVuIGV4cGFuZGluZyBmdW5jdGlvbiBzY29wZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhc0FnZW50LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDYW52YXNBZ2VudC5jcHAKaW5kZXggNWUzZmZj YmMzOGY3NzYxMTQ1NjcyN2IxMDM2M2Q0ZTg1M2NiZGViYy4uMTBiZWYwY2QyMTM0YzdiNjRhMWQx MzA1M2I5Y2Q2N2I5ZDMwOWIyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckNhbnZhc0FnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ2FudmFzQWdlbnQuY3BwCkBAIC01NSwxNCArNTUsMTEgQEAgSW5zcGVjdG9yQ2Fu dmFzQWdlbnQ6Okluc3BlY3RvckNhbnZhc0FnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3Ry dW1lbnRpbmdBZ2UKICAgICAsIG1faW5zcGVjdGVkUGFnZShwYWdlKQogICAgICwgbV9pbmplY3Rl ZFNjcmlwdE1hbmFnZXIoaW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKQogICAgICwgbV9mcm9udGVuZCgw KQotICAgICwgbV9lbmFibGVkKGZhbHNlKQogewotICAgIG1faW5zdHJ1bWVudGluZ0FnZW50cy0+ c2V0SW5zcGVjdG9yQ2FudmFzQWdlbnQodGhpcyk7CiB9CiAKIEluc3BlY3RvckNhbnZhc0FnZW50 Ojp+SW5zcGVjdG9yQ2FudmFzQWdlbnQoKQogewotICAgIG1faW5zdHJ1bWVudGluZ0FnZW50cy0+ c2V0SW5zcGVjdG9yQ2FudmFzQWdlbnQoMCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ2FudmFzQWdl bnQ6OnNldEZyb250ZW5kKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkKQEAgLTc5LDIzICs3 NiwyMiBAQCB2b2lkIEluc3BlY3RvckNhbnZhc0FnZW50OjpjbGVhckZyb250ZW5kKCkKIAogdm9p ZCBJbnNwZWN0b3JDYW52YXNBZ2VudDo6cmVzdG9yZSgpCiB7Ci0gICAgbV9lbmFibGVkID0gbV9z dGF0ZS0+Z2V0Qm9vbGVhbihDYW52YXNBZ2VudFN0YXRlOjpjYW52YXNBZ2VudEVuYWJsZWQpOwor ICAgIGlmIChtX3N0YXRlLT5nZXRCb29sZWFuKENhbnZhc0FnZW50U3RhdGU6OmNhbnZhc0FnZW50 RW5hYmxlZCkpIHsKKyAgICAgICAgRXJyb3JTdHJpbmcgZXJyb3I7CisgICAgICAgIGVuYWJsZSgm ZXJyb3IpOworICAgIH0KIH0KIAogdm9pZCBJbnNwZWN0b3JDYW52YXNBZ2VudDo6ZW5hYmxlKEVy cm9yU3RyaW5nKikKIHsKLSAgICBpZiAobV9lbmFibGVkKQotICAgICAgICByZXR1cm47Ci0gICAg bV9lbmFibGVkID0gdHJ1ZTsKLSAgICBtX3N0YXRlLT5zZXRCb29sZWFuKENhbnZhc0FnZW50U3Rh dGU6OmNhbnZhc0FnZW50RW5hYmxlZCwgbV9lbmFibGVkKTsKKyAgICBtX3N0YXRlLT5zZXRCb29s ZWFuKENhbnZhc0FnZW50U3RhdGU6OmNhbnZhc0FnZW50RW5hYmxlZCwgdHJ1ZSk7CisgICAgbV9p bnN0cnVtZW50aW5nQWdlbnRzLT5zZXRJbnNwZWN0b3JDYW52YXNBZ2VudCh0aGlzKTsKIH0KIAog dm9pZCBJbnNwZWN0b3JDYW52YXNBZ2VudDo6ZGlzYWJsZShFcnJvclN0cmluZyopCiB7Ci0gICAg aWYgKCFtX2VuYWJsZWQpCi0gICAgICAgIHJldHVybjsKLSAgICBtX2VuYWJsZWQgPSBmYWxzZTsK LSAgICBtX3N0YXRlLT5zZXRCb29sZWFuKENhbnZhc0FnZW50U3RhdGU6OmNhbnZhc0FnZW50RW5h YmxlZCwgbV9lbmFibGVkKTsKKyAgICBtX2luc3RydW1lbnRpbmdBZ2VudHMtPnNldEluc3BlY3Rv ckNhbnZhc0FnZW50KDApOworICAgIG1fc3RhdGUtPnNldEJvb2xlYW4oQ2FudmFzQWdlbnRTdGF0 ZTo6Y2FudmFzQWdlbnRFbmFibGVkLCBmYWxzZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ2FudmFz QWdlbnQ6OmRyb3BUcmFjZUxvZyhFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmlu ZyYgdHJhY2VMb2dJZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JDYW52YXNBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNh bnZhc0FnZW50LmgKaW5kZXggZTg2ODYxOWQ2ZTU5YWEyMjA5OGMwNDJkYmMyNjBhN2NkMWFmZWI1 My4uZWY0Y2JkNThjNzI2MzM0NjQwN2UyN2ZhNWUwZWIzZmU2YzBhMzc0OSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhc0FnZW50LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhc0FnZW50LmgKQEAgLTY0LDggKzY0 LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjbGVhckZyb250ZW5kKCk7CiAgICAgdmly dHVhbCB2b2lkIHJlc3RvcmUoKTsKIAotICAgIGJvb2wgZW5hYmxlZCgpIHsgcmV0dXJuIG1fZW5h YmxlZDsgfQotCiAgICAgU2NyaXB0T2JqZWN0IHdyYXBDYW52YXMyRFJlbmRlcmluZ0NvbnRleHRG b3JJbnN0cnVtZW50YXRpb24oY29uc3QgU2NyaXB0T2JqZWN0Jik7CiAjaWYgRU5BQkxFKFdFQkdM KQogICAgIFNjcmlwdE9iamVjdCB3cmFwV2ViR0xSZW5kZXJpbmdDb250ZXh0Rm9ySW5zdHJ1bWVu dGF0aW9uKGNvbnN0IFNjcmlwdE9iamVjdCYpOwpAQCAtOTEsNyArODksNiBAQCBwcml2YXRlOgog ICAgIFBhZ2UqIG1faW5zcGVjdGVkUGFnZTsKICAgICBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIG1f aW5qZWN0ZWRTY3JpcHRNYW5hZ2VyOwogICAgIEluc3BlY3RvckZyb250ZW5kOjpDYW52YXMqIG1f ZnJvbnRlbmQ7Ci0gICAgYm9vbCBtX2VuYWJsZWQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2FudmFz SW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2Fu dmFzSW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggNzgzYTE0NjNlNmE1YmExYjFhZTY0Y2FhYzZlNDVl NDBjYzQxMjM3ZS4uMmMyYmVhOWQwN2ViZTYwMTMwNjI4ODlhMDE0MzY5YWI4NDIxODNhMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhc0luc3RydW1l bnRhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDYW52YXNJ bnN0cnVtZW50YXRpb24uaApAQCAtNDIsOCArNDIsNyBAQCBTY3JpcHRPYmplY3QgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjp3cmFwQ2FudmFzMkRSZW5kZXJpbmdDb250ZXh0Rm9ySW5zdHJ1bWVu dAogewogI2lmIEVOQUJMRShJTlNQRUNUT1IpCiAgICAgaWYgKEluc3RydW1lbnRpbmdBZ2VudHMq IGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yRG9jdW1lbnQoZG9j dW1lbnQpKSB7Ci0gICAgICAgIEluc3BlY3RvckNhbnZhc0FnZW50KiBjYW52YXNBZ2VudCA9IGlu c3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckNhbnZhc0FnZW50KCk7Ci0gICAgICAgIGlmIChj YW52YXNBZ2VudCAmJiBjYW52YXNBZ2VudC0+ZW5hYmxlZCgpKQorICAgICAgICBpZiAoSW5zcGVj dG9yQ2FudmFzQWdlbnQqIGNhbnZhc0FnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVj dG9yQ2FudmFzQWdlbnQoKSkKICAgICAgICAgICAgIHJldHVybiBjYW52YXNBZ2VudC0+d3JhcENh bnZhczJEUmVuZGVyaW5nQ29udGV4dEZvckluc3RydW1lbnRhdGlvbihjb250ZXh0KTsKICAgICB9 CiAjZW5kaWYKQEAgLTU1LDggKzU0LDcgQEAgU2NyaXB0T2JqZWN0IEluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6d3JhcFdlYkdMUmVuZGVyaW5nQ29udGV4dEZvckluc3RydW1lbnRhdGkKIHsKICNp ZiBFTkFCTEUoSU5TUEVDVE9SKQogICAgIGlmIChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVt ZW50aW5nQWdlbnRzID0gaW5zdHJ1bWVudGluZ0FnZW50c0ZvckRvY3VtZW50KGRvY3VtZW50KSkg ewotICAgICAgICBJbnNwZWN0b3JDYW52YXNBZ2VudCogY2FudmFzQWdlbnQgPSBpbnN0cnVtZW50 aW5nQWdlbnRzLT5pbnNwZWN0b3JDYW52YXNBZ2VudCgpOwotICAgICAgICBpZiAoY2FudmFzQWdl bnQgJiYgY2FudmFzQWdlbnQtPmVuYWJsZWQoKSkKKyAgICAgICAgaWYgKEluc3BlY3RvckNhbnZh c0FnZW50KiBjYW52YXNBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckNhbnZh c0FnZW50KCkpCiAgICAgICAgICAgICByZXR1cm4gY2FudmFzQWdlbnQtPndyYXBXZWJHTFJlbmRl cmluZ0NvbnRleHRGb3JJbnN0cnVtZW50YXRpb24oZ2xDb250ZXh0KTsKICAgICB9CiAjZW5kaWYK