34859 2010-02-11 13:43:55 -0800 [chromium] Update Chromium port's usage of url_util::IsStandard 2010-02-26 15:24:50 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 brettw brettw bauerb darin dglazkov fishd jorlow pfeldman tkent tony webkit.review.bot oldest_to_newest 189785 0 brettw 2010-02-11 13:43:55 -0800 I'm working on a google-url patch: http://codereview.chromium.org/564011 which requires a small update to the Chromium port's usage of IsStandard in KURLGoogle.cpp. This bug is to track that update. 190190 1 48673 brettw 2010-02-12 15:40:54 -0800 Created attachment 48673 Patch Do not commit queue this since it needs a coordinated landing with http://codereview.chromium.org/579004 on the Chromium side. 190191 2 webkit.review.bot 2010-02-12 15:47:18 -0800 Attachment 48673 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/platform/KURLGoogle.cpp:586: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] Total errors found: 1 If any of these errors are false positives, please file a bug against check-webkit-style. 190193 3 webkit.review.bot 2010-02-12 15:54:00 -0800 Attachment 48673 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/262201 190197 4 48674 brettw 2010-02-12 16:12:30 -0800 Created attachment 48674 Path with style fixed. See above, this will make the Chromium build fail. 190199 5 webkit.review.bot 2010-02-12 16:15:56 -0800 Attachment 48674 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/261234 191444 6 48674 abarth 2010-02-18 00:04:58 -0800 Comment on attachment 48674 Path with style fixed. Looks reasonable. I didn't understand the relation between - m_url.utf8String().length(), and the rest of the patch. Also, please fix the indentation in V8LocationCustom to be four spaces. (Not sure why the style elf missed that.) 191535 7 bauerb 2010-02-18 04:41:28 -0800 (In reply to comment #6) > (From update of attachment 48674 [details]) > Looks reasonable. I didn't understand the relation between > > - m_url.utf8String().length(), > > and the rest of the patch. This change is to match the signature change of url_util::IsStandard introduced in googleurl, revision 123. 191796 8 brettw 2010-02-18 18:08:23 -0800 Checked in as r54997. 191810 9 tony 2010-02-18 20:01:14 -0800 (In reply to comment #8) > Checked in as r54997. Do you plan on landing the chromium side of this soon? It causes the commit queue and webkit-patch to no longer work. 191811 10 tkent 2010-02-18 20:37:22 -0800 r54998 fixed the build error by r54997. 191851 11 jorlow 2010-02-19 03:23:59 -0800 This broke the canaries and anyone on a hybrid build crome/webkit checkout. I would just revert it, but it seems that you knew this would happen and checked it in anyway, which makes me wonder if reverting it would cause other badness. Please don't do this in the future, though. 191871 12 pfeldman 2010-02-19 05:03:36 -0800 (In reply to comment #11) > This broke the canaries and anyone on a hybrid build crome/webkit checkout. I > would just revert it, but it seems that you knew this would happen and checked > it in anyway, which makes me wonder if reverting it would cause other badness. > > Please don't do this in the future, though. After looking at canaries I just reverted the change. It is a two-sided commit that should be coordinated with sheriff. Once I've reverted it, I came here to post a note and found out the discussion. I still think I did the right thing. 191943 13 brettw 2010-02-19 09:20:08 -0800 I did coordinate with the sheriff. What am I supposed to do differently? What do you mean by "don't do this again!" This is the only way to land two sided patches! The merge landed when I was asleep and I came in to do the part that I coordinated with the sheriff I would land, and it's reverted! And now I have to do THE ENTIRE THING AGAIN. This makes me VERY frustrated to the point where I wish I never worked on this bug. 191948 14 brettw 2010-02-19 09:34:52 -0800 Dimitri clarified that I need to wait for a green revision right before the checkin. I also suspect landing this is impossible when the sheriff is in another time zone. 194133 15 49592 brettw 2010-02-26 09:27:21 -0800 Created attachment 49592 Third try This is the same as the previous patch without the change to the call to url_util::IsStandard. I added a temporary backwards-compat version of IsStandard to googleurl to aid in landing this. I'll land the fix to the call as a separate pass. 194337 16 brettw 2010-02-26 15:24:50 -0800 Committed in r55319 48673 2010-02-12 15:40:54 -0800 2010-02-12 16:12:30 -0800 Patch std.diff text/plain 3542 brettw ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTg3YTA1ZC4uZmZlYmQ3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wMi0xMiAgQnJldHQgV2lsc29u ICA8YnJldHR3QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBVcGRhdGUgdGhlIEdvb2dsZS1VUkwgdmVyc2lvbiBvZiBLVVJMIGFu ZCB0aGUgVjggYmluZGluZ3MgdG8gdGhlIG5ldworICAgICAgICBiZWhhdmlvciBvZiBLVVJMLklz U3RhbmRhcmQuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTM0ODU5CisKKyAgICAgICAgVGhpcyBpcyBjb3ZlcmVkIGJ5IGZhc3QvZG9tL1dpbmRvdy9p bnZhbGlkLXByb3RvY29sLmh0bWwKKworICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOExv Y2F0aW9uQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4TG9jYXRpb246OnByb3RvY29s QWNjZXNzb3JTZXR0ZXIpOgorICAgICAgICAqIHBsYXRmb3JtL0tVUkxHb29nbGUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6S1VSTDo6c2V0UHJvdG9jb2wpOgorICAgICAgICAoV2ViQ29yZTo6S1VS TDo6aXNIaWVyYXJjaGljYWwpOgorCiAyMDEwLTAyLTExICBEYXJpbiBGaXNoZXIgIDxkYXJpbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhMb2NhdGlvbkN1c3RvbS5jcHAgYi9X ZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOExvY2F0aW9uQ3VzdG9tLmNwcAppbmRleCBiNWRm NjAxLi41MjY3MzM2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOExv Y2F0aW9uQ3VzdG9tLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOExvY2F0 aW9uQ3VzdG9tLmNwcApAQCAtMTg1LDcgKzE4NSwxMCBAQCB2b2lkIFY4TG9jYXRpb246OnByb3Rv Y29sQWNjZXNzb3JTZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIHY4OjpMb2NhbDx2 OAogICAgICAgICByZXR1cm47CiAKICAgICBLVVJMIHVybCA9IGZyYW1lLT5sb2FkZXIoKS0+dXJs KCk7Ci0gICAgdXJsLnNldFByb3RvY29sKHByb3RvY29sKTsKKyAgICBpZiAoIXVybC5zZXRQcm90 b2NvbChwcm90b2NvbCkpIHsKKyAgICAgIHRocm93RXJyb3IoIkNhbid0IHNldCBwcm90b2NvbCIs IFY4UHJveHk6OlN5bnRheEVycm9yKTsKKyAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICBuYXZp Z2F0ZUlmQWxsb3dlZChmcmFtZSwgdXJsLCBmYWxzZSwgZmFsc2UpOwogfQpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdv b2dsZS5jcHAKaW5kZXggNjVjYTM0Ni4uN2UyN2I0NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0 Zm9ybS9LVVJMR29vZ2xlLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3Bw CkBAIC01NzIsMTAgKzU3MiwzMiBAQCBTdHJpbmcgS1VSTDo6cGF0aCgpIGNvbnN0CiAKIGJvb2wg S1VSTDo6c2V0UHJvdG9jb2woY29uc3QgU3RyaW5nJiBwcm90b2NvbCkKIHsKKyAgICAvLyBGaXJl Zm94IGFuZCBJRSByZW1vdmUgZXZlcnl0aGluZyBhZnRlciB0aGUgZmlyc3QgJzonLgorICAgIGlu dCBzZXBhcmF0b3JQb3NpdGlvbiA9IHByb3RvY29sLmZpbmQoJzonKTsKKyAgICBTdHJpbmcgbmV3 UHJvdG9jb2wgPSBwcm90b2NvbC5zdWJzdHJpbmcoMCwgc2VwYXJhdG9yUG9zaXRpb24pOworCisg ICAgLy8gSWYgS1VSTCBpcyBnaXZlbiBhbiBpbnZhbGlkIHNjaGVtZSwgaXQgcmV0dXJucyBmYWls dXJlIHdpdGhvdXQgbW9kaWZ5aW5nCisgICAgLy8gdGhlIFVSTCBhdCBhbGwuIFRoaXMgaXMgaW4g Y29udHJhc3QgdG8gbW9zdCBvdGhlciBzZXR0ZXJzIHdoaWNoIG1vZGlmeQorICAgIC8vIHRoZSBV UkwgYW5kIHNldCAibV9pc1ZhbGlkLiIKKyAgICB1cmxfY2Fub246OlJhd0Nhbm9uT3V0cHV0VDxj aGFyPiBjYW5vblByb3RvY29sOworICAgIHVybF9wYXJzZTo6Q29tcG9uZW50IHByb3RvY29sQ29t cG9uZW50OworICAgIGlmICghdXJsX2Nhbm9uOjpDYW5vbmljYWxpemVTY2hlbWUobmV3UHJvdG9j b2wuY2hhcmFjdGVycygpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dXJsX3BhcnNlOjpDb21wb25lbnQoMCwgbmV3UHJvdG9jb2wubGVuZ3RoKCkpLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmNhbm9uUHJvdG9jb2wsICZwcm90b2NvbENv bXBvbmVudCkgfHwKKyAgICAgICAgIXByb3RvY29sQ29tcG9uZW50LmlzX25vbmVtcHR5KCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIEtVUkxHb29nbGVQcml2YXRlOjpSZXBsYWNlbWVu dHMgcmVwbGFjZW1lbnRzOwotICAgIHJlcGxhY2VtZW50cy5TZXRTY2hlbWUoQ2hhcmFjdGVyc09y RW1wdHkocHJvdG9jb2wpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgdXJsX3BhcnNlOjpD b21wb25lbnQoMCwgcHJvdG9jb2wubGVuZ3RoKCkpKTsKKyAgICByZXBsYWNlbWVudHMuU2V0U2No ZW1lKENoYXJhY3RlcnNPckVtcHR5KG5ld1Byb3RvY29sKSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgIHVybF9wYXJzZTo6Q29tcG9uZW50KDAsIG5ld1Byb3RvY29sLmxlbmd0aCgpKSk7CiAg ICAgbV91cmwucmVwbGFjZUNvbXBvbmVudHMocmVwbGFjZW1lbnRzKTsKKworICAgIC8vIGlzVmFs aWQgY291bGQgYmUgZmFsc2UgYnV0IHdlIHN0aWxsIHJldHVybiB0cnVlIGhlcmUuIFRoaXMgaXMg YmVjYXVzZQorICAgIC8vIFdlYkNvcmUgb3IgSlMgc2NyaXB0cyBjYW4gYnVpbGQgdXAgYSBVUkwg Ynkgc2V0dGluZyBpbmRpdmlkdWFsCisgICAgLy8gY29tcG9uZW50cywgYW5kIGEgSlMgZXhjZXB0 aW9uIGlzIGJhc2VkIG9uIHRoZSByZXR1cm4gdmFsdWUgb2YgdGhpcworICAgIC8vIGZ1bmN0aW9u LiBXZSB3YW50IHRvIHRocm93IHRoZSBleGNlcHRpb24gYW5kIHN0b3AgdGhlIHNjcmlwdCBvbmx5 IHdoZW4KKyAgICAvLyBpdHMgdHJ5aW5nIHRvIHNldCBhIGJhZCBwcm90b2NvbCwgYW5kIG5vdCB3 aGVuIGl0IG1heWJlIGp1c3QgaGFzbid0CisgICAgLy8gZmluaXNoZWQgYnVpbGRpbmcgdXAgaXRz IGZpbmFsIHNjaGVtZS4KICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtMTAxNSw3ICsxMDM3LDYg QEAgYm9vbCBLVVJMOjppc0hpZXJhcmNoaWNhbCgpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICByZXR1cm4gdXJsX3V0aWw6OklzU3RhbmRhcmQoCiAgICAgICAgICZtX3VybC51dGY4 U3RyaW5nKCkuZGF0YSgpW21fdXJsLm1fcGFyc2VkLnNjaGVtZS5iZWdpbl0sCi0gICAgICAgIG1f dXJsLnV0ZjhTdHJpbmcoKS5sZW5ndGgoKSwKICAgICAgICAgbV91cmwubV9wYXJzZWQuc2NoZW1l KTsKIH0KIAo= 48674 2010-02-12 16:12:30 -0800 2010-02-26 09:27:21 -0800 Path with style fixed. std.diff text/plain 3542 brettw ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTg3YTA1ZC4uZmZlYmQ3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wMi0xMiAgQnJldHQgV2lsc29u ICA8YnJldHR3QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBVcGRhdGUgdGhlIEdvb2dsZS1VUkwgdmVyc2lvbiBvZiBLVVJMIGFu ZCB0aGUgVjggYmluZGluZ3MgdG8gdGhlIG5ldworICAgICAgICBiZWhhdmlvciBvZiBLVVJMLklz U3RhbmRhcmQuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTM0ODU5CisKKyAgICAgICAgVGhpcyBpcyBjb3ZlcmVkIGJ5IGZhc3QvZG9tL1dpbmRvdy9p bnZhbGlkLXByb3RvY29sLmh0bWwKKworICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOExv Y2F0aW9uQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4TG9jYXRpb246OnByb3RvY29s QWNjZXNzb3JTZXR0ZXIpOgorICAgICAgICAqIHBsYXRmb3JtL0tVUkxHb29nbGUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6S1VSTDo6c2V0UHJvdG9jb2wpOgorICAgICAgICAoV2ViQ29yZTo6S1VS TDo6aXNIaWVyYXJjaGljYWwpOgorCiAyMDEwLTAyLTExICBEYXJpbiBGaXNoZXIgIDxkYXJpbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhMb2NhdGlvbkN1c3RvbS5jcHAgYi9X ZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOExvY2F0aW9uQ3VzdG9tLmNwcAppbmRleCBiNWRm NjAxLi41MjY3MzM2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOExv Y2F0aW9uQ3VzdG9tLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOExvY2F0 aW9uQ3VzdG9tLmNwcApAQCAtMTg1LDcgKzE4NSwxMCBAQCB2b2lkIFY4TG9jYXRpb246OnByb3Rv Y29sQWNjZXNzb3JTZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIHY4OjpMb2NhbDx2 OAogICAgICAgICByZXR1cm47CiAKICAgICBLVVJMIHVybCA9IGZyYW1lLT5sb2FkZXIoKS0+dXJs KCk7Ci0gICAgdXJsLnNldFByb3RvY29sKHByb3RvY29sKTsKKyAgICBpZiAoIXVybC5zZXRQcm90 b2NvbChwcm90b2NvbCkpIHsKKyAgICAgIHRocm93RXJyb3IoIkNhbid0IHNldCBwcm90b2NvbCIs IFY4UHJveHk6OlN5bnRheEVycm9yKTsKKyAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICBuYXZp Z2F0ZUlmQWxsb3dlZChmcmFtZSwgdXJsLCBmYWxzZSwgZmFsc2UpOwogfQpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdv b2dsZS5jcHAKaW5kZXggNjVjYTM0Ni4uM2IxNDAxZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0 Zm9ybS9LVVJMR29vZ2xlLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3Bw CkBAIC01NzIsMTAgKzU3MiwzMiBAQCBTdHJpbmcgS1VSTDo6cGF0aCgpIGNvbnN0CiAKIGJvb2wg S1VSTDo6c2V0UHJvdG9jb2woY29uc3QgU3RyaW5nJiBwcm90b2NvbCkKIHsKKyAgICAvLyBGaXJl Zm94IGFuZCBJRSByZW1vdmUgZXZlcnl0aGluZyBhZnRlciB0aGUgZmlyc3QgJzonLgorICAgIGlu dCBzZXBhcmF0b3JQb3NpdGlvbiA9IHByb3RvY29sLmZpbmQoJzonKTsKKyAgICBTdHJpbmcgbmV3 UHJvdG9jb2wgPSBwcm90b2NvbC5zdWJzdHJpbmcoMCwgc2VwYXJhdG9yUG9zaXRpb24pOworCisg ICAgLy8gSWYgS1VSTCBpcyBnaXZlbiBhbiBpbnZhbGlkIHNjaGVtZSwgaXQgcmV0dXJucyBmYWls dXJlIHdpdGhvdXQgbW9kaWZ5aW5nCisgICAgLy8gdGhlIFVSTCBhdCBhbGwuIFRoaXMgaXMgaW4g Y29udHJhc3QgdG8gbW9zdCBvdGhlciBzZXR0ZXJzIHdoaWNoIG1vZGlmeQorICAgIC8vIHRoZSBV UkwgYW5kIHNldCAibV9pc1ZhbGlkLiIKKyAgICB1cmxfY2Fub246OlJhd0Nhbm9uT3V0cHV0VDxj aGFyPiBjYW5vblByb3RvY29sOworICAgIHVybF9wYXJzZTo6Q29tcG9uZW50IHByb3RvY29sQ29t cG9uZW50OworICAgIGlmICghdXJsX2Nhbm9uOjpDYW5vbmljYWxpemVTY2hlbWUobmV3UHJvdG9j b2wuY2hhcmFjdGVycygpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dXJsX3BhcnNlOjpDb21wb25lbnQoMCwgbmV3UHJvdG9jb2wubGVuZ3RoKCkpLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmNhbm9uUHJvdG9jb2wsICZwcm90b2NvbENv bXBvbmVudCkKKyAgICAgICAgfHwgIXByb3RvY29sQ29tcG9uZW50LmlzX25vbmVtcHR5KCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIEtVUkxHb29nbGVQcml2YXRlOjpSZXBsYWNlbWVu dHMgcmVwbGFjZW1lbnRzOwotICAgIHJlcGxhY2VtZW50cy5TZXRTY2hlbWUoQ2hhcmFjdGVyc09y RW1wdHkocHJvdG9jb2wpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgdXJsX3BhcnNlOjpD b21wb25lbnQoMCwgcHJvdG9jb2wubGVuZ3RoKCkpKTsKKyAgICByZXBsYWNlbWVudHMuU2V0U2No ZW1lKENoYXJhY3RlcnNPckVtcHR5KG5ld1Byb3RvY29sKSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgIHVybF9wYXJzZTo6Q29tcG9uZW50KDAsIG5ld1Byb3RvY29sLmxlbmd0aCgpKSk7CiAg ICAgbV91cmwucmVwbGFjZUNvbXBvbmVudHMocmVwbGFjZW1lbnRzKTsKKworICAgIC8vIGlzVmFs aWQgY291bGQgYmUgZmFsc2UgYnV0IHdlIHN0aWxsIHJldHVybiB0cnVlIGhlcmUuIFRoaXMgaXMg YmVjYXVzZQorICAgIC8vIFdlYkNvcmUgb3IgSlMgc2NyaXB0cyBjYW4gYnVpbGQgdXAgYSBVUkwg Ynkgc2V0dGluZyBpbmRpdmlkdWFsCisgICAgLy8gY29tcG9uZW50cywgYW5kIGEgSlMgZXhjZXB0 aW9uIGlzIGJhc2VkIG9uIHRoZSByZXR1cm4gdmFsdWUgb2YgdGhpcworICAgIC8vIGZ1bmN0aW9u LiBXZSB3YW50IHRvIHRocm93IHRoZSBleGNlcHRpb24gYW5kIHN0b3AgdGhlIHNjcmlwdCBvbmx5 IHdoZW4KKyAgICAvLyBpdHMgdHJ5aW5nIHRvIHNldCBhIGJhZCBwcm90b2NvbCwgYW5kIG5vdCB3 aGVuIGl0IG1heWJlIGp1c3QgaGFzbid0CisgICAgLy8gZmluaXNoZWQgYnVpbGRpbmcgdXAgaXRz IGZpbmFsIHNjaGVtZS4KICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtMTAxNSw3ICsxMDM3LDYg QEAgYm9vbCBLVVJMOjppc0hpZXJhcmNoaWNhbCgpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICByZXR1cm4gdXJsX3V0aWw6OklzU3RhbmRhcmQoCiAgICAgICAgICZtX3VybC51dGY4 U3RyaW5nKCkuZGF0YSgpW21fdXJsLm1fcGFyc2VkLnNjaGVtZS5iZWdpbl0sCi0gICAgICAgIG1f dXJsLnV0ZjhTdHJpbmcoKS5sZW5ndGgoKSwKICAgICAgICAgbV91cmwubV9wYXJzZWQuc2NoZW1l KTsKIH0KIAo= 49592 2010-02-26 09:27:21 -0800 2010-02-26 09:37:13 -0800 Third try std.diff text/plain 3421 brettw ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MThjMGMzNS4uZjk1MGYyYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTM1MDYsNiArMzUwNiwyMyBAQAogICAgICAgICAoV2ViQ29yZTo6 VjhET01XcmFwcGVyOjppbnN0YW50aWF0ZVY4T2JqZWN0KTogTWVyZ2UgaW5zdGFudGlhdGVWOE9i amVjdCBwYXRocy4KICAgICAgICAgKiBiaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuaDoKIAorMjAx MC0wMi0xMiAgQnJldHQgV2lsc29uICA8YnJldHR3QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIFVwZGF0ZSB0aGUgR29vZ2xlLVVSTCB2 ZXJzaW9uIG9mIEtVUkwgYW5kIHRoZSBWOCBiaW5kaW5ncyB0byB0aGUgbmV3CisgICAgICAgIGJl aGF2aW9yIG9mIEtVUkwuSXNTdGFuZGFyZC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ4NTkKKworICAgICAgICBUaGlzIGlzIGNvdmVyZWQgYnkg ZmFzdC9kb20vV2luZG93L2ludmFsaWQtcHJvdG9jb2wuaHRtbAorCisgICAgICAgICogYmluZGlu Z3MvdjgvY3VzdG9tL1Y4TG9jYXRpb25DdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhM b2NhdGlvbjo6cHJvdG9jb2xBY2Nlc3NvclNldHRlcik6CisgICAgICAgICogcGxhdGZvcm0vS1VS TEdvb2dsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpLVVJMOjpzZXRQcm90b2NvbCk6CisgICAg ICAgIChXZWJDb3JlOjpLVVJMOjppc0hpZXJhcmNoaWNhbCk6CisKIDIwMTAtMDItMTggIFhhbiBM b3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEd1c3Rhdm8g Tm9yb25oYS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4TG9jYXRp b25DdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhMb2NhdGlvbkN1c3Rv bS5jcHAKaW5kZXggOGVhOGJmYS4uYjI1NTUzNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5n cy92OC9jdXN0b20vVjhMb2NhdGlvbkN1c3RvbS5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhMb2NhdGlvbkN1c3RvbS5jcHAKQEAgLTE5MCw3ICsxOTAsMTAgQEAgdm9pZCBW OExvY2F0aW9uOjpwcm90b2NvbEFjY2Vzc29yU2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBu YW1lLCB2ODo6TG9jYWw8djgKICAgICAgICAgcmV0dXJuOwogCiAgICAgS1VSTCB1cmwgPSBmcmFt ZS0+bG9hZGVyKCktPnVybCgpOwotICAgIHVybC5zZXRQcm90b2NvbChwcm90b2NvbCk7CisgICAg aWYgKCF1cmwuc2V0UHJvdG9jb2wocHJvdG9jb2wpKSB7CisgICAgICAgIHRocm93RXJyb3IoIkNh bid0IHNldCBwcm90b2NvbCIsIFY4UHJveHk6OlN5bnRheEVycm9yKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KIAogICAgIG5hdmlnYXRlSWZBbGxvd2VkKGZyYW1lLCB1cmwsIGZhbHNlLCBmYWxz ZSk7CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwIGIvV2Vi Q29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcAppbmRleCA2NWNhMzQ2Li5jMjM5Y2E1IDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vS1VSTEdvb2dsZS5jcHAKQEAgLTU3MiwxMCArNTcyLDMyIEBAIFN0cmluZyBLVVJMOjpw YXRoKCkgY29uc3QKIAogYm9vbCBLVVJMOjpzZXRQcm90b2NvbChjb25zdCBTdHJpbmcmIHByb3Rv Y29sKQogeworICAgIC8vIEZpcmVmb3ggYW5kIElFIHJlbW92ZSBldmVyeXRoaW5nIGFmdGVyIHRo ZSBmaXJzdCAnOicuCisgICAgaW50IHNlcGFyYXRvclBvc2l0aW9uID0gcHJvdG9jb2wuZmluZCgn OicpOworICAgIFN0cmluZyBuZXdQcm90b2NvbCA9IHByb3RvY29sLnN1YnN0cmluZygwLCBzZXBh cmF0b3JQb3NpdGlvbik7CisKKyAgICAvLyBJZiBLVVJMIGlzIGdpdmVuIGFuIGludmFsaWQgc2No ZW1lLCBpdCByZXR1cm5zIGZhaWx1cmUgd2l0aG91dCBtb2RpZnlpbmcKKyAgICAvLyB0aGUgVVJM IGF0IGFsbC4gVGhpcyBpcyBpbiBjb250cmFzdCB0byBtb3N0IG90aGVyIHNldHRlcnMgd2hpY2gg bW9kaWZ5CisgICAgLy8gdGhlIFVSTCBhbmQgc2V0ICJtX2lzVmFsaWQuIgorICAgIHVybF9jYW5v bjo6UmF3Q2Fub25PdXRwdXRUPGNoYXI+IGNhbm9uUHJvdG9jb2w7CisgICAgdXJsX3BhcnNlOjpD b21wb25lbnQgcHJvdG9jb2xDb21wb25lbnQ7CisgICAgaWYgKCF1cmxfY2Fub246OkNhbm9uaWNh bGl6ZVNjaGVtZShuZXdQcm90b2NvbC5jaGFyYWN0ZXJzKCksCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1cmxfcGFyc2U6OkNvbXBvbmVudCgwLCBuZXdQcm90b2NvbC5s ZW5ndGgoKSksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmY2Fub25Q cm90b2NvbCwgJnByb3RvY29sQ29tcG9uZW50KQorICAgICAgICB8fCAhcHJvdG9jb2xDb21wb25l bnQuaXNfbm9uZW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgS1VSTEdvb2ds ZVByaXZhdGU6OlJlcGxhY2VtZW50cyByZXBsYWNlbWVudHM7Ci0gICAgcmVwbGFjZW1lbnRzLlNl dFNjaGVtZShDaGFyYWN0ZXJzT3JFbXB0eShwcm90b2NvbCksCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICB1cmxfcGFyc2U6OkNvbXBvbmVudCgwLCBwcm90b2NvbC5sZW5ndGgoKSkpOworICAg IHJlcGxhY2VtZW50cy5TZXRTY2hlbWUoQ2hhcmFjdGVyc09yRW1wdHkobmV3UHJvdG9jb2wpLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgdXJsX3BhcnNlOjpDb21wb25lbnQoMCwgbmV3UHJv dG9jb2wubGVuZ3RoKCkpKTsKICAgICBtX3VybC5yZXBsYWNlQ29tcG9uZW50cyhyZXBsYWNlbWVu dHMpOworCisgICAgLy8gaXNWYWxpZCBjb3VsZCBiZSBmYWxzZSBidXQgd2Ugc3RpbGwgcmV0dXJu IHRydWUgaGVyZS4gVGhpcyBpcyBiZWNhdXNlCisgICAgLy8gV2ViQ29yZSBvciBKUyBzY3JpcHRz IGNhbiBidWlsZCB1cCBhIFVSTCBieSBzZXR0aW5nIGluZGl2aWR1YWwKKyAgICAvLyBjb21wb25l bnRzLCBhbmQgYSBKUyBleGNlcHRpb24gaXMgYmFzZWQgb24gdGhlIHJldHVybiB2YWx1ZSBvZiB0 aGlzCisgICAgLy8gZnVuY3Rpb24uIFdlIHdhbnQgdG8gdGhyb3cgdGhlIGV4Y2VwdGlvbiBhbmQg c3RvcCB0aGUgc2NyaXB0IG9ubHkgd2hlbgorICAgIC8vIGl0cyB0cnlpbmcgdG8gc2V0IGEgYmFk IHByb3RvY29sLCBhbmQgbm90IHdoZW4gaXQgbWF5YmUganVzdCBoYXNuJ3QKKyAgICAvLyBmaW5p c2hlZCBidWlsZGluZyB1cCBpdHMgZmluYWwgc2NoZW1lLgogICAgIHJldHVybiB0cnVlOwogfQog Cg==