133623 2014-06-08 16:02:08 -0700 [Cocoa] WKScriptMessage should include the frame the message is from 2014-06-08 16:22:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 1014042 0 sam 2014-06-08 16:02:08 -0700 [Cocoa] WKScriptMessage should include the frame the message is from 1014043 1 232691 sam 2014-06-08 16:05:15 -0700 Created attachment 232691 Patch 1014044 2 232691 mitz 2014-06-08 16:07:32 -0700 Comment on attachment 232691 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=232691&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.mm:32 > #import "WeakObjCPtr.h" > +#import "WKFrameInfo.h" K < e > Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm:108 > + WKWebView* webView = fromWebPageProxy(page); Is this necessary? 1014045 3 sam 2014-06-08 16:14:21 -0700 (In reply to comment #2) > (From update of attachment 232691 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=232691&action=review > > > Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.mm:32 > > #import "WeakObjCPtr.h" > > +#import "WKFrameInfo.h" > > K < e Will fix. > > Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm:108 > > + WKWebView* webView = fromWebPageProxy(page); > > Is this necessary? Nah. 1014046 4 sam 2014-06-08 16:14:35 -0700 <rdar://problem/17210226> 1014047 5 sam 2014-06-08 16:22:11 -0700 Committed revision 169684 232691 2014-06-08 16:05:15 -0700 2014-06-08 16:07:29 -0700 Patch patch.diff text/plain 5537 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTY4MikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA2LTA4ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NvY29hXSBXS1NjcmlwdE1lc3NhZ2Ug c2hvdWxkIGluY2x1ZGUgdGhlIGZyYW1lIHRoZSBtZXNzYWdlIGlzIGZyb20KKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzE3MjEwMjI2PgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTMzNjIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLU2NyaXB0TWVzc2FnZS5oOgor ICAgICAgICBBZGQgV0tGcmFtZUluZm8gcHJvcGVydHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0NvY29hL1dLU2NyaXB0TWVzc2FnZS5tbToKKyAgICAgICAgKC1bV0tTY3JpcHRNZXNzYWdl IF9pbml0V2l0aEJvZHk6d2ViVmlldzpmcmFtZUluZm86bmFtZTpdKToKKyAgICAgICAgQWRkIFdL RnJhbWVJbmZvIHRvIHRoZSBpbml0aWFsaXplci4KKworICAgICAgICAoLVtXS1NjcmlwdE1lc3Nh Z2UgZnJhbWVJbmZvXSk6CisgICAgICAgIEltcGxlbWVudCBmcmFtZUluZm8gYWNjZXNzb3IuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLU2NyaXB0TWVzc2FnZUludGVybmFsLmg6 CisgICAgICAgIEFkZCBXS0ZyYW1lSW5mbyB0byB0aGUgaW5pdGlhbGl6ZXIuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLVXNlckNvbnRlbnRDb250cm9sbGVyLm1tOgorICAgICAg ICBQYXNzIHRoZSBXS0ZyYW1lSW5mbyB0byB0aGUgV0tTY3JpcHRNZXNzYWdlIGluaXRpYWxpemVy LgorCiAyMDE0LTA2LTA4ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzE3MjA4MjM0PiBbTWFjXSBDbGllbnQtY2VydGlmaWNhdGUgYXV0 aGVudGljYXRpb24gaXNu4oCZdCB3b3JraW5nIHdoZW4gdXNpbmcgdGhlIG1vZGVybiBBUEkKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tTY3JpcHRNZXNzYWdlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Njcmlw dE1lc3NhZ2UuaAkocmV2aXNpb24gMTY5NTg5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1NjcmlwdE1lc3NhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMjksNiArMjks NyBAQAogCiAjaW1wb3J0IDxGb3VuZGF0aW9uL0ZvdW5kYXRpb24uaD4KIAorQGNsYXNzIFdLRnJh bWVJbmZvOwogQGNsYXNzIFdLV2ViVmlldzsKIAogLyohIEEgV0tTY3JpcHRNZXNzYWdlIG9iamVj dCBjb250YWlucyBpbmZvcm1hdGlvbiBhYm91dCBhIG1lc3NhZ2Ugc2VudCBmcm9tCkBAIC00Niw2 ICs0Nyw5IEBAIFdLX0NMQVNTX0FWQUlMQUJMRSgxMF8xMCwgOF8wKQogLyohIEBhYnN0cmFjdCBU aGUgd2ViIHZpZXcgc2VuZGluZyB0aGUgbWVzc2FnZS4gKi8KIEBwcm9wZXJ0eSAobm9uYXRvbWlj LCByZWFkb25seSwgd2VhaykgV0tXZWJWaWV3ICp3ZWJWaWV3OwogCisvKiEgQGFic3RyYWN0IFRo ZSBmcmFtZSBzZW5kaW5nIHRoZSBtZXNzYWdlLiAqLworQHByb3BlcnR5IChub25hdG9taWMsIHJl YWRvbmx5KSBXS0ZyYW1lSW5mbyAqZnJhbWVJbmZvOworCiAvKiEgQGFic3RyYWN0IFRoZSBuYW1l IG9mIHRoZSBtZXNzYWdlIGhhbmRsZXIgdG8gd2hpY2ggdGhlIG1lc3NhZ2UgaXMgc2VudC4KICAq LwogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBOU1N0cmluZyAqbmFtZTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tTY3JpcHRNZXNzYWdlLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tTY3JpcHRN ZXNzYWdlLm1tCShyZXZpc2lvbiAxNjk1ODkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLU2NyaXB0TWVzc2FnZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjksMjEgKzI5 LDI0IEBACiAjaWYgV0tfQVBJX0VOQUJMRUQKIAogI2ltcG9ydCAiV2Vha09iakNQdHIuaCIKKyNp bXBvcnQgIldLRnJhbWVJbmZvLmgiCiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKIEBpbXBs ZW1lbnRhdGlvbiBXS1NjcmlwdE1lc3NhZ2UgewogICAgIFJldGFpblB0cjxpZD4gX2JvZHk7CiAg ICAgV2ViS2l0OjpXZWFrT2JqQ1B0cjxXS1dlYlZpZXc+IF93ZWJWaWV3OworICAgIFJldGFpblB0 cjxXS0ZyYW1lSW5mbz4gX2ZyYW1lSW5mbzsKICAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IF9uYW1l OwogfQogCi0tIChpbnN0YW5jZXR5cGUpX2luaXRXaXRoQm9keTooaWQpYm9keSB3ZWJWaWV3OihX S1dlYlZpZXcgKil3ZWJWaWV3IG5hbWU6KE5TU3RyaW5nICopbmFtZQorLSAoaW5zdGFuY2V0eXBl KV9pbml0V2l0aEJvZHk6KGlkKWJvZHkgd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBmcmFt ZUluZm86KFdLRnJhbWVJbmZvICopZnJhbWVJbmZvIG5hbWU6KE5TU3RyaW5nICopbmFtZQogewog ICAgIGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdF0pKQogICAgICAgICByZXR1cm4gbmlsOwogCiAg ICAgX2JvZHkgPSBbYm9keSBjb3B5XTsKICAgICBfd2ViVmlldyA9IHdlYlZpZXc7CisgICAgX2Zy YW1lSW5mbyA9IGZyYW1lSW5mbzsKICAgICBfbmFtZSA9IGFkb3B0TlMoW25hbWUgY29weV0pOwog CiAgICAgcmV0dXJuIHNlbGY7CkBAIC02MCw2ICs2MywxMSBAQCAtIChXS1dlYlZpZXcgKil3ZWJW aWV3CiAgICAgcmV0dXJuIF93ZWJWaWV3LmdldEF1dG9yZWxlYXNlZCgpOwogfQogCistIChXS0Zy YW1lSW5mbyAqKWZyYW1lSW5mbworeworICAgIHJldHVybiBfZnJhbWVJbmZvLmdldCgpOworfQor CiAtIChOU1N0cmluZyAqKW5hbWUKIHsKICAgICByZXR1cm4gX25hbWUuZ2V0KCk7CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLU2NyaXB0TWVzc2FnZUludGVybmFs LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Nj cmlwdE1lc3NhZ2VJbnRlcm5hbC5oCShyZXZpc2lvbiAxNjk1ODkpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLU2NyaXB0TWVzc2FnZUludGVybmFsLmgJKHdvcmtpbmcg Y29weSkKQEAgLTI5LDcgKzI5LDcgQEAKIAogQGludGVyZmFjZSBXS1NjcmlwdE1lc3NhZ2UgKCkK IAotLSAoaW5zdGFuY2V0eXBlKV9pbml0V2l0aEJvZHk6KGlkKWJvZHkgd2ViVmlldzooV0tXZWJW aWV3ICopd2ViVmlldyBuYW1lOihOU1N0cmluZyAqKW5hbWU7CistIChpbnN0YW5jZXR5cGUpX2lu aXRXaXRoQm9keTooaWQpYm9keSB3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGZyYW1lSW5m bzooV0tGcmFtZUluZm8gKilmcmFtZUluZm8gbmFtZTooTlNTdHJpbmcgKiluYW1lOwogCiBAZW5k CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVc2VyQ29udGVu dENvbnRyb2xsZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1VzZXJDb250ZW50Q29udHJvbGxlci5tbQkocmV2aXNpb24gMTY5NTg5KQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VzZXJDb250ZW50Q29udHJvbGxl ci5tbQkod29ya2luZyBjb3B5KQpAQCAtMjgsNiArMjgsNyBAQAogCiAjaWYgV0tfQVBJX0VOQUJM RUQKIAorI2ltcG9ydCAiV0tGcmFtZUluZm9JbnRlcm5hbC5oIgogI2ltcG9ydCAiV0tTY3JpcHRN ZXNzYWdlSGFuZGxlci5oIgogI2ltcG9ydCAiV0tTY3JpcHRNZXNzYWdlSW50ZXJuYWwuaCIKICNp bXBvcnQgIldLVXNlclNjcmlwdEludGVybmFsLmgiCkBAIC0xMDIsMTQgKzEwMywxNyBAQCBwdWJs aWM6CiAgICAgewogICAgIH0KICAgICAKLSAgICB2aXJ0dWFsIHZvaWQgZGlkUG9zdE1lc3NhZ2Uo V2ViS2l0OjpXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYktpdDo6V2ViRnJhbWVQcm94eSYsIFdlYkNv cmU6OlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSYgc2VyaWFsaXplZFNjcmlwdFZhbHVlKQorICAgIHZp cnR1YWwgdm9pZCBkaWRQb3N0TWVzc2FnZShXZWJLaXQ6OldlYlBhZ2VQcm94eSYgcGFnZSwgV2Vi S2l0OjpXZWJGcmFtZVByb3h5JiBmcmFtZSwgV2ViQ29yZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVl JiBzZXJpYWxpemVkU2NyaXB0VmFsdWUpCiAgICAgeworICAgICAgICBXS1dlYlZpZXcqIHdlYlZp ZXcgPSBmcm9tV2ViUGFnZVByb3h5KHBhZ2UpOworICAgICAgICBSZXRhaW5QdHI8V0tGcmFtZUlu Zm8+IGZyYW1lSW5mbyA9IGFkb3B0TlMoW1tXS0ZyYW1lSW5mbyBhbGxvY10gaW5pdFdpdGhXZWJG cmFtZVByb3h5OmZyYW1lXSk7CisKICAgICAgICAgUmV0YWluUHRyPEpTQ29udGV4dD4gY29udGV4 dCA9IGFkb3B0TlMoW1tKU0NvbnRleHQgYWxsb2NdIGluaXRdKTsKICAgICAgICAgSlNWYWx1ZVJl ZiB2YWx1ZVJlZiA9IHNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5kZXNlcmlhbGl6ZShbY29udGV4dCBK U0dsb2JhbENvbnRleHRSZWZdLCAwKTsKICAgICAgICAgSlNWYWx1ZSAqdmFsdWUgPSBbSlNWYWx1 ZSB2YWx1ZVdpdGhKU1ZhbHVlUmVmOnZhbHVlUmVmIGluQ29udGV4dDpjb250ZXh0LmdldCgpXTsK ICAgICAgICAgaWQgYm9keSA9IFt2YWx1ZSB0b09iamVjdF07CiAKLSAgICAgICAgUmV0YWluUHRy PFdLU2NyaXB0TWVzc2FnZT4gbWVzc2FnZSA9IGFkb3B0TlMoW1tXS1NjcmlwdE1lc3NhZ2UgYWxs b2NdIF9pbml0V2l0aEJvZHk6Ym9keSB3ZWJWaWV3OmZyb21XZWJQYWdlUHJveHkocGFnZSkgbmFt ZTptX25hbWUuZ2V0KCldKTsKKyAgICAgICAgUmV0YWluUHRyPFdLU2NyaXB0TWVzc2FnZT4gbWVz c2FnZSA9IGFkb3B0TlMoW1tXS1NjcmlwdE1lc3NhZ2UgYWxsb2NdIF9pbml0V2l0aEJvZHk6Ym9k eSB3ZWJWaWV3OndlYlZpZXcgZnJhbWVJbmZvOmZyYW1lSW5mby5nZXQoKSBuYW1lOm1fbmFtZS5n ZXQoKV0pOwogICAgIAogICAgICAgICBbbV9oYW5kbGVyIHVzZXJDb250ZW50Q29udHJvbGxlcjpt X2NvbnRyb2xsZXIuZ2V0KCkgZGlkUmVjZWl2ZVNjcmlwdE1lc3NhZ2U6bWVzc2FnZS5nZXQoKV07 CiAgICAgfQo=