65053 2011-07-22 15:41:27 -0700 Switching off acceleration for small canvas broke gpu tests 2011-07-23 11:45:15 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 alokp alokp bsalomon jamesr mdelaney7 senorblanco vangelis webkit.review.bot oldest_to_newest 441227 0 alokp 2011-07-22 15:41:27 -0700 Test expectations for gpu tests do not match if acceleration is switched off for small canvas. We should disable switching acceleration when testing so that we can have a consistent set of test expectations. This does not alter the test coverage because we already run canvas test for both hardware and software. The tests got broken in: http://trac.webkit.org/changeset/91599 441237 1 101785 alokp 2011-07-22 15:56:46 -0700 Created attachment 101785 proposed patch 441238 2 101785 jamesr 2011-07-22 15:58:26 -0700 Comment on attachment 101785 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=101785&action=review At first glance, I think this is reasonable. I'm curious what others think. > Source/WebCore/page/Settings.h:364 > + // Hardware acceleration is useful for large canvii where it can avoid the nit: i think it's "canvases" 441240 3 101786 alokp 2011-07-22 16:08:11 -0700 Created attachment 101786 proposed patch The last patch had missing files. Verified that all canvas-related tests pass with this patch. 441275 4 alokp 2011-07-22 16:48:23 -0700 ping! GPU bots are red - this needs to be committed ASAP. BTW there are also some unrelated regressions in GPU tests related to rotated layers and scrollbar rendering. 441338 5 bsalomon 2011-07-22 21:05:03 -0700 I'm not very familiar with how these settings are managed but it looks reasonable. 441373 6 101786 senorblanco 2011-07-23 06:05:35 -0700 Comment on attachment 101786 proposed patch Looks good. r=me 441403 7 101786 webkit.review.bot 2011-07-23 11:45:10 -0700 Comment on attachment 101786 proposed patch Clearing flags on attachment: 101786 Committed r91638: <http://trac.webkit.org/changeset/91638> 441404 8 webkit.review.bot 2011-07-23 11:45:15 -0700 All reviewed patches have been landed. Closing bug. 101785 2011-07-22 15:56:46 -0700 2011-07-22 16:08:11 -0700 proposed patch test.patch text/plain 7596 alokp SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxNjEzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDctMjIgIEFsb2sgUHJp eWFkYXJzaGkgIDxhbG9rcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgU3dpdGNoaW5nIG9mZiBh Y2NlbGVyYXRpb24gZm9yIHNtYWxsIGNhbnZhcyBicm9rZSBncHUgdGVzdHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1MDUzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGVzZSBh cmUgc3VwcG9zZWQgdG8gZml4IGV4aXN0aW5nIGNhbnZhcyB0ZXN0cyBvbiBncHUuCisKKyAgICAg ICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6c2hvdWxkQWNjZWxlcmF0ZUNhbnZhcyk6CisgICAgICAgICogcGFnZS9TZXR0aW5n cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6U2V0dGluZ3MpOgorICAgICAgICAo V2ViQ29yZTo6U2V0dGluZ3M6OnNldExlZ2FjeUFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKToK KyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpzZXRNaW5pbXVtQWNjZWxlcmF0ZWQyZENhbnZh c1NpemUpOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNl dHRpbmdzOjptaW5pbXVtQWNjZWxlcmF0ZWQyZENhbnZhc1NpemUpOgorCiAyMDExLTA3LTIyICBT ZXJnZXkgR2xhenVub3YgIDxzZXJnLmdsYXp1bm92QGdtYWlsLmNvbT4KIAogICAgICAgICBQZXJm b3JtIHRoZSBKYXZhU2NyaXB0IG5hdmlnYXRpb24gY2hlY2sgb24gYSBjb21wbGV0ZSBVUkwKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVy aW5nQ29udGV4dDJELmNwcAkocmV2aXNpb24gOTE2MDEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1s L2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05 OCwxMSArOTgsNiBAQCBzdGF0aWMgYm9vbCBpc09yaWdpbkNsZWFuKENhY2hlZEltYWdlKiBjCiB9 CiAKICNpZiBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKQotLy8gTnVtYmVyIG9mIHBpeGVs cyBpbiBhIGNhbnZhcyBiZWxvdyB3aGljaCB3ZSB1c2Ugc29mdHdhcmUKLS8vIHJlbmRlcmluZy4g VGhpcyBpcyBvYnZpb3VzbHkgYW4gYXJiaXRyYXJ5IG51bWJlci4gQSBtb3JlIHByZWNpc2UKLS8v IG51bWJlciB3b3VsZCBkZXBlbmQgb24gbWFjaGluZSBhcmNoaXRlY3R1cmUgYW5kIGNhbnZhcyBj b250ZW50cy4KLXN0YXRpYyBjb25zdCBpbnQgbnVtUGl4ZWxzVGhyZXNob2xkID0gMTI4ICogMTI4 OwotCiBzdGF0aWMgYm9vbCBzaG91bGRBY2NlbGVyYXRlQ2FudmFzKGNvbnN0IEhUTUxDYW52YXNF bGVtZW50KiBjYW52YXMpCiB7CiAgICAgY29uc3QgUGFnZSogcGFnZSA9IGNhbnZhcy0+ZG9jdW1l bnQoKS0+cGFnZSgpOwpAQCAtMTE0LDEwICsxMDksNyBAQCBzdGF0aWMgYm9vbCBzaG91bGRBY2Nl bGVyYXRlQ2FudmFzKGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIERvIG5v dCB1c2UgYWNjZWxlcmF0aW9uIGZvciBzbWFsbCBjYW52YXMuCi0gICAgLy8gRm9yIGV2ZXJ5IGFj Y2VsZXJhdGVkIGNhbnZhcyB0aGVyZSBpcyBhbiBleHRyYSBiYWNrLWJ1ZmZlciBhbmQgYSB0ZXh0 dXJlIGNvcHkuCi0gICAgLy8gU21hbGwgY2FudmFzZXMgYXJlIGFsc28gd2lkZWx5IHVzZWQgZm9y IHN0eWxpemVkIGZvbnRzLiBBbnRpLWFsaWFzaW5nCi0gICAgLy8gdGV4dCBpbiBoYXJkd2FyZSBh dCB0aGF0IHNjYWxlIGlzIGdlbmVyYWxseSBzbG93ZXIuCi0gICAgaWYgKGNhbnZhcy0+d2lkdGgo KSAqIGNhbnZhcy0+aGVpZ2h0KCkgPCBudW1QaXhlbHNUaHJlc2hvbGQpCisgICAgaWYgKGNhbnZh cy0+d2lkdGgoKSAqIGNhbnZhcy0+aGVpZ2h0KCkgPCBzZXR0aW5ncy0+bWluaW11bUFjY2VsZXJh dGVkMmRDYW52YXNTaXplKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJldHVybiB0 cnVlOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAJKHJldmlzaW9uIDkxNjAxKQorKysg U291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMSw2 ICsxMTEsNyBAQCBTZXR0aW5nczo6U2V0dGluZ3MoUGFnZSogcGFnZSkKICAgICAsIG1fZGVmYXVs dEZvbnRTaXplKDApCiAgICAgLCBtX2RlZmF1bHRGaXhlZEZvbnRTaXplKDApCiAgICAgLCBtX3Zh bGlkYXRpb25NZXNzYWdlVGltZXJNYWduaWZpY2F0aW9uKDUwKQorICAgICwgbV9taW5pbXVtQWNj ZWxlcmF0ZWQyZENhbnZhc1NpemUoMTI4ICogMTI4KQogICAgICwgbV9tYXhpbXVtRGVjb2RlZElt YWdlU2l6ZShudW1lcmljX2xpbWl0czxzaXplX3Q+OjptYXgoKSkKICNpZiBFTkFCTEUoRE9NX1NU T1JBR0UpCiAgICAgLCBtX3Nlc3Npb25TdG9yYWdlUXVvdGEoU3RvcmFnZU1hcDo6bm9RdW90YSkK QEAgLTc3Myw2ICs3NzQsMTEgQEAgdm9pZCBTZXR0aW5nczo6c2V0TGVnYWN5QWNjZWxlcmF0ZWQy ZENhbgogICAgIG1fbGVnYWN5QWNjZWxlcmF0ZWRDYW52YXMyZEVuYWJsZWQgPSBlbmFibGVkOwog fQogCit2b2lkIFNldHRpbmdzOjpzZXRNaW5pbXVtQWNjZWxlcmF0ZWQyZENhbnZhc1NpemUoaW50 IG51bVBpeGVscykKK3sKKyAgICBtX21pbmltdW1BY2NlbGVyYXRlZDJkQ2FudmFzU2l6ZSA9IG51 bVBpeGVsczsKK30KKwogdm9pZCBTZXR0aW5nczo6c2V0TG9hZERlZmVycmluZ0VuYWJsZWQoYm9v bCBlbmFibGVkKQogewogICAgIG1fbG9hZERlZmVycmluZ0VuYWJsZWQgPSBlbmFibGVkOwpJbmRl eDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAkocmV2aXNpb24gOTE2MDEpCisrKyBTb3VyY2UvV2ViQ29y ZS9wYWdlL1NldHRpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTM1OSw2ICszNTksMTcgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHNldExlZ2FjeUFjY2VsZXJhdGVkMmRDYW52 YXNFbmFibGVkKGJvb2wpOwogICAgICAgICBib29sIGxlZ2FjeUFjY2VsZXJhdGVkMmRDYW52YXNF bmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9sZWdhY3lBY2NlbGVyYXRlZENhbnZhczJkRW5hYmxl ZDsgfQogCisgICAgICAgIC8vIE51bWJlciBvZiBwaXhlbHMgYmVsb3cgd2hpY2ggMkQgY2FudmFz IGlzIHJlbmRlcmVkIGluIHNvZnR3YXJlCisgICAgICAgIC8vIGV2ZW4gaWYgaGFyZHdhcmUgYWNj ZWxlcmF0aW9uIGlzIGVuYWJsZWQuCisgICAgICAgIC8vIEhhcmR3YXJlIGFjY2VsZXJhdGlvbiBp cyB1c2VmdWwgZm9yIGxhcmdlIGNhbnZpaSB3aGVyZSBpdCBjYW4gYXZvaWQgdGhlCisgICAgICAg IC8vIHBpeGVsIGJhbmR3aWR0aCBiZXR3ZWVuIHRoZSBDUFUgYW5kIEdQVS4gQnV0IEdQVSBhY2Nl bGVyYXRpb24gY29tZXMgYXQKKyAgICAgICAgLy8gYSBwcmljZSAtIGV4dHJhIGJhY2stYnVmZmVy IGFuZCB0ZXh0dXJlIGNvcHkuIFNtYWxsIGNhbnZhc2VzIGFyZSBhbHNvCisgICAgICAgIC8vIHdp ZGVseSB1c2VkIGZvciBzdHlsaXplZCBmb250cy4gQW50aS1hbGlhc2luZyB0ZXh0IGluIGhhcmR3 YXJlIGF0IHRoYXQKKyAgICAgICAgLy8gc2NhbGUgaXMgZ2VuZXJhbGx5IHNsb3dlci4gU28gYmVs b3cgYSBjZXJ0YWluIHNpemUgaXQgaXMgYmV0dGVyIHRvCisgICAgICAgIC8vIGRyYXcgY2FudmFz IGluIHNvZnR3YXJlLgorICAgICAgICB2b2lkIHNldE1pbmltdW1BY2NlbGVyYXRlZDJkQ2FudmFz U2l6ZShpbnQpOworICAgICAgICBpbnQgbWluaW11bUFjY2VsZXJhdGVkMmRDYW52YXNTaXplKCkg Y29uc3QgeyByZXR1cm4gbV9taW5pbXVtQWNjZWxlcmF0ZWQyZENhbnZhc1NpemU7IH0KKwogICAg ICAgICB2b2lkIHNldExvYWREZWZlcnJpbmdFbmFibGVkKGJvb2wpOwogICAgICAgICBib29sIGxv YWREZWZlcnJpbmdFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9sb2FkRGVmZXJyaW5nRW5hYmxl ZDsgfQogICAgICAgICAKQEAgLTQ1OCw2ICs0NjksNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgICAgIGludCBtX2RlZmF1bHRGb250U2l6ZTsKICAgICAgICAgaW50IG1fZGVmYXVsdEZpeGVk Rm9udFNpemU7CiAgICAgICAgIGludCBtX3ZhbGlkYXRpb25NZXNzYWdlVGltZXJNYWduaWZpY2F0 aW9uOworICAgICAgICBpbnQgbV9taW5pbXVtQWNjZWxlcmF0ZWQyZENhbnZhc1NpemU7CiAgICAg ICAgIHNpemVfdCBtX21heGltdW1EZWNvZGVkSW1hZ2VTaXplOwogI2lmIEVOQUJMRShET01fU1RP UkFHRSkKICAgICAgICAgdW5zaWduZWQgbV9zZXNzaW9uU3RvcmFnZVF1b3RhOwpJbmRleDogU291 cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxNjEzKQorKysgU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0w Ny0yMiAgQWxvayBQcml5YWRhcnNoaSAgPGFsb2twQGNocm9taXVtLm9yZz4KKworICAgICAgICBT d2l0Y2hpbmcgb2ZmIGFjY2VsZXJhdGlvbiBmb3Igc21hbGwgY2FudmFzIGJyb2tlIGdwdSB0ZXN0 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUwNTMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHB1Ymxp Yy9XZWJTZXR0aW5ncy5oOgorICAgICAgICAqIHNyYy9XZWJTZXR0aW5nc0ltcGwuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJTZXR0aW5nc0ltcGw6OnNldE1pbmltdW1BY2NlbGVyYXRlZDJkQ2Fu dmFzU2l6ZSk6CisgICAgICAgICogc3JjL1dlYlNldHRpbmdzSW1wbC5oOgorCiAyMDExLTA3LTIy ICBDcmlzIE5lY2thciAgPGNkbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgSG9vayB2OCB1cCB0 byBjcnlwdG9ncmFwaGljYWxseVJhbmRvbVZhbHVlcyBhcyBhbiBlbnRyb3B5IHNvdXJjZS4KSW5k ZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRpbmdzLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU2V0dGluZ3MuaAkocmV2aXNp b24gOTE2MDEpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTZXR0aW5ncy5o CSh3b3JraW5nIGNvcHkpCkBAIC0xMTIsNiArMTEyLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwg dm9pZCBzZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nRm9yQW5pbWF0aW9uRW5hYmxlZChib29sKSA9 IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldEFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKGJvb2wp ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJs ZWQoYm9vbCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzZXRNaW5pbXVtQWNjZWxlcmF0ZWQyZENh bnZhc1NpemUoaW50KSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldEFjY2VsZXJhdGVkRHJhd2lu Z0VuYWJsZWQoYm9vbCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRNZW1vcnlJbmZvRW5hYmxl ZChib29sKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldEh5cGVybGlua0F1ZGl0aW5nRW5hYmxl ZChib29sKSA9IDA7CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5n c0ltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNl dHRpbmdzSW1wbC5jcHAJKHJldmlzaW9uIDkxNjAxKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYzLDYgKzM2Mywx MSBAQCB2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0TGVnYWN5QWNjZWxlcmF0CiAgICAgbV9zZXR0 aW5ncy0+c2V0TGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoZW5hYmxlZCk7CiB9CiAK K3ZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRNaW5pbXVtQWNjZWxlcmF0ZWQyZENhbnZhc1NpemUo aW50IG51bVBpeGVscykKK3sKKyAgICBtX3NldHRpbmdzLT5zZXRNaW5pbXVtQWNjZWxlcmF0ZWQy ZENhbnZhc1NpemUobnVtUGl4ZWxzKTsKK30KKwogdm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldE1l bW9yeUluZm9FbmFibGVkKGJvb2wgZW5hYmxlZCkKIHsKICAgICBtX3NldHRpbmdzLT5zZXRNZW1v cnlJbmZvRW5hYmxlZChlbmFibGVkKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlNldHRpbmdzSW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlNldHRpbmdzSW1wbC5oCShyZXZpc2lvbiA5MTYwMSkKKysrIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDUsNiAr MTA1LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzZXRBY2NlbGVyYXRlZENvbXBvc2l0 aW5nRm9yQW5pbWF0aW9uRW5hYmxlZChib29sKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0QWNjZWxl cmF0ZWQyZENhbnZhc0VuYWJsZWQoYm9vbCk7CiAgICAgdmlydHVhbCB2b2lkIHNldExlZ2FjeUFj Y2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKGJvb2wpOworICAgIHZpcnR1YWwgdm9pZCBzZXRNaW5p bXVtQWNjZWxlcmF0ZWQyZENhbnZhc1NpemUoaW50KTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0QWNj ZWxlcmF0ZWREcmF3aW5nRW5hYmxlZChib29sKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TWVtb3J5 SW5mb0VuYWJsZWQoYm9vbCk7CiAgICAgdmlydHVhbCB2b2lkIHNldEh5cGVybGlua0F1ZGl0aW5n RW5hYmxlZChib29sKTsK 101786 2011-07-22 16:08:11 -0700 2011-07-23 11:45:10 -0700 proposed patch test.patch text/plain 9859 alokp SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxNjE0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDctMjIgIEFsb2sgUHJp eWFkYXJzaGkgIDxhbG9rcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgU3dpdGNoaW5nIG9mZiBh Y2NlbGVyYXRpb24gZm9yIHNtYWxsIGNhbnZhcyBicm9rZSBncHUgdGVzdHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1MDUzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGVzZSBh cmUgc3VwcG9zZWQgdG8gZml4IGV4aXN0aW5nIGNhbnZhcyB0ZXN0cyBvbiBncHUuCisKKyAgICAg ICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6c2hvdWxkQWNjZWxlcmF0ZUNhbnZhcyk6CisgICAgICAgICogcGFnZS9TZXR0aW5n cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6U2V0dGluZ3MpOgorICAgICAgICAo V2ViQ29yZTo6U2V0dGluZ3M6OnNldExlZ2FjeUFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKToK KyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpzZXRNaW5pbXVtQWNjZWxlcmF0ZWQyZENhbnZh c1NpemUpOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNl dHRpbmdzOjptaW5pbXVtQWNjZWxlcmF0ZWQyZENhbnZhc1NpemUpOgorCiAyMDExLTA3LTIyICBT ZXJnZXkgR2xhenVub3YgIDxzZXJnLmdsYXp1bm92QGdtYWlsLmNvbT4KIAogICAgICAgICBQZXJm b3JtIHRoZSBKYXZhU2NyaXB0IG5hdmlnYXRpb24gY2hlY2sgb24gYSBjb21wbGV0ZSBVUkwKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVy aW5nQ29udGV4dDJELmNwcAkocmV2aXNpb24gOTE2MDEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1s L2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05 OCwxMSArOTgsNiBAQCBzdGF0aWMgYm9vbCBpc09yaWdpbkNsZWFuKENhY2hlZEltYWdlKiBjCiB9 CiAKICNpZiBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKQotLy8gTnVtYmVyIG9mIHBpeGVs cyBpbiBhIGNhbnZhcyBiZWxvdyB3aGljaCB3ZSB1c2Ugc29mdHdhcmUKLS8vIHJlbmRlcmluZy4g VGhpcyBpcyBvYnZpb3VzbHkgYW4gYXJiaXRyYXJ5IG51bWJlci4gQSBtb3JlIHByZWNpc2UKLS8v IG51bWJlciB3b3VsZCBkZXBlbmQgb24gbWFjaGluZSBhcmNoaXRlY3R1cmUgYW5kIGNhbnZhcyBj b250ZW50cy4KLXN0YXRpYyBjb25zdCBpbnQgbnVtUGl4ZWxzVGhyZXNob2xkID0gMTI4ICogMTI4 OwotCiBzdGF0aWMgYm9vbCBzaG91bGRBY2NlbGVyYXRlQ2FudmFzKGNvbnN0IEhUTUxDYW52YXNF bGVtZW50KiBjYW52YXMpCiB7CiAgICAgY29uc3QgUGFnZSogcGFnZSA9IGNhbnZhcy0+ZG9jdW1l bnQoKS0+cGFnZSgpOwpAQCAtMTE0LDEwICsxMDksNyBAQCBzdGF0aWMgYm9vbCBzaG91bGRBY2Nl bGVyYXRlQ2FudmFzKGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIERvIG5v dCB1c2UgYWNjZWxlcmF0aW9uIGZvciBzbWFsbCBjYW52YXMuCi0gICAgLy8gRm9yIGV2ZXJ5IGFj Y2VsZXJhdGVkIGNhbnZhcyB0aGVyZSBpcyBhbiBleHRyYSBiYWNrLWJ1ZmZlciBhbmQgYSB0ZXh0 dXJlIGNvcHkuCi0gICAgLy8gU21hbGwgY2FudmFzZXMgYXJlIGFsc28gd2lkZWx5IHVzZWQgZm9y IHN0eWxpemVkIGZvbnRzLiBBbnRpLWFsaWFzaW5nCi0gICAgLy8gdGV4dCBpbiBoYXJkd2FyZSBh dCB0aGF0IHNjYWxlIGlzIGdlbmVyYWxseSBzbG93ZXIuCi0gICAgaWYgKGNhbnZhcy0+d2lkdGgo KSAqIGNhbnZhcy0+aGVpZ2h0KCkgPCBudW1QaXhlbHNUaHJlc2hvbGQpCisgICAgaWYgKGNhbnZh cy0+d2lkdGgoKSAqIGNhbnZhcy0+aGVpZ2h0KCkgPCBzZXR0aW5ncy0+bWluaW11bUFjY2VsZXJh dGVkMmRDYW52YXNTaXplKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJldHVybiB0 cnVlOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAJKHJldmlzaW9uIDkxNjAxKQorKysg U291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMSw2 ICsxMTEsNyBAQCBTZXR0aW5nczo6U2V0dGluZ3MoUGFnZSogcGFnZSkKICAgICAsIG1fZGVmYXVs dEZvbnRTaXplKDApCiAgICAgLCBtX2RlZmF1bHRGaXhlZEZvbnRTaXplKDApCiAgICAgLCBtX3Zh bGlkYXRpb25NZXNzYWdlVGltZXJNYWduaWZpY2F0aW9uKDUwKQorICAgICwgbV9taW5pbXVtQWNj ZWxlcmF0ZWQyZENhbnZhc1NpemUoMTI4ICogMTI4KQogICAgICwgbV9tYXhpbXVtRGVjb2RlZElt YWdlU2l6ZShudW1lcmljX2xpbWl0czxzaXplX3Q+OjptYXgoKSkKICNpZiBFTkFCTEUoRE9NX1NU T1JBR0UpCiAgICAgLCBtX3Nlc3Npb25TdG9yYWdlUXVvdGEoU3RvcmFnZU1hcDo6bm9RdW90YSkK QEAgLTc3Myw2ICs3NzQsMTEgQEAgdm9pZCBTZXR0aW5nczo6c2V0TGVnYWN5QWNjZWxlcmF0ZWQy ZENhbgogICAgIG1fbGVnYWN5QWNjZWxlcmF0ZWRDYW52YXMyZEVuYWJsZWQgPSBlbmFibGVkOwog fQogCit2b2lkIFNldHRpbmdzOjpzZXRNaW5pbXVtQWNjZWxlcmF0ZWQyZENhbnZhc1NpemUoaW50 IG51bVBpeGVscykKK3sKKyAgICBtX21pbmltdW1BY2NlbGVyYXRlZDJkQ2FudmFzU2l6ZSA9IG51 bVBpeGVsczsKK30KKwogdm9pZCBTZXR0aW5nczo6c2V0TG9hZERlZmVycmluZ0VuYWJsZWQoYm9v bCBlbmFibGVkKQogewogICAgIG1fbG9hZERlZmVycmluZ0VuYWJsZWQgPSBlbmFibGVkOwpJbmRl eDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAkocmV2aXNpb24gOTE2MDEpCisrKyBTb3VyY2UvV2ViQ29y ZS9wYWdlL1NldHRpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTM1OSw2ICszNTksMTcgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHNldExlZ2FjeUFjY2VsZXJhdGVkMmRDYW52 YXNFbmFibGVkKGJvb2wpOwogICAgICAgICBib29sIGxlZ2FjeUFjY2VsZXJhdGVkMmRDYW52YXNF bmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9sZWdhY3lBY2NlbGVyYXRlZENhbnZhczJkRW5hYmxl ZDsgfQogCisgICAgICAgIC8vIE51bWJlciBvZiBwaXhlbHMgYmVsb3cgd2hpY2ggMkQgY2FudmFz IGlzIHJlbmRlcmVkIGluIHNvZnR3YXJlCisgICAgICAgIC8vIGV2ZW4gaWYgaGFyZHdhcmUgYWNj ZWxlcmF0aW9uIGlzIGVuYWJsZWQuCisgICAgICAgIC8vIEhhcmR3YXJlIGFjY2VsZXJhdGlvbiBp cyB1c2VmdWwgZm9yIGxhcmdlIGNhbnZhc2VzIHdoZXJlIGl0IGNhbiBhdm9pZCB0aGUKKyAgICAg ICAgLy8gcGl4ZWwgYmFuZHdpZHRoIGJldHdlZW4gdGhlIENQVSBhbmQgR1BVLiBCdXQgR1BVIGFj Y2VsZXJhdGlvbiBjb21lcyBhdAorICAgICAgICAvLyBhIHByaWNlIC0gZXh0cmEgYmFjay1idWZm ZXIgYW5kIHRleHR1cmUgY29weS4gU21hbGwgY2FudmFzZXMgYXJlIGFsc28KKyAgICAgICAgLy8g d2lkZWx5IHVzZWQgZm9yIHN0eWxpemVkIGZvbnRzLiBBbnRpLWFsaWFzaW5nIHRleHQgaW4gaGFy ZHdhcmUgYXQgdGhhdAorICAgICAgICAvLyBzY2FsZSBpcyBnZW5lcmFsbHkgc2xvd2VyLiBTbyBi ZWxvdyBhIGNlcnRhaW4gc2l6ZSBpdCBpcyBiZXR0ZXIgdG8KKyAgICAgICAgLy8gZHJhdyBjYW52 YXMgaW4gc29mdHdhcmUuCisgICAgICAgIHZvaWQgc2V0TWluaW11bUFjY2VsZXJhdGVkMmRDYW52 YXNTaXplKGludCk7CisgICAgICAgIGludCBtaW5pbXVtQWNjZWxlcmF0ZWQyZENhbnZhc1NpemUo KSBjb25zdCB7IHJldHVybiBtX21pbmltdW1BY2NlbGVyYXRlZDJkQ2FudmFzU2l6ZTsgfQorCiAg ICAgICAgIHZvaWQgc2V0TG9hZERlZmVycmluZ0VuYWJsZWQoYm9vbCk7CiAgICAgICAgIGJvb2wg bG9hZERlZmVycmluZ0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2xvYWREZWZlcnJpbmdFbmFi bGVkOyB9CiAgICAgICAgIApAQCAtNDU4LDYgKzQ2OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgaW50IG1fZGVmYXVsdEZvbnRTaXplOwogICAgICAgICBpbnQgbV9kZWZhdWx0Rml4 ZWRGb250U2l6ZTsKICAgICAgICAgaW50IG1fdmFsaWRhdGlvbk1lc3NhZ2VUaW1lck1hZ25pZmlj YXRpb247CisgICAgICAgIGludCBtX21pbmltdW1BY2NlbGVyYXRlZDJkQ2FudmFzU2l6ZTsKICAg ICAgICAgc2l6ZV90IG1fbWF4aW11bURlY29kZWRJbWFnZVNpemU7CiAjaWYgRU5BQkxFKERPTV9T VE9SQUdFKQogICAgICAgICB1bnNpZ25lZCBtX3Nlc3Npb25TdG9yYWdlUXVvdGE7CkluZGV4OiBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gOTE2MTQpCisrKyBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEx LTA3LTIyICBBbG9rIFByaXlhZGFyc2hpICA8YWxva3BAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFN3aXRjaGluZyBvZmYgYWNjZWxlcmF0aW9uIGZvciBzbWFsbCBjYW52YXMgYnJva2UgZ3B1IHRl c3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTA1 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcHVi bGljL1dlYlNldHRpbmdzLmg6CisgICAgICAgICogc3JjL1dlYlNldHRpbmdzSW1wbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlNldHRpbmdzSW1wbDo6c2V0TWluaW11bUFjY2VsZXJhdGVkMmRD YW52YXNTaXplKToKKyAgICAgICAgKiBzcmMvV2ViU2V0dGluZ3NJbXBsLmg6CisKIDIwMTEtMDct MjIgIENyaXMgTmVja2FyICA8Y2RuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBIb29rIHY4IHVw IHRvIGNyeXB0b2dyYXBoaWNhbGx5UmFuZG9tVmFsdWVzIGFzIGFuIGVudHJvcHkgc291cmNlLgpJ bmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU2V0dGluZ3MuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTZXR0aW5ncy5oCShyZXZp c2lvbiA5MTYwMSkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRpbmdz LmgJKHdvcmtpbmcgY29weSkKQEAgLTExMiw2ICsxMTIsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCB2b2lkIHNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdGb3JBbmltYXRpb25FbmFibGVkKGJvb2wp ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoYm9v bCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRMZWdhY3lBY2NlbGVyYXRlZDJkQ2FudmFzRW5h YmxlZChib29sKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNldE1pbmltdW1BY2NlbGVyYXRlZDJk Q2FudmFzU2l6ZShpbnQpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0QWNjZWxlcmF0ZWREcmF3 aW5nRW5hYmxlZChib29sKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldE1lbW9yeUluZm9FbmFi bGVkKGJvb2wpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0SHlwZXJsaW5rQXVkaXRpbmdFbmFi bGVkKGJvb2wpID0gMDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRp bmdzSW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi U2V0dGluZ3NJbXBsLmNwcAkocmV2aXNpb24gOTE2MDEpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNjMsNiArMzYz LDExIEBAIHZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRMZWdhY3lBY2NlbGVyYXQKICAgICBtX3Nl dHRpbmdzLT5zZXRMZWdhY3lBY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZChlbmFibGVkKTsKIH0K IAordm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldE1pbmltdW1BY2NlbGVyYXRlZDJkQ2FudmFzU2l6 ZShpbnQgbnVtUGl4ZWxzKQoreworICAgIG1fc2V0dGluZ3MtPnNldE1pbmltdW1BY2NlbGVyYXRl ZDJkQ2FudmFzU2l6ZShudW1QaXhlbHMpOworfQorCiB2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0 TWVtb3J5SW5mb0VuYWJsZWQoYm9vbCBlbmFibGVkKQogewogICAgIG1fc2V0dGluZ3MtPnNldE1l bW9yeUluZm9FbmFibGVkKGVuYWJsZWQpOwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViU2V0dGluZ3NJbXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmgJKHJldmlzaW9uIDkxNjAxKQorKysgU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNSw2 ICsxMDUsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldEFjY2VsZXJhdGVkQ29tcG9z aXRpbmdGb3JBbmltYXRpb25FbmFibGVkKGJvb2wpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRBY2Nl bGVyYXRlZDJkQ2FudmFzRW5hYmxlZChib29sKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TGVnYWN5 QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoYm9vbCk7CisgICAgdmlydHVhbCB2b2lkIHNldE1p bmltdW1BY2NlbGVyYXRlZDJkQ2FudmFzU2l6ZShpbnQpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRB Y2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKGJvb2wpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRNZW1v cnlJbmZvRW5hYmxlZChib29sKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0SHlwZXJsaW5rQXVkaXRp bmdFbmFibGVkKGJvb2wpOwpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL0NoYW5nZUxvZwkocmV2aXNpb24gOTE2MTQpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0wNy0yMiAgQWxvayBQcml5YWRhcnNoaSAg PGFsb2twQGNocm9taXVtLm9yZz4KKworICAgICAgICBTd2l0Y2hpbmcgb2ZmIGFjY2VsZXJhdGlv biBmb3Igc21hbGwgY2FudmFzIGJyb2tlIGdwdSB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUwNTMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlBy ZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKFdlYlByZWZlcmVuY2VzOjpyZXNldCk6CisgICAgICAg IChXZWJQcmVmZXJlbmNlczo6YXBwbHlUbyk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vV2ViUHJlZmVyZW5jZXMuaDoKKwogMjAxMS0wNy0yMiAgT2phbiBWYWZhaSAgPG9qYW5A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIEFkZCBiYWNrIGluIGxpbmUgYWNjaWRlbnRhbGx5IGRl bGV0ZWQgaW4gaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvOTE2MTIuCkluZGV4OiBU b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJlZmVyZW5jZXMuY3BwCShy ZXZpc2lvbiA5MTYwMSkKKysrIFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZl cmVuY2VzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjcsNiArNjcsOSBAQCB2b2lkIFdlYlByZWZl cmVuY2VzOjpyZXNldCgpCiAgICAgZGVmYXVsdEZpeGVkRm9udFNpemUgPSAxMzsKICAgICBtaW5p bXVtRm9udFNpemUgPSAwOwogICAgIG1pbmltdW1Mb2dpY2FsRm9udFNpemUgPSA5OworICAgIC8v IERvIG5vdCBkaXNhYmxlIGFjY2VsZXJhdGlvbiBmb3IgMmQgY2FudmFzIGJhc2VkIG9uIHNpemUu CisgICAgLy8gVGhpcyBtYWtlcyBoYXZpbmcgdGVzdCBleHBlY3RhdGlvbnMgY29uc2lzdGVudC4K KyAgICBtaW5pbXVtQWNjZWxlcmF0ZWQyZENhbnZhc1NpemUgPSAwOwogCiAgICAgRE9NUGFzdGVB bGxvd2VkID0gdHJ1ZTsKICAgICBYU1NBdWRpdG9yRW5hYmxlZCA9IGZhbHNlOwpAQCAtMTI3LDYg KzEzMCw3IEBAIHZvaWQgV2ViUHJlZmVyZW5jZXM6OmFwcGx5VG8oV2ViVmlldyogd2UKICAgICBz ZXR0aW5ncy0+c2V0RGVmYXVsdEZpeGVkRm9udFNpemUoZGVmYXVsdEZpeGVkRm9udFNpemUpOwog ICAgIHNldHRpbmdzLT5zZXRNaW5pbXVtRm9udFNpemUobWluaW11bUZvbnRTaXplKTsKICAgICBz ZXR0aW5ncy0+c2V0TWluaW11bUxvZ2ljYWxGb250U2l6ZShtaW5pbXVtTG9naWNhbEZvbnRTaXpl KTsKKyAgICBzZXR0aW5ncy0+c2V0TWluaW11bUFjY2VsZXJhdGVkMmRDYW52YXNTaXplKG1pbmlt dW1BY2NlbGVyYXRlZDJkQ2FudmFzU2l6ZSk7CiAKICAgICBzZXR0aW5ncy0+c2V0RE9NUGFzdGVB bGxvd2VkKERPTVBhc3RlQWxsb3dlZCk7CiAgICAgc2V0dGluZ3MtPnNldFhTU0F1ZGl0b3JFbmFi bGVkKFhTU0F1ZGl0b3JFbmFibGVkKTsKSW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1dlYlByZWZlcmVuY2VzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vV2ViUHJlZmVyZW5jZXMuaAkocmV2aXNpb24gOTE2MDEpCisrKyBUb29scy9EdW1w UmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC01 MSw2ICs1MSw3IEBAIHN0cnVjdCBXZWJQcmVmZXJlbmNlcyB7CiAgICAgaW50IGRlZmF1bHRGaXhl ZEZvbnRTaXplOwogICAgIGludCBtaW5pbXVtRm9udFNpemU7CiAgICAgaW50IG1pbmltdW1Mb2dp Y2FsRm9udFNpemU7CisgICAgaW50IG1pbmltdW1BY2NlbGVyYXRlZDJkQ2FudmFzU2l6ZTsKIAog ICAgIGJvb2wgRE9NUGFzdGVBbGxvd2VkOwogICAgIGJvb2wgWFNTQXVkaXRvckVuYWJsZWQ7Cg==