45822 2010-09-15 09:25:44 -0700 We should save messages that can't be sent when postMessageToInjectedBundle is called and send in ensureWebProcess 2010-09-15 18:51:44 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jberlin jberlin aroben jberlin jhoneycutt sam oldest_to_newest 279577 0 jberlin 2010-09-15 09:25:44 -0700 WebContext::registerURLSchemeAsEmptyDocument saves the URL Schemes that can't be registered immediately because the WebProcess is not valid at the time it is called and then sends those messages in WebContext::ensureWebProcess. WebContext::postMessageToInjectedBundle should do the same with messages. 279820 1 67741 jberlin 2010-09-15 16:46:47 -0700 Created attachment 67741 Save the messages in postMessageToInjectedBundle and send them in ensureWebProcess 279876 2 67741 jhoneycutt 2010-09-15 18:17:34 -0700 Comment on attachment 67741 Save the messages in postMessageToInjectedBundle and send them in ensureWebProcess > @@ -130,6 +130,12 @@ void WebContext::ensureWebProcess() > for (HashSet<String>::iterator it = m_schemesToRegisterAsEmptyDocument.begin(), end = m_schemesToRegisterAsEmptyDocument.end(); it != end; ++it) > m_process->send(WebProcessMessage::RegisterURLSchemeAsEmptyDocument, 0, CoreIPC::In(*it)); > > + for (size_t i = 0; i != m_pendingMessagesToPostToInjectedBundle.size(); ++i) { > + pair<String, RefPtr<APIObject> > message = m_pendingMessagesToPostToInjectedBundle[i]; I think you can make message a reference to avoid a copy. > @@ -197,8 +203,10 @@ void WebContext::preferencesDidChange() > > void WebContext::postMessageToInjectedBundle(const String& messageName, APIObject* messageBody) > { > - if (!hasValidProcess()) > + if (!hasValidProcess()) { > + m_pendingMessagesToPostToInjectedBundle.append(pair<String, RefPtr<APIObject> >(messageName, messageBody)); You can simplify this using make_pair(messageName, messageBody). r=me 279889 3 jberlin 2010-09-15 18:45:52 -0700 (In reply to comment #2) > (From update of attachment 67741 [details]) > > @@ -130,6 +130,12 @@ void WebContext::ensureWebProcess() > > for (HashSet<String>::iterator it = m_schemesToRegisterAsEmptyDocument.begin(), end = m_schemesToRegisterAsEmptyDocument.end(); it != end; ++it) > > m_process->send(WebProcessMessage::RegisterURLSchemeAsEmptyDocument, 0, CoreIPC::In(*it)); > > > > + for (size_t i = 0; i != m_pendingMessagesToPostToInjectedBundle.size(); ++i) { > > + pair<String, RefPtr<APIObject> > message = m_pendingMessagesToPostToInjectedBundle[i]; > > I think you can make message a reference to avoid a copy. Done. > > > @@ -197,8 +203,10 @@ void WebContext::preferencesDidChange() > > > > void WebContext::postMessageToInjectedBundle(const String& messageName, APIObject* messageBody) > > { > > - if (!hasValidProcess()) > > + if (!hasValidProcess()) { > > + m_pendingMessagesToPostToInjectedBundle.append(pair<String, RefPtr<APIObject> >(messageName, messageBody)); > > You can simplify this using make_pair(messageName, messageBody). Done. > > r=me Thanks! 279895 4 67741 jberlin 2010-09-15 18:51:35 -0700 Comment on attachment 67741 Save the messages in postMessageToInjectedBundle and send them in ensureWebProcess Committed in r67593: http://trac.webkit.org/changeset/67593 67741 2010-09-15 16:46:47 -0700 2010-09-15 18:51:35 -0700 Save the messages in postMessageToInjectedBundle and send them in ensureWebProcess postMessagesToInjectedBundleLater.patch text/plain 2805 jberlin SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NzU3NikKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDktMTUgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX ZSBzaG91bGQgc2F2ZSBtZXNzYWdlcyB0aGF0IGNhbid0IGJlIHNlbnQgd2hlbiBwb3N0TWVzc2Fn ZVRvSW5qZWN0ZWRCdW5kbGUgaXMgY2FsbGVkIGFuZCBzZW5kIGluIGVuc3VyZVdlYlByb2Nlc3Mu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTgyMgor CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJDb250ZXh0OjplbnN1cmVXZWJQcm9jZXNzKToKKyAgICAgICAgUG9zdCBhbnkgbWVzc2FnZXMg dG8gdGhlIEluamVjdGVkIEJ1bmRsZSB0aGF0IGNvdWxkbid0IGJlIHNlbnQgZWFybGllciBiZWNh dXNlIHRoZQorICAgICAgICBXZWJQcm9jZXNzIGhhZG4ndCBiZWVuIGluaXRpYWxpemVkIHlldC4K KyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6cG9zdE1lc3NhZ2VUb0luamVjdGVkQnVuZGxl KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5oOgorCiAyMDEwLTA5LTE1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEFkYW0gUm9iZW4uCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAkocmV2aXNpb24gNjc1 NTQpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTMwLDYgKzEzMCwxMiBAQCB2b2lkIFdlYkNvbnRleHQ6OmVuc3VyZVdlYlByb2Nlc3MoKQog ICAgIGZvciAoSGFzaFNldDxTdHJpbmc+OjppdGVyYXRvciBpdCA9IG1fc2NoZW1lc1RvUmVnaXN0 ZXJBc0VtcHR5RG9jdW1lbnQuYmVnaW4oKSwgZW5kID0gbV9zY2hlbWVzVG9SZWdpc3RlckFzRW1w dHlEb2N1bWVudC5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KQogICAgICAgICBtX3Byb2Nlc3MtPnNl bmQoV2ViUHJvY2Vzc01lc3NhZ2U6OlJlZ2lzdGVyVVJMU2NoZW1lQXNFbXB0eURvY3VtZW50LCAw LCBDb3JlSVBDOjpJbigqaXQpKTsKIAorICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpICE9IG1fcGVu ZGluZ01lc3NhZ2VzVG9Qb3N0VG9JbmplY3RlZEJ1bmRsZS5zaXplKCk7ICsraSkgeworICAgICAg ICBwYWlyPFN0cmluZywgUmVmUHRyPEFQSU9iamVjdD4gPiBtZXNzYWdlID0gbV9wZW5kaW5nTWVz c2FnZXNUb1Bvc3RUb0luamVjdGVkQnVuZGxlW2ldOworICAgICAgICBtX3Byb2Nlc3MtPnNlbmQo SW5qZWN0ZWRCdW5kbGVNZXNzYWdlOjpQb3N0TWVzc2FnZSwgMCwgQ29yZUlQQzo6SW4obWVzc2Fn ZS5maXJzdCwgV2ViQ29udGV4dFVzZXJNZXNzYWdlRW5jb2RlcihtZXNzYWdlLnNlY29uZC5nZXQo KSkpKTsKKyAgICB9CisgICAgbV9wZW5kaW5nTWVzc2FnZXNUb1Bvc3RUb0luamVjdGVkQnVuZGxl LmNsZWFyKCk7CisKICAgICBwbGF0Zm9ybVNldFVwV2ViUHJvY2VzcygpOwogfQogCkBAIC0xOTcs OCArMjAzLDEwIEBAIHZvaWQgV2ViQ29udGV4dDo6cHJlZmVyZW5jZXNEaWRDaGFuZ2UoKQogCiB2 b2lkIFdlYkNvbnRleHQ6OnBvc3RNZXNzYWdlVG9JbmplY3RlZEJ1bmRsZShjb25zdCBTdHJpbmcm IG1lc3NhZ2VOYW1lLCBBUElPYmplY3QqIG1lc3NhZ2VCb2R5KQogewotICAgIGlmICghaGFzVmFs aWRQcm9jZXNzKCkpCisgICAgaWYgKCFoYXNWYWxpZFByb2Nlc3MoKSkgeworICAgICAgICBtX3Bl bmRpbmdNZXNzYWdlc1RvUG9zdFRvSW5qZWN0ZWRCdW5kbGUuYXBwZW5kKHBhaXI8U3RyaW5nLCBS ZWZQdHI8QVBJT2JqZWN0PiA+KG1lc3NhZ2VOYW1lLCBtZXNzYWdlQm9keSkpOwogICAgICAgICBy ZXR1cm47CisgICAgfQogCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBjb25zaWRlciByZXR1cm5p bmcgZmFsc2UgZnJvbSB0aGlzIGZ1bmN0aW9uIGlmIHRoZSBtZXNzYWdlQm9keSBjYW5ub3QKICAg ICAvLyBiZSBlbmNvZGVkLgpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAkocmV2aXNpb24gNjc1 NTQpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAg LTEzNiw2ICsxMzYsNyBAQCBwcml2YXRlOgogICAgIFZpc2l0ZWRMaW5rUHJvdmlkZXIgbV92aXNp dGVkTGlua1Byb3ZpZGVyOwogICAgICAgICAKICAgICBIYXNoU2V0PFdURjo6U3RyaW5nPiBtX3Nj aGVtZXNUb1JlZ2lzdGVyQXNFbXB0eURvY3VtZW50OworICAgIFZlY3RvcjxwYWlyPFN0cmluZywg UmVmUHRyPEFQSU9iamVjdD4gPiA+IG1fcGVuZGluZ01lc3NhZ2VzVG9Qb3N0VG9JbmplY3RlZEJ1 bmRsZTsKIAogI2lmIFBMQVRGT1JNKFdJTikKICAgICBib29sIG1fc2hvdWxkUGFpbnROYXRpdmVD b250cm9sczsKCiAK