90055 2012-06-27 00:56:14 -0700 Fix gcc build after r121302 2012-06-27 02:15:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P1 Blocker --- 1 rniwa rniwa darin eric lforschler mrowe simon.fraser oldest_to_newest 658429 0 rniwa 2012-06-27 00:56:14 -0700 Fix gcc build after r121302 658430 1 149700 rniwa 2012-06-27 00:58:31 -0700 Created attachment 149700 Patch 658431 2 rniwa 2012-06-27 01:02:30 -0700 I don't know what they were thinking to assume RTTI is enabled for very old versions of gcc. They clearly didn't test this code with old gcc :( 658433 3 149700 mrowe 2012-06-27 01:08:39 -0700 Comment on attachment 149700 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=149700&action=review > Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h:349 > +#elif defined(__clang__) || defined(__llvm__) // Assume RTTO is always enabled on LLVM > + > +#define GTEST_HAS_RTTI 1 > + It's not correct to assume that RTTI is enabled. Doing this will break the clang build in the same way that GCC is currently broken. 658435 4 149700 rniwa 2012-06-27 01:09:24 -0700 Comment on attachment 149700 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=149700&action=review >> Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h:349 >> + > > It's not correct to assume that RTTI is enabled. Doing this will break the clang build in the same way that GCC is currently broken. Does clang also defines __GXX_RTTI flag? 658439 5 mrowe 2012-06-27 01:13:36 -0700 Clang defines it when the -fno-rtti flag is not passed. Note that we build TestWebKitAPI with -fno-rtti for both clang and gcc. I'm not quite sure which code path in gtest-port.h clang currently hits though. 658441 6 rniwa 2012-06-27 01:17:53 -0700 (In reply to comment #5) > Clang defines it when the -fno-rtti flag is not passed. Note that we build TestWebKitAPI with -fno-rtti for both clang and gcc. I'm not quite sure which code path in gtest-port.h clang currently hits though. I see some clang support in http://googletest.googlecode.com/svn/trunk/include/gtest/internal/gtest-port.h so I'll copy it over and tweak it to support old gcc. 658442 7 mrowe 2012-06-27 01:18:12 -0700 The cleanest solution is probably to just set GTEST_HAS_RTTI=0 in GCC_PREPROCESSOR_DEFINITIONS in General.xcconfig. That'll tell gtest not to use RTTI with any of our compilers when building on OS X. 658443 8 149702 rniwa 2012-06-27 01:18:17 -0700 Created attachment 149702 Fix clang build 658445 9 rniwa 2012-06-27 01:21:29 -0700 (In reply to comment #7) > The cleanest solution is probably to just set GTEST_HAS_RTTI=0 in GCC_PREPROCESSOR_DEFINITIONS in General.xcconfig. That'll tell gtest not to use RTTI with any of our compilers when building on OS X. I guess I can do that if you don't like my new patch. 658446 10 mrowe 2012-06-27 01:22:41 -0700 (In reply to comment #9) > (In reply to comment #7) > > The cleanest solution is probably to just set GTEST_HAS_RTTI=0 in GCC_PREPROCESSOR_DEFINITIONS in General.xcconfig. That'll tell gtest not to use RTTI with any of our compilers when building on OS X. > > I guess I can do that if you don't like my new patch. I think I'd prefer a tweak to the configuration settings than tweaking a header in a non-obvious way that would be very likely to get undone if we pull in a new version of gtest. 658451 11 rniwa 2012-06-27 01:30:34 -0700 (In reply to comment #10) > I think I'd prefer a tweak to the configuration settings than tweaking a header in a non-obvious way that would be very likely to get undone if we pull in a new version of gtest. Okay, uploading a new patch in a minute. 658459 12 rniwa 2012-06-27 01:44:46 -0700 (In reply to comment #11) > (In reply to comment #10) > > I think I'd prefer a tweak to the configuration settings than tweaking a header in a non-obvious way that would be very likely to get undone if we pull in a new version of gtest. > > Okay, uploading a new patch in a minute. Unfortunately, some don't seem to be able to seem to be seeing the variable I defined in General.xcconfig (ones in InjectedBundleTestWebKitAPI.build). 658461 13 mrowe 2012-06-27 01:47:54 -0700 Sorry, it'll also need to go in Tools/TestWebKitAPI/Configurations/Base.xcconfig, same as the setting of GTEST_HAS_TR1_TUPLE. 658467 14 149708 rniwa 2012-06-27 01:57:08 -0700 Created attachment 149708 Patch 658468 15 rniwa 2012-06-27 01:57:35 -0700 (In reply to comment #13) > Sorry, it'll also need to go in Tools/TestWebKitAPI/Configurations/Base.xcconfig, same as the setting of GTEST_HAS_TR1_TUPLE. Thanks for the help! Done. 658478 16 rniwa 2012-06-27 02:15:24 -0700 Committed r121331: <http://trac.webkit.org/changeset/121331> 149700 2012-06-27 00:58:31 -0700 2012-06-27 01:18:13 -0700 Patch bug-90055-20120627010322.patch text/plain 4090 rniwa SW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv VGhpcmRQYXJ0eS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMTMyNykKKysrIFNvdXJjZS9UaGlyZFBh cnR5L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA2LTI3 ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEZpeCBnY2MgYnVp bGQgYWZ0ZXIgcjEyMTMwMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTAwNTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBEb24ndCBhc3N1bWUgUlRUSSBpcyBlbmFibGVkIGluIGdjYyB3aGVuIFJUVEkgZmxh ZyBpcyBub3QgZGVmaW5lZC4KKworICAgICAgICAqIGd0ZXN0L2luY2x1ZGUvZ3Rlc3QvaW50ZXJu YWwvZ3Rlc3QtcG9ydC5oOgorCiAyMDEyLTA0LTMwICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBGaXggbWFrZSBkaXN0Y2hl Y2suCkluZGV4OiBTb3VyY2UvVGhpcmRQYXJ0eS9ndGVzdC9pbmNsdWRlL2d0ZXN0L2ludGVybmFs L2d0ZXN0LXBvcnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvVGhpcmRQYXJ0eS9ndGVzdC9pbmNs dWRlL2d0ZXN0L2ludGVybmFsL2d0ZXN0LXBvcnQuaAkocmV2aXNpb24gMTIxMzAyKQorKysgU291 cmNlL1RoaXJkUGFydHkvZ3Rlc3QvaW5jbHVkZS9ndGVzdC9pbnRlcm5hbC9ndGVzdC1wb3J0LmgJ KHdvcmtpbmcgY29weSkKQEAgLTM0MywxMCArMzQzLDE0IEBACiAjZGVmaW5lIEdURVNUX0hBU19S VFRJIDAKICNlbmRpZgogCisjZWxpZiBkZWZpbmVkKF9fY2xhbmdfXykgfHwgZGVmaW5lZChfX2xs dm1fXykgLy8gQXNzdW1lIFJUVE8gaXMgYWx3YXlzIGVuYWJsZWQgb24gTExWTQorCisjZGVmaW5l IEdURVNUX0hBU19SVFRJIDEKKwogLy8gU3RhcnRpbmcgd2l0aCB2ZXJzaW9uIDQuMy4yLCBnY2Mg ZGVmaW5lcyBfX0dYWF9SVFRJIGlmZiBSVFRJIGlzIGVuYWJsZWQuCi0jZWxpZiBkZWZpbmVkKF9f R05VQ19fKSAmJiAoR1RFU1RfR0NDX1ZFUl8gPj0gNDAzMDIpCisjZWxpZiBkZWZpbmVkKF9fR05V Q19fKQogCi0jaWZkZWYgX19HWFhfUlRUSQorI2lmIChHVEVTVF9HQ0NfVkVSXyA+PSA0MDMwMikg YW5kIGRlZmluZWQoX19HWFhfUlRUSSkKICNkZWZpbmUgR1RFU1RfSEFTX1JUVEkgMQogI2Vsc2UK ICNkZWZpbmUgR1RFU1RfSEFTX1JUVEkgMApJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTIxMzI3KQorKysgVG9vbHMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDYtMjcgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IGdjYyBidWlsZCBhZnRlciBy MTIxMzAyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 MDA1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0 IGFwcGVhcnMgdGhhdCBnY2MgZG9lc24ndCBsaWtlIHdpbmRvdy5nZXQoKS4qIGluc2lkZSBhIHRl bXBsYXRlIHNvIHJlcGxhY2UgdGhhdCBieSBbd2luZG93LmdldCgpICpdIGluc3RlYWQuCisKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9BY2NlcHRzRmlyc3RNb3VzZS5tbToKKyAg ICAgICAgKFRlc3RXZWJLaXRBUEk6OkFjY2VwdHNGaXJzdE1vdXNlOjpydW5UZXN0KToKKwogMjAx Mi0wNi0yNiAgTWFyayBIYWhuZW5iZXJnICA8bWhhaG5lbmJlcmdAYXBwbGUuY29tPgogCiAgICAg ICAgIEFkZCBzdXBwb3J0IGZvciBwcmVjaXNlVGltZSgpIHRvIFdlYktpdFRlc3RSdW5uZXIKSW5k ZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL0FjY2VwdHNGaXJzdE1vdXNlLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL0FjY2VwdHNGaXJzdE1v dXNlLm1tCShyZXZpc2lvbiAxMjEzMDIpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21h Yy9BY2NlcHRzRmlyc3RNb3VzZS5tbQkod29ya2luZyBjb3B5KQpAQCAtNDgsMTYgKzQ4LDE2IEBA IHRlbXBsYXRlIDx0eXBlbmFtZSBWaWV3Pgogdm9pZCBBY2NlcHRzRmlyc3RNb3VzZTo6cnVuVGVz dChWaWV3IHZpZXcpCiB7CiAgICAgUmV0YWluUHRyPE5TV2luZG93PiB3aW5kb3coQWRvcHROUywg W1tOU1dpbmRvdyBhbGxvY10gaW5pdFdpdGhDb250ZW50UmVjdDp2aWV3LmZyYW1lIHN0eWxlTWFz azpOU0JvcmRlcmxlc3NXaW5kb3dNYXNrIGJhY2tpbmc6TlNCYWNraW5nU3RvcmVCdWZmZXJlZCBk ZWZlcjpZRVNdKTsKLSAgICBbd2luZG93LmdldCgpLmNvbnRlbnRWaWV3IGFkZFN1YnZpZXc6dmll d107CisgICAgW1t3aW5kb3cuZ2V0KCkgY29udGVudFZpZXddIGFkZFN1YnZpZXc6dmlld107CiAK ICAgICBDR0Zsb2F0IHZpZXdIZWlnaHQgPSB2aWV3LmJvdW5kcy5zaXplLmhlaWdodDsKIAogICAg IE5TUG9pbnQgcG9pbnRJbnNpZGVTZWxlY3Rpb24gPSBOU01ha2VQb2ludCg1MCwgdmlld0hlaWdo dCAtIDUwKTsKLSAgICBOU0V2ZW50ICptb3VzZUV2ZW50SW5zaWRlU2VsZWN0aW9uID0gW05TRXZl bnQgbW91c2VFdmVudFdpdGhUeXBlOk5TTGVmdE1vdXNlRG93biBsb2NhdGlvbjpwb2ludEluc2lk ZVNlbGVjdGlvbiBtb2RpZmllckZsYWdzOjAgdGltZXN0YW1wOjAgd2luZG93TnVtYmVyOndpbmRv dy5nZXQoKS53aW5kb3dOdW1iZXIgY29udGV4dDpuaWwgZXZlbnROdW1iZXI6MCBjbGlja0NvdW50 OjEgcHJlc3N1cmU6MV07CisgICAgTlNFdmVudCAqbW91c2VFdmVudEluc2lkZVNlbGVjdGlvbiA9 IFtOU0V2ZW50IG1vdXNlRXZlbnRXaXRoVHlwZTpOU0xlZnRNb3VzZURvd24gbG9jYXRpb246cG9p bnRJbnNpZGVTZWxlY3Rpb24gbW9kaWZpZXJGbGFnczowIHRpbWVzdGFtcDowIHdpbmRvd051bWJl cjpbd2luZG93LmdldCgpIHdpbmRvd051bWJlcl0gY29udGV4dDpuaWwgZXZlbnROdW1iZXI6MCBj bGlja0NvdW50OjEgcHJlc3N1cmU6MV07CiAgICAgRVhQRUNUX1RSVUUoW1t2aWV3IGhpdFRlc3Q6 cG9pbnRJbnNpZGVTZWxlY3Rpb25dIGFjY2VwdHNGaXJzdE1vdXNlOm1vdXNlRXZlbnRJbnNpZGVT ZWxlY3Rpb25dKTsKIAogICAgIE5TUG9pbnQgcG9pbnRPdXRzaWRlU2VsZWN0aW9uID0gTlNNYWtl UG9pbnQoNTAsIHZpZXdIZWlnaHQgLSAxNTApOwotICAgIE5TRXZlbnQgKm1vdXNlRXZlbnRPdXRz aWRlU2VsZWN0aW9uID0gW05TRXZlbnQgbW91c2VFdmVudFdpdGhUeXBlOk5TTGVmdE1vdXNlRG93 biBsb2NhdGlvbjpwb2ludE91dHNpZGVTZWxlY3Rpb24gbW9kaWZpZXJGbGFnczowIHRpbWVzdGFt cDowIHdpbmRvd051bWJlcjp3aW5kb3cuZ2V0KCkud2luZG93TnVtYmVyIGNvbnRleHQ6bmlsIGV2 ZW50TnVtYmVyOjAgY2xpY2tDb3VudDoxIHByZXNzdXJlOjFdOworICAgIE5TRXZlbnQgKm1vdXNl RXZlbnRPdXRzaWRlU2VsZWN0aW9uID0gW05TRXZlbnQgbW91c2VFdmVudFdpdGhUeXBlOk5TTGVm dE1vdXNlRG93biBsb2NhdGlvbjpwb2ludE91dHNpZGVTZWxlY3Rpb24gbW9kaWZpZXJGbGFnczow IHRpbWVzdGFtcDowIHdpbmRvd051bWJlcjpbd2luZG93LmdldCgpIHdpbmRvd051bWJlcl0gY29u dGV4dDpuaWwgZXZlbnROdW1iZXI6MCBjbGlja0NvdW50OjEgcHJlc3N1cmU6MV07CiAgICAgRVhQ RUNUX0ZBTFNFKFtbdmlldyBoaXRUZXN0OnBvaW50SW5zaWRlU2VsZWN0aW9uXSBhY2NlcHRzRmly c3RNb3VzZTptb3VzZUV2ZW50T3V0c2lkZVNlbGVjdGlvbl0pOwogfQogCg== 149702 2012-06-27 01:18:17 -0700 2012-06-27 01:57:04 -0700 Fix clang build bug-90055-20120627012309.patch text/plain 4246 rniwa SW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv VGhpcmRQYXJ0eS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMTMyNykKKysrIFNvdXJjZS9UaGlyZFBh cnR5L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA2LTI3 ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEZpeCBnY2MgYnVp bGQgYWZ0ZXIgcjEyMTMwMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTAwNTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBEb24ndCBhc3N1bWUgUlRUSSBpcyBlbmFibGVkIGluIGdjYyB3aGVuIFJUVEkgZmxh ZyBpcyBub3QgZGVmaW5lZC4KKworICAgICAgICAqIGd0ZXN0L2luY2x1ZGUvZ3Rlc3QvaW50ZXJu YWwvZ3Rlc3QtcG9ydC5oOgorCiAyMDEyLTA0LTMwICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBGaXggbWFrZSBkaXN0Y2hl Y2suCkluZGV4OiBTb3VyY2UvVGhpcmRQYXJ0eS9ndGVzdC9pbmNsdWRlL2d0ZXN0L2ludGVybmFs L2d0ZXN0LXBvcnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvVGhpcmRQYXJ0eS9ndGVzdC9pbmNs dWRlL2d0ZXN0L2ludGVybmFsL2d0ZXN0LXBvcnQuaAkocmV2aXNpb24gMTIxMzAyKQorKysgU291 cmNlL1RoaXJkUGFydHkvZ3Rlc3QvaW5jbHVkZS9ndGVzdC9pbnRlcm5hbC9ndGVzdC1wb3J0LmgJ KHdvcmtpbmcgY29weSkKQEAgLTM0MywxMCArMzQzLDE3IEBACiAjZGVmaW5lIEdURVNUX0hBU19S VFRJIDAKICNlbmRpZgogCisvLyBDbGFuZyBkZWZpbmVzIF9fR1hYX1JUVEkgc3RhcnRpbmcgd2l0 aCB2ZXJzaW9uIDMuMCwgYnV0IGl0cyBtYW51YWwgcmVjb21tZW5kcworLy8gdXNpbmcgaGFzX2Zl YXR1cmUgaW5zdGVhZC4gaGFzX2ZlYXR1cmUoY3h4X3J0dGkpIGlzIHN1cHBvcnRlZCBzaW5jZSAy LjcsIHRoZQorLy8gZmlyc3QgdmVyc2lvbiB3aXRoIEMrKyBzdXBwb3J0LgorI2VsaWYgZGVmaW5l ZChfX2NsYW5nX18pCisKKyNkZWZpbmUgR1RFU1RfSEFTX1JUVEkgX19oYXNfZmVhdHVyZShjeHhf cnR0aSkKKwogLy8gU3RhcnRpbmcgd2l0aCB2ZXJzaW9uIDQuMy4yLCBnY2MgZGVmaW5lcyBfX0dY WF9SVFRJIGlmZiBSVFRJIGlzIGVuYWJsZWQuCi0jZWxpZiBkZWZpbmVkKF9fR05VQ19fKSAmJiAo R1RFU1RfR0NDX1ZFUl8gPj0gNDAzMDIpCisjZWxpZiBkZWZpbmVkKF9fR05VQ19fKQogCi0jaWZk ZWYgX19HWFhfUlRUSQorI2lmIGRlZmluZWQoX19HWFhfUlRUSSkgJiYgR1RFU1RfR0NDX1ZFUl8g Pj0gNDAzMDIKICNkZWZpbmUgR1RFU1RfSEFTX1JUVEkgMQogI2Vsc2UKICNkZWZpbmUgR1RFU1Rf SEFTX1JUVEkgMApJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0No YW5nZUxvZwkocmV2aXNpb24gMTIxMzI3KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDYtMjcgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdl YmtpdC5vcmc+CisKKyAgICAgICAgRml4IGdjYyBidWlsZCBhZnRlciByMTIxMzAyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDA1NQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IGFwcGVhcnMgdGhhdCBn Y2MgZG9lc24ndCBsaWtlIHdpbmRvdy5nZXQoKS4qIGluc2lkZSBhIHRlbXBsYXRlIHNvIHJlcGxh Y2UgdGhhdCBieSBbd2luZG93LmdldCgpICpdIGluc3RlYWQuCisKKyAgICAgICAgKiBUZXN0V2Vi S2l0QVBJL1Rlc3RzL21hYy9BY2NlcHRzRmlyc3RNb3VzZS5tbToKKyAgICAgICAgKFRlc3RXZWJL aXRBUEk6OkFjY2VwdHNGaXJzdE1vdXNlOjpydW5UZXN0KToKKwogMjAxMi0wNi0yNiAgTWFyayBI YWhuZW5iZXJnICA8bWhhaG5lbmJlcmdAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBzdXBwb3J0 IGZvciBwcmVjaXNlVGltZSgpIHRvIFdlYktpdFRlc3RSdW5uZXIKSW5kZXg6IFRvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvbWFjL0FjY2VwdHNGaXJzdE1vdXNlLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL0FjY2VwdHNGaXJzdE1vdXNlLm1tCShyZXZpc2lv biAxMjEzMDIpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9BY2NlcHRzRmlyc3RN b3VzZS5tbQkod29ya2luZyBjb3B5KQpAQCAtNDgsMTYgKzQ4LDE2IEBAIHRlbXBsYXRlIDx0eXBl bmFtZSBWaWV3Pgogdm9pZCBBY2NlcHRzRmlyc3RNb3VzZTo6cnVuVGVzdChWaWV3IHZpZXcpCiB7 CiAgICAgUmV0YWluUHRyPE5TV2luZG93PiB3aW5kb3coQWRvcHROUywgW1tOU1dpbmRvdyBhbGxv Y10gaW5pdFdpdGhDb250ZW50UmVjdDp2aWV3LmZyYW1lIHN0eWxlTWFzazpOU0JvcmRlcmxlc3NX aW5kb3dNYXNrIGJhY2tpbmc6TlNCYWNraW5nU3RvcmVCdWZmZXJlZCBkZWZlcjpZRVNdKTsKLSAg ICBbd2luZG93LmdldCgpLmNvbnRlbnRWaWV3IGFkZFN1YnZpZXc6dmlld107CisgICAgW1t3aW5k b3cuZ2V0KCkgY29udGVudFZpZXddIGFkZFN1YnZpZXc6dmlld107CiAKICAgICBDR0Zsb2F0IHZp ZXdIZWlnaHQgPSB2aWV3LmJvdW5kcy5zaXplLmhlaWdodDsKIAogICAgIE5TUG9pbnQgcG9pbnRJ bnNpZGVTZWxlY3Rpb24gPSBOU01ha2VQb2ludCg1MCwgdmlld0hlaWdodCAtIDUwKTsKLSAgICBO U0V2ZW50ICptb3VzZUV2ZW50SW5zaWRlU2VsZWN0aW9uID0gW05TRXZlbnQgbW91c2VFdmVudFdp dGhUeXBlOk5TTGVmdE1vdXNlRG93biBsb2NhdGlvbjpwb2ludEluc2lkZVNlbGVjdGlvbiBtb2Rp ZmllckZsYWdzOjAgdGltZXN0YW1wOjAgd2luZG93TnVtYmVyOndpbmRvdy5nZXQoKS53aW5kb3dO dW1iZXIgY29udGV4dDpuaWwgZXZlbnROdW1iZXI6MCBjbGlja0NvdW50OjEgcHJlc3N1cmU6MV07 CisgICAgTlNFdmVudCAqbW91c2VFdmVudEluc2lkZVNlbGVjdGlvbiA9IFtOU0V2ZW50IG1vdXNl RXZlbnRXaXRoVHlwZTpOU0xlZnRNb3VzZURvd24gbG9jYXRpb246cG9pbnRJbnNpZGVTZWxlY3Rp b24gbW9kaWZpZXJGbGFnczowIHRpbWVzdGFtcDowIHdpbmRvd051bWJlcjpbd2luZG93LmdldCgp IHdpbmRvd051bWJlcl0gY29udGV4dDpuaWwgZXZlbnROdW1iZXI6MCBjbGlja0NvdW50OjEgcHJl c3N1cmU6MV07CiAgICAgRVhQRUNUX1RSVUUoW1t2aWV3IGhpdFRlc3Q6cG9pbnRJbnNpZGVTZWxl Y3Rpb25dIGFjY2VwdHNGaXJzdE1vdXNlOm1vdXNlRXZlbnRJbnNpZGVTZWxlY3Rpb25dKTsKIAog ICAgIE5TUG9pbnQgcG9pbnRPdXRzaWRlU2VsZWN0aW9uID0gTlNNYWtlUG9pbnQoNTAsIHZpZXdI ZWlnaHQgLSAxNTApOwotICAgIE5TRXZlbnQgKm1vdXNlRXZlbnRPdXRzaWRlU2VsZWN0aW9uID0g W05TRXZlbnQgbW91c2VFdmVudFdpdGhUeXBlOk5TTGVmdE1vdXNlRG93biBsb2NhdGlvbjpwb2lu dE91dHNpZGVTZWxlY3Rpb24gbW9kaWZpZXJGbGFnczowIHRpbWVzdGFtcDowIHdpbmRvd051bWJl cjp3aW5kb3cuZ2V0KCkud2luZG93TnVtYmVyIGNvbnRleHQ6bmlsIGV2ZW50TnVtYmVyOjAgY2xp Y2tDb3VudDoxIHByZXNzdXJlOjFdOworICAgIE5TRXZlbnQgKm1vdXNlRXZlbnRPdXRzaWRlU2Vs ZWN0aW9uID0gW05TRXZlbnQgbW91c2VFdmVudFdpdGhUeXBlOk5TTGVmdE1vdXNlRG93biBsb2Nh dGlvbjpwb2ludE91dHNpZGVTZWxlY3Rpb24gbW9kaWZpZXJGbGFnczowIHRpbWVzdGFtcDowIHdp bmRvd051bWJlcjpbd2luZG93LmdldCgpIHdpbmRvd051bWJlcl0gY29udGV4dDpuaWwgZXZlbnRO dW1iZXI6MCBjbGlja0NvdW50OjEgcHJlc3N1cmU6MV07CiAgICAgRVhQRUNUX0ZBTFNFKFtbdmll dyBoaXRUZXN0OnBvaW50SW5zaWRlU2VsZWN0aW9uXSBhY2NlcHRzRmlyc3RNb3VzZTptb3VzZUV2 ZW50T3V0c2lkZVNlbGVjdGlvbl0pOwogfQogCg== 149708 2012-06-27 01:57:08 -0700 2012-06-27 02:03:01 -0700 Patch bug-90055-20120627020159.patch text/plain 5560 rniwa SW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv VGhpcmRQYXJ0eS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMTMzMCkKKysrIFNvdXJjZS9UaGlyZFBh cnR5L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA2LTI3 ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEZpeCBnY2MgYnVp bGQgYWZ0ZXIgcjEyMTMwMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTAwNTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBc3N1bWUgUlRUSSBpcyBkaXNhYmxlZCBzbyB0aGF0IGd0ZXN0IGJ1aWxkcyB1bmRl ciBYQ29kZSAzLjIuNi4KKworICAgICAgICAqIGd0ZXN0L3hjb2RlL0NvbmZpZy9HZW5lcmFsLnhj Y29uZmlnOgorCiAyMDEyLTA0LTMwICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdh bGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBGaXggbWFrZSBkaXN0Y2hlY2suCkluZGV4 OiBTb3VyY2UvVGhpcmRQYXJ0eS9ndGVzdC94Y29kZS9Db25maWcvR2VuZXJhbC54Y2NvbmZpZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvVGhpcmRQYXJ0eS9ndGVzdC94Y29kZS9Db25maWcvR2VuZXJh bC54Y2NvbmZpZwkocmV2aXNpb24gMTIxMzAyKQorKysgU291cmNlL1RoaXJkUGFydHkvZ3Rlc3Qv eGNvZGUvQ29uZmlnL0dlbmVyYWwueGNjb25maWcJKHdvcmtpbmcgY29weSkKQEAgLTM2LDcgKzM2 LDcgQEAgQUxXQVlTX1NFQVJDSF9VU0VSX1BBVEhTID0gTk8KIC8vIFR1cm4gb24gcG9zaXRpb24g ZGVwZW5kZW50IGNvZGUgZm9yIG1vc3QgY2FzZXMgKG92ZXJyaWRkZW4gd2hlcmUgYXBwcm9wcmlh dGUpCiBHQ0NfRFlOQU1JQ19OT19QSUMgPSBZRVMKIAotR0NDX1BSRVBST0NFU1NPUl9ERUZJTklU SU9OUyA9ICQoR0NDX1BSRVBST0NFU1NPUl9ERUZJTklUSU9OUykgR1RFU1RfSEFTX1RSMV9UVVBM RT0wOworR0NDX1BSRVBST0NFU1NPUl9ERUZJTklUSU9OUyA9ICQoR0NDX1BSRVBST0NFU1NPUl9E RUZJTklUSU9OUykgR1RFU1RfSEFTX1RSMV9UVVBMRT0wIEdURVNUX0hBU19SVFRJPTA7CiAKIENM QU5HX0NYWF9MSUJSQVJZID0gJChDTEFOR19DWFhfTElCUkFSWV8kKFRBUkdFVF9NQUNfT1NfWF9W RVJTSU9OX01BSk9SKSk7CiBDTEFOR19DWFhfTElCUkFSWV8xMDYwID0gbGlic3RkYysrOwpAQCAt NzEsNiArNzEsNSBAQCBTREtST09UXzEwODBfMTA3MCA9IG1hY29zeDEwLjc7CiBTREtST09UXzEw OTBfMTA3MCA9IG1hY29zeDEwLjc7CiBTREtST09UXzEwOTBfMTA4MCA9IG1hY29zeDEwLjg7CiAK LQogLy8gVkVSU0lPTklORyBCVUlMRCBTRVRUSU5HUyAodXNlZCBpbiBJbmZvLnBsaXN0KQogR1RF U1RfVkVSU0lPTklORk9fQUJPVVQgPSAgwqkgMjAwOCBHb29nbGUgSW5jLgpJbmRleDogVG9vbHMv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTIxMzI5 KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIw MTItMDYtMjcgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4 IGdjYyBidWlsZCBhZnRlciByMTIxMzAyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05MDA1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFzc3VtZSBSVFRJIGlzIGFsd2F5cyBkaXNhYmxlZCBzbyB0aGF0IGd0 ZXN0IGJ1aWxkcyBvbiBYQ29kZSAzLjIuNi4KKworICAgICAgICBJdCBhcHBlYXJzIHRoYXQgZ2Nj IGRvZXNuJ3QgbGlrZSB3aW5kb3cuZ2V0KCkuKiBpbnNpZGUgYSB0ZW1wbGF0ZSBzbyByZXBsYWNl IHRoYXQgYnkgW3dpbmRvdy5nZXQoKSAqXSBpbnN0ZWFkLgorCisgICAgICAgICogVGVzdFdlYktp dEFQSS9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnOgorICAgICAgICAqIFRlc3RXZWJLaXRB UEkvVGVzdHMvbWFjL0FjY2VwdHNGaXJzdE1vdXNlLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQ STo6QWNjZXB0c0ZpcnN0TW91c2U6OnJ1blRlc3QpOgorCiAyMDEyLTA2LTI3ICBDc2FiYSBPc3p0 cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIG1hc3Rlci5jZmcgdW5p dHRlc3QgdG8gaGVscCBtaWdyYXRpb24gLSBwYXNzIEJ1aWxkU3RlcCBpbnN0YW5jZXMgaW5zdGVh ZCBvZiBCdWlsZFN0ZXAgc3ViY2xhc3NlcwpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9Db25m aWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRB UEkvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZwkocmV2aXNpb24gMTIxMzAyKQorKysgVG9v bHMvVGVzdFdlYktpdEFQSS9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnCSh3b3JraW5nIGNv cHkpCkBAIC0yNiw3ICsyNiw3IEBACiBDTEFOR19XQVJOX0NYWDBYX0VYVEVOU0lPTlMgPSBOTzsK IEhFQURFUl9TRUFSQ0hfUEFUSFMgPSAke0JVSUxUX1BST0RVQ1RTX0RJUn0vdXNyL2xvY2FsL2lu Y2x1ZGUgJChXRUJDT1JFX1BSSVZBVEVfSEVBREVSU19ESVIpL0ZvcndhcmRpbmdIZWFkZXJzICQo V0VCQ09SRV9QUklWQVRFX0hFQURFUlNfRElSKS9pY3U7CiBGUkFNRVdPUktfU0VBUkNIX1BBVEhT ID0gJChTWVNURU1fTElCUkFSWV9ESVIpL0ZyYW1ld29ya3MvUXVhcnR6LmZyYW1ld29yay9GcmFt ZXdvcmtzICQoU1lTVEVNX0xJQlJBUllfRElSKS9GcmFtZXdvcmtzL0FwcGxpY2F0aW9uU2Vydmlj ZXMuZnJhbWV3b3JrL0ZyYW1ld29ya3MgJChTWVNURU1fTElCUkFSWV9ESVIpL0ZyYW1ld29ya3Mv Q29yZVNlcnZpY2VzLmZyYW1ld29yay9GcmFtZXdvcmtzOwotR0NDX1BSRVBST0NFU1NPUl9ERUZJ TklUSU9OUyA9ICQoREVCVUdfREVGSU5FUykgRU5BQkxFX0RBU0hCT0FSRF9TVVBQT1JUIFdFQktJ VF9WRVJTSU9OX01JTl9SRVFVSVJFRD1XRUJLSVRfVkVSU0lPTl9MQVRFU1QgR1RFU1RfSEFTX1RS MV9UVVBMRT0wOworR0NDX1BSRVBST0NFU1NPUl9ERUZJTklUSU9OUyA9ICQoREVCVUdfREVGSU5F UykgRU5BQkxFX0RBU0hCT0FSRF9TVVBQT1JUIFdFQktJVF9WRVJTSU9OX01JTl9SRVFVSVJFRD1X RUJLSVRfVkVSU0lPTl9MQVRFU1QgR1RFU1RfSEFTX1RSMV9UVVBMRT0wIEdURVNUX0hBU19SVFRJ PTA7CiBERUJVR19JTkZPUk1BVElPTl9GT1JNQVQgPSBkd2FyZi13aXRoLWRzeW07CiBQUkVCSU5E SU5HID0gTk8KIEdDQ19DX0xBTkdVQUdFX1NUQU5EQVJEID0gZ251OTkKSW5kZXg6IFRvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvbWFjL0FjY2VwdHNGaXJzdE1vdXNlLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL0FjY2VwdHNGaXJzdE1vdXNlLm1tCShyZXZp c2lvbiAxMjEzMDIpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9BY2NlcHRzRmly c3RNb3VzZS5tbQkod29ya2luZyBjb3B5KQpAQCAtNDgsMTYgKzQ4LDE2IEBAIHRlbXBsYXRlIDx0 eXBlbmFtZSBWaWV3Pgogdm9pZCBBY2NlcHRzRmlyc3RNb3VzZTo6cnVuVGVzdChWaWV3IHZpZXcp CiB7CiAgICAgUmV0YWluUHRyPE5TV2luZG93PiB3aW5kb3coQWRvcHROUywgW1tOU1dpbmRvdyBh bGxvY10gaW5pdFdpdGhDb250ZW50UmVjdDp2aWV3LmZyYW1lIHN0eWxlTWFzazpOU0JvcmRlcmxl c3NXaW5kb3dNYXNrIGJhY2tpbmc6TlNCYWNraW5nU3RvcmVCdWZmZXJlZCBkZWZlcjpZRVNdKTsK LSAgICBbd2luZG93LmdldCgpLmNvbnRlbnRWaWV3IGFkZFN1YnZpZXc6dmlld107CisgICAgW1t3 aW5kb3cuZ2V0KCkgY29udGVudFZpZXddIGFkZFN1YnZpZXc6dmlld107CiAKICAgICBDR0Zsb2F0 IHZpZXdIZWlnaHQgPSB2aWV3LmJvdW5kcy5zaXplLmhlaWdodDsKIAogICAgIE5TUG9pbnQgcG9p bnRJbnNpZGVTZWxlY3Rpb24gPSBOU01ha2VQb2ludCg1MCwgdmlld0hlaWdodCAtIDUwKTsKLSAg ICBOU0V2ZW50ICptb3VzZUV2ZW50SW5zaWRlU2VsZWN0aW9uID0gW05TRXZlbnQgbW91c2VFdmVu dFdpdGhUeXBlOk5TTGVmdE1vdXNlRG93biBsb2NhdGlvbjpwb2ludEluc2lkZVNlbGVjdGlvbiBt b2RpZmllckZsYWdzOjAgdGltZXN0YW1wOjAgd2luZG93TnVtYmVyOndpbmRvdy5nZXQoKS53aW5k b3dOdW1iZXIgY29udGV4dDpuaWwgZXZlbnROdW1iZXI6MCBjbGlja0NvdW50OjEgcHJlc3N1cmU6 MV07CisgICAgTlNFdmVudCAqbW91c2VFdmVudEluc2lkZVNlbGVjdGlvbiA9IFtOU0V2ZW50IG1v dXNlRXZlbnRXaXRoVHlwZTpOU0xlZnRNb3VzZURvd24gbG9jYXRpb246cG9pbnRJbnNpZGVTZWxl Y3Rpb24gbW9kaWZpZXJGbGFnczowIHRpbWVzdGFtcDowIHdpbmRvd051bWJlcjpbd2luZG93Lmdl dCgpIHdpbmRvd051bWJlcl0gY29udGV4dDpuaWwgZXZlbnROdW1iZXI6MCBjbGlja0NvdW50OjEg cHJlc3N1cmU6MV07CiAgICAgRVhQRUNUX1RSVUUoW1t2aWV3IGhpdFRlc3Q6cG9pbnRJbnNpZGVT ZWxlY3Rpb25dIGFjY2VwdHNGaXJzdE1vdXNlOm1vdXNlRXZlbnRJbnNpZGVTZWxlY3Rpb25dKTsK IAogICAgIE5TUG9pbnQgcG9pbnRPdXRzaWRlU2VsZWN0aW9uID0gTlNNYWtlUG9pbnQoNTAsIHZp ZXdIZWlnaHQgLSAxNTApOwotICAgIE5TRXZlbnQgKm1vdXNlRXZlbnRPdXRzaWRlU2VsZWN0aW9u ID0gW05TRXZlbnQgbW91c2VFdmVudFdpdGhUeXBlOk5TTGVmdE1vdXNlRG93biBsb2NhdGlvbjpw b2ludE91dHNpZGVTZWxlY3Rpb24gbW9kaWZpZXJGbGFnczowIHRpbWVzdGFtcDowIHdpbmRvd051 bWJlcjp3aW5kb3cuZ2V0KCkud2luZG93TnVtYmVyIGNvbnRleHQ6bmlsIGV2ZW50TnVtYmVyOjAg Y2xpY2tDb3VudDoxIHByZXNzdXJlOjFdOworICAgIE5TRXZlbnQgKm1vdXNlRXZlbnRPdXRzaWRl U2VsZWN0aW9uID0gW05TRXZlbnQgbW91c2VFdmVudFdpdGhUeXBlOk5TTGVmdE1vdXNlRG93biBs b2NhdGlvbjpwb2ludE91dHNpZGVTZWxlY3Rpb24gbW9kaWZpZXJGbGFnczowIHRpbWVzdGFtcDow IHdpbmRvd051bWJlcjpbd2luZG93LmdldCgpIHdpbmRvd051bWJlcl0gY29udGV4dDpuaWwgZXZl bnROdW1iZXI6MCBjbGlja0NvdW50OjEgcHJlc3N1cmU6MV07CiAgICAgRVhQRUNUX0ZBTFNFKFtb dmlldyBoaXRUZXN0OnBvaW50SW5zaWRlU2VsZWN0aW9uXSBhY2NlcHRzRmlyc3RNb3VzZTptb3Vz ZUV2ZW50T3V0c2lkZVNlbGVjdGlvbl0pOwogfQogCg==