27824 2009-07-29 18:04:47 -0700 [commit+] [chromium] fix v8 binding problem when locallyEntangledPort returns NULL 2009-08-03 06:26:39 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 jam webkit-unassigned abarth atwilson dglazkov fishd levin oldest_to_newest 135761 0 jam 2009-07-29 18:04:47 -0700 Chromium will need to use a different implementation of PlatforMessagePortChannel to support message ports being in different processes. This is the WebKit side. Please do NOT check this in until the Chromium submission is ready. I'll work with Darin or Dmitry to time it right. 135762 1 33757 jam 2009-07-29 18:08:10 -0700 Created attachment 33757 Proposed patch 135770 2 33757 eric 2009-07-29 18:36:29 -0700 Comment on attachment 33757 Proposed patch Your changelog doesn't make clear what you're doing here. Are you just re-indenting code? Why no tests? + No new tests. (OOPS!) 135777 3 jam 2009-07-29 19:26:42 -0700 (In reply to comment #2) > (From update of attachment 33757 [details]) > Your changelog doesn't make clear what you're doing here. Are you just > re-indenting code? The first section is just re-indenting code. > > Why no tests? > + No new tests. (OOPS!) The existing layout tests cover this. However as our multi-process implementation lives in Chromium's repository, the tests will run under ui_tests. 135860 4 33757 levin 2009-07-30 09:28:48 -0700 Comment on attachment 33757 Proposed patch The general consensus in WebKit land seems to be that pure style/formatting changes should be separated from other changes, so while I think the indentation change in WebCore/bindings/v8/V8GCController.cpp is good, it should be a separate patch. 135871 5 33757 levin 2009-07-30 10:00:48 -0700 Comment on attachment 33757 Proposed patch Detailed comments about the remaining portions. > Index: WebCore/ChangeLog > +2009-07-29 John Abd-El-Malek <jam@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + V8 binding and GYP changes for the Chromium port's multi process message port implementation > + > + https://bugs.webkit.org/show_bug.cgi?id=27824 > + As Eric indicated, "Your changelog doesn't make clear what you're doing here." There should be something here that explains what you are doing. > + No new tests. (OOPS!) > > Why no tests? > > + No new tests. (OOPS!) > The existing layout tests cover this. Please change the line "No new tests. (OOPS!)" to say this. > Index: WebCore/bindings/v8/V8GCController.cpp > + } > + > + // Set back the weak bit that we cleared in GCPrologueVisitor. This comment says what is being done (which I can tell from the code) but not why it is being done. It took me a while but I think I figured out why. Is doing this so that the port will be attempted to be garbage collected again in the next round because the condition "if (port1->isEntangled() && !port2)" may change? And without making this weak, the garbage collection of port is never done? > + if (type == V8ClassIndex::MESSAGEPORT) { > + MessagePort* port1 = static_cast<MessagePort*>(object); > + MessagePort* port2 = port1->locallyEntangledPort(); > + if (port1->isEntangled() && !port2) > + wrapper.MakeWeak(port1, &DOMDataStore::weakActiveDOMObjectCallback); PS If you don't want anyone to commit your patch, simply assign the bug to yourself, which I'll do for you now. When you're ready for landing, coordinate with someone to land the patch. In general, people only automatically land patches assigned to "nodoby". 135956 6 jam 2009-07-30 13:04:46 -0700 I found out I don't need to update the gypi file, since it should contain all the files and I can add an exclusion to the gyp file. As for the code style changes, I think this is a little inconsistent with other patches that go through which fix minor style violations along the way. The discussion on webkit-dev was related to big style fixups, which this one isn't. Anyways, I've attached an updated version with no style fixup. 135957 7 33811 jam 2009-07-30 13:05:34 -0700 Created attachment 33811 new patch 135958 8 jam 2009-07-30 13:07:42 -0700 note, this patch removes the two-sided change, so it can be committed anytime (sooner better than later, as the tests on the chrome side fail without it) 135969 9 33811 abarth 2009-07-30 13:15:57 -0700 Comment on attachment 33811 new patch Thanks John. 136428 10 33811 abarth 2009-08-01 00:37:23 -0700 Comment on attachment 33811 new patch Clearing review flag on attachment: 33811 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/bindings/v8/V8GCController.cpp Committed r46666 M WebCore/ChangeLog M WebCore/bindings/v8/V8GCController.cpp r46666 = d575beb0b79d6a07653bad20c671069a6daba56b (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46666 136429 11 abarth 2009-08-01 00:37:29 -0700 All reviewed patches have been landed. Closing bug. 136621 12 jam 2009-08-03 06:26:39 -0700 (In reply to comment #11) > All reviewed patches have been landed. Closing bug. Thanks! 33757 2009-07-29 18:08:10 -0700 2009-07-30 13:05:34 -0700 Proposed patch mpwebkit.txt text/plain 6899 jam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjU2OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDctMjkgIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBWOCBiaW5kaW5nIGFuZCBHWVAgY2hhbmdlcyBmb3IgdGhlIENocm9taXVtIHBvcnQncyBtdWx0 aSBwcm9jZXNzIG1lc3NhZ2UgcG9ydCBpbXBsZW1lbnRhdGlvbiAKKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc4MjQKKworICAgICAgICBObyBuZXcg dGVzdHMuIChPT1BTISkKKworICAgICAgICAqIFdlYkNvcmUuZ3lwaToKKyAgICAgICAgKiBiaW5k aW5ncy92OC9WOEdDQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHQ1Byb2xvZ3Vl VmlzaXRvcjo6dmlzaXRET01XcmFwcGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkdDRXBpbG9ndWVW aXNpdG9yOjp2aXNpdERPTVdyYXBwZXIpOgorCiAyMDA5LTA3LTI5ICBCcmFkeSBFaWRzb24gIDxi ZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5k ZXg6IFdlYkNvcmUvV2ViQ29yZS5neXBpCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS5n eXBpCShyZXZpc2lvbiA0NjU1OCkKKysrIFdlYkNvcmUvV2ViQ29yZS5neXBpCSh3b3JraW5nIGNv cHkpCkBAIC04OTUsOCArODk1LDYgQEAKICAgICAgICAgICAgICdjc3MvV2ViS2l0Q1NTTWF0cml4 LmgnLAogICAgICAgICAgICAgJ2Nzcy9XZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZS5jcHAnLAogICAg ICAgICAgICAgJ2Nzcy9XZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZS5oJywKLSAgICAgICAgICAgICdk b20vZGVmYXVsdC9QbGF0Zm9ybU1lc3NhZ2VQb3J0Q2hhbm5lbC5jcHAnLAotICAgICAgICAgICAg J2RvbS9kZWZhdWx0L1BsYXRmb3JtTWVzc2FnZVBvcnRDaGFubmVsLmgnLAogICAgICAgICAgICAg J2RvbS9BY3RpdmVET01PYmplY3QuY3BwJywKICAgICAgICAgICAgICdkb20vQWN0aXZlRE9NT2Jq ZWN0LmgnLAogICAgICAgICAgICAgJ2RvbS9BdHRyLmNwcCcsCkluZGV4OiBXZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4R0NDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdz L3Y4L1Y4R0NDb250cm9sbGVyLmNwcAkocmV2aXNpb24gNDY1NTgpCisrKyBXZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4R0NDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk3LDQ0ICsxOTcs NDQgQEAgcHVibGljOgogI3VuZGVmIE1BS0VfQ0FTRQogICAgICAgICB9CiAKLSAgICAvLyBBZGRp dGlvbmFsIGhhbmRsaW5nIG9mIG1lc3NhZ2UgcG9ydCBlbnN1cmluZyB0aGF0IGVudGFuZ2xlZCBw b3J0cyBhbHNvCi0gICAgLy8gaGF2ZSB0aGVpciB3cmFwcGVycyBlbnRhbmdsZWQuIFRoaXMgc2hv dWxkIGlkZWFsbHkgYmUgaGFuZGxlZCB3aGVuIHRoZQotICAgIC8vIHBvcnRzIGFyZSBhY3R1YWxs eSBlbnRhbmdsZWQgaW4gTWVzc2FnZVBvcnQ6OmVudGFuZ2xlLCBidXQgdG8gYXZvaWQKLSAgICAv LyBmb3JraW5nIE1lc3NhZ2VQb3J0LiogdGhpcyBpcyBwb3N0cG9uZWQgdG8gR0MgdGltZS4gSGF2 aW5nIHRoaXMgcG9zdHBvbmVkCi0gICAgLy8gaGFzIHRoZSBkcmF3YmFjayB0aGF0IHRoZSB3cmFw cGVycyBhcmUgImVudGFuZ2xlZC91bmVudGFuZ2xlZCIgZm9yIGVhY2gKLSAgICAvLyBHQyBldmVu IHRob3VnaCB0aGVpciBlbnRhZ2xlbWVudCBtb3N0IGxpa2VseSBpcyBzdGlsbCB0aGUgc2FtZS4K LSAgICBpZiAodHlwZSA9PSBWOENsYXNzSW5kZXg6Ok1FU1NBR0VQT1JUKSB7Ci0gICAgICAgIC8v IEdldCB0aGUgcG9ydCBhbmQgaXRzIGVudGFuZ2xlZCBwb3J0LgotICAgICAgICBNZXNzYWdlUG9y dCogcG9ydDEgPSBzdGF0aWNfY2FzdDxNZXNzYWdlUG9ydCo+KG9iamVjdCk7Ci0gICAgICAgIE1l c3NhZ2VQb3J0KiBwb3J0MiA9IHBvcnQxLT5sb2NhbGx5RW50YW5nbGVkUG9ydCgpOwotCi0gICAg ICAgIC8vIElmIHdlIGFyZSByZW1vdGVseSBlbnRhbmdsZWQsIHRoZW4gbWFyayB0aGlzIG9iamVj dCBhcyByZWFjaGFibGUKLSAgICAgICAgLy8gKHdlIGNhbid0IGRldGVybWluZSByZWFjaGFiaWxp dHkgZGlyZWN0bHkgYXMgdGhlIHJlbW90ZSBvYmplY3QgaXMKLSAgICAgICAgLy8gb3V0LW9mLXBy b2MpLgotICAgICAgICBpZiAocG9ydDEtPmlzRW50YW5nbGVkKCkgJiYgIXBvcnQyKQotICAgICAg ICAgICAgd3JhcHBlci5DbGVhcldlYWsoKTsKLQotICAgICAgICBpZiAocG9ydDIpIHsKLSAgICAg ICAgICAgIC8vIEFzIHBvcnRzIGFyZSBhbHdheXMgZW50YW5nbGVkIGluIHBhaXJzIG9ubHkgcGVy Zm9ybSB0aGUgZW50YW5nbGVtZW50Ci0gICAgICAgICAgICAvLyBvbmNlIGZvciBlYWNoIHBhaXIg KHNlZSBBU1NFUlQgaW4gTWVzc2FnZVBvcnQ6OnVuZW50YW5nbGUoKSkuCi0gICAgICAgICAgICBp ZiAocG9ydDEgPCBwb3J0MikgewotICAgICAgICAgICAgICAgIHY4OjpIYW5kbGU8djg6OlZhbHVl PiBwb3J0MVdyYXBwZXIgPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb1Y4T2JqZWN0KFY4Q2xhc3NJ bmRleDo6TUVTU0FHRVBPUlQsIHBvcnQxKTsKLSAgICAgICAgICAgICAgICB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gcG9ydDJXcmFwcGVyID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChW OENsYXNzSW5kZXg6Ok1FU1NBR0VQT1JULCBwb3J0Mik7Ci0gICAgICAgICAgICAgICAgQVNTRVJU KHBvcnQxV3JhcHBlci0+SXNPYmplY3QoKSk7Ci0gICAgICAgICAgICAgICAgdjg6OkhhbmRsZTx2 ODo6T2JqZWN0Pjo6Q2FzdChwb3J0MVdyYXBwZXIpLT5TZXRJbnRlcm5hbEZpZWxkKFY4Q3VzdG9t OjprTWVzc2FnZVBvcnRFbnRhbmdsZWRQb3J0SW5kZXgsIHBvcnQyV3JhcHBlcik7Ci0gICAgICAg ICAgICAgICAgQVNTRVJUKHBvcnQyV3JhcHBlci0+SXNPYmplY3QoKSk7Ci0gICAgICAgICAgICAg ICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChwb3J0MldyYXBwZXIpLT5TZXRJbnRlcm5h bEZpZWxkKFY4Q3VzdG9tOjprTWVzc2FnZVBvcnRFbnRhbmdsZWRQb3J0SW5kZXgsIHBvcnQxV3Jh cHBlcik7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBS ZW1vdmUgdGhlIHdyYXBwZXIgZW50YW5nbGVtZW50IHdoZW4gYSBwb3J0IGlzIG5vdCBlbnRhbmds ZWQuCi0gICAgICAgICAgICBpZiAoVjhET01XcmFwcGVyOjpkb21PYmplY3RIYXNKU1dyYXBwZXIo cG9ydDEpKSB7Ci0gICAgICAgICAgICAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHdyYXBwZXIg PSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb1Y4T2JqZWN0KFY4Q2xhc3NJbmRleDo6TUVTU0FHRVBP UlQsIHBvcnQxKTsKLSAgICAgICAgICAgICAgICBBU1NFUlQod3JhcHBlci0+SXNPYmplY3QoKSk7 Ci0gICAgICAgICAgICAgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdCh3cmFwcGVyKS0+ U2V0SW50ZXJuYWxGaWVsZChWOEN1c3RvbTo6a01lc3NhZ2VQb3J0RW50YW5nbGVkUG9ydEluZGV4 LCB2ODo6VW5kZWZpbmVkKCkpOworICAgICAgICAvLyBBZGRpdGlvbmFsIGhhbmRsaW5nIG9mIG1l c3NhZ2UgcG9ydCBlbnN1cmluZyB0aGF0IGVudGFuZ2xlZCBwb3J0cyBhbHNvCisgICAgICAgIC8v IGhhdmUgdGhlaXIgd3JhcHBlcnMgZW50YW5nbGVkLiBUaGlzIHNob3VsZCBpZGVhbGx5IGJlIGhh bmRsZWQgd2hlbiB0aGUKKyAgICAgICAgLy8gcG9ydHMgYXJlIGFjdHVhbGx5IGVudGFuZ2xlZCBp biBNZXNzYWdlUG9ydDo6ZW50YW5nbGUsIGJ1dCB0byBhdm9pZAorICAgICAgICAvLyBmb3JraW5n IE1lc3NhZ2VQb3J0LiogdGhpcyBpcyBwb3N0cG9uZWQgdG8gR0MgdGltZS4gSGF2aW5nIHRoaXMg cG9zdHBvbmVkCisgICAgICAgIC8vIGhhcyB0aGUgZHJhd2JhY2sgdGhhdCB0aGUgd3JhcHBlcnMg YXJlICJlbnRhbmdsZWQvdW5lbnRhbmdsZWQiIGZvciBlYWNoCisgICAgICAgIC8vIEdDIGV2ZW4g dGhvdWdoIHRoZWlyIGVudGFnbGVtZW50IG1vc3QgbGlrZWx5IGlzIHN0aWxsIHRoZSBzYW1lLgor ICAgICAgICBpZiAodHlwZSA9PSBWOENsYXNzSW5kZXg6Ok1FU1NBR0VQT1JUKSB7CisgICAgICAg ICAgICAvLyBHZXQgdGhlIHBvcnQgYW5kIGl0cyBlbnRhbmdsZWQgcG9ydC4KKyAgICAgICAgICAg IE1lc3NhZ2VQb3J0KiBwb3J0MSA9IHN0YXRpY19jYXN0PE1lc3NhZ2VQb3J0Kj4ob2JqZWN0KTsK KyAgICAgICAgICAgIE1lc3NhZ2VQb3J0KiBwb3J0MiA9IHBvcnQxLT5sb2NhbGx5RW50YW5nbGVk UG9ydCgpOworCisgICAgICAgICAgICAvLyBJZiB3ZSBhcmUgcmVtb3RlbHkgZW50YW5nbGVkLCB0 aGVuIG1hcmsgdGhpcyBvYmplY3QgYXMgcmVhY2hhYmxlCisgICAgICAgICAgICAvLyAod2UgY2Fu J3QgZGV0ZXJtaW5lIHJlYWNoYWJpbGl0eSBkaXJlY3RseSBhcyB0aGUgcmVtb3RlIG9iamVjdCBp cworICAgICAgICAgICAgLy8gb3V0LW9mLXByb2MpLgorICAgICAgICAgICAgaWYgKHBvcnQxLT5p c0VudGFuZ2xlZCgpICYmICFwb3J0MikKKyAgICAgICAgICAgICAgICB3cmFwcGVyLkNsZWFyV2Vh aygpOworCisgICAgICAgICAgICBpZiAocG9ydDIpIHsKKyAgICAgICAgICAgICAgICAvLyBBcyBw b3J0cyBhcmUgYWx3YXlzIGVudGFuZ2xlZCBpbiBwYWlycyBvbmx5IHBlcmZvcm0gdGhlIGVudGFu Z2xlbWVudAorICAgICAgICAgICAgICAgIC8vIG9uY2UgZm9yIGVhY2ggcGFpciAoc2VlIEFTU0VS VCBpbiBNZXNzYWdlUG9ydDo6dW5lbnRhbmdsZSgpKS4KKyAgICAgICAgICAgICAgICBpZiAocG9y dDEgPCBwb3J0MikgeworICAgICAgICAgICAgICAgICAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g cG9ydDFXcmFwcGVyID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENsYXNzSW5k ZXg6Ok1FU1NBR0VQT1JULCBwb3J0MSk7CisgICAgICAgICAgICAgICAgICAgIHY4OjpIYW5kbGU8 djg6OlZhbHVlPiBwb3J0MldyYXBwZXIgPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb1Y4T2JqZWN0 KFY4Q2xhc3NJbmRleDo6TUVTU0FHRVBPUlQsIHBvcnQyKTsKKyAgICAgICAgICAgICAgICAgICAg QVNTRVJUKHBvcnQxV3JhcHBlci0+SXNPYmplY3QoKSk7CisgICAgICAgICAgICAgICAgICAgIHY4 OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QocG9ydDFXcmFwcGVyKS0+U2V0SW50ZXJuYWxGaWVs ZChWOEN1c3RvbTo6a01lc3NhZ2VQb3J0RW50YW5nbGVkUG9ydEluZGV4LCBwb3J0MldyYXBwZXIp OworICAgICAgICAgICAgICAgICAgICBBU1NFUlQocG9ydDJXcmFwcGVyLT5Jc09iamVjdCgpKTsK KyAgICAgICAgICAgICAgICAgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChwb3J0Mldy YXBwZXIpLT5TZXRJbnRlcm5hbEZpZWxkKFY4Q3VzdG9tOjprTWVzc2FnZVBvcnRFbnRhbmdsZWRQ b3J0SW5kZXgsIHBvcnQxV3JhcHBlcik7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg fSBlbHNlIHsKKyAgICAgICAgICAgICAgICAvLyBSZW1vdmUgdGhlIHdyYXBwZXIgZW50YW5nbGVt ZW50IHdoZW4gYSBwb3J0IGlzIG5vdCBlbnRhbmdsZWQuCisgICAgICAgICAgICAgICAgaWYgKFY4 RE9NV3JhcHBlcjo6ZG9tT2JqZWN0SGFzSlNXcmFwcGVyKHBvcnQxKSkgeworICAgICAgICAgICAg ICAgICAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gd3JhcHBlciA9IFY4RE9NV3JhcHBlcjo6Y29u dmVydFRvVjhPYmplY3QoVjhDbGFzc0luZGV4OjpNRVNTQUdFUE9SVCwgcG9ydDEpOworICAgICAg ICAgICAgICAgICAgICBBU1NFUlQod3JhcHBlci0+SXNPYmplY3QoKSk7CisgICAgICAgICAgICAg ICAgICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3Qod3JhcHBlciktPlNldEludGVybmFs RmllbGQoVjhDdXN0b206OmtNZXNzYWdlUG9ydEVudGFuZ2xlZFBvcnRJbmRleCwgdjg6OlVuZGVm aW5lZCgpKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICB9Ci19CiB9OwogCiBjbGFzcyBHcm91cGVySXRlbSB7CkBAIC00MDIsOCArNDAyLDE3IEBAIEFD VElWRV9ET01fT0JKRUNUX1RZUEVTKE1BS0VfQ0FTRSkKICAgICAgICAgZGVmYXVsdDoKICAgICAg ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogI3VuZGVmIE1BS0VfQ0FTRQorICAgICAgICB9 CisKKyAgICAgICAgLy8gU2V0IGJhY2sgdGhlIHdlYWsgYml0IHRoYXQgd2UgY2xlYXJlZCBpbiBH Q1Byb2xvZ3VlVmlzaXRvci4KKyAgICAgICAgaWYgKHR5cGUgPT0gVjhDbGFzc0luZGV4OjpNRVNT QUdFUE9SVCkgeworICAgICAgICAgICAgTWVzc2FnZVBvcnQqIHBvcnQxID0gc3RhdGljX2Nhc3Q8 TWVzc2FnZVBvcnQqPihvYmplY3QpOworICAgICAgICAgICAgTWVzc2FnZVBvcnQqIHBvcnQyID0g cG9ydDEtPmxvY2FsbHlFbnRhbmdsZWRQb3J0KCk7CisgICAgICAgICAgICBpZiAocG9ydDEtPmlz RW50YW5nbGVkKCkgJiYgIXBvcnQyKQorICAgICAgICAgICAgICAgIHdyYXBwZXIuTWFrZVdlYWso cG9ydDEsICZET01EYXRhU3RvcmU6OndlYWtBY3RpdmVET01PYmplY3RDYWxsYmFjayk7CisKKyAg ICAgICAgfQogICAgIH0KLX0KIH07CiAKIHZvaWQgVjhHQ0NvbnRyb2xsZXI6OmdjRXBpbG9ndWUo KQo= 33811 2009-07-30 13:05:34 -0700 2009-08-01 00:37:23 -0700 new patch mpwebkit2.txt text/plain 1812 jam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjU5NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMDctMzAgIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGaXggYSBtZXNzYWdlIHBvcnQgaGFuZGxlIGFsd2F5cyBnZXR0aW5nIG1hcmtlZCBhcyByZWFj aGFibGUgb25jZSBpdCBnZXRzIGVudGFuZ2xlZC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc4MjQKKworICAgICAgICBObyB0ZXN0cyBzaW5jZSB0 aGlzIG9ubHkgYXJpc2VzIHdpdGggdGhlIENocm9taXVtIG11bHRpLXByb2Nlc3MgbWVzc2FnZSBw b3J0IGltcGxlbWVudGF0aW9uCisgICAgICAgIHdoaWNoIGlzbid0IGluIHRoaXMgcmVwb3N0aW9y eS4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4R0NDb250cm9sbGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkdDRXBpbG9ndWVWaXNpdG9yOjp2aXNpdERPTVdyYXBwZXIpOgorCiAyMDA5LTA3 LTMwICBEZWFuIE1jTmFtZWUgIDxkZWFubUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9WOEdDQ29u dHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOEdDQ29udHJv bGxlci5jcHAJKHJldmlzaW9uIDQ2NTU4KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9WOEdDQ29u dHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQwMiw4ICs0MDIsMTkgQEAgQUNUSVZFX0RP TV9PQkpFQ1RfVFlQRVMoTUFLRV9DQVNFKQogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CiAjdW5kZWYgTUFLRV9DQVNFCisgICAgICAgIH0KKworICAg ICAgICBpZiAodHlwZSA9PSBWOENsYXNzSW5kZXg6Ok1FU1NBR0VQT1JUKSB7CisgICAgICAgICAg ICBNZXNzYWdlUG9ydCogcG9ydDEgPSBzdGF0aWNfY2FzdDxNZXNzYWdlUG9ydCo+KG9iamVjdCk7 CisgICAgICAgICAgICBNZXNzYWdlUG9ydCogcG9ydDIgPSBwb3J0MS0+bG9jYWxseUVudGFuZ2xl ZFBvcnQoKTsKKyAgICAgICAgICAgIGlmIChwb3J0MS0+aXNFbnRhbmdsZWQoKSAmJiAhcG9ydDIp IHsKKyAgICAgICAgICAgICAgICAvLyBXZSBtYXJrZWQgdGhpcyBwb3J0IGFzIHJlYWNoYWJsZSBp biBHQ1Byb2xvZ3VlVmlzaXRvci4gIFVuZG8gdGhpcyBub3cgc2luY2UgdGhlCisgICAgICAgICAg ICAgICAgLy8gcG9ydCBjb3VsZCBiZSBub3QgcmVhY2hhYmxlIGluIHRoZSBmdXR1cmUgaWYgaXQg Z2V0cyBkaXNlbnRhbmdsZWQgKGFuZCBhbHNvCisgICAgICAgICAgICAgICAgLy8gR0NQcm9sb2d1 ZVZpc2l0b3IgZXhwZWN0cyB0byBzZWUgYWxsIGhhbmRsZXMgbWFya2VkIGFzIHdlYWspLgorICAg ICAgICAgICAgICAgIHdyYXBwZXIuTWFrZVdlYWsocG9ydDEsICZET01EYXRhU3RvcmU6OndlYWtB Y3RpdmVET01PYmplY3RDYWxsYmFjayk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KICAgICB9 Ci19CiB9OwogCiB2b2lkIFY4R0NDb250cm9sbGVyOjpnY0VwaWxvZ3VlKCkK