114411 2013-04-10 22:35:14 -0700 Remove some includes of CachedImage.h 2013-04-10 23:20:59 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap andersca commit-queue d-r esprehn+autocc fmalita macpherson menard ojan.autocc pdr rniwa schenney oldest_to_newest 873561 0 ap 2013-04-10 22:35:14 -0700 CachedImage.h brings a lot of networking headers with itself, so it's best to not include it too much. 873562 1 197508 ap 2013-04-10 22:40:10 -0700 Created attachment 197508 proposed patch 873573 2 ap 2013-04-10 23:20:59 -0700 Committed <http://trac.webkit.org/changeset/148175>. 197508 2013-04-10 22:40:10 -0700 2013-04-10 23:16:46 -0700 proposed patch FasterRebuildCachedImage.txt text/plain 11956 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0ODE3MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEzLTA0LTEwICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBzb21lIGluY2x1 ZGVzIG9mIENhY2hlZEltYWdlLmgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExNDQxMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogY3NzL0NTU0Nyb3NzZmFkZVZhbHVlLmg6IEluaXRpYWxpemluZyBDYWNo ZWRSZXNvdXJjZUhhbmRsZSB3aXRoIDAgcmVxdWlyZXMgYQorICAgICAgICBkZWZpbml0aW9uIG9m IGEgY2xhc3MgaXQgaG9sZHMsIGJ1dCBkZWZhdWx0IGNvbnN0cnVjdGlvbiBkb2VzIG5vdC4KKwor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291cmNlLmNwcDoKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVySW1hZ2VSZXNvdXJjZS5oOgorICAgICAgICBNb3ZlZCBkZWZpbml0aW9u cyBvZiB2aXJ0dWFsIGZ1bmN0aW9ucyB0byBhIC5jcHAgZmlsZS4gVGhyZSBpcyBubyB3aW4gZnJv bSBoYXZpbmcKKyAgICAgICAgdGhlbSBpbmxpbmUsIGFuZCBub3cgd2UgZG9uJ3QgbmVlZCBDYWNo ZWRJbWFnZS5oIGluIHRoZSBoZWFkZXIuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU05vZGVD dXN0b20uY3BwOgorICAgICAgICAqIGRvbS9DbGlwYm9hcmQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q2xpcGJvYXJkOjpDbGlwYm9hcmQpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9DbGlwYm9h cmRNYWMuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHA6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxp c3RJdGVtLmNwcDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGlzdE1hcmtlci5jcHA6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlQ29sLmNwcDoKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyVGFibGVSb3cuY3BwOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZVNl Y3Rpb24uY3BwOgorICAgICAgICAqIHN2Zy9ncmFwaGljcy9TVkdJbWFnZUNhY2hlLmNwcDoKKyAg ICAgICAgUmVtb3ZlZCB1bm5lY2Vzc2FyeSBpbmNsdWRlcy4KKworICAgICAgICAqIHBsYXRmb3Jt L21hYy9QYXN0ZWJvYXJkTWFjLm1tOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJTbmFwc2hv dHRlZFBsdWdJbi5jcHA6CisgICAgICAgIEFkZGVkIG9uZXMgd2hlcmUgdGhleWFyZSBub3cgbmVj ZXNzYXJ5LgorCiAyMDEzLTA0LTEwICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQu b3JnPgogCiAgICAgICAgIFJlcGxhY2UgRU5BQkxFX0xFR0FDWV9XRUJfQVVESU8gcHJlcHJvY2Vz c29yIHN0YXRlbWVudHMgaW4gSURMIGZpbGVzIHdpdGggQ29uZGl0aW9uYWwgYXR0cmlidXRlCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU05vZGVDdXN0b20uY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTm9kZUN1c3RvbS5jcHAJKHJldmlz aW9uIDE0ODA3NykKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTm9kZUN1c3RvbS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTI3LDggKzI3LDYgQEAKICNpbmNsdWRlICJKU05vZGUuaCIK IAogI2luY2x1ZGUgIkF0dHIuaCIKLSNpbmNsdWRlICJDYWNoZWRJbWFnZS5oIgotI2luY2x1ZGUg IkNhY2hlZFNjcmlwdC5oIgogI2luY2x1ZGUgIkNEQVRBU2VjdGlvbi5oIgogI2luY2x1ZGUgIkNv bW1lbnQuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgpJbmRleDogU291cmNlL1dlYkNvcmUvY3Nz L0NTU0Nyb3NzZmFkZVZhbHVlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NT U0Nyb3NzZmFkZVZhbHVlLmgJKHJldmlzaW9uIDE0ODA3NykKKysrIFNvdXJjZS9XZWJDb3JlL2Nz cy9DU1NDcm9zc2ZhZGVWYWx1ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw3ICsyNiw2IEBACiAj aWZuZGVmIENTU0Nyb3NzZmFkZVZhbHVlX2gKICNkZWZpbmUgQ1NTQ3Jvc3NmYWRlVmFsdWVfaAog Ci0jaW5jbHVkZSAiQ2FjaGVkSW1hZ2UuaCIKICNpbmNsdWRlICJDYWNoZWRJbWFnZUNsaWVudC5o IgogI2luY2x1ZGUgIkNhY2hlZFJlc291cmNlSGFuZGxlLmgiCiAjaW5jbHVkZSAiQ1NTSW1hZ2VH ZW5lcmF0b3JWYWx1ZS5oIgpAQCAtNzUsMTUgKzc0LDE3IEBAIHByaXZhdGU6CiAgICAgICAgIDog Q1NTSW1hZ2VHZW5lcmF0b3JWYWx1ZShDcm9zc2ZhZGVDbGFzcykKICAgICAgICAgLCBtX2Zyb21W YWx1ZShmcm9tVmFsdWUpCiAgICAgICAgICwgbV90b1ZhbHVlKHRvVmFsdWUpCi0gICAgICAgICwg bV9jYWNoZWRGcm9tSW1hZ2UoMCkKLSAgICAgICAgLCBtX2NhY2hlZFRvSW1hZ2UoMCkKLSAgICAg ICAgLCBtX2Nyb3NzZmFkZVN1YmltYWdlT2JzZXJ2ZXIodGhpcykgeyB9CisgICAgICAgICwgbV9j cm9zc2ZhZGVTdWJpbWFnZU9ic2VydmVyKHRoaXMpCisgICAgeworICAgIH0KIAogICAgIGNsYXNz IENyb3NzZmFkZVN1YmltYWdlT2JzZXJ2ZXJQcm94eSA6IHB1YmxpYyBDYWNoZWRJbWFnZUNsaWVu dCB7CiAgICAgcHVibGljOgogICAgICAgICBDcm9zc2ZhZGVTdWJpbWFnZU9ic2VydmVyUHJveHko Q1NTQ3Jvc3NmYWRlVmFsdWUqIG93bmVyVmFsdWUpCi0gICAgICAgIDogbV9vd25lclZhbHVlKG93 bmVyVmFsdWUpCi0gICAgICAgICwgbV9yZWFkeShmYWxzZSkgeyB9CisgICAgICAgICAgICA6IG1f b3duZXJWYWx1ZShvd25lclZhbHVlKQorICAgICAgICAgICAgLCBtX3JlYWR5KGZhbHNlKQorICAg ICAgICB7CisgICAgICAgIH0KIAogICAgICAgICB2aXJ0dWFsIH5Dcm9zc2ZhZGVTdWJpbWFnZU9i c2VydmVyUHJveHkoKSB7IH0KICAgICAgICAgdmlydHVhbCB2b2lkIGltYWdlQ2hhbmdlZChDYWNo ZWRJbWFnZSosIGNvbnN0IEludFJlY3QqID0gMCkgT1ZFUlJJREU7CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9kb20vQ2xpcGJvYXJkLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20v Q2xpcGJvYXJkLmNwcAkocmV2aXNpb24gMTQ4MDc3KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0Ns aXBib2FyZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2LDcgKzI2LDYgQEAKICNpbmNsdWRlICJj b25maWcuaCIKICNpbmNsdWRlICJDbGlwYm9hcmQuaCIKIAotI2luY2x1ZGUgIkNhY2hlZEltYWdl LmgiCiAjaW5jbHVkZSAiRmlsZUxpc3QuaCIKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUg IkZyYW1lTG9hZGVyLmgiCkBAIC00MCw3ICszOSw2IEBAIENsaXBib2FyZDo6Q2xpcGJvYXJkKENs aXBib2FyZEFjY2Vzc1BvbGkKICAgICAsIG1fZWZmZWN0QWxsb3dlZCgidW5pbml0aWFsaXplZCIp CiAgICAgLCBtX2RyYWdTdGFydGVkKGZhbHNlKQogICAgICwgbV9jbGlwYm9hcmRUeXBlKGNsaXBi b2FyZFR5cGUpCi0gICAgLCBtX2RyYWdJbWFnZSgwKQogewogfQogICAgIApJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMuaAkocmV2aXNpb24gMTQ4MDc3KQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5oCSh3b3JraW5nIGNv cHkpCkBAIC0yNiw3ICsyNiw2IEBACiAjaWZuZGVmIENsaXBib2FyZE1hY19oCiAjZGVmaW5lIENs aXBib2FyZE1hY19oCiAKLSNpbmNsdWRlICJDYWNoZWRJbWFnZS5oIgogI2luY2x1ZGUgIkNhY2hl ZEltYWdlQ2xpZW50LmgiCiAjaW5jbHVkZSAiQ2xpcGJvYXJkLmgiCiAjaW5jbHVkZSA8d3RmL1Jl dGFpblB0ci5oPgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRN YWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9h cmRNYWMubW0JKHJldmlzaW9uIDE0ODA3NykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h Yy9QYXN0ZWJvYXJkTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw3ICsyNiw3IEBACiAjaW1w b3J0ICJjb25maWcuaCIKICNpbXBvcnQgIlBhc3RlYm9hcmQuaCIKIAotI2ltcG9ydCAiQ2FjaGVk UmVzb3VyY2UuaCIKKyNpbXBvcnQgIkNhY2hlZEltYWdlLmgiCiAjaW1wb3J0ICJDbGlwYm9hcmRN YWMuaCIKICNpbXBvcnQgIkRPTVJhbmdlSW50ZXJuYWwuaCIKICNpbXBvcnQgIkRvY3VtZW50Lmgi CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwCShyZXZp c2lvbiAxNDgwNzcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTIwLDcgKzIwLDYgQEAKICNpbmNsdWRlICJjb25maWcuaCIK ICNpbmNsdWRlICJJbmxpbmVGbG93Qm94LmgiCiAKLSNpbmNsdWRlICJDYWNoZWRJbWFnZS5oIgog I2luY2x1ZGUgIkNTU1Byb3BlcnR5TmFtZXMuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2lu Y2x1ZGUgIkVsbGlwc2lzQm94LmgiCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmNwcAkocmV2aXNpb24gMTQ4MDc3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1LDcgKzI1LDYgQEAKICNpbmNsdWRlICJj b25maWcuaCIKICNpbmNsdWRlICJSZW5kZXJCb3guaCIKIAotI2luY2x1ZGUgIkNhY2hlZEltYWdl LmgiCiAjaW5jbHVkZSAiQ2hyb21lLmgiCiAjaW5jbHVkZSAiQ2hyb21lQ2xpZW50LmgiCiAjaW5j bHVkZSAiRG9jdW1lbnQuaCIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJ bWFnZVJlc291cmNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVySW1hZ2VSZXNvdXJjZS5jcHAJKHJldmlzaW9uIDE0ODA3NykKKysrIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291cmNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzcsNyArMzcsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFJlbmRlckltYWdlUmVzb3VyY2U6 OlJlbmRlckltYWdlUmVzb3VyY2UoKQogICAgIDogbV9yZW5kZXJlcigwKQotICAgICwgbV9jYWNo ZWRJbWFnZSgwKQogewogfQogCkBAIC05MCw2ICs4OSwxNiBAQCB2b2lkIFJlbmRlckltYWdlUmVz b3VyY2U6OnJlc2V0QW5pbWF0aW9uCiAgICAgICAgIG1fcmVuZGVyZXItPnJlcGFpbnQoKTsKIH0K IAorUGFzc1JlZlB0cjxJbWFnZT4gUmVuZGVySW1hZ2VSZXNvdXJjZTo6aW1hZ2UoaW50LCBpbnQp IGNvbnN0Cit7CisgICAgcmV0dXJuIG1fY2FjaGVkSW1hZ2UgPyBtX2NhY2hlZEltYWdlLT5pbWFn ZUZvclJlbmRlcmVyKG1fcmVuZGVyZXIpIDogbnVsbEltYWdlKCk7Cit9CisKK2Jvb2wgUmVuZGVy SW1hZ2VSZXNvdXJjZTo6ZXJyb3JPY2N1cnJlZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fY2Fj aGVkSW1hZ2UgJiYgbV9jYWNoZWRJbWFnZS0+ZXJyb3JPY2N1cnJlZCgpOworfQorCiB2b2lkIFJl bmRlckltYWdlUmVzb3VyY2U6OnNldENvbnRhaW5lclNpemVGb3JSZW5kZXJlcihjb25zdCBJbnRT aXplJiBpbWFnZUNvbnRhaW5lclNpemUpCiB7CiAgICAgQVNTRVJUKG1fcmVuZGVyZXIpOwpAQCAt MTAyLDQgKzExMSwyNCBAQCBJbWFnZSogUmVuZGVySW1hZ2VSZXNvdXJjZTo6bnVsbEltYWdlKCkK ICAgICByZXR1cm4gSW1hZ2U6Om51bGxJbWFnZSgpOwogfQogCitib29sIFJlbmRlckltYWdlUmVz b3VyY2U6OnVzZXNJbWFnZUNvbnRhaW5lclNpemUoKSBjb25zdAoreworICAgIHJldHVybiBtX2Nh Y2hlZEltYWdlID8gbV9jYWNoZWRJbWFnZS0+dXNlc0ltYWdlQ29udGFpbmVyU2l6ZSgpIDogZmFs c2U7Cit9CisKK2Jvb2wgUmVuZGVySW1hZ2VSZXNvdXJjZTo6aW1hZ2VIYXNSZWxhdGl2ZVdpZHRo KCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9jYWNoZWRJbWFnZSA/IG1fY2FjaGVkSW1hZ2UtPmlt YWdlSGFzUmVsYXRpdmVXaWR0aCgpIDogZmFsc2U7Cit9CisKK2Jvb2wgUmVuZGVySW1hZ2VSZXNv dXJjZTo6aW1hZ2VIYXNSZWxhdGl2ZUhlaWdodCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fY2Fj aGVkSW1hZ2UgPyBtX2NhY2hlZEltYWdlLT5pbWFnZUhhc1JlbGF0aXZlSGVpZ2h0KCkgOiBmYWxz ZTsKK30KKworTGF5b3V0U2l6ZSBSZW5kZXJJbWFnZVJlc291cmNlOjppbWFnZVNpemUoZmxvYXQg bXVsdGlwbGllcikgY29uc3QKK3sKKyAgICByZXR1cm4gbV9jYWNoZWRJbWFnZSA/IG1fY2FjaGVk SW1hZ2UtPmltYWdlU2l6ZUZvclJlbmRlcmVyKG1fcmVuZGVyZXIsIG11bHRpcGxpZXIpIDogTGF5 b3V0U2l6ZSgpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2VSZXNvdXJjZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291cmNlLmgJKHJldmlzaW9uIDE0ODA3 NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291cmNlLmgJKHdv cmtpbmcgY29weSkKQEAgLTI2LDcgKzI2LDYgQEAKICNpZm5kZWYgUmVuZGVySW1hZ2VSZXNvdXJj ZV9oCiAjZGVmaW5lIFJlbmRlckltYWdlUmVzb3VyY2VfaAogCi0jaW5jbHVkZSAiQ2FjaGVkSW1h Z2UuaCIKICNpbmNsdWRlICJDYWNoZWRSZXNvdXJjZUhhbmRsZS5oIgogI2luY2x1ZGUgIkltYWdl LmgiCiAjaW5jbHVkZSAiTGF5b3V0U2l6ZS5oIgpAQCAtNTUsMTUgKzU0LDE1IEBAIHB1YmxpYzoK IAogICAgIHZvaWQgcmVzZXRBbmltYXRpb24oKTsKIAotICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxJ bWFnZT4gaW1hZ2UoaW50IC8qIHdpZHRoICovID0gMCwgaW50IC8qIGhlaWdodCAqLyA9IDApIGNv bnN0IHsgcmV0dXJuIG1fY2FjaGVkSW1hZ2UgPyBtX2NhY2hlZEltYWdlLT5pbWFnZUZvclJlbmRl cmVyKG1fcmVuZGVyZXIpIDogbnVsbEltYWdlKCk7IH0KLSAgICB2aXJ0dWFsIGJvb2wgZXJyb3JP Y2N1cnJlZCgpIGNvbnN0IHsgcmV0dXJuIG1fY2FjaGVkSW1hZ2UgJiYgbV9jYWNoZWRJbWFnZS0+ ZXJyb3JPY2N1cnJlZCgpOyB9CisgICAgdmlydHVhbCBQYXNzUmVmUHRyPEltYWdlPiBpbWFnZShp bnQgd2lkdGggPSAwLCBpbnQgaGVpZ2h0ID0gMCkgY29uc3Q7CisgICAgdmlydHVhbCBib29sIGVy cm9yT2NjdXJyZWQoKSBjb25zdDsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRDb250YWluZXJTaXpl Rm9yUmVuZGVyZXIoY29uc3QgSW50U2l6ZSYpOwotICAgIHZpcnR1YWwgYm9vbCB1c2VzSW1hZ2VD b250YWluZXJTaXplKCkgY29uc3QgeyByZXR1cm4gbV9jYWNoZWRJbWFnZSA/IG1fY2FjaGVkSW1h Z2UtPnVzZXNJbWFnZUNvbnRhaW5lclNpemUoKSA6IGZhbHNlOyB9Ci0gICAgdmlydHVhbCBib29s IGltYWdlSGFzUmVsYXRpdmVXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY2FjaGVkSW1hZ2UgPyBt X2NhY2hlZEltYWdlLT5pbWFnZUhhc1JlbGF0aXZlV2lkdGgoKSA6IGZhbHNlOyB9Ci0gICAgdmly dHVhbCBib29sIGltYWdlSGFzUmVsYXRpdmVIZWlnaHQoKSBjb25zdCB7IHJldHVybiBtX2NhY2hl ZEltYWdlID8gbV9jYWNoZWRJbWFnZS0+aW1hZ2VIYXNSZWxhdGl2ZUhlaWdodCgpIDogZmFsc2U7 IH0KKyAgICB2aXJ0dWFsIGJvb2wgdXNlc0ltYWdlQ29udGFpbmVyU2l6ZSgpIGNvbnN0OworICAg IHZpcnR1YWwgYm9vbCBpbWFnZUhhc1JlbGF0aXZlV2lkdGgoKSBjb25zdDsKKyAgICB2aXJ0dWFs IGJvb2wgaW1hZ2VIYXNSZWxhdGl2ZUhlaWdodCgpIGNvbnN0OwogCi0gICAgdmlydHVhbCBMYXlv dXRTaXplIGltYWdlU2l6ZShmbG9hdCBtdWx0aXBsaWVyKSBjb25zdCB7IHJldHVybiBtX2NhY2hl ZEltYWdlID8gbV9jYWNoZWRJbWFnZS0+aW1hZ2VTaXplRm9yUmVuZGVyZXIobV9yZW5kZXJlciwg bXVsdGlwbGllcikgOiBMYXlvdXRTaXplKCk7IH0KKyAgICB2aXJ0dWFsIExheW91dFNpemUgaW1h Z2VTaXplKGZsb2F0IG11bHRpcGxpZXIpIGNvbnN0OwogCiAgICAgdmlydHVhbCBXcmFwcGVkSW1h Z2VQdHIgaW1hZ2VQdHIoKSBjb25zdCB7IHJldHVybiBtX2NhY2hlZEltYWdlLmdldCgpOyB9CiAK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0SXRlbS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNwcAkocmV2 aXNpb24gMTQ4MDc3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVt LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQsNyArMjQsNiBAQAogI2luY2x1ZGUgImNvbmZpZy5o IgogI2luY2x1ZGUgIlJlbmRlckxpc3RJdGVtLmgiCiAKLSNpbmNsdWRlICJDYWNoZWRJbWFnZS5o IgogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIkhUTUxPTGlzdEVsZW1lbnQuaCIK ICNpbmNsdWRlICJOb2RlVHJhdmVyc2FsLmgiCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGlzdE1hcmtlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxpc3RNYXJrZXIuY3BwCShyZXZpc2lvbiAxNDgwNzcpCisrKyBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdE1hcmtlci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI1LDcgKzI1LDYgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJSZW5kZXJMaXN0 TWFya2VyLmgiCiAKLSNpbmNsdWRlICJDYWNoZWRJbWFnZS5oIgogI2luY2x1ZGUgIkRvY3VtZW50 LmgiCiAjaW5jbHVkZSAiRm9udC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgpJbmRl eDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNuYXBzaG90dGVkUGx1Z0luLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU25hcHNob3R0ZWRQ bHVnSW4uY3BwCShyZXZpc2lvbiAxNDgwNzcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyU25hcHNob3R0ZWRQbHVnSW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsyNiw3 IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiUmVuZGVyU25hcHNob3R0ZWRQbHVn SW4uaCIKIAorI2luY2x1ZGUgIkNhY2hlZEltYWdlLmgiCiAjaW5jbHVkZSAiQ2hyb21lLmgiCiAj aW5jbHVkZSAiQ2hyb21lQ2xpZW50LmgiCiAjaW5jbHVkZSAiQ3Vyc29yLmgiCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDb2wuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNvbC5jcHAJKHJldmlzaW9uIDE0ODA3 NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNvbC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI2LDcgKzI2LDYgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRl ICJSZW5kZXJUYWJsZUNvbC5oIgogCi0jaW5jbHVkZSAiQ2FjaGVkSW1hZ2UuaCIKICNpbmNsdWRl ICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJIVE1MVGFibGVDb2xFbGVtZW50LmgiCiAjaW5jbHVk ZSAiUmVuZGVyVGFibGUuaCIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU YWJsZVJvdy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRhYmxlUm93LmNwcAkocmV2aXNpb24gMTQ4MDc3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRhYmxlUm93LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjUsNyArMjUsNiBAQAog I2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlJlbmRlclRhYmxlUm93LmgiCiAKLSNpbmNs dWRlICJDYWNoZWRJbWFnZS5oIgogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiSFRN TE5hbWVzLmgiCiAjaW5jbHVkZSAiSGl0VGVzdFJlc3VsdC5oIgpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAJKHJldmlzaW9uIDE0ODA3 NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yNSw3ICsyNSw2IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKICNp bmNsdWRlICJSZW5kZXJUYWJsZVNlY3Rpb24uaCIKLSNpbmNsdWRlICJDYWNoZWRJbWFnZS5oIgog I2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiSGl0VGVzdFJlc3VsdC5oIgogI2luY2x1 ZGUgIkhUTUxOYW1lcy5oIgpJbmRleDogU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0lt YWdlQ2FjaGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9T VkdJbWFnZUNhY2hlLmNwcAkocmV2aXNpb24gMTQ4MDc3KQorKysgU291cmNlL1dlYkNvcmUvc3Zn L2dyYXBoaWNzL1NWR0ltYWdlQ2FjaGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMiw3ICsyMiw2 IEBACiAjaW5jbHVkZSAiU1ZHSW1hZ2VDYWNoZS5oIgogCiAjaWYgRU5BQkxFKFNWRykKLSNpbmNs dWRlICJDYWNoZWRJbWFnZS5oIgogI2luY2x1ZGUgIkZyYW1lVmlldy5oIgogI2luY2x1ZGUgIkdy YXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkltYWdlQnVmZmVyLmgiCg==