26685 2009-06-24 10:32:47 -0700 [Skia] Skia folded SkPorterDuff into SkXfermode 2009-06-24 16:55:03 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 0 thakis webkit-unassigned brettw dglazkov oldest_to_newest 127937 0 thakis 2009-06-24 10:32:47 -0700 Skia did an backwards-incompatible api change (r232, 235, 236, 239 at http://code.google.com/p/skia/source/list ). Use the new api. 127938 1 31790 thakis 2009-06-24 10:36:22 -0700 Created attachment 31790 Use new skia api 127983 2 eric 2009-06-24 13:48:36 -0700 The change looks fine. I need some Chromium person to confirm this is correct, and then I can r+ it. setXfermodeMode is about the worst method name ever. I'm surprised Skia is moving from "PorterDuffMode" which actually made some sense, to "XfermodeMode" which is just silly. ;) 127988 3 reed 2009-06-24 14:01:03 -0700 LGTM 127989 4 31809 thakis 2009-06-24 14:01:48 -0700 Created attachment 31809 Fill in bug, reviewer, and email fields 127990 5 31809 eric 2009-06-24 14:04:03 -0700 Comment on attachment 31809 Fill in bug, reviewer, and email fields You don't generally fill in the reviewer. The committer will do that (or the commit script will). 127996 6 eric 2009-06-24 14:10:23 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/platform/graphics/skia/GraphicsContextSkia.cpp M WebCore/platform/graphics/skia/ImageBufferSkia.cpp M WebCore/platform/graphics/skia/ImageSkia.cpp M WebCore/platform/graphics/skia/PlatformContextSkia.cpp M WebCore/platform/graphics/skia/PlatformContextSkia.h M WebCore/platform/graphics/skia/SkiaUtils.cpp M WebCore/platform/graphics/skia/SkiaUtils.h Committed r45103 http://trac.webkit.org/changeset/45103 128024 7 dglazkov 2009-06-24 16:27:24 -0700 Dudes, come on -- not cool. We've been trying to get the integration builder green for the last 3 days so that abarth and japhet could land their patches, and now this ... http://build.chromium.org/buildbot/waterfall.fyi/builders/Webkit%20(webkit.org)/builds/6294 128026 8 eric 2009-06-24 16:38:23 -0700 I'm happy to roll it out. Or you're welcome to Dimitri. Your call. 128035 9 dglazkov 2009-06-24 16:55:03 -0700 Apologies for being a bad sport. This is being taken care of downstream as we speak. 31790 2009-06-24 10:36:22 -0700 2009-06-24 14:01:48 -0700 Use new skia api webkit_skia_patch.txt text/plain 11217 thakis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTA4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMDktMDYtMjQgIE5pY29sYXMgV2ViZXIgIDxzZXQgRU1BSUxfQURE UkVTUyBlbnZpcm9ubWVudCB2YXJpYWJsZT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBY2NvbW9kYXRlIGZvciBiYWNrd2FyZHMtaW5jb21wYXRpYmxl IHNraWEgYXBpIGNoYW5nZXMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dy YXBoaWNzQ29udGV4dFNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0 OjpjbGVhclJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpzZXRDb21w b3NpdGVPcGVyYXRpb24pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VC dWZmZXJTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVyOjpJbWFnZUJ1ZmZl cik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZVNraWEuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6cGFpbnRTa0JpdG1hcCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZTo6 ZHJhd1BhdHRlcm4pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1D b250ZXh0U2tpYS5jcHA6CisgICAgICAgIChQbGF0Zm9ybUNvbnRleHRTa2lhOjpTdGF0ZTo6U3Rh dGUpOgorICAgICAgICAoUGxhdGZvcm1Db250ZXh0U2tpYTo6c2V0dXBQYWludENvbW1vbik6Cisg ICAgICAgIChQbGF0Zm9ybUNvbnRleHRTa2lhOjpzZXRYZmVybW9kZU1vZGUpOgorICAgICAgICAo UGxhdGZvcm1Db250ZXh0U2tpYTo6YXBwbHlDbGlwRnJvbUltYWdlKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9za2lhL1NraWFVdGlscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjopOgor ICAgICAgICAoV2ViQ29yZTo6V2ViQ29yZUNvbXBvc2l0ZVRvU2tpYUNvbXBvc2l0ZSk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Ta2lhVXRpbHMuaDoKKwogMjAwOS0wNi0yNCAg RGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERhdmlkIExldmluLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBo aWNzQ29udGV4dFNraWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAkocmV2aXNpb24gNDUwODYpCisrKyBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTMzMSw3ICszMzEsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xlYXJS ZWN0KGNvbnN0IEZsCiAKICAgICBTa1BhaW50IHBhaW50OwogICAgIHBsYXRmb3JtQ29udGV4dCgp LT5zZXR1cFBhaW50Rm9yRmlsbGluZygmcGFpbnQpOwotICAgIHBhaW50LnNldFBvcnRlckR1ZmZY ZmVybW9kZShTa1BvcnRlckR1ZmY6OmtDbGVhcl9Nb2RlKTsKKyAgICBwYWludC5zZXRYZmVybW9k ZU1vZGUoU2tYZmVybW9kZTo6a0NsZWFyX01vZGUpOwogICAgIHBsYXRmb3JtQ29udGV4dCgpLT5j YW52YXMoKS0+ZHJhd1JlY3QociwgcGFpbnQpOwogfQogCkBAIC04NTgsNyArODU4LDcgQEAgdm9p ZCBHcmFwaGljc0NvbnRleHQ6OnNldENvbXBvc2l0ZU9wZXJhdAogewogICAgIGlmIChwYWludGlu Z0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBwbGF0Zm9ybUNvbnRleHQoKS0+c2V0 UG9ydGVyRHVmZk1vZGUoV2ViQ29yZUNvbXBvc2l0ZVRvU2tpYUNvbXBvc2l0ZShvcCkpOworICAg IHBsYXRmb3JtQ29udGV4dCgpLT5zZXRYZmVybW9kZU1vZGUoV2ViQ29yZUNvbXBvc2l0ZVRvU2tp YUNvbXBvc2l0ZShvcCkpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0SW1hZ2VJbnRl cnBvbGF0aW9uUXVhbGl0eShJbnRlcnBvbGF0aW9uUXVhbGl0eSkKSW5kZXg6IFdlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCShyZXZpc2lv biA0NTA4NikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNr aWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MSw3ICs3MSw3IEBAIEltYWdlQnVmZmVyOjpJbWFn ZUJ1ZmZlcihjb25zdCBJbnRTaXplJiAKICAgICAvLyBNYWtlIHRoZSBiYWNrZ3JvdW5kIHRyYW5z cGFyZW50LiBJdCB3b3VsZCBiZSBuaWNlIGlmIHRoaXMgd2Fzbid0CiAgICAgLy8gcmVxdWlyZWQs IGJ1dCB0aGUgY2FudmFzIGlzIGN1cnJlbnRseSBmaWxsZWQgd2l0aCB0aGUgbWFnaWMgdHJhbnNw YXJlbmN5CiAgICAgLy8gY29sb3IuIENhbiB3ZSBoYXZlIGFub3RoZXIgd2F5IHRvIG1hbmFnZSB0 aGlzPwotICAgIG1fZGF0YS5tX2NhbnZhcy5kcmF3QVJHQigwLCAwLCAwLCAwLCBTa1BvcnRlckR1 ZmY6OmtDbGVhcl9Nb2RlKTsKKyAgICBtX2RhdGEubV9jYW52YXMuZHJhd0FSR0IoMCwgMCwgMCwg MCwgU2tYZmVybW9kZTo6a0NsZWFyX01vZGUpOwogICAgIHN1Y2Nlc3MgPSB0cnVlOwogfQogCklu ZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VTa2lhLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VTa2lhLmNwcAkocmV2 aXNpb24gNDUwODYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VTa2lh LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjIwLDEwICsyMjAsMTAgQEAgc3RhdGljIHZvaWQgZHJh d1Jlc2FtcGxlZEJpdG1hcChTa0NhbnZhcwogICAgIH0KIH0KIAotc3RhdGljIHZvaWQgcGFpbnRT a0JpdG1hcChQbGF0Zm9ybUNvbnRleHRTa2lhKiBwbGF0Zm9ybUNvbnRleHQsIGNvbnN0IE5hdGl2 ZUltYWdlU2tpYSYgYml0bWFwLCBjb25zdCBTa0lSZWN0JiBzcmNSZWN0LCBjb25zdCBTa1JlY3Qm IGRlc3RSZWN0LCBjb25zdCBTa1BvcnRlckR1ZmY6Ok1vZGUmIGNvbXBPcCkKK3N0YXRpYyB2b2lk IHBhaW50U2tCaXRtYXAoUGxhdGZvcm1Db250ZXh0U2tpYSogcGxhdGZvcm1Db250ZXh0LCBjb25z dCBOYXRpdmVJbWFnZVNraWEmIGJpdG1hcCwgY29uc3QgU2tJUmVjdCYgc3JjUmVjdCwgY29uc3Qg U2tSZWN0JiBkZXN0UmVjdCwgY29uc3QgU2tYZmVybW9kZTo6TW9kZSYgY29tcE9wKQogewogICAg IFNrUGFpbnQgcGFpbnQ7Ci0gICAgcGFpbnQuc2V0UG9ydGVyRHVmZlhmZXJtb2RlKGNvbXBPcCk7 CisgICAgcGFpbnQuc2V0WGZlcm1vZGVNb2RlKGNvbXBPcCk7CiAgICAgcGFpbnQuc2V0RmlsdGVy Qml0bWFwKHRydWUpOwogICAgIGludCBhbHBoYSA9IHJvdW5kZihwbGF0Zm9ybUNvbnRleHQtPmdl dEFscGhhKCkgKiAyNTYpOwogICAgIGlmIChhbHBoYSA+IDI1NSkKQEAgLTM3OSw3ICszNzksNyBA QCB2b2lkIEltYWdlOjpkcmF3UGF0dGVybihHcmFwaGljc0NvbnRleHQqCiAKICAgICBTa1BhaW50 IHBhaW50OwogICAgIHBhaW50LnNldFNoYWRlcihzaGFkZXIpLT51bnJlZigpOwotICAgIHBhaW50 LnNldFBvcnRlckR1ZmZYZmVybW9kZShXZWJDb3JlQ29tcG9zaXRlVG9Ta2lhQ29tcG9zaXRlKGNv bXBvc2l0ZU9wKSk7CisgICAgcGFpbnQuc2V0WGZlcm1vZGVNb2RlKFdlYkNvcmVDb21wb3NpdGVU b1NraWFDb21wb3NpdGUoY29tcG9zaXRlT3ApKTsKICAgICBwYWludC5zZXRGaWx0ZXJCaXRtYXAo cmVzYW1wbGluZyA9PSBSRVNBTVBMRV9MSU5FQVIpOwogCiAgICAgY29udGV4dC0+cGxhdGZvcm1D b250ZXh0KCktPnBhaW50U2tQYWludChkZXN0UmVjdCwgcGFpbnQpOwpJbmRleDogV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNw cAkocmV2aXNpb24gNDUwODYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxh dGZvcm1Db250ZXh0U2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU3LDcgKzU3LDcgQEAgc3Ry dWN0IFBsYXRmb3JtQ29udGV4dFNraWE6OlN0YXRlIHsKIAogICAgIC8vIENvbW1vbiBzaGFkZXIg c3RhdGUuCiAgICAgZmxvYXQgbV9hbHBoYTsKLSAgICBTa1BvcnRlckR1ZmY6Ok1vZGUgbV9wb3J0 ZXJEdWZmTW9kZTsKKyAgICBTa1hmZXJtb2RlOjpNb2RlIG1feGZlck1vZGU7CiAgICAgU2tTaGFk ZXIqIG1fZ3JhZGllbnQ7CiAgICAgU2tTaGFkZXIqIG1fcGF0dGVybjsKICAgICBib29sIG1fdXNl QW50aWFsaWFzaW5nOwpAQCAtOTgsNyArOTgsNyBAQCBwcml2YXRlOgogLy8gTm90ZTogS2VlcCB0 aGVzZXMgZGVmYXVsdCB2YWx1ZXMgaW4gc3luYyB3aXRoIEdyYXBoaWNzQ29udGV4dFN0YXRlLgog UGxhdGZvcm1Db250ZXh0U2tpYTo6U3RhdGU6OlN0YXRlKCkKICAgICA6IG1fYWxwaGEoMSkKLSAg ICAsIG1fcG9ydGVyRHVmZk1vZGUoU2tQb3J0ZXJEdWZmOjprU3JjT3Zlcl9Nb2RlKQorICAgICwg bV94ZmVyTW9kZShTa1hmZXJtb2RlOjprU3JjT3Zlcl9Nb2RlKQogICAgICwgbV9ncmFkaWVudCgw KQogICAgICwgbV9wYXR0ZXJuKDApCiAgICAgLCBtX3VzZUFudGlhbGlhc2luZyh0cnVlKQpAQCAt MTE4LDcgKzExOCw3IEBAIFBsYXRmb3JtQ29udGV4dFNraWE6OlN0YXRlOjpTdGF0ZSgpCiAKIFBs YXRmb3JtQ29udGV4dFNraWE6OlN0YXRlOjpTdGF0ZShjb25zdCBTdGF0ZSYgb3RoZXIpCiAgICAg OiBtX2FscGhhKG90aGVyLm1fYWxwaGEpCi0gICAgLCBtX3BvcnRlckR1ZmZNb2RlKG90aGVyLm1f cG9ydGVyRHVmZk1vZGUpCisgICAgLCBtX3hmZXJNb2RlKG90aGVyLm1feGZlck1vZGUpCiAgICAg LCBtX2dyYWRpZW50KG90aGVyLm1fZ3JhZGllbnQpCiAgICAgLCBtX3BhdHRlcm4ob3RoZXIubV9w YXR0ZXJuKQogICAgICwgbV91c2VBbnRpYWxpYXNpbmcob3RoZXIubV91c2VBbnRpYWxpYXNpbmcp CkBAIC0yOTksNyArMjk5LDcgQEAgdm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpzZXR1cFBhaW50 Q29tbQogI2VuZGlmCiAKICAgICBwYWludC0+c2V0QW50aUFsaWFzKG1fc3RhdGUtPm1fdXNlQW50 aWFsaWFzaW5nKTsKLSAgICBwYWludC0+c2V0UG9ydGVyRHVmZlhmZXJtb2RlKG1fc3RhdGUtPm1f cG9ydGVyRHVmZk1vZGUpOworICAgIHBhaW50LT5zZXRYZmVybW9kZU1vZGUobV9zdGF0ZS0+bV94 ZmVyTW9kZSk7CiAgICAgcGFpbnQtPnNldExvb3BlcihtX3N0YXRlLT5tX2xvb3Blcik7CiAKICAg ICBpZiAobV9zdGF0ZS0+bV9ncmFkaWVudCkKQEAgLTM4Miw5ICszODIsOSBAQCB2b2lkIFBsYXRm b3JtQ29udGV4dFNraWE6OnNldExpbmVKb2luKFNrCiAgICAgbV9zdGF0ZS0+bV9saW5lSm9pbiA9 IGxqOwogfQogCi12b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnNldFBvcnRlckR1ZmZNb2RlKFNr UG9ydGVyRHVmZjo6TW9kZSBwZG0pCit2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnNldFhmZXJt b2RlTW9kZShTa1hmZXJtb2RlOjpNb2RlIHBkbSkKIHsKLSAgICBtX3N0YXRlLT5tX3BvcnRlckR1 ZmZNb2RlID0gcGRtOworICAgIG1fc3RhdGUtPm1feGZlck1vZGUgPSBwZG07CiB9CiAKIHZvaWQg UGxhdGZvcm1Db250ZXh0U2tpYTo6c2V0RmlsbENvbG9yKFNrQ29sb3IgY29sb3IpCkBAIC01MjYs NyArNTI2LDcgQEAgdm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjphcHBseUNsaXBGcm9tSQogICAg IC8vIE5PVEU6IHRoaXMgYXNzdW1lcyB0aGUgaW1hZ2UgbWFzayBjb250YWlucyBvcGFxdWUgYmxh Y2sgZm9yIHRoZSBwb3J0aW9ucyB0aGF0IGFyZSB0byBiZSBzaG93biwgYXMgc3VjaCB3ZQogICAg IC8vIG9ubHkgbG9vayBhdCB0aGUgYWxwaGEgd2hlbiBjb21wb3NpdGluZy4gSSdtIG5vdCAxMDAl IHN1cmUgdGhpcyBpcyB3aGF0IFdlYktpdCBleHBlY3RzIGZvciBpbWFnZSBjbGlwcGluZy4KICAg ICBTa1BhaW50IHBhaW50OwotICAgIHBhaW50LnNldFBvcnRlckR1ZmZYZmVybW9kZShTa1BvcnRl ckR1ZmY6OmtEc3RJbl9Nb2RlKTsKKyAgICBwYWludC5zZXRYZmVybW9kZU1vZGUoU2tYZmVybW9k ZTo6a0RzdEluX01vZGUpOwogICAgIG1fY2FudmFzLT5kcmF3Qml0bWFwKGltYWdlQnVmZmVyLCBT a0Zsb2F0VG9TY2FsYXIocmVjdC54KCkpLCBTa0Zsb2F0VG9TY2FsYXIocmVjdC55KCkpLCAmcGFp bnQpOwogfQogI2VuZGlmCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxh dGZvcm1Db250ZXh0U2tpYS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmgJKHJldmlzaW9uIDQ1MDg2KQorKysgV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuaAkod29ya2luZyBj b3B5KQpAQCAtMTE1LDcgKzExNSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldExpbmVDYXAoU2tQ YWludDo6Q2FwKTsKICAgICB2b2lkIHNldExpbmVKb2luKFNrUGFpbnQ6OkpvaW4pOwogICAgIHZv aWQgc2V0RmlsbFJ1bGUoU2tQYXRoOjpGaWxsVHlwZSk7Ci0gICAgdm9pZCBzZXRQb3J0ZXJEdWZm TW9kZShTa1BvcnRlckR1ZmY6Ok1vZGUpOworICAgIHZvaWQgc2V0WGZlcm1vZGVNb2RlKFNrWGZl cm1vZGU6Ok1vZGUpOwogICAgIHZvaWQgc2V0RmlsbENvbG9yKFNrQ29sb3IpOwogICAgIHZvaWQg c2V0U3Ryb2tlU3R5bGUoV2ViQ29yZTo6U3Ryb2tlU3R5bGUpOwogICAgIHZvaWQgc2V0U3Ryb2tl Q29sb3IoU2tDb2xvcik7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2tp YVV0aWxzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEv U2tpYVV0aWxzLmNwcAkocmV2aXNpb24gNDUwODYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3NraWEvU2tpYVV0aWxzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEsMzcgKzQxLDM3IEBA CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIGNvbnN0IHN0cnVjdCBDb21wb3NpdE9w VG9Qb3J0ZXJEdWZmTW9kZSB7CitzdGF0aWMgY29uc3Qgc3RydWN0IENvbXBvc2l0T3BUb1hmZXJt b2RlTW9kZSB7CiAgICAgdWludDhfdCBtQ29tcG9zaXRPcDsKLSAgICB1aW50OF90IG1Qb3J0ZXJE dWZmTW9kZTsKLX0gZ01hcENvbXBvc2l0T3BzVG9Qb3J0ZXJEdWZmTW9kZXNbXSA9IHsKLSAgICB7 IENvbXBvc2l0ZUNsZWFyLCAgICAgICAgICAgU2tQb3J0ZXJEdWZmOjprQ2xlYXJfTW9kZSB9LAot ICAgIHsgQ29tcG9zaXRlQ29weSwgICAgICAgICAgICBTa1BvcnRlckR1ZmY6OmtTcmNfTW9kZSB9 LAotICAgIHsgQ29tcG9zaXRlU291cmNlT3ZlciwgICAgICBTa1BvcnRlckR1ZmY6OmtTcmNPdmVy X01vZGUgfSwKLSAgICB7IENvbXBvc2l0ZVNvdXJjZUluLCAgICAgICAgU2tQb3J0ZXJEdWZmOjpr U3JjSW5fTW9kZSB9LAotICAgIHsgQ29tcG9zaXRlU291cmNlT3V0LCAgICAgICBTa1BvcnRlckR1 ZmY6OmtTcmNPdXRfTW9kZSB9LAotICAgIHsgQ29tcG9zaXRlU291cmNlQXRvcCwgICAgICBTa1Bv cnRlckR1ZmY6OmtTcmNBVG9wX01vZGUgfSwKLSAgICB7IENvbXBvc2l0ZURlc3RpbmF0aW9uT3Zl ciwgU2tQb3J0ZXJEdWZmOjprRHN0T3Zlcl9Nb2RlIH0sCi0gICAgeyBDb21wb3NpdGVEZXN0aW5h dGlvbkluLCAgIFNrUG9ydGVyRHVmZjo6a0RzdEluX01vZGUgfSwKLSAgICB7IENvbXBvc2l0ZURl c3RpbmF0aW9uT3V0LCAgU2tQb3J0ZXJEdWZmOjprRHN0T3V0X01vZGUgfSwKLSAgICB7IENvbXBv c2l0ZURlc3RpbmF0aW9uQXRvcCwgU2tQb3J0ZXJEdWZmOjprRHN0QVRvcF9Nb2RlIH0sCi0gICAg eyBDb21wb3NpdGVYT1IsICAgICAgICAgICAgIFNrUG9ydGVyRHVmZjo6a1hvcl9Nb2RlIH0sCi0g ICAgeyBDb21wb3NpdGVQbHVzRGFya2VyLCAgICAgIFNrUG9ydGVyRHVmZjo6a0Rhcmtlbl9Nb2Rl IH0sCi0gICAgeyBDb21wb3NpdGVIaWdobGlnaHQsICAgICAgIFNrUG9ydGVyRHVmZjo6a1NyY092 ZXJfTW9kZSB9LCAgLy8gVE9ETwotICAgIHsgQ29tcG9zaXRlUGx1c0xpZ2h0ZXIsICAgICBTa1Bv cnRlckR1ZmY6OmtBZGRfTW9kZSB9CisgICAgdWludDhfdCBtX3hmZXJtb2RlTW9kZTsKK30gZ01h cENvbXBvc2l0T3BzVG9YZmVybW9kZU1vZGVzW10gPSB7CisgICAgeyBDb21wb3NpdGVDbGVhciwg ICAgICAgICAgIFNrWGZlcm1vZGU6OmtDbGVhcl9Nb2RlIH0sCisgICAgeyBDb21wb3NpdGVDb3B5 LCAgICAgICAgICAgIFNrWGZlcm1vZGU6OmtTcmNfTW9kZSB9LAorICAgIHsgQ29tcG9zaXRlU291 cmNlT3ZlciwgICAgICBTa1hmZXJtb2RlOjprU3JjT3Zlcl9Nb2RlIH0sCisgICAgeyBDb21wb3Np dGVTb3VyY2VJbiwgICAgICAgIFNrWGZlcm1vZGU6OmtTcmNJbl9Nb2RlIH0sCisgICAgeyBDb21w b3NpdGVTb3VyY2VPdXQsICAgICAgIFNrWGZlcm1vZGU6OmtTcmNPdXRfTW9kZSB9LAorICAgIHsg Q29tcG9zaXRlU291cmNlQXRvcCwgICAgICBTa1hmZXJtb2RlOjprU3JjQVRvcF9Nb2RlIH0sCisg ICAgeyBDb21wb3NpdGVEZXN0aW5hdGlvbk92ZXIsIFNrWGZlcm1vZGU6OmtEc3RPdmVyX01vZGUg fSwKKyAgICB7IENvbXBvc2l0ZURlc3RpbmF0aW9uSW4sICAgU2tYZmVybW9kZTo6a0RzdEluX01v ZGUgfSwKKyAgICB7IENvbXBvc2l0ZURlc3RpbmF0aW9uT3V0LCAgU2tYZmVybW9kZTo6a0RzdE91 dF9Nb2RlIH0sCisgICAgeyBDb21wb3NpdGVEZXN0aW5hdGlvbkF0b3AsIFNrWGZlcm1vZGU6OmtE c3RBVG9wX01vZGUgfSwKKyAgICB7IENvbXBvc2l0ZVhPUiwgICAgICAgICAgICAgU2tYZmVybW9k ZTo6a1hvcl9Nb2RlIH0sCisgICAgeyBDb21wb3NpdGVQbHVzRGFya2VyLCAgICAgIFNrWGZlcm1v ZGU6OmtEYXJrZW5fTW9kZSB9LAorICAgIHsgQ29tcG9zaXRlSGlnaGxpZ2h0LCAgICAgICBTa1hm ZXJtb2RlOjprU3JjT3Zlcl9Nb2RlIH0sICAvLyBUT0RPCisgICAgeyBDb21wb3NpdGVQbHVzTGln aHRlciwgICAgIFNrWGZlcm1vZGU6OmtQbHVzX01vZGUgfQogfTsKIAotU2tQb3J0ZXJEdWZmOjpN b2RlIFdlYkNvcmVDb21wb3NpdGVUb1NraWFDb21wb3NpdGUoQ29tcG9zaXRlT3BlcmF0b3Igb3Ap CitTa1hmZXJtb2RlOjpNb2RlIFdlYkNvcmVDb21wb3NpdGVUb1NraWFDb21wb3NpdGUoQ29tcG9z aXRlT3BlcmF0b3Igb3ApCiB7Ci0gICAgY29uc3QgQ29tcG9zaXRPcFRvUG9ydGVyRHVmZk1vZGUq IHRhYmxlID0gZ01hcENvbXBvc2l0T3BzVG9Qb3J0ZXJEdWZmTW9kZXM7CisgICAgY29uc3QgQ29t cG9zaXRPcFRvWGZlcm1vZGVNb2RlKiB0YWJsZSA9IGdNYXBDb21wb3NpdE9wc1RvWGZlcm1vZGVN b2RlczsKICAgICAKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgU0tfQVJSQVlfQ09VTlQo Z01hcENvbXBvc2l0T3BzVG9Qb3J0ZXJEdWZmTW9kZXMpOyBpKyspIHsKKyAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwgU0tfQVJSQVlfQ09VTlQoZ01hcENvbXBvc2l0T3BzVG9YZmVybW9kZU1v ZGVzKTsgaSsrKSB7CiAgICAgICAgIGlmICh0YWJsZVtpXS5tQ29tcG9zaXRPcCA9PSBvcCkKLSAg ICAgICAgICAgIHJldHVybiAoU2tQb3J0ZXJEdWZmOjpNb2RlKXRhYmxlW2ldLm1Qb3J0ZXJEdWZm TW9kZTsKKyAgICAgICAgICAgIHJldHVybiAoU2tYZmVybW9kZTo6TW9kZSl0YWJsZVtpXS5tX3hm ZXJtb2RlTW9kZTsKICAgICB9CiAKICAgICBTa0RFQlVHRigoIkdyYXBoaWNzQ29udGV4dDo6c2V0 Q29tcG9zaXRlT3BlcmF0aW9uIHVrbm93biBDb21wb3NpdGVPcGVyYXRvciAlZFxuIiwgb3ApKTsK LSAgICByZXR1cm4gU2tQb3J0ZXJEdWZmOjprU3JjT3Zlcl9Nb2RlOyAvLyBmYWxsLWJhY2sKKyAg ICByZXR1cm4gU2tYZmVybW9kZTo6a1NyY092ZXJfTW9kZTsgLy8gZmFsbC1iYWNrCiB9CiAKIHN0 YXRpYyBVOENQVSBJbnZTY2FsZUJ5dGUoVThDUFUgY29tcG9uZW50LCB1aW50MzJfdCBzY2FsZSkK SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Ta2lhVXRpbHMuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2tpYVV0aWxzLmgJKHJldmlz aW9uIDQ1MDg2KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1NraWFVdGlscy5o CSh3b3JraW5nIGNvcHkpCkBAIC0zNiwxNCArMzYsMTQgQEAKICNpbmNsdWRlIDx3dGYvTWF0aEV4 dHJhcy5oPgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIlNrUGF0aC5o IgotI2luY2x1ZGUgIlNrUG9ydGVyRHVmZi5oIgorI2luY2x1ZGUgIlNrWGZlcm1vZGUuaCIKIAog Y2xhc3MgU2tDYW52YXM7CiBjbGFzcyBTa1JlZ2lvbjsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog Ci1Ta1BvcnRlckR1ZmY6Ok1vZGUgV2ViQ29yZUNvbXBvc2l0ZVRvU2tpYUNvbXBvc2l0ZShDb21w b3NpdGVPcGVyYXRvcik7CitTa1hmZXJtb2RlOjpNb2RlIFdlYkNvcmVDb21wb3NpdGVUb1NraWFD b21wb3NpdGUoQ29tcG9zaXRlT3BlcmF0b3IpOwogCiAvLyBtb3ZlIHRoaXMgZ3V5IGludG8gU2tD b2xvci5oCiBTa0NvbG9yIFNrUE1Db2xvclRvQ29sb3IoU2tQTUNvbG9yKTsK 31809 2009-06-24 14:01:48 -0700 2009-06-24 16:39:06 -0700 Fill in bug, reviewer, and email fields webkit_skia_patch.txt text/plain 11250 thakis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTA4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMDktMDYtMjQgIE5pY29sYXMgV2ViZXIgIDx0aGFraXNAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjY4NQorICAgICAgICBBY2Nv bW9kYXRlIGZvciBiYWNrd2FyZHMtaW5jb21wYXRpYmxlIHNraWEgYXBpIGNoYW5nZXMuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpjbGVhclJlY3QpOgorICAgICAgICAo V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpzZXRDb21wb3NpdGVPcGVyYXRpb24pOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJTa2lhLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkltYWdlQnVmZmVyOjpJbWFnZUJ1ZmZlcik6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9JbWFnZVNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cGFpbnRTa0Jp dG1hcCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZTo6ZHJhd1BhdHRlcm4pOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHA6CisgICAgICAg IChQbGF0Zm9ybUNvbnRleHRTa2lhOjpTdGF0ZTo6U3RhdGUpOgorICAgICAgICAoUGxhdGZvcm1D b250ZXh0U2tpYTo6c2V0dXBQYWludENvbW1vbik6CisgICAgICAgIChQbGF0Zm9ybUNvbnRleHRT a2lhOjpzZXRYZmVybW9kZU1vZGUpOgorICAgICAgICAoUGxhdGZvcm1Db250ZXh0U2tpYTo6YXBw bHlDbGlwRnJvbUltYWdlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRm b3JtQ29udGV4dFNraWEuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1NraWFV dGlscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjopOgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29y ZUNvbXBvc2l0ZVRvU2tpYUNvbXBvc2l0ZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9Ta2lhVXRpbHMuaDoKKwogMjAwOS0wNi0yNCAgRGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgpJbmRleDogV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRT a2lhLmNwcAkocmV2aXNpb24gNDUwODYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Nr aWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzMSw3ICszMzEs NyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xlYXJSZWN0KGNvbnN0IEZsCiAKICAgICBTa1Bh aW50IHBhaW50OwogICAgIHBsYXRmb3JtQ29udGV4dCgpLT5zZXR1cFBhaW50Rm9yRmlsbGluZygm cGFpbnQpOwotICAgIHBhaW50LnNldFBvcnRlckR1ZmZYZmVybW9kZShTa1BvcnRlckR1ZmY6OmtD bGVhcl9Nb2RlKTsKKyAgICBwYWludC5zZXRYZmVybW9kZU1vZGUoU2tYZmVybW9kZTo6a0NsZWFy X01vZGUpOwogICAgIHBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKS0+ZHJhd1JlY3QociwgcGFp bnQpOwogfQogCkBAIC04NTgsNyArODU4LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnNldENv bXBvc2l0ZU9wZXJhdAogewogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJl dHVybjsKLSAgICBwbGF0Zm9ybUNvbnRleHQoKS0+c2V0UG9ydGVyRHVmZk1vZGUoV2ViQ29yZUNv bXBvc2l0ZVRvU2tpYUNvbXBvc2l0ZShvcCkpOworICAgIHBsYXRmb3JtQ29udGV4dCgpLT5zZXRY ZmVybW9kZU1vZGUoV2ViQ29yZUNvbXBvc2l0ZVRvU2tpYUNvbXBvc2l0ZShvcCkpOwogfQogCiB2 b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0SW1hZ2VJbnRlcnBvbGF0aW9uUXVhbGl0eShJbnRlcnBv bGF0aW9uUXVhbGl0eSkKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFn ZUJ1ZmZlclNraWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCShyZXZpc2lvbiA0NTA4NikKKysrIFdlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC03MSw3ICs3MSw3IEBAIEltYWdlQnVmZmVyOjpJbWFnZUJ1ZmZlcihjb25zdCBJbnRTaXplJiAK ICAgICAvLyBNYWtlIHRoZSBiYWNrZ3JvdW5kIHRyYW5zcGFyZW50LiBJdCB3b3VsZCBiZSBuaWNl IGlmIHRoaXMgd2Fzbid0CiAgICAgLy8gcmVxdWlyZWQsIGJ1dCB0aGUgY2FudmFzIGlzIGN1cnJl bnRseSBmaWxsZWQgd2l0aCB0aGUgbWFnaWMgdHJhbnNwYXJlbmN5CiAgICAgLy8gY29sb3IuIENh biB3ZSBoYXZlIGFub3RoZXIgd2F5IHRvIG1hbmFnZSB0aGlzPwotICAgIG1fZGF0YS5tX2NhbnZh cy5kcmF3QVJHQigwLCAwLCAwLCAwLCBTa1BvcnRlckR1ZmY6OmtDbGVhcl9Nb2RlKTsKKyAgICBt X2RhdGEubV9jYW52YXMuZHJhd0FSR0IoMCwgMCwgMCwgMCwgU2tYZmVybW9kZTo6a0NsZWFyX01v ZGUpOwogICAgIHN1Y2Nlc3MgPSB0cnVlOwogfQogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3NraWEvSW1hZ2VTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3NraWEvSW1hZ2VTa2lhLmNwcAkocmV2aXNpb24gNDUwODYpCisrKyBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VTa2lhLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjIwLDEwICsyMjAsMTAgQEAgc3RhdGljIHZvaWQgZHJhd1Jlc2FtcGxlZEJpdG1hcChTa0NhbnZh cwogICAgIH0KIH0KIAotc3RhdGljIHZvaWQgcGFpbnRTa0JpdG1hcChQbGF0Zm9ybUNvbnRleHRT a2lhKiBwbGF0Zm9ybUNvbnRleHQsIGNvbnN0IE5hdGl2ZUltYWdlU2tpYSYgYml0bWFwLCBjb25z dCBTa0lSZWN0JiBzcmNSZWN0LCBjb25zdCBTa1JlY3QmIGRlc3RSZWN0LCBjb25zdCBTa1BvcnRl ckR1ZmY6Ok1vZGUmIGNvbXBPcCkKK3N0YXRpYyB2b2lkIHBhaW50U2tCaXRtYXAoUGxhdGZvcm1D b250ZXh0U2tpYSogcGxhdGZvcm1Db250ZXh0LCBjb25zdCBOYXRpdmVJbWFnZVNraWEmIGJpdG1h cCwgY29uc3QgU2tJUmVjdCYgc3JjUmVjdCwgY29uc3QgU2tSZWN0JiBkZXN0UmVjdCwgY29uc3Qg U2tYZmVybW9kZTo6TW9kZSYgY29tcE9wKQogewogICAgIFNrUGFpbnQgcGFpbnQ7Ci0gICAgcGFp bnQuc2V0UG9ydGVyRHVmZlhmZXJtb2RlKGNvbXBPcCk7CisgICAgcGFpbnQuc2V0WGZlcm1vZGVN b2RlKGNvbXBPcCk7CiAgICAgcGFpbnQuc2V0RmlsdGVyQml0bWFwKHRydWUpOwogICAgIGludCBh bHBoYSA9IHJvdW5kZihwbGF0Zm9ybUNvbnRleHQtPmdldEFscGhhKCkgKiAyNTYpOwogICAgIGlm IChhbHBoYSA+IDI1NSkKQEAgLTM3OSw3ICszNzksNyBAQCB2b2lkIEltYWdlOjpkcmF3UGF0dGVy bihHcmFwaGljc0NvbnRleHQqCiAKICAgICBTa1BhaW50IHBhaW50OwogICAgIHBhaW50LnNldFNo YWRlcihzaGFkZXIpLT51bnJlZigpOwotICAgIHBhaW50LnNldFBvcnRlckR1ZmZYZmVybW9kZShX ZWJDb3JlQ29tcG9zaXRlVG9Ta2lhQ29tcG9zaXRlKGNvbXBvc2l0ZU9wKSk7CisgICAgcGFpbnQu c2V0WGZlcm1vZGVNb2RlKFdlYkNvcmVDb21wb3NpdGVUb1NraWFDb21wb3NpdGUoY29tcG9zaXRl T3ApKTsKICAgICBwYWludC5zZXRGaWx0ZXJCaXRtYXAocmVzYW1wbGluZyA9PSBSRVNBTVBMRV9M SU5FQVIpOwogCiAgICAgY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCktPnBhaW50U2tQYWludChk ZXN0UmVjdCwgcGFpbnQpOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1Bs YXRmb3JtQ29udGV4dFNraWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcAkocmV2aXNpb24gNDUwODYpCisrKyBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTU3LDcgKzU3LDcgQEAgc3RydWN0IFBsYXRmb3JtQ29udGV4dFNraWE6 OlN0YXRlIHsKIAogICAgIC8vIENvbW1vbiBzaGFkZXIgc3RhdGUuCiAgICAgZmxvYXQgbV9hbHBo YTsKLSAgICBTa1BvcnRlckR1ZmY6Ok1vZGUgbV9wb3J0ZXJEdWZmTW9kZTsKKyAgICBTa1hmZXJt b2RlOjpNb2RlIG1feGZlck1vZGU7CiAgICAgU2tTaGFkZXIqIG1fZ3JhZGllbnQ7CiAgICAgU2tT aGFkZXIqIG1fcGF0dGVybjsKICAgICBib29sIG1fdXNlQW50aWFsaWFzaW5nOwpAQCAtOTgsNyAr OTgsNyBAQCBwcml2YXRlOgogLy8gTm90ZTogS2VlcCB0aGVzZXMgZGVmYXVsdCB2YWx1ZXMgaW4g c3luYyB3aXRoIEdyYXBoaWNzQ29udGV4dFN0YXRlLgogUGxhdGZvcm1Db250ZXh0U2tpYTo6U3Rh dGU6OlN0YXRlKCkKICAgICA6IG1fYWxwaGEoMSkKLSAgICAsIG1fcG9ydGVyRHVmZk1vZGUoU2tQ b3J0ZXJEdWZmOjprU3JjT3Zlcl9Nb2RlKQorICAgICwgbV94ZmVyTW9kZShTa1hmZXJtb2RlOjpr U3JjT3Zlcl9Nb2RlKQogICAgICwgbV9ncmFkaWVudCgwKQogICAgICwgbV9wYXR0ZXJuKDApCiAg ICAgLCBtX3VzZUFudGlhbGlhc2luZyh0cnVlKQpAQCAtMTE4LDcgKzExOCw3IEBAIFBsYXRmb3Jt Q29udGV4dFNraWE6OlN0YXRlOjpTdGF0ZSgpCiAKIFBsYXRmb3JtQ29udGV4dFNraWE6OlN0YXRl OjpTdGF0ZShjb25zdCBTdGF0ZSYgb3RoZXIpCiAgICAgOiBtX2FscGhhKG90aGVyLm1fYWxwaGEp Ci0gICAgLCBtX3BvcnRlckR1ZmZNb2RlKG90aGVyLm1fcG9ydGVyRHVmZk1vZGUpCisgICAgLCBt X3hmZXJNb2RlKG90aGVyLm1feGZlck1vZGUpCiAgICAgLCBtX2dyYWRpZW50KG90aGVyLm1fZ3Jh ZGllbnQpCiAgICAgLCBtX3BhdHRlcm4ob3RoZXIubV9wYXR0ZXJuKQogICAgICwgbV91c2VBbnRp YWxpYXNpbmcob3RoZXIubV91c2VBbnRpYWxpYXNpbmcpCkBAIC0yOTksNyArMjk5LDcgQEAgdm9p ZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpzZXR1cFBhaW50Q29tbQogI2VuZGlmCiAKICAgICBwYWlu dC0+c2V0QW50aUFsaWFzKG1fc3RhdGUtPm1fdXNlQW50aWFsaWFzaW5nKTsKLSAgICBwYWludC0+ c2V0UG9ydGVyRHVmZlhmZXJtb2RlKG1fc3RhdGUtPm1fcG9ydGVyRHVmZk1vZGUpOworICAgIHBh aW50LT5zZXRYZmVybW9kZU1vZGUobV9zdGF0ZS0+bV94ZmVyTW9kZSk7CiAgICAgcGFpbnQtPnNl dExvb3BlcihtX3N0YXRlLT5tX2xvb3Blcik7CiAKICAgICBpZiAobV9zdGF0ZS0+bV9ncmFkaWVu dCkKQEAgLTM4Miw5ICszODIsOSBAQCB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnNldExpbmVK b2luKFNrCiAgICAgbV9zdGF0ZS0+bV9saW5lSm9pbiA9IGxqOwogfQogCi12b2lkIFBsYXRmb3Jt Q29udGV4dFNraWE6OnNldFBvcnRlckR1ZmZNb2RlKFNrUG9ydGVyRHVmZjo6TW9kZSBwZG0pCit2 b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnNldFhmZXJtb2RlTW9kZShTa1hmZXJtb2RlOjpNb2Rl IHBkbSkKIHsKLSAgICBtX3N0YXRlLT5tX3BvcnRlckR1ZmZNb2RlID0gcGRtOworICAgIG1fc3Rh dGUtPm1feGZlck1vZGUgPSBwZG07CiB9CiAKIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6c2V0 RmlsbENvbG9yKFNrQ29sb3IgY29sb3IpCkBAIC01MjYsNyArNTI2LDcgQEAgdm9pZCBQbGF0Zm9y bUNvbnRleHRTa2lhOjphcHBseUNsaXBGcm9tSQogICAgIC8vIE5PVEU6IHRoaXMgYXNzdW1lcyB0 aGUgaW1hZ2UgbWFzayBjb250YWlucyBvcGFxdWUgYmxhY2sgZm9yIHRoZSBwb3J0aW9ucyB0aGF0 IGFyZSB0byBiZSBzaG93biwgYXMgc3VjaCB3ZQogICAgIC8vIG9ubHkgbG9vayBhdCB0aGUgYWxw aGEgd2hlbiBjb21wb3NpdGluZy4gSSdtIG5vdCAxMDAlIHN1cmUgdGhpcyBpcyB3aGF0IFdlYktp dCBleHBlY3RzIGZvciBpbWFnZSBjbGlwcGluZy4KICAgICBTa1BhaW50IHBhaW50OwotICAgIHBh aW50LnNldFBvcnRlckR1ZmZYZmVybW9kZShTa1BvcnRlckR1ZmY6OmtEc3RJbl9Nb2RlKTsKKyAg ICBwYWludC5zZXRYZmVybW9kZU1vZGUoU2tYZmVybW9kZTo6a0RzdEluX01vZGUpOwogICAgIG1f Y2FudmFzLT5kcmF3Qml0bWFwKGltYWdlQnVmZmVyLCBTa0Zsb2F0VG9TY2FsYXIocmVjdC54KCkp LCBTa0Zsb2F0VG9TY2FsYXIocmVjdC55KCkpLCAmcGFpbnQpOwogfQogI2VuZGlmCkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRT a2lhLmgJKHJldmlzaW9uIDQ1MDg2KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lh L1BsYXRmb3JtQ29udGV4dFNraWEuaAkod29ya2luZyBjb3B5KQpAQCAtMTE1LDcgKzExNSw3IEBA IHB1YmxpYzoKICAgICB2b2lkIHNldExpbmVDYXAoU2tQYWludDo6Q2FwKTsKICAgICB2b2lkIHNl dExpbmVKb2luKFNrUGFpbnQ6OkpvaW4pOwogICAgIHZvaWQgc2V0RmlsbFJ1bGUoU2tQYXRoOjpG aWxsVHlwZSk7Ci0gICAgdm9pZCBzZXRQb3J0ZXJEdWZmTW9kZShTa1BvcnRlckR1ZmY6Ok1vZGUp OworICAgIHZvaWQgc2V0WGZlcm1vZGVNb2RlKFNrWGZlcm1vZGU6Ok1vZGUpOwogICAgIHZvaWQg c2V0RmlsbENvbG9yKFNrQ29sb3IpOwogICAgIHZvaWQgc2V0U3Ryb2tlU3R5bGUoV2ViQ29yZTo6 U3Ryb2tlU3R5bGUpOwogICAgIHZvaWQgc2V0U3Ryb2tlQ29sb3IoU2tDb2xvcik7CkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2tpYVV0aWxzLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2tpYVV0aWxzLmNwcAkocmV2aXNpb24g NDUwODYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2tpYVV0aWxzLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNDEsMzcgKzQxLDM3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAotc3RhdGljIGNvbnN0IHN0cnVjdCBDb21wb3NpdE9wVG9Qb3J0ZXJEdWZmTW9kZSB7CitzdGF0 aWMgY29uc3Qgc3RydWN0IENvbXBvc2l0T3BUb1hmZXJtb2RlTW9kZSB7CiAgICAgdWludDhfdCBt Q29tcG9zaXRPcDsKLSAgICB1aW50OF90IG1Qb3J0ZXJEdWZmTW9kZTsKLX0gZ01hcENvbXBvc2l0 T3BzVG9Qb3J0ZXJEdWZmTW9kZXNbXSA9IHsKLSAgICB7IENvbXBvc2l0ZUNsZWFyLCAgICAgICAg ICAgU2tQb3J0ZXJEdWZmOjprQ2xlYXJfTW9kZSB9LAotICAgIHsgQ29tcG9zaXRlQ29weSwgICAg ICAgICAgICBTa1BvcnRlckR1ZmY6OmtTcmNfTW9kZSB9LAotICAgIHsgQ29tcG9zaXRlU291cmNl T3ZlciwgICAgICBTa1BvcnRlckR1ZmY6OmtTcmNPdmVyX01vZGUgfSwKLSAgICB7IENvbXBvc2l0 ZVNvdXJjZUluLCAgICAgICAgU2tQb3J0ZXJEdWZmOjprU3JjSW5fTW9kZSB9LAotICAgIHsgQ29t cG9zaXRlU291cmNlT3V0LCAgICAgICBTa1BvcnRlckR1ZmY6OmtTcmNPdXRfTW9kZSB9LAotICAg IHsgQ29tcG9zaXRlU291cmNlQXRvcCwgICAgICBTa1BvcnRlckR1ZmY6OmtTcmNBVG9wX01vZGUg fSwKLSAgICB7IENvbXBvc2l0ZURlc3RpbmF0aW9uT3ZlciwgU2tQb3J0ZXJEdWZmOjprRHN0T3Zl cl9Nb2RlIH0sCi0gICAgeyBDb21wb3NpdGVEZXN0aW5hdGlvbkluLCAgIFNrUG9ydGVyRHVmZjo6 a0RzdEluX01vZGUgfSwKLSAgICB7IENvbXBvc2l0ZURlc3RpbmF0aW9uT3V0LCAgU2tQb3J0ZXJE dWZmOjprRHN0T3V0X01vZGUgfSwKLSAgICB7IENvbXBvc2l0ZURlc3RpbmF0aW9uQXRvcCwgU2tQ b3J0ZXJEdWZmOjprRHN0QVRvcF9Nb2RlIH0sCi0gICAgeyBDb21wb3NpdGVYT1IsICAgICAgICAg ICAgIFNrUG9ydGVyRHVmZjo6a1hvcl9Nb2RlIH0sCi0gICAgeyBDb21wb3NpdGVQbHVzRGFya2Vy LCAgICAgIFNrUG9ydGVyRHVmZjo6a0Rhcmtlbl9Nb2RlIH0sCi0gICAgeyBDb21wb3NpdGVIaWdo bGlnaHQsICAgICAgIFNrUG9ydGVyRHVmZjo6a1NyY092ZXJfTW9kZSB9LCAgLy8gVE9ETwotICAg IHsgQ29tcG9zaXRlUGx1c0xpZ2h0ZXIsICAgICBTa1BvcnRlckR1ZmY6OmtBZGRfTW9kZSB9Cisg ICAgdWludDhfdCBtX3hmZXJtb2RlTW9kZTsKK30gZ01hcENvbXBvc2l0T3BzVG9YZmVybW9kZU1v ZGVzW10gPSB7CisgICAgeyBDb21wb3NpdGVDbGVhciwgICAgICAgICAgIFNrWGZlcm1vZGU6OmtD bGVhcl9Nb2RlIH0sCisgICAgeyBDb21wb3NpdGVDb3B5LCAgICAgICAgICAgIFNrWGZlcm1vZGU6 OmtTcmNfTW9kZSB9LAorICAgIHsgQ29tcG9zaXRlU291cmNlT3ZlciwgICAgICBTa1hmZXJtb2Rl OjprU3JjT3Zlcl9Nb2RlIH0sCisgICAgeyBDb21wb3NpdGVTb3VyY2VJbiwgICAgICAgIFNrWGZl cm1vZGU6OmtTcmNJbl9Nb2RlIH0sCisgICAgeyBDb21wb3NpdGVTb3VyY2VPdXQsICAgICAgIFNr WGZlcm1vZGU6OmtTcmNPdXRfTW9kZSB9LAorICAgIHsgQ29tcG9zaXRlU291cmNlQXRvcCwgICAg ICBTa1hmZXJtb2RlOjprU3JjQVRvcF9Nb2RlIH0sCisgICAgeyBDb21wb3NpdGVEZXN0aW5hdGlv bk92ZXIsIFNrWGZlcm1vZGU6OmtEc3RPdmVyX01vZGUgfSwKKyAgICB7IENvbXBvc2l0ZURlc3Rp bmF0aW9uSW4sICAgU2tYZmVybW9kZTo6a0RzdEluX01vZGUgfSwKKyAgICB7IENvbXBvc2l0ZURl c3RpbmF0aW9uT3V0LCAgU2tYZmVybW9kZTo6a0RzdE91dF9Nb2RlIH0sCisgICAgeyBDb21wb3Np dGVEZXN0aW5hdGlvbkF0b3AsIFNrWGZlcm1vZGU6OmtEc3RBVG9wX01vZGUgfSwKKyAgICB7IENv bXBvc2l0ZVhPUiwgICAgICAgICAgICAgU2tYZmVybW9kZTo6a1hvcl9Nb2RlIH0sCisgICAgeyBD b21wb3NpdGVQbHVzRGFya2VyLCAgICAgIFNrWGZlcm1vZGU6OmtEYXJrZW5fTW9kZSB9LAorICAg IHsgQ29tcG9zaXRlSGlnaGxpZ2h0LCAgICAgICBTa1hmZXJtb2RlOjprU3JjT3Zlcl9Nb2RlIH0s ICAvLyBUT0RPCisgICAgeyBDb21wb3NpdGVQbHVzTGlnaHRlciwgICAgIFNrWGZlcm1vZGU6OmtQ bHVzX01vZGUgfQogfTsKIAotU2tQb3J0ZXJEdWZmOjpNb2RlIFdlYkNvcmVDb21wb3NpdGVUb1Nr aWFDb21wb3NpdGUoQ29tcG9zaXRlT3BlcmF0b3Igb3ApCitTa1hmZXJtb2RlOjpNb2RlIFdlYkNv cmVDb21wb3NpdGVUb1NraWFDb21wb3NpdGUoQ29tcG9zaXRlT3BlcmF0b3Igb3ApCiB7Ci0gICAg Y29uc3QgQ29tcG9zaXRPcFRvUG9ydGVyRHVmZk1vZGUqIHRhYmxlID0gZ01hcENvbXBvc2l0T3Bz VG9Qb3J0ZXJEdWZmTW9kZXM7CisgICAgY29uc3QgQ29tcG9zaXRPcFRvWGZlcm1vZGVNb2RlKiB0 YWJsZSA9IGdNYXBDb21wb3NpdE9wc1RvWGZlcm1vZGVNb2RlczsKICAgICAKLSAgICBmb3IgKHVu c2lnbmVkIGkgPSAwOyBpIDwgU0tfQVJSQVlfQ09VTlQoZ01hcENvbXBvc2l0T3BzVG9Qb3J0ZXJE dWZmTW9kZXMpOyBpKyspIHsKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgU0tfQVJSQVlf Q09VTlQoZ01hcENvbXBvc2l0T3BzVG9YZmVybW9kZU1vZGVzKTsgaSsrKSB7CiAgICAgICAgIGlm ICh0YWJsZVtpXS5tQ29tcG9zaXRPcCA9PSBvcCkKLSAgICAgICAgICAgIHJldHVybiAoU2tQb3J0 ZXJEdWZmOjpNb2RlKXRhYmxlW2ldLm1Qb3J0ZXJEdWZmTW9kZTsKKyAgICAgICAgICAgIHJldHVy biAoU2tYZmVybW9kZTo6TW9kZSl0YWJsZVtpXS5tX3hmZXJtb2RlTW9kZTsKICAgICB9CiAKICAg ICBTa0RFQlVHRigoIkdyYXBoaWNzQ29udGV4dDo6c2V0Q29tcG9zaXRlT3BlcmF0aW9uIHVrbm93 biBDb21wb3NpdGVPcGVyYXRvciAlZFxuIiwgb3ApKTsKLSAgICByZXR1cm4gU2tQb3J0ZXJEdWZm OjprU3JjT3Zlcl9Nb2RlOyAvLyBmYWxsLWJhY2sKKyAgICByZXR1cm4gU2tYZmVybW9kZTo6a1Ny Y092ZXJfTW9kZTsgLy8gZmFsbC1iYWNrCiB9CiAKIHN0YXRpYyBVOENQVSBJbnZTY2FsZUJ5dGUo VThDUFUgY29tcG9uZW50LCB1aW50MzJfdCBzY2FsZSkKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9Ta2lhVXRpbHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3NraWEvU2tpYVV0aWxzLmgJKHJldmlzaW9uIDQ1MDg2KQorKysgV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9za2lhL1NraWFVdGlscy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiwx NCArMzYsMTQgQEAKICNpbmNsdWRlIDx3dGYvTWF0aEV4dHJhcy5oPgogI2luY2x1ZGUgIkdyYXBo aWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIlNrUGF0aC5oIgotI2luY2x1ZGUgIlNrUG9ydGVyRHVm Zi5oIgorI2luY2x1ZGUgIlNrWGZlcm1vZGUuaCIKIAogY2xhc3MgU2tDYW52YXM7CiBjbGFzcyBT a1JlZ2lvbjsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1Ta1BvcnRlckR1ZmY6Ok1vZGUgV2Vi Q29yZUNvbXBvc2l0ZVRvU2tpYUNvbXBvc2l0ZShDb21wb3NpdGVPcGVyYXRvcik7CitTa1hmZXJt b2RlOjpNb2RlIFdlYkNvcmVDb21wb3NpdGVUb1NraWFDb21wb3NpdGUoQ29tcG9zaXRlT3BlcmF0 b3IpOwogCiAvLyBtb3ZlIHRoaXMgZ3V5IGludG8gU2tDb2xvci5oCiBTa0NvbG9yIFNrUE1Db2xv clRvQ29sb3IoU2tQTUNvbG9yKTsK