86121 2012-05-10 11:32:58 -0700 [Chromium] Remove WEBKIT_USING_SKIA ifdefs that are always true 2012-05-10 14:43:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pilgrim pilgrim abarth dglazkov fishd jamesr tkent+wkapi webkit.review.bot oldest_to_newest 620773 0 pilgrim 2012-05-10 11:32:58 -0700 As discussed in https://bugs.webkit.org/show_bug.cgi?id=86018#c9 620782 1 jamesr 2012-05-10 11:36:31 -0700 Equivalent chromium patch is here: https://chromiumcodereview.appspot.com/10391041/ once that lands it should be possible to remove the WEBKIT_USING_SKIA definition from WebCommon.h 620842 2 141222 pilgrim 2012-05-10 12:18:59 -0700 Created attachment 141222 Patch 620845 3 pilgrim 2012-05-10 12:19:37 -0700 This patch does not touch WebCommon.h. 620846 4 webkit.review.bot 2012-05-10 12:20:19 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 620889 5 abarth 2012-05-10 13:02:24 -0700 Thanks! 621009 6 141222 webkit.review.bot 2012-05-10 14:43:20 -0700 Comment on attachment 141222 Patch Clearing flags on attachment: 141222 Committed r116689: <http://trac.webkit.org/changeset/116689> 621010 7 webkit.review.bot 2012-05-10 14:43:25 -0700 All reviewed patches have been landed. Closing bug. 141222 2012-05-10 12:18:59 -0700 2012-05-10 14:43:20 -0700 Patch bug-86121-20120510151855.patch text/plain 13241 pilgrim SW5kZXg6IFNvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1Bs YXRmb3JtL0NoYW5nZUxvZwkocmV2aXNpb24gMTE2Njc1KQorKysgU291cmNlL1BsYXRmb3JtL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA1LTEwICBNYXJr IFBpbGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJl bW92ZSBXRUJLSVRfVVNJTkdfU0tJQSBpZmRlZnMgdGhhdCBhcmUgYWx3YXlzIHRydWUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2MTIxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hyb21pdW0gYWx3YXlz IHVzZXMgU2tpYSBub3csIHNvIHRoaXMganVzdCByZW1vdmVzIHRoZSBiYXJyaWVycworICAgICAg ICBhcm91bmQgY29kZSB0aGF0IHdhcyBwcmV2aW91c2x5ICNpZidkLgorCisgICAgICAgICogY2hy b21pdW0vcHVibGljL1dlYkNhbnZhcy5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKiBj aHJvbWl1bS9wdWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaDoKKyAgICAgICAgKFdlYkdyYXBo aWNzQ29udGV4dDNEKToKKyAgICAgICAgKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0Q6Om9u Q3JlYXRlR3JHTEludGVyZmFjZSk6CisgICAgICAgICogY2hyb21pdW0vcHVibGljL1dlYkltYWdl Lmg6CisgICAgICAgIChXZWJJbWFnZSk6CisKIDIwMTItMDUtMTAgIE1hcmsgUGlsZ3JpbSAgPHBp bGdyaW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gUmVtb3ZlIGRlYWQgY29k ZSBiZWhpbmQgdW51c2VkIFdFQktJVF9VU0lOR19DRwpJbmRleDogU291cmNlL1BsYXRmb3JtL2No cm9taXVtL3B1YmxpYy9XZWJDYW52YXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvUGxhdGZvcm0v Y2hyb21pdW0vcHVibGljL1dlYkNhbnZhcy5oCShyZXZpc2lvbiAxMTY2NjYpCisrKyBTb3VyY2Uv UGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkNhbnZhcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0z MywxNyArMzMsMTEgQEAKIAogI2luY2x1ZGUgIldlYkNvbW1vbi5oIgogCi0jaWYgV0VCS0lUX1VT SU5HX1NLSUEKIGNsYXNzIFNrQ2FudmFzOwotI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJLaXQgewog Ci0jaWYgV0VCS0lUX1VTSU5HX1NLSUEKIHR5cGVkZWYgU2tDYW52YXMgV2ViQ2FudmFzOwotI2Vs c2UKLSNlcnJvciAiTmVlZCB0byBkZWZpbmUgV2ViQ2FudmFzIgotI2VuZGlmCiAKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdAogCkluZGV4OiBTb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dl YkdyYXBoaWNzQ29udGV4dDNELmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1BsYXRmb3JtL2Nocm9t aXVtL3B1YmxpYy9XZWJHcmFwaGljc0NvbnRleHQzRC5oCShyZXZpc2lvbiAxMTY2NjYpCisrKyBT b3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkdyYXBoaWNzQ29udGV4dDNELmgJKHdv cmtpbmcgY29weSkKQEAgLTM4LDkgKzM4LDcgQEAKIAogI2RlZmluZSBVU0VfV0dDM0RfVFlQRVMK IAotI2lmIFdFQktJVF9VU0lOR19TS0lBCiBzdHJ1Y3QgR3JHTEludGVyZmFjZTsKLSNlbmRpZgog CiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtNDEzLDE0ICs0MTEsMTAgQEAgcHVibGljOgogICAg IHZpcnR1YWwgdm9pZCBnZXRRdWVyeWl2RVhUKFdHQzNEZW51bSB0YXJnZXQsIFdHQzNEZW51bSBw bmFtZSwgV0dDM0RpbnQqIHBhcmFtcykgeyB9CiAgICAgdmlydHVhbCB2b2lkIGdldFF1ZXJ5T2Jq ZWN0dWl2RVhUKFdlYkdMSWQgcXVlcnksIFdHQzNEZW51bSBwbmFtZSwgV0dDM0R1aW50KiBwYXJh bXMpIHsgfQogCi0jaWYgV0VCS0lUX1VTSU5HX1NLSUEKICAgICBHckdMSW50ZXJmYWNlKiBjcmVh dGVHckdMSW50ZXJmYWNlKCk7Ci0jZW5kaWYKIAogcHJvdGVjdGVkOgotI2lmIFdFQktJVF9VU0lO R19TS0lBCiAgICAgdmlydHVhbCBHckdMSW50ZXJmYWNlKiBvbkNyZWF0ZUdyR0xJbnRlcmZhY2Uo KSB7IHJldHVybiAwOyB9Ci0jZW5kaWYKIAogfTsKIApJbmRleDogU291cmNlL1BsYXRmb3JtL2No cm9taXVtL3B1YmxpYy9XZWJJbWFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9QbGF0Zm9ybS9j aHJvbWl1bS9wdWJsaWMvV2ViSW1hZ2UuaAkocmV2aXNpb24gMTE2NjY2KQorKysgU291cmNlL1Bs YXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJJbWFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw5 ICszMyw3IEBACiAKICNpbmNsdWRlICJXZWJDb21tb24uaCIKIAotI2lmIFdFQktJVF9VU0lOR19T S0lBCiAjaW5jbHVkZSA8U2tCaXRtYXAuaD4KLSNlbmRpZgogCiAjaWYgV0VCS0lUX0lNUExFTUVO VEFUSU9OCiBuYW1lc3BhY2UgV2ViQ29yZSB7IGNsYXNzIEltYWdlOyB9CkBAIC04MSw3ICs3OSw2 IEBAIHB1YmxpYzoKICAgICBXZWJJbWFnZSYgb3BlcmF0b3I9KGNvbnN0IFdURjo6UGFzc1JlZlB0 cjxXZWJDb3JlOjpJbWFnZT4mKTsKICNlbmRpZgogCi0jaWYgV0VCS0lUX1VTSU5HX1NLSUEKICAg ICBXZWJJbWFnZShjb25zdCBTa0JpdG1hcCYgYml0bWFwKSA6IG1fYml0bWFwKGJpdG1hcCkgeyB9 CiAKICAgICBXZWJJbWFnZSYgb3BlcmF0b3I9KGNvbnN0IFNrQml0bWFwJiBiaXRtYXApCkBAIC05 Nyw3ICs5NCw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBpbml0KCkgeyB9CiAgICAgU2tCaXRtYXAg bV9iaXRtYXA7CiAKLSNlbmRpZgogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gMTE2Njc1KQorKysgU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwzNyBAQAorMjAx Mi0wNS0xMCAgTWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg W0Nocm9taXVtXSBSZW1vdmUgV0VCS0lUX1VTSU5HX1NLSUEgaWZkZWZzIHRoYXQgYXJlIGFsd2F5 cyB0cnVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 NjEyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENo cm9taXVtIGFsd2F5cyB1c2VzIFNraWEgbm93LCBzbyB0aGlzIGp1c3QgcmVtb3ZlcyB0aGUgYmFy cmllcnMKKyAgICAgICAgYXJvdW5kIGNvZGUgdGhhdCB3YXMgcHJldmlvdXNseSAjaWYnZC4KKwor ICAgICAgICAqIFJFQURNRToKKyAgICAgICAgKiBzcmMvRHJhZ0NsaWVudEltcGwuY3BwOgorICAg ICAgICAoV2ViS2l0OjpEcmFnQ2xpZW50SW1wbDo6c3RhcnREcmFnKToKKyAgICAgICAgKiBzcmMv UGFnZU92ZXJsYXkuY3BwOgorICAgICAgICAqIHNyYy9QbGF0Zm9ybVN1cHBvcnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UGxhdGZvcm1TdXBwb3J0OjpjbGlwYm9hcmRXcml0ZUltYWdlKToKKyAg ICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtU3VwcG9ydDo6cGFpbnRTY3JvbGxiYXJUaHVtYik6Cisg ICAgICAgICogc3JjL1dlYkNvbnRlbnRMYXllckltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJDb250ZW50TGF5ZXJJbXBsOjpwYWludENvbnRlbnRzKToKKyAgICAgICAgKiBzcmMvV2ViRm9u dEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGb250SW1wbDo6ZHJhd1RleHQpOgorICAg ICAgICAqIHNyYy9XZWJGcmFtZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUlt cGw6OnByaW50UGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6cHJpbnRQYWdl c1dpdGhCb3VuZGFyaWVzKToKKyAgICAgICAgKiBzcmMvV2ViR3JhcGhpY3NDb250ZXh0M0QuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRDo6Y3JlYXRlR3JHTEludGVy ZmFjZSk6CisgICAgICAgICogc3JjL1dlYkltYWdlRGVjb2Rlci5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkltYWdlRGVjb2Rlcjo6Z2V0RnJhbWVBdEluZGV4KToKKyAgICAgICAgKiBzcmMvV2Vi UGx1Z2luQ29udGFpbmVySW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBsdWdpbkNvbnRh aW5lckltcGw6OnBhaW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGx1Z2luQ29udGFpbmVySW1w bDo6cHJpbnRQYWdlKToKKyAgICAgICAgKiBzcmMvcGFpbnRpbmcvR3JhcGhpY3NDb250ZXh0QnVp bGRlci5oOgorICAgICAgICAoV2ViS2l0KToKKwogMjAxMi0wNS0xMCAgVmFydW4gSmFpbiAgPHZh cnVuamFpbkBnb29nbGUuY29tPgogCiAgICAgICAgIFtjaHJvbWl1bV0gVHJpZ2dlciBjb250ZXh0 IG1lbnUgZm9yIGxvbmcgcHJlc3MgZ2VzdHVyZQpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1 bS9SRUFETUUKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9SRUFETUUJKHJl dmlzaW9uIDExNjY2NikKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vUkVBRE1FCSh3b3JraW5n IGNvcHkpCkBAIC0zNSw4ICszNSw2IEBAIERFRklORVMKICAgY2FsbGVkIGJ5IGEgcHVibGljIGlu bGluZS1kZWZpbmVkIG1ldGhvZCBzaG91bGQgYmUgYW5ub3RhdGVkIHdpdGgKICAgV0VCS0lUX0VY UE9SVC4gIFdFQktJVF9FWFBPUlQgaXMgbm90IHVzZWQgdG8gZXhwb3J0IHdob2xlIGNsYXNzZXMu CiAKLSAgV0VCS0lUX1VTSU5HX1NLSUEgaXMgZGVmaW5lZCB3aGVuIHVzaW5nIFNraWEgYXMgdGhl IGdyYXBoaWNzIGxpYnJhcnkuCi0KICAgV0VCS0lUX1VTSU5HX1Y4IGlzIGRlZmluZWQgd2hlbiB1 c2luZyBWOCBhcyB0aGUgSmF2YVNjcmlwdCBsaWJyYXJ5LgogCiAgIFdFQktJVF9VU0lOR19KU0Mg aXMgZGVmaW5lZCB3aGVuIHVzaW5nIEpTQyBhcyB0aGUgSmF2YVNjcmlwdCBsaWJyYXJ5LgpJbmRl eDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRHJhZ0NsaWVudEltcGwuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0RyYWdDbGllbnRJbXBsLmNwcAkocmV2 aXNpb24gMTE2NjY2KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRHJhZ0NsaWVudElt cGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04OSwxMSArODksNyBAQCB2b2lkIERyYWdDbGllbnRJ bXBsOjpzdGFydERyYWcoRHJhZ0ltYWdlCiAgICAgV2ViUG9pbnQgb2Zmc2V0UG9pbnQob2Zmc2V0 U2l6ZS53aWR0aCgpLCBvZmZzZXRTaXplLmhlaWdodCgpKTsKICAgICBtX3dlYlZpZXctPnN0YXJ0 RHJhZ2dpbmcoCiAgICAgICAgIGRyYWdEYXRhLCBzdGF0aWNfY2FzdDxXZWJEcmFnT3BlcmF0aW9u c01hc2s+KGRyYWdPcGVyYXRpb25NYXNrKSwKLSNpZiBXRUJLSVRfVVNJTkdfU0tJQQogICAgICAg ICBkcmFnSW1hZ2UgPyBXZWJJbWFnZSgqZHJhZ0ltYWdlKSA6IFdlYkltYWdlKCksCi0jZWxzZQot ICAgICAgICBkcmFnSW1hZ2UgPyBXZWJJbWFnZShkcmFnSW1hZ2UpIDogV2ViSW1hZ2UoKSwKLSNl bmRpZgogICAgICAgICBvZmZzZXRQb2ludCk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1BhZ2VPdmVybGF5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9QYWdlT3ZlcmxheS5jcHAJKHJldmlzaW9uIDExNjY2NikKKysrIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1BhZ2VPdmVybGF5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYs OSArNDYsNyBAQCBuYW1lc3BhY2UgewogCiBXZWJDYW52YXMqIFRvV2ViQ2FudmFzKEdyYXBoaWNz Q29udGV4dCogZ2MpCiB7Ci0jaWYgV0VCS0lUX1VTSU5HX1NLSUEKICAgICByZXR1cm4gZ2MtPnBs YXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKTsKLSNlbmRpZgogfQogCiB9IC8vIG5hbWVzcGFjZQpJ bmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1cHBvcnQuY3Bw CShyZXZpc2lvbiAxMTY2NjYpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9y bVN1cHBvcnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MCw5ICs4MCw3IEBACiAjaW5jbHVkZSAi cGxhdGZvcm0vYW5kcm9pZC9XZWJUaGVtZUVuZ2luZS5oIgogI2VuZGlmCiAKLSNpZiBXRUJLSVRf VVNJTkdfU0tJQQogI2luY2x1ZGUgIk5hdGl2ZUltYWdlU2tpYS5oIgotI2VuZGlmCiAKICNpbmNs dWRlICJBc3luY0ZpbGVTeXN0ZW1DaHJvbWl1bS5oIgogI2luY2x1ZGUgIkJpdG1hcEltYWdlLmgi CkBAIC0yMjQsMTEgKzIyMiw3IEBAIHZvaWQgUGxhdGZvcm1TdXBwb3J0OjpjbGlwYm9hcmRXcml0 ZUltYWcKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgS1VS TCYgc291cmNlVVJMLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBTdHJpbmcmIHRpdGxlKQogewotI2lmIFdFQktJVF9VU0lOR19TS0lBCiAgICAgV2ViSW1h Z2Ugd2ViSW1hZ2UoaW1hZ2UtPmJpdG1hcCgpKTsKLSNlbHNlCi0gICAgV2ViSW1hZ2Ugd2ViSW1h Z2UoaW1hZ2UpOwotI2VuZGlmCiAgICAgd2ViS2l0UGxhdGZvcm1TdXBwb3J0KCktPmNsaXBib2Fy ZCgpLT53cml0ZUltYWdlKHdlYkltYWdlLCBzb3VyY2VVUkwsIHRpdGxlKTsKIH0KIApAQCAtNjcy LDExICs2NjYsNyBAQCB2b2lkIFBsYXRmb3JtU3VwcG9ydDo6cGFpbnRTY3JvbGxiYXJUaHVtCiAg ICAgd2ViVGhlbWVTY3JvbGxiYXJJbmZvLnZpc2libGVTaXplID0gc2Nyb2xsYmFySW5mby52aXNp YmxlU2l6ZTsKICAgICB3ZWJUaGVtZVNjcm9sbGJhckluZm8udG90YWxTaXplID0gc2Nyb2xsYmFy SW5mby50b3RhbFNpemU7CiAKLSNpZiBXRUJLSVRfVVNJTkdfU0tJQQogICAgIFdlYktpdDo6V2Vi Q2FudmFzKiB3ZWJDYW52YXMgPSBnYy0+cGxhdGZvcm1Db250ZXh0KCktPmNhbnZhcygpOwotI2Vs c2UKLSAgICBXZWJLaXQ6OldlYkNhbnZhcyogd2ViQ2FudmFzID0gZ2MtPnBsYXRmb3JtQ29udGV4 dCgpOwotI2VuZGlmCiAgICAgd2ViS2l0UGxhdGZvcm1TdXBwb3J0KCktPnRoZW1lRW5naW5lKCkt PnBhaW50U2Nyb2xsYmFyVGh1bWIoCiAgICAgICAgIHdlYkNhbnZhcywKICAgICAgICAgc3RhdGlj X2Nhc3Q8V2ViVGhlbWVFbmdpbmU6OlN0YXRlPihzdGF0ZSksCkluZGV4OiBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJDb250ZW50TGF5ZXJJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJDb250ZW50TGF5ZXJJbXBsLmNwcAkocmV2aXNpb24g MTE2NjY2KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQ29udGVudExheWVySW1w bC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwLDkgKzMwLDcgQEAKICNpbmNsdWRlICJwbGF0Zm9y bS9XZWJSZWN0LmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0LmgiCiAjaW5jbHVkZSAicGxh dGZvcm0vV2ViQ2FudmFzLmgiCi0jaWYgV0VCS0lUX1VTSU5HX1NLSUEKICNpbmNsdWRlICJQbGF0 Zm9ybUNvbnRleHRTa2lhLmgiCi0jZW5kaWYKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAK QEAgLTY0LDkgKzYyLDcgQEAgdm9pZCBXZWJDb250ZW50TGF5ZXJJbXBsOjpwYWludENvbnRlbnRz KAogewogICAgIGlmICghbV9jb250ZW50Q2xpZW50KQogICAgICAgICByZXR1cm47Ci0jaWYgV0VC S0lUX1VTSU5HX1NLSUEKICAgICBXZWJDYW52YXMqIGNhbnZhcyA9IGdjLnBsYXRmb3JtQ29udGV4 dCgpLT5jYW52YXMoKTsKLSNlbmRpZgogICAgIG1fY29udGVudENsaWVudC0+cGFpbnRDb250ZW50 cyhjYW52YXMsIFdlYlJlY3QoY2xpcCkpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJGb250SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViRm9udEltcGwuY3BwCShyZXZpc2lvbiAxMTY2NjYpCisrKyBTb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJGb250SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk5LDkg Kzk5LDcgQEAgdm9pZCBXZWJGb250SW1wbDo6ZHJhd1RleHQoV2ViQ2FudmFzKiBjYQogICAgIEdy YXBoaWNzQ29udGV4dEJ1aWxkZXIgYnVpbGRlcihjYW52YXMpOwogICAgIEdyYXBoaWNzQ29udGV4 dCYgZ2MgPSBidWlsZGVyLmNvbnRleHQoKTsKIAotI2lmIFdFQktJVF9VU0lOR19TS0lBCiAgICAg Z2MucGxhdGZvcm1Db250ZXh0KCktPnNldERyYXdpbmdUb0ltYWdlQnVmZmVyKCFjYW52YXNJc09w YXF1ZSk7Ci0jZW5kaWYKIAogICAgIGdjLnNhdmUoKTsKICAgICBnYy5zZXRGaWxsQ29sb3IoY29s b3IsIENvbG9yU3BhY2VEZXZpY2VSR0IpOwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViRnJhbWVJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJGcmFtZUltcGwuY3BwCShyZXZpc2lvbiAxMTY2NjYpCisrKyBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDkzLDkg KzE0OTMsNyBAQCBmbG9hdCBXZWJGcmFtZUltcGw6OnByaW50UGFnZShpbnQgcGFnZSwKIAogICAg IEdyYXBoaWNzQ29udGV4dEJ1aWxkZXIgYnVpbGRlcihjYW52YXMpOwogICAgIEdyYXBoaWNzQ29u dGV4dCYgZ2MgPSBidWlsZGVyLmNvbnRleHQoKTsKLSNpZiBXRUJLSVRfVVNJTkdfU0tJQQogICAg IGdjLnBsYXRmb3JtQ29udGV4dCgpLT5zZXRQcmludGluZyh0cnVlKTsKLSNlbmRpZgogCiAgICAg cmV0dXJuIG1fcHJpbnRDb250ZXh0LT5zcG9vbFBhZ2UoZ2MsIHBhZ2UpOwogfQpAQCAtMTk3MSw5 ICsxOTY5LDcgQEAgdm9pZCBXZWJGcmFtZUltcGw6OnByaW50UGFnZXNXaXRoQm91bmRhcgogCiAg ICAgR3JhcGhpY3NDb250ZXh0QnVpbGRlciBidWlsZGVyKGNhbnZhcyk7CiAgICAgR3JhcGhpY3ND b250ZXh0JiBncmFwaGljc0NvbnRleHQgPSBidWlsZGVyLmNvbnRleHQoKTsKLSNpZiBXRUJLSVRf VVNJTkdfU0tJQQogICAgIGdyYXBoaWNzQ29udGV4dC5wbGF0Zm9ybUNvbnRleHQoKS0+c2V0UHJp bnRpbmcodHJ1ZSk7Ci0jZW5kaWYKIAogICAgIG1fcHJpbnRDb250ZXh0LT5zcG9vbEFsbFBhZ2Vz V2l0aEJvdW5kYXJpZXMoZ3JhcGhpY3NDb250ZXh0LAogICAgICAgICBGbG9hdFNpemUocGFnZVNp emVJblBpeGVscy53aWR0aCwgcGFnZVNpemVJblBpeGVscy5oZWlnaHQpKTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkdyYXBoaWNzQ29udGV4dDNELmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGljc0NvbnRleHQzRC5jcHAJ KHJldmlzaW9uIDExNjY2NikKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkdyYXBo aWNzQ29udGV4dDNELmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAsOCArMzAsNiBAQAogCiBuYW1l c3BhY2UgV2ViS2l0IHsKIAotI2lmIFdFQktJVF9VU0lOR19TS0lBCi0KIG5hbWVzcGFjZSB7CiAg ICAgdm9pZCBiaW5kV2ViR3JhcGhpY3NDb250ZXh0M0RHTENvbnRleHRDYWxsYmFjayhjb25zdCBH ckdMSW50ZXJmYWNlKiBpbnRlcmZhY2UpCiAgICAgewpAQCAtNDksNiArNDcsNCBAQCBHckdMSW50 ZXJmYWNlKiBXZWJHcmFwaGljc0NvbnRleHQzRDo6Y3JlCiAgICAgcmV0dXJuIGludGVyZmFjZTsK IH0KIAotI2VuZGlmCi0KIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViSW1hZ2VEZWNvZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbWFnZURlY29kZXIuY3BwCShyZXZpc2lvbiAxMTY2NjYp CisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbWFnZURlY29kZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zOSwxMCArMzksOCBAQAogCiAjaW5jbHVkZSA8cHVibGljL1dlYkltYWdl Lmg+CiAKLSNpZiBXRUJLSVRfVVNJTkdfU0tJQQogI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNp bmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgotI2VuZGlmCiAKICNpbmNsdWRlIDx3dGYvUGFzc1Jl ZlB0ci5oPgogCkBAIC0xMTIsMTAgKzExMCw4IEBAIFdlYkltYWdlIFdlYkltYWdlRGVjb2Rlcjo6 Z2V0RnJhbWVBdEluZGUKICAgICBJbWFnZUZyYW1lKiBjb25zdCBmcmFtZUJ1ZmZlciA9IG1fcHJp dmF0ZS0+ZnJhbWVCdWZmZXJBdEluZGV4KGluZGV4KTsKICAgICBpZiAoIWZyYW1lQnVmZmVyKQog ICAgICAgICByZXR1cm4gV2ViSW1hZ2UoKTsKLSNpZiBXRUJLSVRfVVNJTkdfU0tJQQogICAgIE93 blB0cjxOYXRpdmVJbWFnZVNraWE+IGltYWdlID0gYWRvcHRQdHIoZnJhbWVCdWZmZXItPmFzTmV3 TmF0aXZlSW1hZ2UoKSk7CiAgICAgcmV0dXJuIFdlYkltYWdlKGltYWdlLT5iaXRtYXAoKSk7Ci0j ZW5kaWYKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAkocmV2aXNp b24gMTE2NjY2KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFp bmVySW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgwLDkgKzgwLDcgQEAKICNpbmNsdWRlICJQ bGF0Zm9ybUdlc3R1cmVFdmVudC5oIgogI2VuZGlmCiAKLSNpZiBXRUJLSVRfVVNJTkdfU0tJQQog I2luY2x1ZGUgIlBsYXRmb3JtQ29udGV4dFNraWEuaCIKLSNlbmRpZgogCiB1c2luZyBuYW1lc3Bh Y2UgV2ViQ29yZTsKIApAQCAtMTI2LDkgKzEyNCw3IEBAIHZvaWQgV2ViUGx1Z2luQ29udGFpbmVy SW1wbDo6cGFpbnQoR3JhcGgKICAgICBJbnRQb2ludCBvcmlnaW4gPSB2aWV3LT53aW5kb3dUb0Nv bnRlbnRzKEludFBvaW50KDAsIDApKTsKICAgICBnYy0+dHJhbnNsYXRlKHN0YXRpY19jYXN0PGZs b2F0PihvcmlnaW4ueCgpKSwgc3RhdGljX2Nhc3Q8ZmxvYXQ+KG9yaWdpbi55KCkpKTsKIAotI2lm IFdFQktJVF9VU0lOR19TS0lBCiAgICAgV2ViQ2FudmFzKiBjYW52YXMgPSBnYy0+cGxhdGZvcm1D b250ZXh0KCktPmNhbnZhcygpOwotI2VuZGlmCiAKICAgICBJbnRSZWN0IHdpbmRvd1JlY3QgPQog ICAgICAgICBJbnRSZWN0KHZpZXctPmNvbnRlbnRzVG9XaW5kb3coZGFtYWdlUmVjdC5sb2NhdGlv bigpKSwgZGFtYWdlUmVjdC5zaXplKCkpOwpAQCAtMjU3LDkgKzI1Myw3IEBAIGJvb2wgV2ViUGx1 Z2luQ29udGFpbmVySW1wbDo6cHJpbnRQYWdlKGkKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCogZ2MpCiB7CiAgICAgZ2MtPnNh dmUoKTsKLSNpZiBXRUJLSVRfVVNJTkdfU0tJQQogICAgIFdlYkNhbnZhcyogY2FudmFzID0gZ2Mt PnBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKTsKLSNlbmRpZgogICAgIGJvb2wgcmV0ID0gbV93 ZWJQbHVnaW4tPnByaW50UGFnZShwYWdlTnVtYmVyLCBjYW52YXMpOwogICAgIGdjLT5yZXN0b3Jl KCk7CiAgICAgcmV0dXJuIHJldDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL3Bh aW50aW5nL0dyYXBoaWNzQ29udGV4dEJ1aWxkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9wYWludGluZy9HcmFwaGljc0NvbnRleHRCdWlsZGVyLmgJKHJldmlz aW9uIDExNjY2NikKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL3BhaW50aW5nL0dyYXBo aWNzQ29udGV4dEJ1aWxkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMzMsMTQgKzMzLDEwIEBACiAK ICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKIAotI2lmIFdFQktJVF9VU0lOR19TS0lBCiAj aW5jbHVkZSAiUGxhdGZvcm1Db250ZXh0U2tpYS5oIgotI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJL aXQgewogCi0jaWYgV0VCS0lUX1VTSU5HX1NLSUEKLQogY2xhc3MgR3JhcGhpY3NDb250ZXh0QnVp bGRlciB7CiBwdWJsaWM6CiAgICAgR3JhcGhpY3NDb250ZXh0QnVpbGRlcihXZWJDYW52YXMqIGNh bnZhcykKQEAgLTU2LDEwICs1Miw2IEBAIHByaXZhdGU6CiAgICAgV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0IG1fZ3JhcGhpY3NDb250ZXh0OwogfTsKIAotI2Vsc2UKLSNlcnJvciAiTmVlZCB0byBk ZWZpbmUgR3JhcGhpY3NDb250ZXh0QnVpbGRlciEiCi0jZW5kaWYKLQogfSAvLyBuYW1lc3BhY2Ug V2ViS2l0CiAKICNlbmRpZgo=