20662 2008-09-05 05:34:31 -0700 debian patches for webkit 1.0.1 (their versioning) 2012-02-20 15:09:39 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED DUPLICATE 19775 Gtk P2 Normal --- 19775 19910 1 lkcl webkit-unassigned alp ap eric gustavo jmalonzo mh+webkit oldest_to_newest 90258 0 lkcl 2008-09-05 05:34:31 -0700 folks, hi, debian has some strange patches for ARM and other stuff, which i thought best to attach to make sure none of them have been missed. they're quite small and trivial but highly significant for various architectures. 90259 1 23189 lkcl 2008-09-05 05:34:56 -0700 Created attachment 23189 debian 1.0.1 downstream patches 90493 2 ap 2008-09-08 03:47:56 -0700 It's good to have these available for reference, but to get them landed, we'd obviously need to split and categorize the changes, write ChangeLogs etc. 96652 3 jmalonzo 2008-10-25 00:26:58 -0700 (CC'ing Mike Hommey) Mike: do you know which ones should go upstream and which ones shouldn't? 96654 4 mh+webkit 2008-10-25 00:45:34 -0700 (In reply to comment #3) > (CC'ing Mike Hommey) > > Mike: do you know which ones should go upstream and which ones shouldn't? Most of it is already in another bug, IIRC. I'll try to find out where it is. Anyways, I'm currently merging current trunk in and updating the whole thing, so I'll keep you posted. 96662 5 mh+webkit 2008-10-25 02:30:21 -0700 So, to take it down: debian/control is debian specific WebCore/platform/text/AtomicString.cpp, WebCore/platform/text/StringHash.h, JavaScriptCore/wtf/Platform.h, JavaScriptCore/wtf/ListHashSet.h, JavaScriptCore/wtf/Vector.h, JavaScriptCore/wtf/FastMalloc.cpp: These are in bug #19775. While the fix is okay for debian, it is not for webkit without rework WebCore/platform/graphics/BitmapImage.cpp, WebCore/platform/graphics/cg/ImageCG.cpp, WebCore/platform/graphics/cairo/ImageCairo.cpp: Cherry-pick from svn revision 34625. WebCore/page/gtk/AXObjectCacheAtk.cpp: Fix specific to 1.0.1 release tarball. See bug #19910 142427 6 eric 2009-08-24 15:13:58 -0700 I noticed this bug this afternoon. Is there still stuff to do here or should we close this? It's been a year since the last activity. 142508 7 38525 mh+webkit 2009-08-24 22:10:34 -0700 Created attachment 38525 debian 1.1.13 downstream patch We still use a part of the patch that was uploaded here. Here are the changes we have against 1.1.13 released yesterday. 142509 8 mh+webkit 2009-08-24 22:13:51 -0700 Note this patch is roughly what is in bug 19775. 142539 9 eric 2009-08-25 00:31:55 -0700 Ok. That will need to be split up into separate patches and ChangeLogs added of course. :) 142641 10 mh+webkit 2009-08-25 10:55:10 -0700 (In reply to comment #9) > Ok. That will need to be split up into separate patches and ChangeLogs added > of course. :) If I'm not mistaken, the whole patch is to address bug 19775, though some changes in the webkit code made one of the changes affect arm as well. 560394 11 gustavo 2012-02-20 15:09:39 -0800 This bug is actually obsolete for a while. We no longer carry most of these changes. *** This bug has been marked as a duplicate of bug 19775 *** 23189 2008-09-05 05:34:56 -0700 2009-08-24 22:10:34 -0700 debian 1.0.1 downstream patches f text/plain 8097 lkcl LS0tIHdlYmtpdC0xLjAuMS5vcmlnL0phdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCisrKyB3 ZWJraXQtMS4wLjEvSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmgKQEAgLTE3Miw2ICsxNzIs MjMgQEAKICNkZWZpbmUgV1RGX1BMQVRGT1JNX1g4Nl82NCAxCiAjZW5kaWYKIAorLyogUExBVEZP Uk0oU1BBUkMpICovCisjaWYgICBkZWZpbmVkKF9fc3BhcmNfXykgXAorICAgfHwgZGVmaW5lZChf X3NwYXJjKQorI2RlZmluZSBXVEZfUExBVEZPUk1fU1BBUkMgMQorI2RlZmluZSBXVEZfUExBVEZP Uk1fQklHX0VORElBTiAxCisjZW5kaWYKKworLyogRm9yIHVuZGVmaW5lZCBwbGF0Zm9ybXMgKi8K KyNpZiAhZGVmaW5lZChXVEZfUExBVEZPUk1fQklHX0VORElBTikgJiYgIWRlZmluZWQoV1RGX1BM QVRGT1JNX01JRERMRV9FTkRJQU4pCisjaW5jbHVkZSA8c3lzL3BhcmFtLmg+CisjaWYgX19CWVRF X09SREVSID09IF9fQklHX0VORElBTgorI2RlZmluZSBXVEZfUExBVEZPUk1fQklHX0VORElBTiAx CisjZWxpZiAgX19CWVRFX09SREVSID09IF9fUERQX0VORElBTgorI2RlZmluZSBXVEZfUExBVEZP Uk1fTUlERExFX0VORElBTiAxCisjZW5kaWYKKyNlbmRpZgorCiAvKiBDb21waWxlciAqLwogCiAv KiBDT01QSUxFUihNU1ZDKSAqLwotLS0gd2Via2l0LTEuMC4xLm9yaWcvSmF2YVNjcmlwdENvcmUv d3RmL0xpc3RIYXNoU2V0LmgKKysrIHdlYmtpdC0xLjAuMS9KYXZhU2NyaXB0Q29yZS93dGYvTGlz dEhhc2hTZXQuaApAQCAtMTIyLDcgKzEyMiw3IEBACiAgICAgICAgICAgICA6IG1fZnJlZUxpc3Qo cG9vbCgpKQogICAgICAgICAgICAgLCBtX2lzRG9uZVdpdGhJbml0aWFsRnJlZUxpc3QoZmFsc2Up CiAgICAgICAgIHsgCi0gICAgICAgICAgICBtZW1zZXQobV9wb29sLnBvb2wsIDAsIHNpemVvZiht X3Bvb2wucG9vbCkpOworICAgICAgICAgICAgbWVtc2V0KG1fcG9vbCwgMCwgc2l6ZW9mKG1fcG9v bCkpOwogICAgICAgICB9CiAKICAgICAgICAgTm9kZSogYWxsb2NhdGUoKQpAQCAtMTY2LDcgKzE2 Niw3IEBACiAgICAgICAgIH0KIAogICAgIHByaXZhdGU6Ci0gICAgICAgIE5vZGUqIHBvb2woKSB7 IHJldHVybiByZWludGVycHJldF9jYXN0PE5vZGUqPihtX3Bvb2wucG9vbCk7IH0KKyAgICAgICAg Tm9kZSogcG9vbCgpIHsgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8Tm9kZSo+KG1fcG9vbCk7IH0K ICAgICAgICAgTm9kZSogcGFzdFBvb2woKSB7IHJldHVybiBwb29sKCkgKyBtX3Bvb2xTaXplOyB9 CiAKICAgICAgICAgYm9vbCBpblBvb2woTm9kZSogbm9kZSkKQEAgLTE3NywxMCArMTc3LDcgQEAK ICAgICAgICAgTm9kZSogbV9mcmVlTGlzdDsKICAgICAgICAgYm9vbCBtX2lzRG9uZVdpdGhJbml0 aWFsRnJlZUxpc3Q7CiAgICAgICAgIHN0YXRpYyBjb25zdCBzaXplX3QgbV9wb29sU2l6ZSA9IDI1 NjsKLSAgICAgICAgdW5pb24gewotICAgICAgICAgICAgY2hhciBwb29sW3NpemVvZihOb2RlKSAq IG1fcG9vbFNpemVdOwotICAgICAgICAgICAgZG91YmxlIGZvckFsaWdubWVudDsKLSAgICAgICAg fSBtX3Bvb2w7CisgICAgICAgIHVpbnQzMl90IG1fcG9vbFsoc2l6ZW9mKE5vZGUpICogbV9wb29s U2l6ZSArIHNpemVvZih1aW50MzJfdCkgLSAxKSAvIHNpemVvZih1aW50MzJfdCldOwogICAgIH07 CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBWYWx1ZUFyZz4gc3RydWN0IExpc3RIYXNoU2V0Tm9k ZSB7Ci0tLSB3ZWJraXQtMS4wLjEub3JpZy9KYXZhU2NyaXB0Q29yZS93dGYvVmVjdG9yLmgKKysr IHdlYmtpdC0xLjAuMS9KYXZhU2NyaXB0Q29yZS93dGYvVmVjdG9yLmgKQEAgLTM4Niw4ICszODYs NyBAQAogICAgICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IG1faW5saW5lQnVmZmVyU2l6ZSA9IGlu bGluZUNhcGFjaXR5ICogc2l6ZW9mKFQpOwogICAgICAgICBUKiBpbmxpbmVCdWZmZXIoKSB7IHJl dHVybiByZWludGVycHJldF9jYXN0PFQqPigmbV9pbmxpbmVCdWZmZXIpOyB9CiAKLSAgICAgICAg Ly8gRklYTUU6IE5vdGhpbmcgZ3VhcmFudGVlcyB0aGlzIGJ1ZmZlciBpcyBhcHByb3ByaWF0ZWx5 IGFsaWduZWQgdG8gaG9sZCBvYmplY3RzIG9mIHR5cGUgVC4KLSAgICAgICAgY2hhciBtX2lubGlu ZUJ1ZmZlclttX2lubGluZUJ1ZmZlclNpemVdOworICAgICAgICB1aW50NjRfdCBtX2lubGluZUJ1 ZmZlclsobV9pbmxpbmVCdWZmZXJTaXplICsgc2l6ZW9mKHVpbnQ2NF90KSAtIDEpIC8gc2l6ZW9m KHVpbnQ2NF90KV07CiAgICAgfTsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBp bmxpbmVDYXBhY2l0eSA9IDA+Ci0tLSB3ZWJraXQtMS4wLjEub3JpZy9KYXZhU2NyaXB0Q29yZS93 dGYvRmFzdE1hbGxvYy5jcHAKKysrIHdlYmtpdC0xLjAuMS9KYXZhU2NyaXB0Q29yZS93dGYvRmFz dE1hbGxvYy5jcHAKQEAgLTE4MjQsMTMgKzE4MjQsMTMgQEAKIAogLy8gUGFnZS1sZXZlbCBhbGxv Y2F0b3IKIHN0YXRpYyBTcGluTG9jayBwYWdlaGVhcF9sb2NrID0gU1BJTkxPQ0tfSU5JVElBTEla RVI7Ci1zdGF0aWMgdm9pZCogcGFnZWhlYXBfbWVtb3J5WyhzaXplb2YoVENNYWxsb2NfUGFnZUhl YXApICsgc2l6ZW9mKHZvaWQqKSAtIDEpIC8gc2l6ZW9mKHZvaWQqKV07CitzdGF0aWMgdWludDY0 X3QgcGFnZWhlYXBfbWVtb3J5WyhzaXplb2YoVENNYWxsb2NfUGFnZUhlYXApICsgc2l6ZW9mKHVp bnQ2NF90KSAtIDEpIC8gc2l6ZW9mKHVpbnQ2NF90KV07CiBzdGF0aWMgYm9vbCBwaGluaXRlZCA9 IGZhbHNlOwogCiAvLyBBdm9pZCBleHRyYSBsZXZlbCBvZiBpbmRpcmVjdGlvbiBieSBtYWtpbmcg InBhZ2VoZWFwIiBiZSBqdXN0IGFuIGFsaWFzCiAvLyBvZiBwYWdlaGVhcF9tZW1vcnkuCiB0eXBl ZGVmIHVuaW9uIHsKLSAgICB2b2lkKiBtX21lbW9yeTsKKyAgICB1aW50NjRfdCogbV9tZW1vcnk7 CiAgICAgVENNYWxsb2NfUGFnZUhlYXAqIG1fcGFnZUhlYXA7CiB9IFBhZ2VIZWFwVW5pb247CiAK LS0tIHdlYmtpdC0xLjAuMS5vcmlnL2RlYmlhbi9jb250cm9sCisrKyB3ZWJraXQtMS4wLjEvZGVi aWFuL2NvbnRyb2wKQEAgLTAsMCArMSw1NiBAQAorU291cmNlOiB3ZWJraXQKK1ByaW9yaXR5OiBv cHRpb25hbAorU2VjdGlvbjogd2ViCitNYWludGFpbmVyOiBEZWJpYW4gV2ViS2l0IE1haW50YWlu ZXJzIDxwa2ctd2Via2l0LW1haW50YWluZXJzQGxpc3RzLmFsaW90aC5kZWJpYW4ub3JnPgorVXBs b2FkZXJzOiBNaWtlIEhvbW1leSA8Z2xhbmRpdW1AZGViaWFuLm9yZz4KK0J1aWxkLURlcGVuZHM6 IGRlYmhlbHBlciAoPj0gNS4wKSwgbGliZ3RrMi4wLWRldiAoPj0gMi4xMCksIGxpYnBhbmdvMS4w LWRldiAoPj0gMS4xNiksIGxpYmljdS1kZXYsIGxpYnhzbHQtZGV2LCBsaWJjdXJsNC1kZXYsIGxp YnNxbGl0ZTMtZGV2LCBncGVyZiwgYmlzb24sIGZsZXgsIGxpYmpwZWc2Mi1kZXYsIGxpYnBuZzEy LWRldiwgYXV0b2NvbmYsIGF1dG9tYWtlLCBsaWJ0b29sLCBsaWJ4dC1kZXYKK1N0YW5kYXJkcy1W ZXJzaW9uOiAzLjguMC4xCitIb21lcGFnZTogaHR0cDovL3dlYmtpdC5vcmcvCitWY3MtQnJvd3Nl cjogaHR0cDovL2dpdC5kZWJpYW4ub3JnLz9wPXBrZy13ZWJraXQvd2Via2l0LmdpdAorVmNzLUdp dDogZ2l0Oi8vZ2l0LmRlYmlhbi5vcmcvZ2l0L3BrZy13ZWJraXQvd2Via2l0LmdpdAorCitQYWNr YWdlOiBsaWJ3ZWJraXQtMS4wLTEKK1NlY3Rpb246IGxpYnMKK0FyY2hpdGVjdHVyZTogYW55CitE ZXBlbmRzOiAke3NobGliczpEZXBlbmRzfQorRGVzY3JpcHRpb246IFdlYiBjb250ZW50IGVuZ2lu ZSBsaWJyYXJ5IGZvciBHdGsrCisgV2ViS2l0IGlzIGEgd2ViIGNvbnRlbnQgZW5naW5lLCBkZXJp dmVkIGZyb20gS0hUTUwgYW5kIEtKUyBmcm9tIEtERSwgYW5kCisgdXNlZCBwcmltYXJpbHkgaW4g QXBwbGUncyBTYWZhcmkgYnJvd3Nlci4gIEl0IGlzIG1hZGUgdG8gYmUgZW1iZWRkZWQgaW4KKyBv dGhlciBhcHBsaWNhdGlvbnMsIHN1Y2ggYXMgbWFpbCByZWFkZXJzLCBvciB3ZWIgYnJvd3NlcnMu CisgLgorIEl0IGlzIGFibGUgdG8gZGlzcGxheSBjb250ZW50IHN1Y2ggYXMgSFRNTCwgU1ZHLCBY TUwsIGFuZCBvdGhlcnMuIEl0IGFsc28KKyBzdXBwb3J0cyBET00sIFhNTEh0dHBSZXF1ZXN0LCBY U0xULCBDU1MsIEphdmFzY3JpcHQvRUNNQXNjcmlwdCBhbmQgbW9yZS4KKyAuCisgVGhpcyBpcyB0 aGUgbGlicmFyeSBmb3IgZW1iZWRkaW5nIGluIEd0aysgYXBwbGljYXRpb25zLgorCitQYWNrYWdl OiBsaWJ3ZWJraXQtZGV2CitTZWN0aW9uOiBsaWJkZXZlbAorUHJpb3JpdHk6IGV4dHJhCitBcmNo aXRlY3R1cmU6IGFsbAorRGVwZW5kczogbGlid2Via2l0LTEuMC0xICg+PSAke3NvdXJjZTpVcHN0 cmVhbS1WZXJzaW9ufSksIGxpYmd0azIuMC1kZXYKK0NvbmZsaWN0czogbGlid2Via2l0Z2RrLWRl dgorRGVzY3JpcHRpb246IFdlYiBjb250ZW50IGVuZ2luZSBsaWJyYXJ5IGZvciBHdGsrIC0gRGV2 ZWxvcG1lbnQgZmlsZXMKKyBXZWJLaXQgaXMgYSB3ZWIgY29udGVudCBlbmdpbmUsIGRlcml2ZWQg ZnJvbSBLSFRNTCBhbmQgS0pTIGZyb20gS0RFLCBhbmQKKyB1c2VkIHByaW1hcmlseSBpbiBBcHBs ZSdzIFNhZmFyaSBicm93c2VyLiAgSXQgaXMgbWFkZSB0byBiZSBlbWJlZGRlZCBpbgorIG90aGVy IGFwcGxpY2F0aW9ucywgc3VjaCBhcyBtYWlsIHJlYWRlcnMsIG9yIHdlYiBicm93c2Vycy4KKyAu CisgSXQgaXMgYWJsZSB0byBkaXNwbGF5IGNvbnRlbnQgc3VjaCBhcyBIVE1MLCBTVkcsIFhNTCwg YW5kIG90aGVycy4gSXQgYWxzbworIHN1cHBvcnRzIERPTSwgWE1MSHR0cFJlcXVlc3QsIFhTTFQs IENTUywgSmF2YXNjcmlwdC9FQ01Bc2NyaXB0IGFuZCBtb3JlLgorIC4KKyBUaGlzIHBhY2thZ2Ug cHJvdmlkZXMgZGV2ZWxvcG1lbnQgZmlsZXMgcmVxdWlyZWQgdG8gY3JlYXRlIEd0aysgYXBwbGlj YXRpb25zCisgZW1iZWRkaW5nIFdlYktpdC4KKworUGFja2FnZTogbGlid2Via2l0LTEuMC0xLWRi ZworU2VjdGlvbjogbGliZGV2ZWwKK1ByaW9yaXR5OiBleHRyYQorQXJjaGl0ZWN0dXJlOiBhbnkK K0RlcGVuZHM6IGxpYndlYmtpdC0xLjAtMSAoPSAke2JpbmFyeTpWZXJzaW9ufSkKK0Rlc2NyaXB0 aW9uOiBXZWIgY29udGVudCBlbmdpbmUgbGlicmFyeSBmb3IgR3RrKyAtIERlYnVnZ2luZyBzeW1i b2xzCisgV2ViS2l0IGlzIGEgd2ViIGNvbnRlbnQgZW5naW5lLCBkZXJpdmVkIGZyb20gS0hUTUwg YW5kIEtKUyBmcm9tIEtERSwgYW5kCisgdXNlZCBwcmltYXJpbHkgaW4gQXBwbGUncyBTYWZhcmkg YnJvd3Nlci4gIEl0IGlzIG1hZGUgdG8gYmUgZW1iZWRkZWQgaW4KKyBvdGhlciBhcHBsaWNhdGlv bnMsIHN1Y2ggYXMgbWFpbCByZWFkZXJzLCBvciB3ZWIgYnJvd3NlcnMuCisgLgorIEl0IGlzIGFi bGUgdG8gZGlzcGxheSBjb250ZW50IHN1Y2ggYXMgSFRNTCwgU1ZHLCBYTUwsIGFuZCBvdGhlcnMu IEl0IGFsc28KKyBzdXBwb3J0cyBET00sIFhNTEh0dHBSZXF1ZXN0LCBYU0xULCBDU1MsIEphdmFz Y3JpcHQvRUNNQXNjcmlwdCBhbmQgbW9yZS4KKyAuCisgVGhpcyBwYWNrYWdlIHByb3ZpZGVzIHRo ZSBkZWJ1Z2dpbmcgc3ltYm9scyBmb3IgdGhlIFdlYmtpdCBsaWJyYXJ5IGZvciBHdGsrLgotLS0g d2Via2l0LTEuMC4xLm9yaWcvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1N0cmluZ0hhc2guaAorKysg d2Via2l0LTEuMC4xL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9TdHJpbmdIYXNoLmgKQEAgLTQ2LDYg KzQ2LDE1IEBACiAgICAgICAgICAgICBpZiAoYUxlbmd0aCAhPSBiTGVuZ3RoKQogICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKIAorI2lmIFBMQVRGT1JNKEFSTSkgfHwgUExBVEZPUk0oU1BB UkMpCisgICAgICAgICAgICBjb25zdCBVQ2hhciogYUNoYXJzID0gYS0+Y2hhcmFjdGVycygpOwor ICAgICAgICAgICAgY29uc3QgVUNoYXIqIGJDaGFycyA9IGItPmNoYXJhY3RlcnMoKTsKKyAgICAg ICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgIT0gYUxlbmd0aDsgKytpKQorICAgICAgICAg ICAgICAgIGlmICgqYUNoYXJzKysgIT0gKmJDaGFycysrKQorICAgICAgICAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CisKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworI2Vsc2UKICAgICAgICAg ICAgIGNvbnN0IHVpbnQzMl90KiBhQ2hhcnMgPSByZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQz Ml90Kj4oYS0+Y2hhcmFjdGVycygpKTsKICAgICAgICAgICAgIGNvbnN0IHVpbnQzMl90KiBiQ2hh cnMgPSByZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQzMl90Kj4oYi0+Y2hhcmFjdGVycygpKTsK IApAQCAtNTgsNiArNjcsNyBAQAogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisjZW5kaWYKICAgICAgICAgfQogCiAgICAgICAgIHN0YXRp YyB1bnNpZ25lZCBoYXNoKGNvbnN0IFJlZlB0cjxTdHJpbmdJbXBsPiYga2V5KSB7IHJldHVybiBr ZXktPmhhc2goKTsgfQotLS0gd2Via2l0LTEuMC4xLm9yaWcvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0 L0F0b21pY1N0cmluZy5jcHAKKysrIHdlYmtpdC0xLjAuMS9XZWJDb3JlL3BsYXRmb3JtL3RleHQv QXRvbWljU3RyaW5nLmNwcApAQCAtOTQsNyArOTQsNyBAQAogICAgIGlmIChzdHJpbmctPmxlbmd0 aCgpICE9IGxlbmd0aCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0jaWYgUExBVEZPUk0oQVJN KQorI2lmIFBMQVRGT1JNKEFSTSkgfHwgUExBVEZPUk0oU1BBUkMpCiAgICAgY29uc3QgVUNoYXIq IHN0cmluZ0NoYXJhY3RlcnMgPSBzdHJpbmctPmNoYXJhY3RlcnMoKTsKICAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpICE9IGxlbmd0aDsgKytpKSB7CiAgICAgICAgIGlmICgqc3RyaW5nQ2hhcmFj dGVycysrICE9ICpjaGFyYWN0ZXJzKyspCi0tLSB3ZWJraXQtMS4wLjEub3JpZy9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmNwcAorKysgd2Via2l0LTEuMC4xL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuY3BwCkBAIC0yMDMsNyArMjAzLDcgQEAKIGJv b2wgQml0bWFwSW1hZ2U6OmZyYW1lSGFzQWxwaGFBdEluZGV4KHNpemVfdCBpbmRleCkKIHsKICAg ICBpZiAoaW5kZXggPj0gZnJhbWVDb3VudCgpKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAg cmV0dXJuIHRydWU7CiAKICAgICBpZiAoaW5kZXggPj0gbV9mcmFtZXMuc2l6ZSgpIHx8ICFtX2Zy YW1lc1tpbmRleF0ubV9mcmFtZSkKICAgICAgICAgY2FjaGVGcmFtZShpbmRleCk7Ci0tLSB3ZWJr aXQtMS4wLjEub3JpZy9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQ0cuY3BwCisr KyB3ZWJraXQtMS4wLjEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUNHLmNwcApA QCAtODcsNiArODcsNyBAQAogCiAgICAgbV9mcmFtZXMuZ3JvdygxKTsKICAgICBtX2ZyYW1lc1sw XS5tX2ZyYW1lID0gY2dJbWFnZTsKKyAgICBtX2ZyYW1lc1swXS5tX2hhc0FscGhhID0gdHJ1ZTsK ICAgICBjaGVja0ZvclNvbGlkQ29sb3IoKTsKIH0KIAotLS0gd2Via2l0LTEuMC4xLm9yaWcvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZUNhaXJvLmNwcAorKysgd2Via2l0LTEu MC4xL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VDYWlyby5jcHAKQEAgLTc2 LDYgKzc2LDcgQEAKIAogICAgIG1fZnJhbWVzLmdyb3coMSk7CiAgICAgbV9mcmFtZXNbMF0ubV9m cmFtZSA9IHN1cmZhY2U7CisgICAgbV9mcmFtZXNbMF0ubV9oYXNBbHBoYSA9IGNhaXJvX3N1cmZh Y2VfZ2V0X2NvbnRlbnQoc3VyZmFjZSkgIT0gQ0FJUk9fQ09OVEVOVF9DT0xPUjsKICAgICBjaGVj a0ZvclNvbGlkQ29sb3IoKTsKIH0KIAotLS0gd2Via2l0LTEuMC4xLm9yaWcvV2ViQ29yZS9wYWdl L2d0ay9BWE9iamVjdENhY2hlQXRrLmNwcAorKysgd2Via2l0LTEuMC4xL1dlYkNvcmUvcGFnZS9n dGsvQVhPYmplY3RDYWNoZUF0ay5jcHAKQEAgLTI2LDYgKzI2LDggQEAKIAogI2luY2x1ZGUgIkNT dHJpbmcuaCIKIAorI2luY2x1ZGUgPHN0ZGlvLmg+CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAog dm9pZCBBWE9iamVjdENhY2hlOjpkZXRhY2hXcmFwcGVyKEFjY2Vzc2liaWxpdHlPYmplY3QqIG9i aikK 38525 2009-08-24 22:10:34 -0700 2010-06-10 18:54:16 -0700 debian 1.1.13 downstream patch diff text/plain 4479 mh+webkit ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3d0Zi9GYXN0TWFsbG9jLmNwcCBiL0phdmFTY3Jp cHRDb3JlL3d0Zi9GYXN0TWFsbG9jLmNwcAppbmRleCBhZmIwMjIwLi5mZTdjOTEzIDEwMDY0NAot LS0gYS9KYXZhU2NyaXB0Q29yZS93dGYvRmFzdE1hbGxvYy5jcHAKKysrIGIvSmF2YVNjcmlwdENv cmUvd3RmL0Zhc3RNYWxsb2MuY3BwCkBAIC0yMjU1LDEzICsyMjU1LDEzIEBAIHN0YXRpYyBUQ01h bGxvY19DZW50cmFsX0ZyZWVMaXN0UGFkZGVkIGNlbnRyYWxfY2FjaGVba051bUNsYXNzZXNdOwog CiAvLyBQYWdlLWxldmVsIGFsbG9jYXRvcgogc3RhdGljIFNwaW5Mb2NrIHBhZ2VoZWFwX2xvY2sg PSBTUElOTE9DS19JTklUSUFMSVpFUjsKLXN0YXRpYyB2b2lkKiBwYWdlaGVhcF9tZW1vcnlbKHNp emVvZihUQ01hbGxvY19QYWdlSGVhcCkgKyBzaXplb2Yodm9pZCopIC0gMSkgLyBzaXplb2Yodm9p ZCopXTsKK3N0YXRpYyB1aW50NjRfdCBwYWdlaGVhcF9tZW1vcnlbKHNpemVvZihUQ01hbGxvY19Q YWdlSGVhcCkgKyBzaXplb2YodWludDY0X3QpIC0gMSkgLyBzaXplb2YodWludDY0X3QpXTsKIHN0 YXRpYyBib29sIHBoaW5pdGVkID0gZmFsc2U7CiAKIC8vIEF2b2lkIGV4dHJhIGxldmVsIG9mIGlu ZGlyZWN0aW9uIGJ5IG1ha2luZyAicGFnZWhlYXAiIGJlIGp1c3QgYW4gYWxpYXMKIC8vIG9mIHBh Z2VoZWFwX21lbW9yeS4KIHR5cGVkZWYgdW5pb24gewotICAgIHZvaWQqIG1fbWVtb3J5OworICAg IHVpbnQ2NF90KiBtX21lbW9yeTsKICAgICBUQ01hbGxvY19QYWdlSGVhcCogbV9wYWdlSGVhcDsK IH0gUGFnZUhlYXBVbmlvbjsKIApkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvd3RmL0xpc3RI YXNoU2V0LmggYi9KYXZhU2NyaXB0Q29yZS93dGYvTGlzdEhhc2hTZXQuaAppbmRleCAzOGNjOTk4 Li4wY2MyZGQ0IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS93dGYvTGlzdEhhc2hTZXQuaAor KysgYi9KYXZhU2NyaXB0Q29yZS93dGYvTGlzdEhhc2hTZXQuaApAQCAtMTI3LDcgKzEyNyw3IEBA IG5hbWVzcGFjZSBXVEYgewogICAgICAgICAgICAgOiBtX2ZyZWVMaXN0KHBvb2woKSkKICAgICAg ICAgICAgICwgbV9pc0RvbmVXaXRoSW5pdGlhbEZyZWVMaXN0KGZhbHNlKQogICAgICAgICB7IAot ICAgICAgICAgICAgbWVtc2V0KG1fcG9vbC5wb29sLCAwLCBzaXplb2YobV9wb29sLnBvb2wpKTsK KyAgICAgICAgICAgIG1lbXNldChtX3Bvb2wsIDAsIHNpemVvZihtX3Bvb2wpKTsKICAgICAgICAg fQogCiAgICAgICAgIE5vZGUqIGFsbG9jYXRlKCkKQEAgLTE3MSw3ICsxNzEsNyBAQCBuYW1lc3Bh Y2UgV1RGIHsKICAgICAgICAgfQogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgTm9kZSogcG9vbCgp IHsgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8Tm9kZSo+KG1fcG9vbC5wb29sKTsgfQorICAgICAg ICBOb2RlKiBwb29sKCkgeyByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxOb2RlKj4obV9wb29sKTsg fQogICAgICAgICBOb2RlKiBwYXN0UG9vbCgpIHsgcmV0dXJuIHBvb2woKSArIG1fcG9vbFNpemU7 IH0KIAogICAgICAgICBib29sIGluUG9vbChOb2RlKiBub2RlKQpAQCAtMTgyLDEwICsxODIsNyBA QCBuYW1lc3BhY2UgV1RGIHsKICAgICAgICAgTm9kZSogbV9mcmVlTGlzdDsKICAgICAgICAgYm9v bCBtX2lzRG9uZVdpdGhJbml0aWFsRnJlZUxpc3Q7CiAgICAgICAgIHN0YXRpYyBjb25zdCBzaXpl X3QgbV9wb29sU2l6ZSA9IDI1NjsKLSAgICAgICAgdW5pb24gewotICAgICAgICAgICAgY2hhciBw b29sW3NpemVvZihOb2RlKSAqIG1fcG9vbFNpemVdOwotICAgICAgICAgICAgZG91YmxlIGZvckFs aWdubWVudDsKLSAgICAgICAgfSBtX3Bvb2w7CisgICAgICAgIHVpbnQzMl90IG1fcG9vbFsoc2l6 ZW9mKE5vZGUpICogbV9wb29sU2l6ZSArIHNpemVvZih1aW50MzJfdCkgLSAxKSAvIHNpemVvZih1 aW50MzJfdCldOwogICAgIH07CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBWYWx1ZUFyZz4gc3Ry dWN0IExpc3RIYXNoU2V0Tm9kZSB7CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS93dGYvUGxh dGZvcm0uaCBiL0phdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCmluZGV4IDk4ZDYyNmMuLjc4 M2NlMjggMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCisrKyBiL0ph dmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCkBAIC0yNzYsNiArMjc2LDEzIEBACiAjZGVmaW5l IFdURl9QTEFURk9STV9YODZfNjQgMQogI2VuZGlmCiAKKy8qIFBMQVRGT1JNKFNQQVJDKSAqLwor I2lmICAgZGVmaW5lZChfX3NwYXJjX18pIFwKKyAgIHx8IGRlZmluZWQoX19zcGFyYykKKyNkZWZp bmUgV1RGX1BMQVRGT1JNX1NQQVJDIDEKKyNkZWZpbmUgV1RGX1BMQVRGT1JNX0JJR19FTkRJQU4g MQorI2VuZGlmCisKIC8qIFBMQVRGT1JNKFNINCkgKi8KICNpZiBkZWZpbmVkKF9fU0g0X18pCiAj ZGVmaW5lIFdURl9QTEFURk9STV9TSDQgMQpAQCAtMzAxLDYgKzMwOCwxNiBAQAogIyAgIGVuZGlm CiAjZW5kaWYKIAorLyogRm9yIHVuZGVmaW5lZCBwbGF0Zm9ybXMgKi8KKyNpZiAhZGVmaW5lZChX VEZfUExBVEZPUk1fQklHX0VORElBTikgJiYgIWRlZmluZWQoV1RGX1BMQVRGT1JNX01JRERMRV9F TkRJQU4pCisjaW5jbHVkZSA8c3lzL3BhcmFtLmg+CisjaWYgX19CWVRFX09SREVSID09IF9fQklH X0VORElBTgorI2RlZmluZSBXVEZfUExBVEZPUk1fQklHX0VORElBTiAxCisjZWxpZiAgX19CWVRF X09SREVSID09IF9fUERQX0VORElBTgorI2RlZmluZSBXVEZfUExBVEZPUk1fTUlERExFX0VORElB TiAxCisjZW5kaWYKKyNlbmRpZgorCiAvKiBDb21waWxlciAqLwogCiAvKiBDT01QSUxFUihNU1ZD KSAqLwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0F0b21pY1N0cmluZy5jcHAg Yi9XZWJDb3JlL3BsYXRmb3JtL3RleHQvQXRvbWljU3RyaW5nLmNwcAppbmRleCA0MDk0MzllLi45 NTUyZmQ3IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvQXRvbWljU3RyaW5nLmNw cAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3RleHQvQXRvbWljU3RyaW5nLmNwcApAQCAtMTAxLDcg KzEwMSw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBlcXVhbChTdHJpbmdJbXBsKiBzdHJpbmcsIGNv bnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCB1bnNpZ25lZCBsCiAgICAgaWYgKHN0cmluZy0+bGVuZ3Ro KCkgIT0gbGVuZ3RoKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSNpZiBQTEFURk9STShBUk0p IHx8IFBMQVRGT1JNKFNINCkKKyNpZiBQTEFURk9STShBUk0pIHx8IFBMQVRGT1JNKFNQQVJDKSB8 fCBQTEFURk9STShTSDQpCiAgICAgY29uc3QgVUNoYXIqIHN0cmluZ0NoYXJhY3RlcnMgPSBzdHJp bmctPmNoYXJhY3RlcnMoKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpICE9IGxlbmd0aDsg KytpKSB7CiAgICAgICAgIGlmICgqc3RyaW5nQ2hhcmFjdGVycysrICE9ICpjaGFyYWN0ZXJzKysp CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvU3RyaW5nSGFzaC5oIGIvV2ViQ29y ZS9wbGF0Zm9ybS90ZXh0L1N0cmluZ0hhc2guaAppbmRleCAzMzZkY2UzLi4wZjE0ZWYzIDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvU3RyaW5nSGFzaC5oCisrKyBiL1dlYkNvcmUv cGxhdGZvcm0vdGV4dC9TdHJpbmdIYXNoLmgKQEAgLTQ3LDYgKzQ3LDE1IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgICAgIGlmIChhTGVuZ3RoICE9IGJMZW5ndGgpCiAgICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCisjaWYgUExBVEZPUk0oQVJNKSB8fCBQTEFURk9STShTUEFS QykKKyAgICAgICAgICAgIGNvbnN0IFVDaGFyKiBhQ2hhcnMgPSBhLT5jaGFyYWN0ZXJzKCk7Cisg ICAgICAgICAgICBjb25zdCBVQ2hhciogYkNoYXJzID0gYi0+Y2hhcmFjdGVycygpOworICAgICAg ICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSAhPSBhTGVuZ3RoOyArK2kpCisgICAgICAgICAg ICAgICAgaWYgKCphQ2hhcnMrKyAhPSAqYkNoYXJzKyspCisgICAgICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisjZWxzZQogICAgICAgICAg ICAgY29uc3QgdWludDMyX3QqIGFDaGFycyA9IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDMy X3QqPihhLT5jaGFyYWN0ZXJzKCkpOwogICAgICAgICAgICAgY29uc3QgdWludDMyX3QqIGJDaGFy cyA9IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDMyX3QqPihiLT5jaGFyYWN0ZXJzKCkpOwog CkBAIC01OSw2ICs2OCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAgIHJldHVybiB0cnVlOworI2VuZGlmCiAgICAgICAg IH0KIAogICAgICAgICBzdGF0aWMgdW5zaWduZWQgaGFzaChjb25zdCBSZWZQdHI8U3RyaW5nSW1w bD4mIGtleSkgeyByZXR1cm4ga2V5LT5oYXNoKCk7IH0K