44525 2010-08-24 08:39:37 -0700 Accelerated 2D canvas should work without accelerated compositing 2010-08-24 12:17:47 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 senorblanco senorblanco gustavo jamesr kbr webkit.review.bot xan.lopez oldest_to_newest 268567 0 senorblanco 2010-08-24 08:39:37 -0700 It should be possible to run with --enable-accelerated-2d-canvas but not --enable-accelerated-compositing. It doesn't have to be fast (will use readback and software compositing), but it should work. 268581 1 65279 senorblanco 2010-08-24 09:02:11 -0700 Created attachment 65279 Patch 268609 2 webkit.review.bot 2010-08-24 09:53:34 -0700 Attachment 65279 did not build on gtk: Build output: http://queues.webkit.org/results/3776570 268631 3 65293 senorblanco 2010-08-24 10:34:19 -0700 Created attachment 65293 Patch 268632 4 jamesr 2010-08-24 10:35:33 -0700 Looks good to me! 268692 5 65293 kbr 2010-08-24 11:52:35 -0700 Comment on attachment 65293 Patch Looks good to me. 268706 6 senorblanco 2010-08-24 12:17:47 -0700 Committed r65921: <http://trac.webkit.org/changeset/65921> 65279 2010-08-24 09:02:11 -0700 2010-08-24 10:34:14 -0700 Patch bug-44525-20100824120209.patch text/plain 5680 senorblanco SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTkwMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzIgQEAKKzIwMTAtMDgtMjQgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRml4IGFjY2VsZXJhdGVkIDJkIGNhbnZhcyB3aXRoIGFjY2VsZXJhdGVkIGNvbXBvc2l0 aW5nIG9mZi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQ0NTI1CisKKyAgICAgICAgVGVzdGVkIGJ5IHJ1bm5pbmcgd2l0aCAtLWFjY2VsZXJhdGVkLTJk LWNhbnZhcyB3aXRoCisgICAgICAgIC0tYWNjZWxlcmF0ZWQtY29tcG9zaXRpbmcgb2ZmLgorICAg ICAgICBJbWFnZUJ1ZmZlcjo6Y29weUltYWdlIGNoYW5nZXMgY292ZXJlZCBieQorICAgICAgICBM YXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jYW52YXMtcGF0dGVybi0qLmh0bWwuCisKKyAgICAgICAg KiBodG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDYW52 YXNFbGVtZW50OjpwYWludCk6CisgICAgICAgIEV4dGVuZCB0aGUgYWNjZWxlcmF0ZWQgY29tcG9z aXRpbmcgY2hlY2sgYW5kIHRoZSByZWFkYmFjayBmb3IKKyAgICAgICAgbm9uLWFjY2VsZXJhdGVk IGNvbXBvc2l0aW5nIHRvIGFjY2VsZXJhdGVkIDJEIGNhbnZhcyBhbHNvLgorICAgICAgICAqIGh0 bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQuY3BwOgorICAgICAgICAqIGh0bWwvY2Fu dmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1Jl bmRlcmluZ0NvbnRleHQ6OnBhaW50c0ludG9DYW52YXNCdWZmZXIpOgorICAgICAgICBNb3ZlIHRo aXMgbG9naWMgZnJvbSBXZWJHTCB0byBjb21tb24gY2FudmFzIGNvbnRleHQgY29kZS4KKyAgICAg ICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaDoKKyAgICAgICAgUmVtb3Zl IGltcGxlbWVudGF0aW9uIG9mIHBhaW50c0ludG9DYW52YXNCdWZmZXIuCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW1hZ2VCdWZmZXI6OmNvcHlJbWFnZSk6CisgICAgICAgIFdoZW4gY29weWluZyB0aGUgaW1h Z2UgZm9yIHBhdHRlcm5zLCBzeW5jIHRoZSBzb2Z0d2FyZSBjYW52YXMuCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OnByZXBhcmVGb3JTb2Z0d2FyZURyYXcpOgorICAg ICAgICBVc2UgU2tEZXZpY2U6OmVyYXNlQ29sb3IoKSB0byBjbGVhciB0aGUgY2FudmFzIGZvciBt aXhlZCBtb2RlIHJlbmRlcmluZy4KKwogMjAxMC0wOC0yMyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCkluZGV4OiBXZWJDb3Jl L2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9I VE1MQ2FudmFzRWxlbWVudC5jcHAJKHJldmlzaW9uIDY1OTAwKQorKysgV2ViQ29yZS9odG1sL0hU TUxDYW52YXNFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjcyLDE1ICsyNzIsMTEgQEAg dm9pZCBIVE1MQ2FudmFzRWxlbWVudDo6cGFpbnQoR3JhcGhpY3NDbwogICAgIGlmIChjb250ZXh0 LT5wYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKICAgICAKLSNpZiBFTkFCTEUo M0RfQ0FOVkFTKQotICAgIFdlYkdMUmVuZGVyaW5nQ29udGV4dCogY29udGV4dDNEID0gMDsKLSAg ICBpZiAobV9jb250ZXh0ICYmIG1fY29udGV4dC0+aXMzZCgpKSB7Ci0gICAgICAgIGNvbnRleHQz RCA9IHN0YXRpY19jYXN0PFdlYkdMUmVuZGVyaW5nQ29udGV4dCo+KG1fY29udGV4dC5nZXQoKSk7 Ci0gICAgICAgIGlmICghY29udGV4dDNELT5wYWludHNJbnRvQ2FudmFzQnVmZmVyKCkpCisgICAg aWYgKG1fY29udGV4dCkgeworICAgICAgICBpZiAoIW1fY29udGV4dC0+cGFpbnRzSW50b0NhbnZh c0J1ZmZlcigpKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBjb250ZXh0M0QtPnBhaW50 UmVuZGVyaW5nUmVzdWx0c1RvQ2FudmFzKCk7CisgICAgICAgIG1fY29udGV4dC0+cGFpbnRSZW5k ZXJpbmdSZXN1bHRzVG9DYW52YXMoKTsKICAgICB9Ci0jZW5kaWYKIAogICAgIGlmIChoYXNDcmVh dGVkSW1hZ2VCdWZmZXIoKSkgewogICAgICAgICBJbWFnZUJ1ZmZlciogaW1hZ2VCdWZmZXIgPSBi dWZmZXIoKTsKSW5kZXg6IFdlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4 dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdD b250ZXh0LmNwcAkocmV2aXNpb24gNjU5MDApCisrKyBXZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZh c1JlbmRlcmluZ0NvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNSw2ICsyNSw3IEBACiAK ICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJDYW52YXNSZW5kZXJpbmdDb250ZXh0Lmgi CisjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0M0QuaCIKIAogI2luY2x1ZGUgIkhUTUxDYW52YXNF bGVtZW50LmgiCiAKQEAgLTQ1LDQgKzQ2LDExIEBAIHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4 dDo6ZGVyZWYoKQogICAgIG1fY2FudmFzLT5kZXJlZigpOyAKIH0KIAorYm9vbCBDYW52YXNSZW5k ZXJpbmdDb250ZXh0OjpwYWludHNJbnRvQ2FudmFzQnVmZmVyKCkgY29uc3QKK3sKKyAgICBpZiAo R3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQzRCA9IGdyYXBoaWNzQ29udGV4dDNEKCkpCisgICAg ICAgIHJldHVybiBjb250ZXh0M0QtPnBhaW50c0ludG9DYW52YXNCdWZmZXIoKTsKKyAgICByZXR1 cm4gdHJ1ZTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9odG1s L2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9o dG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0LmgJKHJldmlzaW9uIDY1OTAwKQorKysg V2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0LmgJKHdvcmtpbmcgY29w eSkKQEAgLTU0LDYgKzU0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2aXJ0dWFs IEdyYXBoaWNzQ29udGV4dDNEKiBncmFwaGljc0NvbnRleHQzRCgpIGNvbnN0IHsgcmV0dXJuIDA7 IH0KIAogICAgICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRSZW5kZXJpbmdSZXN1bHRzVG9DYW52YXMo KSB7fQorICAgICAgICBib29sIHBhaW50c0ludG9DYW52YXNCdWZmZXIoKSBjb25zdDsKIAogICAg IHByaXZhdGU6CiAgICAgICAgIEhUTUxDYW52YXNFbGVtZW50KiBtX2NhbnZhczsKSW5kZXg6IFdl YkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaAkocmV2aXNpb24gNjU5 MDApCisrKyBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0yODUsOCArMjg1LDYgQEAgcHVibGljOgogCiAgICAgdm9pZCByZW1vdmVP YmplY3QoV2ViR0xPYmplY3QqKTsKIAotICAgIGJvb2wgcGFpbnRzSW50b0NhbnZhc0J1ZmZlcigp IGNvbnN0IHsgcmV0dXJuIG1fY29udGV4dC0+cGFpbnRzSW50b0NhbnZhc0J1ZmZlcigpOyB9Ci0K ICAgcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgV2ViR0xPYmplY3Q7CiAKSW5kZXg6IFdlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCShy ZXZpc2lvbiA2NTkwMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1 ZmZlclNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NCw2ICs5NCw3IEBAIGJvb2wgSW1hZ2VC dWZmZXI6OmRyYXdzVXNpbmdDb3B5KCkgY29uc3QKIAogUGFzc1JlZlB0cjxJbWFnZT4gSW1hZ2VC dWZmZXI6OmNvcHlJbWFnZSgpIGNvbnN0CiB7CisgICAgbV9jb250ZXh0LT5wbGF0Zm9ybUNvbnRl eHQoKS0+c3luY1NvZnR3YXJlQ2FudmFzKCk7CiAgICAgcmV0dXJuIEJpdG1hcEltYWdlU2luZ2xl RnJhbWVTa2lhOjpjcmVhdGUoKm1fZGF0YS5tX3BsYXRmb3JtQ29udGV4dC5iaXRtYXAoKSwgdHJ1 ZSk7CiB9CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNv bnRleHRTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Nr aWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAJKHJldmlzaW9uIDY1OTAwKQorKysgV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC03MzMsMTEgKzczMyw3IEBAIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6cHJlcGFy ZUZvclNvZnQKIAogICAgICAgICBpZiAobV9zdGF0ZS0+bV94ZmVyTW9kZSA9PSBTa1hmZXJtb2Rl OjprU3JjT3Zlcl9Nb2RlKSB7CiAgICAgICAgICAgICAvLyBMYXN0IGRyYXduIG9uIGhhcmR3YXJl OyBjbGVhciBvdXQgdGhlIGNhbnZhcy4KLSAgICAgICAgICAgIG1fY2FudmFzLT5zYXZlKCk7Ci0g ICAgICAgICAgICBTa1JlY3QgYm91bmRzID0gezAsIDAsIG1fY2FudmFzLT5nZXREZXZpY2UoKS0+ d2lkdGgoKSwgbV9jYW52YXMtPmdldERldmljZSgpLT5oZWlnaHQoKX07Ci0gICAgICAgICAgICBt X2NhbnZhcy0+Y2xpcFJlY3QoYm91bmRzLCBTa1JlZ2lvbjo6a1JlcGxhY2VfT3ApOwotICAgICAg ICAgICAgbV9jYW52YXMtPmRyYXdBUkdCKDAsIDAsIDAsIDAsIFNrWGZlcm1vZGU6OmtDbGVhcl9N b2RlKTsKLSAgICAgICAgICAgIG1fY2FudmFzLT5yZXN0b3JlKCk7CisgICAgICAgICAgICBtX2Nh bnZhcy0+Z2V0RGV2aWNlKCktPmVyYXNlQ29sb3IoMCk7CiAgICAgICAgICAgICAvLyBTdGFydCBj b21wb3NpdGluZyBpbnRvIHRoZSBlbXB0eSBjYW52YXMuCiAgICAgICAgICAgICBtX2JhY2tpbmdT dG9yZVN0YXRlID0gTWl4ZWQ7CiAgICAgICAgIH0gZWxzZSB7Cg== 65293 2010-08-24 10:34:19 -0700 2010-08-24 11:52:35 -0700 Patch bug-44525-20100824133417.patch text/plain 5829 senorblanco SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTkwMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzIgQEAKKzIwMTAtMDgtMjQgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRml4IGFjY2VsZXJhdGVkIDJkIGNhbnZhcyB3aXRoIGFjY2VsZXJhdGVkIGNvbXBvc2l0 aW5nIG9mZi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQ0NTI1CisKKyAgICAgICAgVGVzdGVkIGJ5IHJ1bm5pbmcgd2l0aCAtLWFjY2VsZXJhdGVkLTJk LWNhbnZhcyB3aXRoCisgICAgICAgIC0tYWNjZWxlcmF0ZWQtY29tcG9zaXRpbmcgb2ZmLgorICAg ICAgICBJbWFnZUJ1ZmZlcjo6Y29weUltYWdlIGNoYW5nZXMgY292ZXJlZCBieQorICAgICAgICBM YXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jYW52YXMtcGF0dGVybi0qLmh0bWwuCisKKyAgICAgICAg KiBodG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDYW52 YXNFbGVtZW50OjpwYWludCk6CisgICAgICAgIEV4dGVuZCB0aGUgYWNjZWxlcmF0ZWQgY29tcG9z aXRpbmcgY2hlY2sgYW5kIHRoZSByZWFkYmFjayBmb3IKKyAgICAgICAgbm9uLWFjY2VsZXJhdGVk IGNvbXBvc2l0aW5nIHRvIGFjY2VsZXJhdGVkIDJEIGNhbnZhcyBhbHNvLgorICAgICAgICAqIGh0 bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQuY3BwOgorICAgICAgICAqIGh0bWwvY2Fu dmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1Jl bmRlcmluZ0NvbnRleHQ6OnBhaW50c0ludG9DYW52YXNCdWZmZXIpOgorICAgICAgICBNb3ZlIHRo aXMgbG9naWMgZnJvbSBXZWJHTCB0byBjb21tb24gY2FudmFzIGNvbnRleHQgY29kZS4KKyAgICAg ICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaDoKKyAgICAgICAgUmVtb3Zl IGltcGxlbWVudGF0aW9uIG9mIHBhaW50c0ludG9DYW52YXNCdWZmZXIuCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW1hZ2VCdWZmZXI6OmNvcHlJbWFnZSk6CisgICAgICAgIFdoZW4gY29weWluZyB0aGUgaW1h Z2UgZm9yIHBhdHRlcm5zLCBzeW5jIHRoZSBzb2Z0d2FyZSBjYW52YXMuCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OnByZXBhcmVGb3JTb2Z0d2FyZURyYXcpOgorICAg ICAgICBVc2UgU2tEZXZpY2U6OmVyYXNlQ29sb3IoKSB0byBjbGVhciB0aGUgY2FudmFzIGZvciBt aXhlZCBtb2RlIHJlbmRlcmluZy4KKwogMjAxMC0wOC0yMyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCkluZGV4OiBXZWJDb3Jl L2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9I VE1MQ2FudmFzRWxlbWVudC5jcHAJKHJldmlzaW9uIDY1OTAwKQorKysgV2ViQ29yZS9odG1sL0hU TUxDYW52YXNFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjcyLDE1ICsyNzIsMTEgQEAg dm9pZCBIVE1MQ2FudmFzRWxlbWVudDo6cGFpbnQoR3JhcGhpY3NDbwogICAgIGlmIChjb250ZXh0 LT5wYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKICAgICAKLSNpZiBFTkFCTEUo M0RfQ0FOVkFTKQotICAgIFdlYkdMUmVuZGVyaW5nQ29udGV4dCogY29udGV4dDNEID0gMDsKLSAg ICBpZiAobV9jb250ZXh0ICYmIG1fY29udGV4dC0+aXMzZCgpKSB7Ci0gICAgICAgIGNvbnRleHQz RCA9IHN0YXRpY19jYXN0PFdlYkdMUmVuZGVyaW5nQ29udGV4dCo+KG1fY29udGV4dC5nZXQoKSk7 Ci0gICAgICAgIGlmICghY29udGV4dDNELT5wYWludHNJbnRvQ2FudmFzQnVmZmVyKCkpCisgICAg aWYgKG1fY29udGV4dCkgeworICAgICAgICBpZiAoIW1fY29udGV4dC0+cGFpbnRzSW50b0NhbnZh c0J1ZmZlcigpKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBjb250ZXh0M0QtPnBhaW50 UmVuZGVyaW5nUmVzdWx0c1RvQ2FudmFzKCk7CisgICAgICAgIG1fY29udGV4dC0+cGFpbnRSZW5k ZXJpbmdSZXN1bHRzVG9DYW52YXMoKTsKICAgICB9Ci0jZW5kaWYKIAogICAgIGlmIChoYXNDcmVh dGVkSW1hZ2VCdWZmZXIoKSkgewogICAgICAgICBJbWFnZUJ1ZmZlciogaW1hZ2VCdWZmZXIgPSBi dWZmZXIoKTsKSW5kZXg6IFdlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4 dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdD b250ZXh0LmNwcAkocmV2aXNpb24gNjU5MDApCisrKyBXZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZh c1JlbmRlcmluZ0NvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNSw3ICsyNSw5IEBACiAK ICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJDYW52YXNSZW5kZXJpbmdDb250ZXh0Lmgi Ci0KKyNpZiBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKSB8fCBFTkFCTEUoM0RfQ0FOVkFT KQorI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgiCisjZW5kaWYKICNpbmNsdWRlICJIVE1M Q2FudmFzRWxlbWVudC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC00NSw0ICs0NywxMyBA QCB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQ6OmRlcmVmKCkKICAgICBtX2NhbnZhcy0+ZGVy ZWYoKTsgCiB9CiAKK2Jvb2wgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDo6cGFpbnRzSW50b0NhbnZh c0J1ZmZlcigpIGNvbnN0Cit7CisjaWYgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykgfHwg RU5BQkxFKDNEX0NBTlZBUykKKyAgICBpZiAoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQzRCA9 IGdyYXBoaWNzQ29udGV4dDNEKCkpCisgICAgICAgIHJldHVybiBjb250ZXh0M0QtPnBhaW50c0lu dG9DYW52YXNCdWZmZXIoKTsKKyNlbmRpZgorICAgIHJldHVybiB0cnVlOworfQorCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmlu Z0NvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRl cmluZ0NvbnRleHQuaAkocmV2aXNpb24gNjU5MDApCisrKyBXZWJDb3JlL2h0bWwvY2FudmFzL0Nh bnZhc1JlbmRlcmluZ0NvbnRleHQuaAkod29ya2luZyBjb3B5KQpAQCAtNTQsNiArNTQsNyBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgR3JhcGhpY3NDb250ZXh0M0QqIGdy YXBoaWNzQ29udGV4dDNEKCkgY29uc3QgeyByZXR1cm4gMDsgfQogCiAgICAgICAgIHZpcnR1YWwg dm9pZCBwYWludFJlbmRlcmluZ1Jlc3VsdHNUb0NhbnZhcygpIHt9CisgICAgICAgIGJvb2wgcGFp bnRzSW50b0NhbnZhc0J1ZmZlcigpIGNvbnN0OwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgSFRN TENhbnZhc0VsZW1lbnQqIG1fY2FudmFzOwpJbmRleDogV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJH TFJlbmRlcmluZ0NvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvY2FudmFzL1dl YkdMUmVuZGVyaW5nQ29udGV4dC5oCShyZXZpc2lvbiA2NTkwMCkKKysrIFdlYkNvcmUvaHRtbC9j YW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTI4NSw4ICsy ODUsNiBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHJlbW92ZU9iamVjdChXZWJHTE9iamVjdCopOwog Ci0gICAgYm9vbCBwYWludHNJbnRvQ2FudmFzQnVmZmVyKCkgY29uc3QgeyByZXR1cm4gbV9jb250 ZXh0LT5wYWludHNJbnRvQ2FudmFzQnVmZmVyKCk7IH0KLQogICBwcml2YXRlOgogICAgIGZyaWVu ZCBjbGFzcyBXZWJHTE9iamVjdDsKIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9z a2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAJKHJldmlzaW9uIDY1OTAwKQorKysgV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTk0LDYgKzk0LDcgQEAgYm9vbCBJbWFnZUJ1ZmZlcjo6ZHJhd3NVc2luZ0NvcHko KSBjb25zdAogCiBQYXNzUmVmUHRyPEltYWdlPiBJbWFnZUJ1ZmZlcjo6Y29weUltYWdlKCkgY29u c3QKIHsKKyAgICBtX2NvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLT5zeW5jU29mdHdhcmVDYW52 YXMoKTsKICAgICByZXR1cm4gQml0bWFwSW1hZ2VTaW5nbGVGcmFtZVNraWE6OmNyZWF0ZSgqbV9k YXRhLm1fcGxhdGZvcm1Db250ZXh0LmJpdG1hcCgpLCB0cnVlKTsKIH0KIApJbmRleDogV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lh LmNwcAkocmV2aXNpb24gNjU5MDApCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEv UGxhdGZvcm1Db250ZXh0U2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTczMywxMSArNzMzLDcg QEAgdm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpwcmVwYXJlRm9yU29mdAogCiAgICAgICAgIGlm IChtX3N0YXRlLT5tX3hmZXJNb2RlID09IFNrWGZlcm1vZGU6OmtTcmNPdmVyX01vZGUpIHsKICAg ICAgICAgICAgIC8vIExhc3QgZHJhd24gb24gaGFyZHdhcmU7IGNsZWFyIG91dCB0aGUgY2FudmFz LgotICAgICAgICAgICAgbV9jYW52YXMtPnNhdmUoKTsKLSAgICAgICAgICAgIFNrUmVjdCBib3Vu ZHMgPSB7MCwgMCwgbV9jYW52YXMtPmdldERldmljZSgpLT53aWR0aCgpLCBtX2NhbnZhcy0+Z2V0 RGV2aWNlKCktPmhlaWdodCgpfTsKLSAgICAgICAgICAgIG1fY2FudmFzLT5jbGlwUmVjdChib3Vu ZHMsIFNrUmVnaW9uOjprUmVwbGFjZV9PcCk7Ci0gICAgICAgICAgICBtX2NhbnZhcy0+ZHJhd0FS R0IoMCwgMCwgMCwgMCwgU2tYZmVybW9kZTo6a0NsZWFyX01vZGUpOwotICAgICAgICAgICAgbV9j YW52YXMtPnJlc3RvcmUoKTsKKyAgICAgICAgICAgIG1fY2FudmFzLT5nZXREZXZpY2UoKS0+ZXJh c2VDb2xvcigwKTsKICAgICAgICAgICAgIC8vIFN0YXJ0IGNvbXBvc2l0aW5nIGludG8gdGhlIGVt cHR5IGNhbnZhcy4KICAgICAgICAgICAgIG1fYmFja2luZ1N0b3JlU3RhdGUgPSBNaXhlZDsKICAg ICAgICAgfSBlbHNlIHsK