101851 2012-11-10 14:41:19 -0800 Including <CoreText/CoreText.h> breaks the chromium/mac build. 2012-11-10 15:36:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 101799 1 webkit.review.bot mkwst ap mitz mkwst oldest_to_newest 763732 0 webkit.review.bot 2012-11-10 14:41:19 -0800 http://trac.webkit.org/changeset/134146 broke the build: Including <CoreText/CoreText.h> breaks the chromium/mac build. (Requested by mkwst on #webkit). This is an automatic bug report generated by the sheriff-bot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests case pain. "Only you can prevent forest fires." -- Smokey the Bear 763734 1 173476 webkit.review.bot 2012-11-10 14:41:57 -0800 Created attachment 173476 ROLLOUT of r134146 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 763737 2 173476 mitz 2012-11-10 14:47:53 -0800 Comment on attachment 173476 ROLLOUT of r134146 Please post a sensible patch, such as one reverting only the #include directive. 763738 3 mkwst 2012-11-10 14:54:51 -0800 Hi! I did look for you on #webkit before requesting the rollout, and chromium/mac hasn't built in the last ~20 hours. I don't think rolling the patch out would have been unreasonable. (In reply to comment #2) > (From update of attachment 173476 [details]) > Please post a sensible patch, such as one reverting only the #include directive. If I knew what I was doing in this area of the code, I would have. :) I got a pointer on the channel in a direction that looks good, though. If it ends up working, I'll post a patch here. 763739 4 173478 mkwst 2012-11-10 15:01:18 -0800 Created attachment 173478 Patch 763740 5 mkwst 2012-11-10 15:02:31 -0800 (In reply to comment #4) > Created an attachment (id=173478) [details] > Patch This compiles locally, but it's copy/paste cargo-culting. Hopefully it's also correct. :) 763741 6 173478 mitz 2012-11-10 15:02:45 -0800 Comment on attachment 173478 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173478&action=review > Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp:34 > +#if PLATFORM(WX) || PLATFORM(CHROMIUM) > +#include <ApplicationServices/ApplicationServices.h> > +#else > #include <CoreText/CoreText.h> > +#endif This is not necessary. ApplicationServices.h can be used everywhere. 763743 7 mkwst 2012-11-10 15:06:10 -0800 (In reply to comment #6) > (From update of attachment 173478 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=173478&action=review > > > Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp:34 > > +#if PLATFORM(WX) || PLATFORM(CHROMIUM) > > +#include <ApplicationServices/ApplicationServices.h> > > +#else > > #include <CoreText/CoreText.h> > > +#endif > > This is not necessary. ApplicationServices.h can be used everywhere. I've copied it out of http://trac.webkit.org/browser/trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm. I'll fix that file as well. 763744 8 173479 mkwst 2012-11-10 15:12:03 -0800 Created attachment 173479 Patch 763749 9 173479 webkit.review.bot 2012-11-10 15:36:35 -0800 Comment on attachment 173479 Patch Clearing flags on attachment: 173479 Committed r134165: <http://trac.webkit.org/changeset/134165> 763750 10 webkit.review.bot 2012-11-10 15:36:40 -0800 All reviewed patches have been landed. Closing bug. 173476 2012-11-10 14:41:57 -0800 2012-11-10 15:01:15 -0800 ROLLOUT of r134146 bug-101851-20121110224818.patch text/plain 8015 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGE5ZGYzZjg3YWY0N2Vk MDQzMTY3YjY0NjFiYjg2ZjkzNTBkZDg5MC4uNDg0MDJmZDI5OTI5NDIzMjU2ZTBhYWIxZjhjZTE4 OGU5YTZkYjQ3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTExLTEwICBTaGVy aWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KKworICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByMTM0MTQ2LgorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3Jn L2NoYW5nZXNldC8xMzQxNDYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwMTg1MQorCisgICAgICAgIEluY2x1ZGluZyA8Q29yZVRleHQvQ29yZVRleHQu aD4gYnJlYWtzIHRoZSBjaHJvbWl1bS9tYWMgYnVpbGQuCisgICAgICAgIChSZXF1ZXN0ZWQgYnkg bWt3c3Qgb24gI3dlYmtpdCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvU2lt cGxlRm9udERhdGFDb3JlVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0 YTo6Z2V0Q0ZTdHJpbmdBdHRyaWJ1dGVzKToKKwogMjAxMi0xMS0xMCAgQW5kcmVhcyBLbGluZyAg PGtsaW5nQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRG9uJ3QgZGV0YWNoIGZyb20gc2hhcmVkIEVs ZW1lbnRBdHRyaWJ1dGVEYXRhIHdoZW4gb3ZlcndyaXRpbmcgYXR0cmlidXRlIHdpdGggaWRlbnRp Y2FsIHZhbHVlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv bWFjL1NpbXBsZUZvbnREYXRhQ29yZVRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhQ29yZVRleHQuY3BwCmluZGV4IGFhZTg3OGI4ZWZk NWY4ODA3YmE4OTE3MGIxMjZlN2JhOGQyMTBiZGMuLjBiNzEzMzQ3ZjYwNDYzNTU0OWU1MGQ1NjM2 NTIxOGIyMzQ0MjZhY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL21hYy9TaW1wbGVGb250RGF0YUNvcmVUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFDb3JlVGV4dC5jcHAKQEAgLTEsMzMg KzEsNDEgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDUsIDIwMDYsIDIwMTIgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA1LCAyMDA2IEFwcGxl IENvbXB1dGVyLCBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAy MDA2IEFsZXhleSBQcm9za3VyeWFrb3YKICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwog ICogYXJlIG1ldDoKLSAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJl dGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlv bnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICog ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyIGluIHRoZQotICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxz IHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KICAqCi0gKiBUSElTIFNPRlRXQVJFIElT IFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCi0g KiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywKLSAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklM SVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSAqIFBVUlBPU0UgQVJFIERJU0NMQUlN RUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwotICog QkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwg RVhFTVBMQVJZLCBPUgotICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKLSAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VS VklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUwotICogSU5U RVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFks IFdIRVRIRVIgSU4KLSAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNM VURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCi0gKiBBUklTSU5HIElOIEFOWSBXQVkgT1VU IE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCi0gKiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKiAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNv dXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuIAor ICogMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUgY29weXJpZ2h0CisgKiAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uIAor ICogMy4gIE5laXRoZXIgdGhlIG5hbWUgb2YgQXBwbGUgQ29tcHV0ZXIsIEluYy4gKCJBcHBsZSIp IG5vciB0aGUgbmFtZXMgb2YKKyAqICAgICBpdHMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRv IGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkCisgKiAgICAgZnJvbSB0aGlzIHNv ZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLiAKKyAqCisg KiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIEFORCBJVFMgQ09OVFJJQlVUT1JT ICJBUyBJUyIgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorICogV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQor ICogRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgT1IgSVRTIENPTlRSSUJVVE9S UyBCRSBMSUFCTEUgRk9SIEFOWQorICogRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BF Q0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMKKyAqIChJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsKKyAqIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORAorICogT04gQU5ZIFRIRU9SWSBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAq IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRSBPRgorICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi0jaW5jbHVkZSAiY29uZmlnLmgi Ci0jaW5jbHVkZSAiU2ltcGxlRm9udERhdGEuaCIKKyNpbXBvcnQgImNvbmZpZy5oIgorI2ltcG9y dCAiU2ltcGxlRm9udERhdGEuaCIKKworI2ltcG9ydCAiRm9udC5oIgorI2ltcG9ydCAiRm9udENh Y2hlLmgiCisjaW1wb3J0ICJGb250RGVzY3JpcHRpb24uaCIKKyNpbXBvcnQgPEFwcGxpY2F0aW9u U2VydmljZXMvQXBwbGljYXRpb25TZXJ2aWNlcy5oPgogCi0jaW5jbHVkZSA8Q29yZVRleHQvQ29y ZVRleHQuaD4KK3VzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApA QCAtMzgsMjggKzQ2LDMzIEBAIENGRGljdGlvbmFyeVJlZiBTaW1wbGVGb250RGF0YTo6Z2V0Q0ZT dHJpbmdBdHRyaWJ1dGVzKFR5cGVzZXR0aW5nRmVhdHVyZXMgdHlwZXNlCiAgICAgUmV0YWluUHRy PENGRGljdGlvbmFyeVJlZj4mIGF0dHJpYnV0ZXNEaWN0aW9uYXJ5ID0gYWRkUmVzdWx0Lml0ZXJh dG9yLT52YWx1ZTsKICAgICBpZiAoIWFkZFJlc3VsdC5pc05ld0VudHJ5KQogICAgICAgICByZXR1 cm4gYXR0cmlidXRlc0RpY3Rpb25hcnkuZ2V0KCk7CisgICAgCisgICAgYm9vbCB0cmVhdExpbmVB c1ZlcnRpY2FsID0gb3JpZW50YXRpb24gPT0gVmVydGljYWw7CiAKLSAgICBhdHRyaWJ1dGVzRGlj dGlvbmFyeS5hZG9wdENGKENGRGljdGlvbmFyeUNyZWF0ZU11dGFibGUoa0NGQWxsb2NhdG9yRGVm YXVsdCwgNCwgJmtDRkNvcHlTdHJpbmdEaWN0aW9uYXJ5S2V5Q2FsbEJhY2tzLCAma0NGVHlwZURp Y3Rpb25hcnlWYWx1ZUNhbGxCYWNrcykpOwotICAgIENGTXV0YWJsZURpY3Rpb25hcnlSZWYgbXV0 YWJsZUF0dHJpYnV0ZXMgPSAoQ0ZNdXRhYmxlRGljdGlvbmFyeVJlZilhdHRyaWJ1dGVzRGljdGlv bmFyeS5nZXQoKTsKKyAgICBib29sIGFsbG93TGlnYXR1cmVzID0gKCF0cmVhdExpbmVBc1ZlcnRp Y2FsICYmIHBsYXRmb3JtRGF0YSgpLmFsbG93c0xpZ2F0dXJlcygpKSB8fCAodHlwZXNldHRpbmdG ZWF0dXJlcyAmIExpZ2F0dXJlcyk7CiAKLSAgICBDRkRpY3Rpb25hcnlTZXRWYWx1ZShtdXRhYmxl QXR0cmlidXRlcywga0NURm9udEF0dHJpYnV0ZU5hbWUsIHBsYXRmb3JtRGF0YSgpLmN0Rm9udCgp KTsKKyAgICBzdGF0aWMgY29uc3QgaW50IGxpZ2F0dXJlc05vdEFsbG93ZWRWYWx1ZSA9IDA7Cisg ICAgc3RhdGljIENGTnVtYmVyUmVmIGxpZ2F0dXJlc05vdEFsbG93ZWQgPSBDRk51bWJlckNyZWF0 ZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBrQ0ZOdW1iZXJJbnRUeXBlLCAmbGlnYXR1cmVzTm90QWxs b3dlZFZhbHVlKTsKIAotICAgIGlmICghKHR5cGVzZXR0aW5nRmVhdHVyZXMgJiBLZXJuaW5nKSkg ewotICAgICAgICBjb25zdCBmbG9hdCB6ZXJvID0gMDsKLSAgICAgICAgc3RhdGljIENGTnVtYmVy UmVmIHplcm9LZXJuaW5nVmFsdWUgPSBDRk51bWJlckNyZWF0ZShrQ0ZBbGxvY2F0b3JEZWZhdWx0 LCBrQ0ZOdW1iZXJGbG9hdFR5cGUsICZ6ZXJvKTsKLSAgICAgICAgQ0ZEaWN0aW9uYXJ5U2V0VmFs dWUobXV0YWJsZUF0dHJpYnV0ZXMsIGtDVEtlcm5BdHRyaWJ1dGVOYW1lLCB6ZXJvS2VybmluZ1Zh bHVlKTsKLSAgICB9CisgICAgc3RhdGljIGNvbnN0IGludCBsaWdhdHVyZXNBbGxvd2VkVmFsdWUg PSAxOworICAgIHN0YXRpYyBDRk51bWJlclJlZiBsaWdhdHVyZXNBbGxvd2VkID0gQ0ZOdW1iZXJD cmVhdGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwga0NGTnVtYmVySW50VHlwZSwgJmxpZ2F0dXJlc0Fs bG93ZWRWYWx1ZSk7CiAKLSAgICBib29sIGFsbG93TGlnYXR1cmVzID0gKG9yaWVudGF0aW9uID09 IEhvcml6b250YWwgJiYgcGxhdGZvcm1EYXRhKCkuYWxsb3dzTGlnYXR1cmVzKCkpIHx8ICh0eXBl c2V0dGluZ0ZlYXR1cmVzICYgTGlnYXR1cmVzKTsKLSAgICBpZiAoIWFsbG93TGlnYXR1cmVzKSB7 Ci0gICAgICAgIGNvbnN0IGludCB6ZXJvID0gMDsKLSAgICAgICAgc3RhdGljIENGTnVtYmVyUmVm IGVzc2VudGlhbExpZ2F0dXJlc1ZhbHVlID0gQ0ZOdW1iZXJDcmVhdGUoa0NGQWxsb2NhdG9yRGVm YXVsdCwga0NGTnVtYmVySW50VHlwZSwgJnplcm8pOwotICAgICAgICBDRkRpY3Rpb25hcnlTZXRW YWx1ZShtdXRhYmxlQXR0cmlidXRlcywga0NUTGlnYXR1cmVBdHRyaWJ1dGVOYW1lLCBlc3NlbnRp YWxMaWdhdHVyZXNWYWx1ZSk7CisgICAgaWYgKCEodHlwZXNldHRpbmdGZWF0dXJlcyAmIEtlcm5p bmcpKSB7CisgICAgICAgIHN0YXRpYyBjb25zdCBmbG9hdCBrZXJuaW5nQWRqdXN0bWVudFZhbHVl ID0gMDsKKyAgICAgICAgc3RhdGljIENGTnVtYmVyUmVmIGtlcm5pbmdBZGp1c3RtZW50ID0gQ0ZO dW1iZXJDcmVhdGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwga0NGTnVtYmVyRmxvYXRUeXBlLCAma2Vy bmluZ0FkanVzdG1lbnRWYWx1ZSk7CisgICAgICAgIHN0YXRpYyBjb25zdCB2b2lkKiBrZXlzV2l0 aEtlcm5pbmdEaXNhYmxlZFtdID0geyBrQ1RGb250QXR0cmlidXRlTmFtZSwga0NUS2VybkF0dHJp YnV0ZU5hbWUsIGtDVExpZ2F0dXJlQXR0cmlidXRlTmFtZSwga0NUVmVydGljYWxGb3Jtc0F0dHJp YnV0ZU5hbWUgfTsKKyAgICAgICAgY29uc3Qgdm9pZCogdmFsdWVzV2l0aEtlcm5pbmdEaXNhYmxl ZFtdID0geyBwbGF0Zm9ybURhdGEoKS5jdEZvbnQoKSwga2VybmluZ0FkanVzdG1lbnQsIGFsbG93 TGlnYXR1cmVzCisgICAgICAgICAgICA/IGxpZ2F0dXJlc0FsbG93ZWQgOiBsaWdhdHVyZXNOb3RB bGxvd2VkLCB0cmVhdExpbmVBc1ZlcnRpY2FsID8ga0NGQm9vbGVhblRydWUgOiBrQ0ZCb29sZWFu RmFsc2UgfTsKKyAgICAgICAgYXR0cmlidXRlc0RpY3Rpb25hcnkuYWRvcHRDRihDRkRpY3Rpb25h cnlDcmVhdGUoMCwga2V5c1dpdGhLZXJuaW5nRGlzYWJsZWQsIHZhbHVlc1dpdGhLZXJuaW5nRGlz YWJsZWQsCisgICAgICAgICAgICBXVEZfQVJSQVlfTEVOR1RIKGtleXNXaXRoS2VybmluZ0Rpc2Fi bGVkKSwgJmtDRkNvcHlTdHJpbmdEaWN0aW9uYXJ5S2V5Q2FsbEJhY2tzLCAma0NGVHlwZURpY3Rp b25hcnlWYWx1ZUNhbGxCYWNrcykpOworICAgIH0gZWxzZSB7CisgICAgICAgIC8vIEJ5IG9taXR0 aW5nIHRoZSBrQ1RLZXJuQXR0cmlidXRlTmFtZSBhdHRyaWJ1dGUsIHdlIGdldCBDb3JlIFRleHQn cyBzdGFuZGFyZCBrZXJuaW5nLgorICAgICAgICBzdGF0aWMgY29uc3Qgdm9pZCoga2V5c1dpdGhL ZXJuaW5nRW5hYmxlZFtdID0geyBrQ1RGb250QXR0cmlidXRlTmFtZSwga0NUTGlnYXR1cmVBdHRy aWJ1dGVOYW1lLCBrQ1RWZXJ0aWNhbEZvcm1zQXR0cmlidXRlTmFtZSB9OworICAgICAgICBjb25z dCB2b2lkKiB2YWx1ZXNXaXRoS2VybmluZ0VuYWJsZWRbXSA9IHsgcGxhdGZvcm1EYXRhKCkuY3RG b250KCksIGFsbG93TGlnYXR1cmVzID8gbGlnYXR1cmVzQWxsb3dlZCA6IGxpZ2F0dXJlc05vdEFs bG93ZWQsIHRyZWF0TGluZUFzVmVydGljYWwgPyBrQ0ZCb29sZWFuVHJ1ZSA6IGtDRkJvb2xlYW5G YWxzZSB9OworICAgICAgICBhdHRyaWJ1dGVzRGljdGlvbmFyeS5hZG9wdENGKENGRGljdGlvbmFy eUNyZWF0ZSgwLCBrZXlzV2l0aEtlcm5pbmdFbmFibGVkLCB2YWx1ZXNXaXRoS2VybmluZ0VuYWJs ZWQsCisgICAgICAgICAgICBXVEZfQVJSQVlfTEVOR1RIKGtleXNXaXRoS2VybmluZ0VuYWJsZWQp LCAma0NGQ29weVN0cmluZ0RpY3Rpb25hcnlLZXlDYWxsQmFja3MsICZrQ0ZUeXBlRGljdGlvbmFy eVZhbHVlQ2FsbEJhY2tzKSk7CiAgICAgfQogCi0gICAgaWYgKG9yaWVudGF0aW9uID09IFZlcnRp Y2FsKQotICAgICAgICBDRkRpY3Rpb25hcnlTZXRWYWx1ZShtdXRhYmxlQXR0cmlidXRlcywga0NU VmVydGljYWxGb3Jtc0F0dHJpYnV0ZU5hbWUsIGtDRkJvb2xlYW5UcnVlKTsKLQogICAgIHJldHVy biBhdHRyaWJ1dGVzRGljdGlvbmFyeS5nZXQoKTsKIH0KIAo= 173478 2012-11-10 15:01:18 -0800 2012-11-10 15:11:59 -0800 Patch bug-101851-20121110235923.patch text/plain 1579 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc1ZTFlMGVjZThlNjlk ZTQ1NzM5OWEyYTNlOTY5OWEwNTgzMTdmYy4uMzcwOTBhZTc5MDY2OTFkNDY4ZDVhNDI3ZWUyYmYw ODFmZTZkOWEzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTExLTEwICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5jbHVkaW5nIDxDb3JlVGV4 dC9Db3JlVGV4dC5oPiBicmVha3MgdGhlIGNocm9taXVtL21hYyBidWlsZC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTg1MQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHIxMzQxNDYgaW50cm9kdWNlZCBp bmNsdXNpb24gb2YgJ0NvcmVUZXh0L0NvcmVUZXh0LmgnIGluCisgICAgICAgIFNpbXBsZUZvbnRE YXRhQ29yZVRleHQuY3BwLCB3aGljaCBicm9rZSB0aGUgY2hyb21pdW0vbWFjIGJ1aWxkLiBHcmVw cGluZworICAgICAgICBhcm91bmQsIGl0IGxvb2tzIGxpa2UgdGhpcyBuZWVkcyB0byBiZSBtb2Rp ZmllZCBvbiB0aGUgQ2hyb21pdW0gYW5kIFdYCisgICAgICAgIHBsYXRmb3JtcyB0byBpbmNsdWRl ICdBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaCcuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFDb3JlVGV4dC5jcHA6CisKIDIw MTItMTEtMTAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTWFjXSBHdWFyZCBXZWJDb3JlIFBhZ2VWaXNpYmlsaXR5IFN5bWJvbCBFeHBvcnQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0 YUNvcmVUZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1w bGVGb250RGF0YUNvcmVUZXh0LmNwcAppbmRleCBhYWU4NzhiOGVmZDVmODgwN2JhODkxNzBiMTI2 ZTdiYThkMjEwYmRjLi4zNTVhODJlNzBmYmQzZjllY2U1NzNlYjFjMzhmMjAwZjJiMTlhYzhjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvU2ltcGxlRm9u dERhdGFDb3JlVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv bWFjL1NpbXBsZUZvbnREYXRhQ29yZVRleHQuY3BwCkBAIC0yNyw3ICsyNywxMSBAQAogI2luY2x1 ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlNpbXBsZUZvbnREYXRhLmgiCiAKKyNpZiBQTEFURk9S TShXWCkgfHwgUExBVEZPUk0oQ0hST01JVU0pCisjaW5jbHVkZSA8QXBwbGljYXRpb25TZXJ2aWNl cy9BcHBsaWNhdGlvblNlcnZpY2VzLmg+CisjZWxzZQogI2luY2x1ZGUgPENvcmVUZXh0L0NvcmVU ZXh0Lmg+CisjZW5kaWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCg== 173479 2012-11-10 15:12:03 -0800 2012-11-10 15:36:35 -0800 Patch bug-101851-20121111001008.patch text/plain 2447 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc1ZTFlMGVjZThlNjlk ZTQ1NzM5OWEyYTNlOTY5OWEwNTgzMTdmYy4uMjBiNDE2ZmUwMzNiOGFiOTM2ODhlZjhkZWJkNWNl ZWE2MmQ4MTY1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTEwICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5jbHVkaW5nIDxDb3JlVGV4 dC9Db3JlVGV4dC5oPiBicmVha3MgdGhlIGNocm9taXVtL21hYyBidWlsZC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTg1MQorCisgICAgICAgIFJl dmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCisKKyAgICAgICAgcjEzNDE0NiBpbnRyb2R1Y2VkIGlu Y2x1c2lvbiBvZiAnQ29yZVRleHQvQ29yZVRleHQuaCcgaW4KKyAgICAgICAgU2ltcGxlRm9udERh dGFDb3JlVGV4dC5jcHAsIHdoaWNoIGJyb2tlIHRoZSBjaHJvbWl1bS9tYWMgYnVpbGQuIEdyZXBw aW5nCisgICAgICAgIGFyb3VuZCwgaXQgbG9va3MgbGlrZSB0aGlzIG5lZWRzIHRvIGJlIG1vZGlm aWVkIHRvIGluY2x1ZGUKKyAgICAgICAgJ0FwcGxpY2F0aW9uU2VydmljZXMvQXBwbGljYXRpb25T ZXJ2aWNlcy5oJy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1wbGVGb250 RGF0YUNvcmVUZXh0LmNwcDoKKyAgICAgICAgICAgIERyb3AgJ0NvcmVUZXh0LmgnIGluIGZhdm9y IG9mICdBcHBsaWNhdGlvblNlcnZpY2VzLmgnLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L21hYy9Db21wbGV4VGV4dENvbnRyb2xsZXJDb3JlVGV4dC5tbToKKyAgICAgICAgICAgIERyb3Ag dGhlIHBsYXRmb3JtLXNwZWNpZmljICcjaWYnIGxvZ2ljOyBqdXN0IGluY2x1ZGUgJ0FwcGxpY2F0 aW9uU2VydmljZXMuaCcuCisKIDIwMTItMTEtMTAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJv QGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBHdWFyZCBXZWJDb3JlIFBhZ2VWaXNpYmlsaXR5 IFN5bWJvbCBFeHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL21hYy9Db21wbGV4VGV4dENvbnRyb2xsZXJDb3JlVGV4dC5tbSBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21wbGV4VGV4dENvbnRyb2xsZXJDb3JlVGV4dC5tbQpp bmRleCA0Y2I4NzZjMzY1ZWM5ZGQ3MTYwYTFkMmZkZTA5ZTdmMzJmMDBiYWM5Li42MjUwOTY4ZTc3 NDM2M2I0YzVjMTA0NDY2MjRlOTA3MWUzOWRlZWU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxleFRleHRDb250cm9sbGVyQ29yZVRleHQubW0K KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29u dHJvbGxlckNvcmVUZXh0Lm1tCkBAIC0zMSwxMSArMzEsNyBAQAogI2luY2x1ZGUgIlRleHRSdW4u aCIKICNpbmNsdWRlICJXZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmgiCiAKLSNpZiBQTEFURk9STShX WCkgfHwgUExBVEZPUk0oQ0hST01JVU0pCiAjaW5jbHVkZSA8QXBwbGljYXRpb25TZXJ2aWNlcy9B cHBsaWNhdGlvblNlcnZpY2VzLmg+Ci0jZWxzZQotI2luY2x1ZGUgPENvcmVUZXh0L0NvcmVUZXh0 Lmg+Ci0jZW5kaWYKIAogI2lmICFQTEFURk9STShJT1MpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9N SU5fUkVRVUlSRUQgPT0gMTA1MAogLy8gVGhlIGZvbGxvd2luZyBzeW1ib2xzIGFyZSBTUEkgaW4g MTAuNS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9T aW1wbGVGb250RGF0YUNvcmVUZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL21hYy9TaW1wbGVGb250RGF0YUNvcmVUZXh0LmNwcAppbmRleCBhYWU4NzhiOGVmZDVmODgw N2JhODkxNzBiMTI2ZTdiYThkMjEwYmRjLi42YzJjMTE3MjdhNTgzZGEyODcwZjcwMDNiMDQxY2M1 NWUwNmMxNDQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9t YWMvU2ltcGxlRm9udERhdGFDb3JlVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhQ29yZVRleHQuY3BwCkBAIC0yNyw3ICsyNyw3 IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU2ltcGxlRm9udERhdGEuaCIKIAot I2luY2x1ZGUgPENvcmVUZXh0L0NvcmVUZXh0Lmg+CisjaW5jbHVkZSA8QXBwbGljYXRpb25TZXJ2 aWNlcy9BcHBsaWNhdGlvblNlcnZpY2VzLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAo=