124374 2013-11-14 12:07:59 -0800 Web Inspector: Simply generated domain dispatch methods for domains with few commands 2013-11-14 13:28:38 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 950791 0 joepeck 2013-11-14 12:07:59 -0800 A bunch of domains have only a few methods. The hash lookup does not make sense. Turn: void InspectorInspectorBackendDispatcher::dispatch(long callId, const String& method, PassRefPtr<InspectorObject> message) { Ref<InspectorInspectorBackendDispatcher> protect(*this); typedef void (InspectorInspectorBackendDispatcher::*CallHandler)(long callId, const InspectorObject& message); typedef HashMap<String, CallHandler> DispatchMap; DEFINE_STATIC_LOCAL(DispatchMap, dispatchMap, ()); if (dispatchMap.isEmpty()) { static const struct MethodTable { const char* name; CallHandler handler; } commands[] = { { "enable", &InspectorInspectorBackendDispatcher::enable }, { "disable", &InspectorInspectorBackendDispatcher::disable }, }; size_t length = WTF_ARRAY_LENGTH(commands); for (size_t i = 0; i < length; ++i) dispatchMap.add(commands[i].name, commands[i].handler); } HashMap<String, CallHandler>::iterator it = dispatchMap.find(method); if (it == dispatchMap.end()) { m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, String("'") + "Inspector" + '.' + method + "' was not found"); return; } ((*this).*it->value)(callId, *message.get()); } into: void InspectorInspectorBackendDispatcher::dispatch(long callId, const String& method, PassRefPtr<InspectorObject> message) { Ref<InspectorInspectorBackendDispatcher> protect(*this); if (method == "enable") enable(callId, *message.get()); else if (method == "disable") disable(callId, *message.get()); else m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, String("'") + "Inspector" + '.' + method + "' was not found"); } 950793 1 webkit-bug-importer 2013-11-14 12:08:30 -0800 <rdar://problem/15472278> 950799 2 216967 joepeck 2013-11-14 12:20:03 -0800 Created attachment 216967 [PATCH] Proposed Fix 950816 3 216967 commit-queue 2013-11-14 13:28:37 -0800 Comment on attachment 216967 [PATCH] Proposed Fix Clearing flags on attachment: 216967 Committed r159308: <http://trac.webkit.org/changeset/159308> 950817 4 commit-queue 2013-11-14 13:28:38 -0800 All reviewed patches have been landed. Closing bug. 216967 2013-11-14 12:20:03 -0800 2013-11-14 13:28:37 -0800 [PATCH] Proposed Fix gen2.patch text/plain 6563 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwMWE5Y2JmLi43MDgxNDU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTMtMTEtMTQgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBTaW1wbHkgZ2VuZXJhdGVkIGRvbWFpbiBkaXNwYXRjaCBt ZXRob2RzIGZvciBkb21haW5zIHdpdGggZmV3IGNvbW1hbmRzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQzNzQKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5z cGVjdG9yLnB5OgorICAgICAgICAoR2VuZXJhdG9yLmdvKToKKyAgICAgICAgKEdlbmVyYXRvci5w cm9jZXNzX2NvbW1hbmQpOgorICAgICAgICAqIGluc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVj dG9yU3RyaW5ncy5weToKKwogMjAxMy0xMS0xMyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9A YXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IENsZWFuZXIgQmFja2VuZCBNZXRo b2QgQ2FsbGluZyBDb2RlIEdlbmVyYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5IGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucHkKaW5kZXggNGUyYzAyNy4uZDQ3NWIzYyAxMDA3 NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3Iu cHkKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3Iu cHkKQEAgLTEsNiArMSw3IEBACiAjIS91c3IvYmluL2VudiBweXRob24KICMgQ29weXJpZ2h0IChj KSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjIENvcHlyaWdodCAoYykg MjAxMiBJbnRlbCBDb3Jwb3JhdGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0 IChjKSAyMDEzIEFwcGxlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KICMKICMgUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucyBhcmUKQEAgLTE3MzEsNiArMTczMiw3IEBAIGNsYXNzIFRlbXBsYXRlczoK ICAgICBmcm9udGVuZF9kb21haW5fY2xhc3MgPSBzdHJpbmcuVGVtcGxhdGUoQ29kZUdlbmVyYXRv ckluc3BlY3RvclN0cmluZ3MuZnJvbnRlbmRfZG9tYWluX2NsYXNzKQogICAgIGJhY2tlbmRfZGlz cGF0Y2hlcl9jb25zdHJ1Y3RvciA9IHN0cmluZy5UZW1wbGF0ZShDb2RlR2VuZXJhdG9ySW5zcGVj dG9yU3RyaW5ncy5iYWNrZW5kX2Rpc3BhdGNoZXJfY29uc3RydWN0b3IpCiAgICAgYmFja2VuZF9k aXNwYXRjaGVyX2Rpc3BhdGNoX21ldGhvZCA9IHN0cmluZy5UZW1wbGF0ZShDb2RlR2VuZXJhdG9y SW5zcGVjdG9yU3RyaW5ncy5iYWNrZW5kX2Rpc3BhdGNoZXJfZGlzcGF0Y2hfbWV0aG9kKQorICAg IGJhY2tlbmRfZGlzcGF0Y2hlcl9kaXNwYXRjaF9tZXRob2Rfc2ltcGxlID0gc3RyaW5nLlRlbXBs YXRlKENvZGVHZW5lcmF0b3JJbnNwZWN0b3JTdHJpbmdzLmJhY2tlbmRfZGlzcGF0Y2hlcl9kaXNw YXRjaF9tZXRob2Rfc2ltcGxlKQogICAgIGJhY2tlbmRfbWV0aG9kID0gc3RyaW5nLlRlbXBsYXRl KENvZGVHZW5lcmF0b3JJbnNwZWN0b3JTdHJpbmdzLmJhY2tlbmRfbWV0aG9kKQogICAgIGZyb250 ZW5kX21ldGhvZCA9IHN0cmluZy5UZW1wbGF0ZShDb2RlR2VuZXJhdG9ySW5zcGVjdG9yU3RyaW5n cy5mcm9udGVuZF9tZXRob2QpCiAgICAgY2FsbGJhY2tfbWV0aG9kID0gc3RyaW5nLlRlbXBsYXRl KENvZGVHZW5lcmF0b3JJbnNwZWN0b3JTdHJpbmdzLmNhbGxiYWNrX21ldGhvZCkKQEAgLTE5MDYs MTAgKzE5MDgsMTEgQEAgY2xhc3MgR2VuZXJhdG9yOgogCiAgICAgICAgICAgICBiYWNrZW5kX21l dGhvZF9jb3VudCA9IGxlbihHZW5lcmF0b3IuYmFja2VuZF9tZXRob2RfaW1wbGVtZW50YXRpb25f bGlzdCkKIAorICAgICAgICAgICAgZGlzcGF0Y2hlcl9pZl9jaGFpbiA9IFtdCiAgICAgICAgICAg ICBkaXNwYXRjaGVyX2NvbW1hbmRzX2xpc3QgPSBbXQogICAgICAgICAgICAgaWYgImNvbW1hbmRz IiBpbiBqc29uX2RvbWFpbjoKICAgICAgICAgICAgICAgICBmb3IganNvbl9jb21tYW5kIGluIGpz b25fZG9tYWluWyJjb21tYW5kcyJdOgotICAgICAgICAgICAgICAgICAgICBHZW5lcmF0b3IucHJv Y2Vzc19jb21tYW5kKGpzb25fY29tbWFuZCwgZG9tYWluX25hbWUsIGFnZW50X2ludGVyZmFjZV9u YW1lLCBkaXNwYXRjaGVyX25hbWUsIGRpc3BhdGNoZXJfY29tbWFuZHNfbGlzdCkKKyAgICAgICAg ICAgICAgICAgICAgR2VuZXJhdG9yLnByb2Nlc3NfY29tbWFuZChqc29uX2NvbW1hbmQsIGRvbWFp bl9uYW1lLCBhZ2VudF9pbnRlcmZhY2VfbmFtZSwgZGlzcGF0Y2hlcl9uYW1lLCBkaXNwYXRjaGVy X2lmX2NoYWluLCBkaXNwYXRjaGVyX2NvbW1hbmRzX2xpc3QpCiAKICAgICAgICAgICAgIEdlbmVy YXRvci5iYWNrZW5kX2hhbmRsZXJfaW50ZXJmYWNlX2xpc3QuYXBwZW5kKCJwcm90ZWN0ZWQ6XG4i KQogICAgICAgICAgICAgR2VuZXJhdG9yLmJhY2tlbmRfaGFuZGxlcl9pbnRlcmZhY2VfbGlzdC5h cHBlbmQoIiAgICB2aXJ0dWFsIH4lcygpIHsgfVxuIiAlIGFnZW50X2ludGVyZmFjZV9uYW1lKQpA QCAtMTkyNSwxMCArMTkyOCwxNiBAQCBjbGFzcyBHZW5lcmF0b3I6CiAgICAgICAgICAgICAgICAg ZGlzcGF0Y2hlck5hbWU9ZGlzcGF0Y2hlcl9uYW1lLAogICAgICAgICAgICAgICAgIGFnZW50TmFt ZT1hZ2VudF9pbnRlcmZhY2VfbmFtZSkpCiAKLSAgICAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5k X21ldGhvZF9pbXBsZW1lbnRhdGlvbl9saXN0Lmluc2VydChiYWNrZW5kX21ldGhvZF9jb3VudCAr IDEsIFRlbXBsYXRlcy5iYWNrZW5kX2Rpc3BhdGNoZXJfZGlzcGF0Y2hfbWV0aG9kLnN1YnN0aXR1 dGUoTm9uZSwKLSAgICAgICAgICAgICAgICBkb21haW5OYW1lPWRvbWFpbl9uYW1lLAotICAgICAg ICAgICAgICAgIGRpc3BhdGNoZXJOYW1lPWRpc3BhdGNoZXJfbmFtZSwKLSAgICAgICAgICAgICAg ICBkaXNwYXRjaGVyQ29tbWFuZHM9IlxuIi5qb2luKGRpc3BhdGNoZXJfY29tbWFuZHNfbGlzdCkp KQorICAgICAgICAgICAgaWYgImNvbW1hbmRzIiBpbiBqc29uX2RvbWFpbiBhbmQgbGVuKGpzb25f ZG9tYWluWyJjb21tYW5kcyJdKSA8PSA1OgorICAgICAgICAgICAgICAgIEdlbmVyYXRvci5iYWNr ZW5kX21ldGhvZF9pbXBsZW1lbnRhdGlvbl9saXN0Lmluc2VydChiYWNrZW5kX21ldGhvZF9jb3Vu dCArIDEsIFRlbXBsYXRlcy5iYWNrZW5kX2Rpc3BhdGNoZXJfZGlzcGF0Y2hfbWV0aG9kX3NpbXBs ZS5zdWJzdGl0dXRlKE5vbmUsCisgICAgICAgICAgICAgICAgICAgIGRvbWFpbk5hbWU9ZG9tYWlu X25hbWUsCisgICAgICAgICAgICAgICAgICAgIGRpc3BhdGNoZXJOYW1lPWRpc3BhdGNoZXJfbmFt ZSwKKyAgICAgICAgICAgICAgICAgICAgaWZDaGFpbj0iXG4iLmpvaW4oZGlzcGF0Y2hlcl9pZl9j aGFpbikpKQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBHZW5lcmF0b3IuYmFj a2VuZF9tZXRob2RfaW1wbGVtZW50YXRpb25fbGlzdC5pbnNlcnQoYmFja2VuZF9tZXRob2RfY291 bnQgKyAxLCBUZW1wbGF0ZXMuYmFja2VuZF9kaXNwYXRjaGVyX2Rpc3BhdGNoX21ldGhvZC5zdWJz dGl0dXRlKE5vbmUsCisgICAgICAgICAgICAgICAgICAgIGRvbWFpbk5hbWU9ZG9tYWluX25hbWUs CisgICAgICAgICAgICAgICAgICAgIGRpc3BhdGNoZXJOYW1lPWRpc3BhdGNoZXJfbmFtZSwKKyAg ICAgICAgICAgICAgICAgICAgZGlzcGF0Y2hlckNvbW1hbmRzPSJcbiIuam9pbihkaXNwYXRjaGVy X2NvbW1hbmRzX2xpc3QpKSkKIAogICAgICAgICAgICAgaWYgZG9tYWluX2d1YXJkOgogICAgICAg ICAgICAgICAgIGZvciBsIGluIHJldmVyc2VkKGZpcnN0X2N5Y2xlX2d1YXJkYWJsZV9saXN0X2xp c3QpOgpAQCAtMTk4NCw3ICsxOTkzLDcgQEAgY2xhc3MgR2VuZXJhdG9yOgogICAgICAgICBjb250 YWluZXJfbmFtZSA9ICJwYXJhbXNPYmplY3QiCiAKICAgICBAc3RhdGljbWV0aG9kCi0gICAgZGVm IHByb2Nlc3NfY29tbWFuZChqc29uX2NvbW1hbmQsIGRvbWFpbl9uYW1lLCBhZ2VudF9pbnRlcmZh Y2VfbmFtZSwgZGlzcGF0Y2hlcl9uYW1lLCBkaXNwYXRjaGVyX2NvbW1hbmRzX2xpc3QpOgorICAg IGRlZiBwcm9jZXNzX2NvbW1hbmQoanNvbl9jb21tYW5kLCBkb21haW5fbmFtZSwgYWdlbnRfaW50 ZXJmYWNlX25hbWUsIGRpc3BhdGNoZXJfbmFtZSwgZGlzcGF0Y2hlcl9pZl9jaGFpbiwgZGlzcGF0 Y2hlcl9jb21tYW5kc19saXN0KToKICAgICAgICAganNvbl9jb21tYW5kX25hbWUgPSBqc29uX2Nv bW1hbmRbIm5hbWUiXQogCiAgICAgICAgIGFkX2hvY190eXBlX291dHB1dCA9IFtdCkBAIC0xOTk1 LDYgKzIwMDQsMTEgQEAgY2xhc3MgR2VuZXJhdG9yOgogCiAgICAgICAgIEdlbmVyYXRvci5iYWNr ZW5kX2hhbmRsZXJfaW50ZXJmYWNlX2xpc3QuYXBwZW5kKCIgICAgdmlydHVhbCB2b2lkICVzKEVy cm9yU3RyaW5nKiIgJSBqc29uX2NvbW1hbmRfbmFtZSkKIAorICAgICAgICBpZiBub3QgZGlzcGF0 Y2hlcl9pZl9jaGFpbjoKKyAgICAgICAgICAgIGRpc3BhdGNoZXJfaWZfY2hhaW4uYXBwZW5kKCIg ICAgaWYgKG1ldGhvZCA9PSBcIiVzXCIpIiAlIGpzb25fY29tbWFuZF9uYW1lKQorICAgICAgICBl bHNlOgorICAgICAgICAgICAgZGlzcGF0Y2hlcl9pZl9jaGFpbi5hcHBlbmQoIiAgICBlbHNlIGlm IChtZXRob2QgPT0gXCIlc1wiKSIgJSBqc29uX2NvbW1hbmRfbmFtZSkKKyAgICAgICAgZGlzcGF0 Y2hlcl9pZl9jaGFpbi5hcHBlbmQoIiAgICAgICAgJXMoY2FsbElkLCAqbWVzc2FnZS5nZXQoKSk7 IiAlIGpzb25fY29tbWFuZF9uYW1lKQogICAgICAgICBkaXNwYXRjaGVyX2NvbW1hbmRzX2xpc3Qu YXBwZW5kKCIgICAgICAgICAgICB7IFwiJXNcIiwgICYlczo6JXMgfSwiICUgKGpzb25fY29tbWFu ZF9uYW1lLCBkaXNwYXRjaGVyX25hbWUsIGpzb25fY29tbWFuZF9uYW1lKSkKIAogICAgICAgICBt ZXRob2RfaW5fcGFyYW1zX2hhbmRsaW5nID0gW10KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yU3RyaW5ncy5weSBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yU3RyaW5ncy5weQppbmRleCBjYzVh ZGZlLi5iZDE4YmYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdl bmVyYXRvckluc3BlY3RvclN0cmluZ3MucHkKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0NvZGVHZW5lcmF0b3JJbnNwZWN0b3JTdHJpbmdzLnB5CkBAIC0xLDQgKzEsNSBAQAogIyBDb3B5 cmlnaHQgKGMpIDIwMTMgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJp Z2h0IChjKSAyMDEzIEFwcGxlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KICMKICMgUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucyBhcmUKQEAgLTUzLDYgKzU0LDE3IEBAICR7ZGlzcGF0Y2hlck5hbWV9 Ojoke2Rpc3BhdGNoZXJOYW1lfShJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlciogYmFja2VuZERp c3BhdGNoCiB9CiAiIiIpCiAKK2JhY2tlbmRfZGlzcGF0Y2hlcl9kaXNwYXRjaF9tZXRob2Rfc2lt cGxlID0gKAorIiIidm9pZCAke2Rpc3BhdGNoZXJOYW1lfTo6ZGlzcGF0Y2gobG9uZyBjYWxsSWQs IGNvbnN0IFN0cmluZyYgbWV0aG9kLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gbWVzc2Fn ZSkKK3sKKyAgICBSZWY8JHtkaXNwYXRjaGVyTmFtZX0+IHByb3RlY3QoKnRoaXMpOworCiske2lm Q2hhaW59CisgICAgZWxzZQorICAgICAgICBtX2JhY2tlbmREaXNwYXRjaGVyLT5yZXBvcnRQcm90 b2NvbEVycm9yKCZjYWxsSWQsIEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyOjpNZXRob2ROb3RG b3VuZCwgU3RyaW5nKCInIikgKyAiJHtkb21haW5OYW1lfSIgKyAnLicgKyBtZXRob2QgKyAiJyB3 YXMgbm90IGZvdW5kIik7Cit9CisiIiIpCisKIGJhY2tlbmRfZGlzcGF0Y2hlcl9kaXNwYXRjaF9t ZXRob2QgPSAoCiAiIiJ2b2lkICR7ZGlzcGF0Y2hlck5hbWV9OjpkaXNwYXRjaChsb25nIGNhbGxJ ZCwgY29uc3QgU3RyaW5nJiBtZXRob2QsIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBtZXNz YWdlKQogewo=