94377 2012-08-17 13:21:35 -0700 canvas.context.drawImage() should draw SVG at the correct scale. 2012-08-20 16:50:45 -0700 1 1 1 Unclassified WebKit SVG 420+ Unspecified Unspecified RESOLVED FIXED P2 Normal --- 93772 1 pdr pdr japhet simon.fraser thorton webkit.review.bot zimmermann oldest_to_newest 698596 0 pdr 2012-08-17 13:21:35 -0700 This is the first bug from wkbug.com/93772. Using drawImage() with an SVG image will incorrectly scale the image as SVG is scaled up for hi resolution displays ("retina", "hidpi") but canvas does not take this into account. Patch forthcoming. 698639 1 159199 pdr 2012-08-17 14:05:42 -0700 Created attachment 159199 Canvas drawImage() should draw SVG at the correct scale. 698698 2 159214 pdr 2012-08-17 14:59:01 -0700 Created attachment 159214 Minor cleanup of test--removed spurious setTimeout. 698702 3 pdr 2012-08-17 15:00:06 -0700 Adding some people who know this area really well. 699919 4 159214 thorton 2012-08-20 14:02:05 -0700 Comment on attachment 159214 Minor cleanup of test--removed spurious setTimeout. View in context: https://bugs.webkit.org/attachment.cgi?id=159214&action=review This seems right to me! > Source/WebCore/ChangeLog:8 > + After this patch, we now take incorporate the page scale in Grammar ("take incorporate"). 699930 5 159515 pdr 2012-08-20 14:07:32 -0700 Created attachment 159515 Fix grammar mistake Thanks for the quick review. 699982 6 159515 webkit.review.bot 2012-08-20 14:34:23 -0700 Comment on attachment 159515 Fix grammar mistake Rejecting attachment 159515 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 Timothy Horton found in /mnt/git/webkit-commit-queue/LayoutTests/ChangeLog does not appear to be a valid reviewer according to committers.py. ERROR: /mnt/git/webkit-commit-queue/LayoutTests/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/13548148 699992 7 159525 pdr 2012-08-20 14:38:41 -0700 Created attachment 159525 Fix reviewer's name. 700176 8 159525 webkit.review.bot 2012-08-20 16:50:39 -0700 Comment on attachment 159525 Fix reviewer's name. Clearing flags on attachment: 159525 Committed r126094: <http://trac.webkit.org/changeset/126094> 700177 9 webkit.review.bot 2012-08-20 16:50:45 -0700 All reviewed patches have been landed. Closing bug. 159199 2012-08-17 14:05:42 -0700 2012-08-17 14:59:01 -0700 Canvas drawImage() should draw SVG at the correct scale. 94377.1.patch text/plain 5754 pdr SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTkyOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA4LTE3ICBQaGlsaXAg Um9nZXJzICA8cGRyQGdvb2dsZS5jb20+CisKKyAgICAgICAgQ2FudmFzIGRyYXdJbWFnZSgpIHNo b3VsZCBkcmF3IFNWRyBhdCB0aGUgY29ycmVjdCBzY2FsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0Mzc3CisKKyAgICAgICAgUHJldmlvdXNseSwg ZHJhd2luZyBTVkcgaW4gY2FudmFzIHdvdWxkIHJlbmRlciBhdCB0aGUgaW5jb3JyZWN0IHNjYWxl CisgICAgICAgIGJlY2F1c2UgaW1hZ2VTaXplRm9yUmVuZGVyZXIgZGlkIG5vdCB0YWtlIGludG8g YWNjb3VudCB0aGUgcGFnZSBzY2FsZS4KKyAgICAgICAgQWZ0ZXIgdGhpcyBwYXRjaCwgd2Ugbm93 IHRha2UgaW5jb3Jwb3JhdGUgdGhlIHBhZ2Ugc2NhbGUgaW4KKyAgICAgICAgQ2FjaGVkSW1hZ2U6 OmltYWdlU2l6ZUZvclJlbmRlcmVyKCkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGVzdDogc3ZnL2FzLWltYWdlL3N2Zy1hcy1pbWFnZS1jYW52YXMu aHRtbAorCisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNhY2hlZEltYWdlOjppbWFnZVNpemVGb3JSZW5kZXJlcik6CisKIDIwMTItMDgt MTcgIEpvaG4gTWVsbG9yICA8am9obm1lQGNocm9taXVtLm9yZz4KIAogICAgICAgICBUZXh0IEF1 dG9zaXppbmc6IEluY3JlYXNlIGxpbmUgaGVpZ2h0IGluIHByb3BvcnRpb24gdG8gZm9udCBzaXpl LgpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCShy ZXZpc2lvbiAxMjU4NzIpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1h Z2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDUsOCArMjQ1LDE0IEBAIEludFNpemUgQ2FjaGVk SW1hZ2U6OmltYWdlU2l6ZUZvclJlbmRlcmUKICAgICBpZiAobV9pbWFnZS0+aXNTVkdJbWFnZSgp KSB7CiAgICAgICAgIFNWR0ltYWdlQ2FjaGU6OlNpemVBbmRTY2FsZXMgc2l6ZUFuZFNjYWxlcyA9 IG1fc3ZnSW1hZ2VDYWNoZS0+cmVxdWVzdGVkU2l6ZUFuZFNjYWxlcyhyZW5kZXJlcik7CiAgICAg ICAgIGlmICghc2l6ZUFuZFNjYWxlcy5zaXplLmlzRW1wdHkoKSkgewotICAgICAgICAgICAgaW1h Z2VTaXplLnNldFdpZHRoKHNpemVBbmRTY2FsZXMuc2l6ZS53aWR0aCgpIC8gc2l6ZUFuZFNjYWxl cy56b29tKTsKLSAgICAgICAgICAgIGltYWdlU2l6ZS5zZXRIZWlnaHQoc2l6ZUFuZFNjYWxlcy5z aXplLmhlaWdodCgpIC8gc2l6ZUFuZFNjYWxlcy56b29tKTsKKyAgICAgICAgICAgIGZsb2F0IHNj YWxlID0gc2l6ZUFuZFNjYWxlcy5zY2FsZTsKKyAgICAgICAgICAgIGlmICghc2NhbGUpIHsKKyAg ICAgICAgICAgICAgICBQYWdlKiBwYWdlID0gcmVuZGVyZXItPmRvY3VtZW50KCktPnBhZ2UoKTsK KyAgICAgICAgICAgICAgICBzY2FsZSA9IHBhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCkgKiBwYWdl LT5wYWdlU2NhbGVGYWN0b3IoKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaW1hZ2VT aXplLnNldFdpZHRoKHNjYWxlICogc2l6ZUFuZFNjYWxlcy5zaXplLndpZHRoKCkgLyBzaXplQW5k U2NhbGVzLnpvb20pOworICAgICAgICAgICAgaW1hZ2VTaXplLnNldEhlaWdodChzY2FsZSAqIHNp emVBbmRTY2FsZXMuc2l6ZS5oZWlnaHQoKSAvIHNpemVBbmRTY2FsZXMuem9vbSk7CiAgICAgICAg IH0KICAgICB9CiAjZW5kaWYKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTkyOCkKKysrIExheW91dFRl c3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA4LTE3 ICBQaGlsaXAgUm9nZXJzICA8cGRyQGdvb2dsZS5jb20+CisKKyAgICAgICAgQ2FudmFzIGRyYXdJ bWFnZSgpIHNob3VsZCBkcmF3IFNWRyBhdCB0aGUgY29ycmVjdCBzY2FsZS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0Mzc3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdmcvYXMtaW1hZ2UvcmVzb3Vy Y2VzLzEwMHB4LWdyZWVuLXJlY3Quc3ZnOiBBZGRlZC4KKyAgICAgICAgKiBzdmcvYXMtaW1hZ2Uv c3ZnLWFzLWltYWdlLWNhbnZhcy1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBzdmcv YXMtaW1hZ2Uvc3ZnLWFzLWltYWdlLWNhbnZhcy5odG1sOiBBZGRlZC4KKwogMjAxMi0wOC0xNyAg S2lyYW4gTXVwcGFsYSAgPGNtdXBwYWxhQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgdGVz dCBleHBlY3RhdGlvbnMgZm9yIGluc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS1kZWNvZGUtcmVz aXplLmh0bWwgb24gbWFjCkluZGV4OiBMYXlvdXRUZXN0cy9zdmcvYXMtaW1hZ2Uvc3ZnLWFzLWlt YWdlLWNhbnZhcy1leHBlY3RlZC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3N2Zy9h cy1pbWFnZS9zdmctYXMtaW1hZ2UtY2FudmFzLWV4cGVjdGVkLmh0bWwJKHJldmlzaW9uIDApCisr KyBMYXlvdXRUZXN0cy9zdmcvYXMtaW1hZ2Uvc3ZnLWFzLWltYWdlLWNhbnZhcy1leHBlY3RlZC5o dG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI3IEBACis8IURPQ1RZUEUgSFRNTD4KKzxodG1s PgorPGJvZHk+Cis8ZGl2PgorICAgIFRoaXMgdGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSAxMDAg eCAxMDAgZ3JlZW4gcmVjdC48YnIvPgorICAgIDxjYW52YXMgaWQ9ImNhbnZhcyIgd2lkdGg9IjIw MCIgaGVpZ2h0PSIyMDAiPjwvY2FudmFzPgorPC9kaXY+Cis8c2NyaXB0PgorICAgIGZ1bmN0aW9u IGZpbmlzaFRlc3QoKSB7CisgICAgICAgIHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7CisgICAgICAg IHZhciBjYW52YXMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY2FudmFzJyk7CisgICAgICAg IHZhciBjb250ZXh0ID0gY2FudmFzLmdldENvbnRleHQoJzJkJyk7CisgICAgICAgIGNvbnRleHQu ZmlsbFN0eWxlID0gImdyZWVuIjsKKyAgICAgICAgY29udGV4dC5maWxsUmVjdCgwLCAwLCAxMDAs IDEwMCk7CisgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAgIHRlc3RS dW5uZXIubm90aWZ5RG9uZSgpOworICAgIH0sMSk7CisgICAgfQorCisgICAgaWYgKHdpbmRvdy50 ZXN0UnVubmVyKSB7CisgICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgICAg ICB0ZXN0UnVubmVyLnNldEJhY2tpbmdTY2FsZUZhY3RvcigyLCBmaW5pc2hUZXN0KTsKKyAgICB9 IGVsc2UKKyAgICAgICAgZmluaXNoVGVzdCgpOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ CkluZGV4OiBMYXlvdXRUZXN0cy9zdmcvYXMtaW1hZ2Uvc3ZnLWFzLWltYWdlLWNhbnZhcy5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3N2Zy9hcy1pbWFnZS9zdmctYXMtaW1hZ2UtY2Fu dmFzLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9zdmcvYXMtaW1hZ2Uvc3ZnLWFz LWltYWdlLWNhbnZhcy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDM1IEBACis8IURPQ1RZ UEUgSFRNTD4KKzxodG1sPgorPGhlYWQ+CisgICAgPHRpdGxlPlRlc3QgZm9yIFdLOTQzNzc6IGNh bnZhcy5jb250ZXh0LmRyYXdJbWFnZSgpIHNob3VsZCBkcmF3IFNWRyBpbWFnZXMgYXQgdGhlIGNv cnJlY3Qgc2NhbGUuPC90aXRsZT4KKzwvaGVhZD4KKzxib2R5PgorPGRpdj4KKyAgICBUaGlzIHRl c3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgMTAwIHggMTAwIGdyZWVuIHJlY3QuPGJyLz4KKyAgICA8 Y2FudmFzIGlkPSJjYW52YXMiIHdpZHRoPSIyMDAiIGhlaWdodD0iMjAwIj48L2NhbnZhcz4KKyAg ICA8aW1nIGlkPSJpbWFnZSIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIyMDAiIHN0eWxlPSJ2aXNpYmls aXR5OiBoaWRkZW47IiBzcmM9InJlc291cmNlcy8xMDBweC1ncmVlbi1yZWN0LnN2ZyI+PC9pbWc+ Cis8L2Rpdj4KKzxzY3JpcHQ+CisgICAgZnVuY3Rpb24gZmluaXNoVGVzdCgpIHsKKyAgICAgICAg dmFyIGltYWdlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImltYWdlIik7CisgICAgICAgIHZh ciBjYW52YXMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY2FudmFzIik7CisgICAgICAgIHNl dFRpbWVvdXQoZnVuY3Rpb24oKSB7CisgICAgICAgICAgICB2YXIgY29udGV4dCA9IGNhbnZhcy5n ZXRDb250ZXh0KCcyZCcpOworICAgICAgICAgICAgLy8gV2UgZHJhdyB0aGUgMjAweDIwMCBpbWFn ZSB0aGF0IGNvbnRhaW5zIGEgMTAweDEwMCBncmVlbiByZWN0LgorICAgICAgICAgICAgY29udGV4 dC5kcmF3SW1hZ2UoaW1hZ2UsIDAsIDAsIDIwMCwgMjAwKTsKKworICAgICAgICAgICAgaWYgKHdp bmRvdy50ZXN0UnVubmVyKQorICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgp OworICAgICAgICB9LCAxKTsKKyAgICB9CisKKyAgICBpbWFnZS5vbmxvYWQgPSBmdW5jdGlvbigp IHsKKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAgICAgICB0ZXN0UnVu bmVyLndhaXRVbnRpbERvbmUoKTsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIuc2V0QmFja2luZ1Nj YWxlRmFjdG9yKDIsIGZpbmlzaFRlc3QpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIHNl dFRpbWVvdXQoZmluaXNoVGVzdCwgMSk7CisgICAgfQorPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0 bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9zdmcvYXMtaW1hZ2UvcmVzb3VyY2VzLzEwMHB4LWdyZWVu LXJlY3Quc3ZnCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3N2Zy9hcy1pbWFnZS9yZXNvdXJj ZXMvMTAwcHgtZ3JlZW4tcmVjdC5zdmcJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9zdmcv YXMtaW1hZ2UvcmVzb3VyY2VzLzEwMHB4LWdyZWVuLXJlY3Quc3ZnCShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDMgQEAKKzxzdmcgd2lkdGg9IjIwMCIgaGVpZ2h0PSIyMDAiIHhtbG5zPSJodHRwOi8v d3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkv eGxpbmsiPgorICAgIDxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDBweCIgaGVpZ2h0PSIxMDBw eCIgZmlsbD0iZ3JlZW4iLz4KKzwvc3ZnPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK 159214 2012-08-17 14:59:01 -0700 2012-08-20 14:07:32 -0700 Minor cleanup of test--removed spurious setTimeout. 94377.2.patch text/plain 5697 pdr SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTkyOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA4LTE3ICBQaGlsaXAg Um9nZXJzICA8cGRyQGdvb2dsZS5jb20+CisKKyAgICAgICAgQ2FudmFzIGRyYXdJbWFnZSgpIHNo b3VsZCBkcmF3IFNWRyBhdCB0aGUgY29ycmVjdCBzY2FsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0Mzc3CisKKyAgICAgICAgUHJldmlvdXNseSwg ZHJhd2luZyBTVkcgaW4gY2FudmFzIHdvdWxkIHJlbmRlciBhdCB0aGUgaW5jb3JyZWN0IHNjYWxl CisgICAgICAgIGJlY2F1c2UgaW1hZ2VTaXplRm9yUmVuZGVyZXIgZGlkIG5vdCB0YWtlIGludG8g YWNjb3VudCB0aGUgcGFnZSBzY2FsZS4KKyAgICAgICAgQWZ0ZXIgdGhpcyBwYXRjaCwgd2Ugbm93 IHRha2UgaW5jb3Jwb3JhdGUgdGhlIHBhZ2Ugc2NhbGUgaW4KKyAgICAgICAgQ2FjaGVkSW1hZ2U6 OmltYWdlU2l6ZUZvclJlbmRlcmVyKCkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGVzdDogc3ZnL2FzLWltYWdlL3N2Zy1hcy1pbWFnZS1jYW52YXMu aHRtbAorCisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNhY2hlZEltYWdlOjppbWFnZVNpemVGb3JSZW5kZXJlcik6CisKIDIwMTItMDgt MTcgIEpvaG4gTWVsbG9yICA8am9obm1lQGNocm9taXVtLm9yZz4KIAogICAgICAgICBUZXh0IEF1 dG9zaXppbmc6IEluY3JlYXNlIGxpbmUgaGVpZ2h0IGluIHByb3BvcnRpb24gdG8gZm9udCBzaXpl LgpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCShy ZXZpc2lvbiAxMjU4NzIpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1h Z2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDUsOCArMjQ1LDE0IEBAIEludFNpemUgQ2FjaGVk SW1hZ2U6OmltYWdlU2l6ZUZvclJlbmRlcmUKICAgICBpZiAobV9pbWFnZS0+aXNTVkdJbWFnZSgp KSB7CiAgICAgICAgIFNWR0ltYWdlQ2FjaGU6OlNpemVBbmRTY2FsZXMgc2l6ZUFuZFNjYWxlcyA9 IG1fc3ZnSW1hZ2VDYWNoZS0+cmVxdWVzdGVkU2l6ZUFuZFNjYWxlcyhyZW5kZXJlcik7CiAgICAg ICAgIGlmICghc2l6ZUFuZFNjYWxlcy5zaXplLmlzRW1wdHkoKSkgewotICAgICAgICAgICAgaW1h Z2VTaXplLnNldFdpZHRoKHNpemVBbmRTY2FsZXMuc2l6ZS53aWR0aCgpIC8gc2l6ZUFuZFNjYWxl cy56b29tKTsKLSAgICAgICAgICAgIGltYWdlU2l6ZS5zZXRIZWlnaHQoc2l6ZUFuZFNjYWxlcy5z aXplLmhlaWdodCgpIC8gc2l6ZUFuZFNjYWxlcy56b29tKTsKKyAgICAgICAgICAgIGZsb2F0IHNj YWxlID0gc2l6ZUFuZFNjYWxlcy5zY2FsZTsKKyAgICAgICAgICAgIGlmICghc2NhbGUpIHsKKyAg ICAgICAgICAgICAgICBQYWdlKiBwYWdlID0gcmVuZGVyZXItPmRvY3VtZW50KCktPnBhZ2UoKTsK KyAgICAgICAgICAgICAgICBzY2FsZSA9IHBhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCkgKiBwYWdl LT5wYWdlU2NhbGVGYWN0b3IoKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaW1hZ2VT aXplLnNldFdpZHRoKHNjYWxlICogc2l6ZUFuZFNjYWxlcy5zaXplLndpZHRoKCkgLyBzaXplQW5k U2NhbGVzLnpvb20pOworICAgICAgICAgICAgaW1hZ2VTaXplLnNldEhlaWdodChzY2FsZSAqIHNp emVBbmRTY2FsZXMuc2l6ZS5oZWlnaHQoKSAvIHNpemVBbmRTY2FsZXMuem9vbSk7CiAgICAgICAg IH0KICAgICB9CiAjZW5kaWYKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTkyOCkKKysrIExheW91dFRl c3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA4LTE3 ICBQaGlsaXAgUm9nZXJzICA8cGRyQGdvb2dsZS5jb20+CisKKyAgICAgICAgQ2FudmFzIGRyYXdJ bWFnZSgpIHNob3VsZCBkcmF3IFNWRyBhdCB0aGUgY29ycmVjdCBzY2FsZS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0Mzc3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdmcvYXMtaW1hZ2UvcmVzb3Vy Y2VzLzEwMHB4LWdyZWVuLXJlY3Quc3ZnOiBBZGRlZC4KKyAgICAgICAgKiBzdmcvYXMtaW1hZ2Uv c3ZnLWFzLWltYWdlLWNhbnZhcy1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBzdmcv YXMtaW1hZ2Uvc3ZnLWFzLWltYWdlLWNhbnZhcy5odG1sOiBBZGRlZC4KKwogMjAxMi0wOC0xNyAg S2lyYW4gTXVwcGFsYSAgPGNtdXBwYWxhQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgdGVz dCBleHBlY3RhdGlvbnMgZm9yIGluc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS1kZWNvZGUtcmVz aXplLmh0bWwgb24gbWFjCkluZGV4OiBMYXlvdXRUZXN0cy9zdmcvYXMtaW1hZ2Uvc3ZnLWFzLWlt YWdlLWNhbnZhcy1leHBlY3RlZC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3N2Zy9h cy1pbWFnZS9zdmctYXMtaW1hZ2UtY2FudmFzLWV4cGVjdGVkLmh0bWwJKHJldmlzaW9uIDApCisr KyBMYXlvdXRUZXN0cy9zdmcvYXMtaW1hZ2Uvc3ZnLWFzLWltYWdlLWNhbnZhcy1leHBlY3RlZC5o dG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI1IEBACis8IURPQ1RZUEUgSFRNTD4KKzxodG1s PgorPGJvZHk+Cis8ZGl2PgorICAgIFRoaXMgdGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSAxMDAg eCAxMDAgZ3JlZW4gcmVjdC48YnIvPgorICAgIDxjYW52YXMgaWQ9ImNhbnZhcyIgd2lkdGg9IjIw MCIgaGVpZ2h0PSIyMDAiPjwvY2FudmFzPgorPC9kaXY+Cis8c2NyaXB0PgorICAgIGZ1bmN0aW9u IGZpbmlzaFRlc3QoKSB7CisgICAgICAgIHZhciBjYW52YXMgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgnY2FudmFzJyk7CisgICAgICAgIHZhciBjb250ZXh0ID0gY2FudmFzLmdldENvbnRleHQo JzJkJyk7CisgICAgICAgIGNvbnRleHQuZmlsbFN0eWxlID0gImdyZWVuIjsKKyAgICAgICAgY29u dGV4dC5maWxsUmVjdCgwLCAwLCAxMDAsIDEwMCk7CisgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1 bm5lcikKKyAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgIH0KKworICAg IGlmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAgICAgICB0ZXN0UnVubmVyLndhaXRVbnRpbERv bmUoKTsKKyAgICAgICAgdGVzdFJ1bm5lci5zZXRCYWNraW5nU2NhbGVGYWN0b3IoMiwgZmluaXNo VGVzdCk7CisgICAgfSBlbHNlCisgICAgICAgIGZpbmlzaFRlc3QoKTsKKzwvc2NyaXB0PgorPC9i b2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvc3ZnL2FzLWltYWdlL3N2Zy1hcy1pbWFn ZS1jYW52YXMuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9zdmcvYXMtaW1hZ2Uvc3Zn LWFzLWltYWdlLWNhbnZhcy5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvc3ZnL2Fz LWltYWdlL3N2Zy1hcy1pbWFnZS1jYW52YXMuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwz NSBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT5UZXN0IGZv ciBXSzk0Mzc3OiBjYW52YXMuY29udGV4dC5kcmF3SW1hZ2UoKSBzaG91bGQgZHJhdyBTVkcgaW1h Z2VzIGF0IHRoZSBjb3JyZWN0IHNjYWxlLjwvdGl0bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXY+ CisgICAgVGhpcyB0ZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIDEwMCB4IDEwMCBncmVlbiByZWN0 Ljxici8+CisgICAgPGNhbnZhcyBpZD0iY2FudmFzIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+ PC9jYW52YXM+CisgICAgPGltZyBpZD0iaW1hZ2UiIHdpZHRoPSIyMDAiIGhlaWdodD0iMjAwIiBz dHlsZT0idmlzaWJpbGl0eTogaGlkZGVuOyIgc3JjPSJyZXNvdXJjZXMvMTAwcHgtZ3JlZW4tcmVj dC5zdmciPjwvaW1nPgorPC9kaXY+Cis8c2NyaXB0PgorICAgIGZ1bmN0aW9uIGZpbmlzaFRlc3Qo KSB7CisgICAgICAgIHZhciBpbWFnZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJpbWFnZSIp OworICAgICAgICB2YXIgY2FudmFzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNhbnZhcyIp OworICAgICAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgdmFyIGNvbnRl eHQgPSBjYW52YXMuZ2V0Q29udGV4dCgnMmQnKTsKKyAgICAgICAgICAgIC8vIFdlIGRyYXcgdGhl IDIwMHgyMDAgaW1hZ2UgdGhhdCBjb250YWlucyBhIDEwMHgxMDAgZ3JlZW4gcmVjdC4KKyAgICAg ICAgICAgIGNvbnRleHQuZHJhd0ltYWdlKGltYWdlLCAwLCAwLCAyMDAsIDIwMCk7CisKKyAgICAg ICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAgICAgICB0ZXN0UnVubmVy Lm5vdGlmeURvbmUoKTsKKyAgICAgICAgfSwgMSk7CisgICAgfQorCisgICAgaW1hZ2Uub25sb2Fk ID0gZnVuY3Rpb24oKSB7CisgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAgICAg ICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgICAgICAgICB0ZXN0UnVubmVy LnNldEJhY2tpbmdTY2FsZUZhY3RvcigyLCBmaW5pc2hUZXN0KTsKKyAgICAgICAgfSBlbHNlCisg ICAgICAgICAgICBmaW5pc2hUZXN0KCk7CisgICAgfQorPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0 bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9zdmcvYXMtaW1hZ2UvcmVzb3VyY2VzLzEwMHB4LWdyZWVu LXJlY3Quc3ZnCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3N2Zy9hcy1pbWFnZS9yZXNvdXJj ZXMvMTAwcHgtZ3JlZW4tcmVjdC5zdmcJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9zdmcv YXMtaW1hZ2UvcmVzb3VyY2VzLzEwMHB4LWdyZWVuLXJlY3Quc3ZnCShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDMgQEAKKzxzdmcgd2lkdGg9IjIwMCIgaGVpZ2h0PSIyMDAiIHhtbG5zPSJodHRwOi8v d3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkv eGxpbmsiPgorICAgIDxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDBweCIgaGVpZ2h0PSIxMDBw eCIgZmlsbD0iZ3JlZW4iLz4KKzwvc3ZnPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK 159515 2012-08-20 14:07:32 -0700 2012-08-20 14:38:41 -0700 Fix grammar mistake 94377.3.patch text/plain 5692 pdr SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTkyOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA4LTE3ICBQaGlsaXAg Um9nZXJzICA8cGRyQGdvb2dsZS5jb20+CisKKyAgICAgICAgQ2FudmFzIGRyYXdJbWFnZSgpIHNo b3VsZCBkcmF3IFNWRyBhdCB0aGUgY29ycmVjdCBzY2FsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0Mzc3CisKKyAgICAgICAgUHJldmlvdXNseSwg ZHJhd2luZyBTVkcgaW4gY2FudmFzIHdvdWxkIHJlbmRlciBhdCB0aGUgaW5jb3JyZWN0IHNjYWxl CisgICAgICAgIGJlY2F1c2UgaW1hZ2VTaXplRm9yUmVuZGVyZXIgZGlkIG5vdCB0YWtlIGludG8g YWNjb3VudCB0aGUgcGFnZSBzY2FsZS4KKyAgICAgICAgQWZ0ZXIgdGhpcyBwYXRjaCwgd2Ugbm93 IGluY29ycG9yYXRlIHRoZSBwYWdlIHNjYWxlIGluCisgICAgICAgIENhY2hlZEltYWdlOjppbWFn ZVNpemVGb3JSZW5kZXJlcigpLgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSG9ydG9u LgorCisgICAgICAgIFRlc3Q6IHN2Zy9hcy1pbWFnZS9zdmctYXMtaW1hZ2UtY2FudmFzLmh0bWwK KworICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDYWNoZWRJbWFnZTo6aW1hZ2VTaXplRm9yUmVuZGVyZXIpOgorCiAyMDEyLTA4LTE3ICBK b2huIE1lbGxvciAgPGpvaG5tZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVGV4dCBBdXRvc2l6 aW5nOiBJbmNyZWFzZSBsaW5lIGhlaWdodCBpbiBwcm9wb3J0aW9uIHRvIGZvbnQgc2l6ZS4KSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcAkocmV2aXNp b24gMTI1ODcyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjQ1LDggKzI0NSwxNCBAQCBJbnRTaXplIENhY2hlZEltYWdl OjppbWFnZVNpemVGb3JSZW5kZXJlCiAgICAgaWYgKG1faW1hZ2UtPmlzU1ZHSW1hZ2UoKSkgewog ICAgICAgICBTVkdJbWFnZUNhY2hlOjpTaXplQW5kU2NhbGVzIHNpemVBbmRTY2FsZXMgPSBtX3N2 Z0ltYWdlQ2FjaGUtPnJlcXVlc3RlZFNpemVBbmRTY2FsZXMocmVuZGVyZXIpOwogICAgICAgICBp ZiAoIXNpemVBbmRTY2FsZXMuc2l6ZS5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAgIGltYWdlU2l6 ZS5zZXRXaWR0aChzaXplQW5kU2NhbGVzLnNpemUud2lkdGgoKSAvIHNpemVBbmRTY2FsZXMuem9v bSk7Ci0gICAgICAgICAgICBpbWFnZVNpemUuc2V0SGVpZ2h0KHNpemVBbmRTY2FsZXMuc2l6ZS5o ZWlnaHQoKSAvIHNpemVBbmRTY2FsZXMuem9vbSk7CisgICAgICAgICAgICBmbG9hdCBzY2FsZSA9 IHNpemVBbmRTY2FsZXMuc2NhbGU7CisgICAgICAgICAgICBpZiAoIXNjYWxlKSB7CisgICAgICAg ICAgICAgICAgUGFnZSogcGFnZSA9IHJlbmRlcmVyLT5kb2N1bWVudCgpLT5wYWdlKCk7CisgICAg ICAgICAgICAgICAgc2NhbGUgPSBwYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpICogcGFnZS0+cGFn ZVNjYWxlRmFjdG9yKCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGltYWdlU2l6ZS5z ZXRXaWR0aChzY2FsZSAqIHNpemVBbmRTY2FsZXMuc2l6ZS53aWR0aCgpIC8gc2l6ZUFuZFNjYWxl cy56b29tKTsKKyAgICAgICAgICAgIGltYWdlU2l6ZS5zZXRIZWlnaHQoc2NhbGUgKiBzaXplQW5k U2NhbGVzLnNpemUuaGVpZ2h0KCkgLyBzaXplQW5kU2NhbGVzLnpvb20pOwogICAgICAgICB9CiAg ICAgfQogI2VuZGlmCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMjU5MjgpCisrKyBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxMi0wOC0xNyAgUGhp bGlwIFJvZ2VycyAgPHBkckBnb29nbGUuY29tPgorCisgICAgICAgIENhbnZhcyBkcmF3SW1hZ2Uo KSBzaG91bGQgZHJhdyBTVkcgYXQgdGhlIGNvcnJlY3Qgc2NhbGUuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDM3NworCisgICAgICAgIFJldmlld2Vk IGJ5IFRpbW90aHkgSG9ydG9uLgorCisgICAgICAgICogc3ZnL2FzLWltYWdlL3Jlc291cmNlcy8x MDBweC1ncmVlbi1yZWN0LnN2ZzogQWRkZWQuCisgICAgICAgICogc3ZnL2FzLWltYWdlL3N2Zy1h cy1pbWFnZS1jYW52YXMtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogc3ZnL2FzLWlt YWdlL3N2Zy1hcy1pbWFnZS1jYW52YXMuaHRtbDogQWRkZWQuCisKIDIwMTItMDgtMTcgIEtpcmFu IE11cHBhbGEgIDxjbXVwcGFsYUBhcHBsZS5jb20+CiAKICAgICAgICAgVXBkYXRlIHRlc3QgZXhw ZWN0YXRpb25zIGZvciBpbnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtZGVjb2RlLXJlc2l6ZS5o dG1sIG9uIG1hYwpJbmRleDogTGF5b3V0VGVzdHMvc3ZnL2FzLWltYWdlL3N2Zy1hcy1pbWFnZS1j YW52YXMtZXhwZWN0ZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9zdmcvYXMtaW1h Z2Uvc3ZnLWFzLWltYWdlLWNhbnZhcy1leHBlY3RlZC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5 b3V0VGVzdHMvc3ZnL2FzLWltYWdlL3N2Zy1hcy1pbWFnZS1jYW52YXMtZXhwZWN0ZWQuaHRtbAko cmV2aXNpb24gMCkKQEAgLTAsMCArMSwyNSBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKzxi b2R5PgorPGRpdj4KKyAgICBUaGlzIHRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgMTAwIHggMTAw IGdyZWVuIHJlY3QuPGJyLz4KKyAgICA8Y2FudmFzIGlkPSJjYW52YXMiIHdpZHRoPSIyMDAiIGhl aWdodD0iMjAwIj48L2NhbnZhcz4KKzwvZGl2PgorPHNjcmlwdD4KKyAgICBmdW5jdGlvbiBmaW5p c2hUZXN0KCkgeworICAgICAgICB2YXIgY2FudmFzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo J2NhbnZhcycpOworICAgICAgICB2YXIgY29udGV4dCA9IGNhbnZhcy5nZXRDb250ZXh0KCcyZCcp OworICAgICAgICBjb250ZXh0LmZpbGxTdHlsZSA9ICJncmVlbiI7CisgICAgICAgIGNvbnRleHQu ZmlsbFJlY3QoMCwgMCwgMTAwLCAxMDApOworICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIp CisgICAgICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICB9CisKKyAgICBpZiAo d2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7 CisgICAgICAgIHRlc3RSdW5uZXIuc2V0QmFja2luZ1NjYWxlRmFjdG9yKDIsIGZpbmlzaFRlc3Qp OworICAgIH0gZWxzZQorICAgICAgICBmaW5pc2hUZXN0KCk7Cis8L3NjcmlwdD4KKzwvYm9keT4K KzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL3N2Zy9hcy1pbWFnZS9zdmctYXMtaW1hZ2UtY2Fu dmFzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvc3ZnL2FzLWltYWdlL3N2Zy1hcy1p bWFnZS1jYW52YXMuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3N2Zy9hcy1pbWFn ZS9zdmctYXMtaW1hZ2UtY2FudmFzLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMzUgQEAK KzwhRE9DVFlQRSBIVE1MPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8dGl0bGU+VGVzdCBmb3IgV0s5 NDM3NzogY2FudmFzLmNvbnRleHQuZHJhd0ltYWdlKCkgc2hvdWxkIGRyYXcgU1ZHIGltYWdlcyBh dCB0aGUgY29ycmVjdCBzY2FsZS48L3RpdGxlPgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2PgorICAg IFRoaXMgdGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSAxMDAgeCAxMDAgZ3JlZW4gcmVjdC48YnIv PgorICAgIDxjYW52YXMgaWQ9ImNhbnZhcyIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIyMDAiPjwvY2Fu dmFzPgorICAgIDxpbWcgaWQ9ImltYWdlIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCIgc3R5bGU9 InZpc2liaWxpdHk6IGhpZGRlbjsiIHNyYz0icmVzb3VyY2VzLzEwMHB4LWdyZWVuLXJlY3Quc3Zn Ij48L2ltZz4KKzwvZGl2PgorPHNjcmlwdD4KKyAgICBmdW5jdGlvbiBmaW5pc2hUZXN0KCkgewor ICAgICAgICB2YXIgaW1hZ2UgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiaW1hZ2UiKTsKKyAg ICAgICAgdmFyIGNhbnZhcyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjYW52YXMiKTsKKyAg ICAgICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsKKyAgICAgICAgICAgIHZhciBjb250ZXh0ID0g Y2FudmFzLmdldENvbnRleHQoJzJkJyk7CisgICAgICAgICAgICAvLyBXZSBkcmF3IHRoZSAyMDB4 MjAwIGltYWdlIHRoYXQgY29udGFpbnMgYSAxMDB4MTAwIGdyZWVuIHJlY3QuCisgICAgICAgICAg ICBjb250ZXh0LmRyYXdJbWFnZShpbWFnZSwgMCwgMCwgMjAwLCAyMDApOworCisgICAgICAgICAg ICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3Rp ZnlEb25lKCk7CisgICAgICAgIH0sIDEpOworICAgIH0KKworICAgIGltYWdlLm9ubG9hZCA9IGZ1 bmN0aW9uKCkgeworICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAg IHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgICAgICAgICAgdGVzdFJ1bm5lci5zZXRC YWNraW5nU2NhbGVGYWN0b3IoMiwgZmluaXNoVGVzdCk7CisgICAgICAgIH0gZWxzZQorICAgICAg ICAgICAgZmluaXNoVGVzdCgpOworICAgIH0KKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpJ bmRleDogTGF5b3V0VGVzdHMvc3ZnL2FzLWltYWdlL3Jlc291cmNlcy8xMDBweC1ncmVlbi1yZWN0 LnN2Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9zdmcvYXMtaW1hZ2UvcmVzb3VyY2VzLzEw MHB4LWdyZWVuLXJlY3Quc3ZnCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvc3ZnL2FzLWlt YWdlL3Jlc291cmNlcy8xMDBweC1ncmVlbi1yZWN0LnN2ZwkocmV2aXNpb24gMCkKQEAgLTAsMCAr MSwzIEBACis8c3ZnIHdpZHRoPSIyMDAiIGhlaWdodD0iMjAwIiB4bWxucz0iaHR0cDovL3d3dy53 My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5r Ij4KKyAgICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwcHgiIGhlaWdodD0iMTAwcHgiIGZp bGw9ImdyZWVuIi8+Cis8L3N2Zz4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCg== 159525 2012-08-20 14:38:41 -0700 2012-08-20 16:50:39 -0700 Fix reviewer's name. 94377.4.patch text/plain 5684 pdr SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTkyOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA4LTE3ICBQaGlsaXAg Um9nZXJzICA8cGRyQGdvb2dsZS5jb20+CisKKyAgICAgICAgQ2FudmFzIGRyYXdJbWFnZSgpIHNo b3VsZCBkcmF3IFNWRyBhdCB0aGUgY29ycmVjdCBzY2FsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0Mzc3CisKKyAgICAgICAgUHJldmlvdXNseSwg ZHJhd2luZyBTVkcgaW4gY2FudmFzIHdvdWxkIHJlbmRlciBhdCB0aGUgaW5jb3JyZWN0IHNjYWxl CisgICAgICAgIGJlY2F1c2UgaW1hZ2VTaXplRm9yUmVuZGVyZXIgZGlkIG5vdCB0YWtlIGludG8g YWNjb3VudCB0aGUgcGFnZSBzY2FsZS4KKyAgICAgICAgQWZ0ZXIgdGhpcyBwYXRjaCwgd2Ugbm93 IGluY29ycG9yYXRlIHRoZSBwYWdlIHNjYWxlIGluCisgICAgICAgIENhY2hlZEltYWdlOjppbWFn ZVNpemVGb3JSZW5kZXJlcigpLgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisK KyAgICAgICAgVGVzdDogc3ZnL2FzLWltYWdlL3N2Zy1hcy1pbWFnZS1jYW52YXMuaHRtbAorCisg ICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkNhY2hlZEltYWdlOjppbWFnZVNpemVGb3JSZW5kZXJlcik6CisKIDIwMTItMDgtMTcgIEpvaG4g TWVsbG9yICA8am9obm1lQGNocm9taXVtLm9yZz4KIAogICAgICAgICBUZXh0IEF1dG9zaXppbmc6 IEluY3JlYXNlIGxpbmUgaGVpZ2h0IGluIHByb3BvcnRpb24gdG8gZm9udCBzaXplLgpJbmRleDog U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCShyZXZpc2lvbiAx MjU4NzIpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yNDUsOCArMjQ1LDE0IEBAIEludFNpemUgQ2FjaGVkSW1hZ2U6Omlt YWdlU2l6ZUZvclJlbmRlcmUKICAgICBpZiAobV9pbWFnZS0+aXNTVkdJbWFnZSgpKSB7CiAgICAg ICAgIFNWR0ltYWdlQ2FjaGU6OlNpemVBbmRTY2FsZXMgc2l6ZUFuZFNjYWxlcyA9IG1fc3ZnSW1h Z2VDYWNoZS0+cmVxdWVzdGVkU2l6ZUFuZFNjYWxlcyhyZW5kZXJlcik7CiAgICAgICAgIGlmICgh c2l6ZUFuZFNjYWxlcy5zaXplLmlzRW1wdHkoKSkgewotICAgICAgICAgICAgaW1hZ2VTaXplLnNl dFdpZHRoKHNpemVBbmRTY2FsZXMuc2l6ZS53aWR0aCgpIC8gc2l6ZUFuZFNjYWxlcy56b29tKTsK LSAgICAgICAgICAgIGltYWdlU2l6ZS5zZXRIZWlnaHQoc2l6ZUFuZFNjYWxlcy5zaXplLmhlaWdo dCgpIC8gc2l6ZUFuZFNjYWxlcy56b29tKTsKKyAgICAgICAgICAgIGZsb2F0IHNjYWxlID0gc2l6 ZUFuZFNjYWxlcy5zY2FsZTsKKyAgICAgICAgICAgIGlmICghc2NhbGUpIHsKKyAgICAgICAgICAg ICAgICBQYWdlKiBwYWdlID0gcmVuZGVyZXItPmRvY3VtZW50KCktPnBhZ2UoKTsKKyAgICAgICAg ICAgICAgICBzY2FsZSA9IHBhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCkgKiBwYWdlLT5wYWdlU2Nh bGVGYWN0b3IoKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaW1hZ2VTaXplLnNldFdp ZHRoKHNjYWxlICogc2l6ZUFuZFNjYWxlcy5zaXplLndpZHRoKCkgLyBzaXplQW5kU2NhbGVzLnpv b20pOworICAgICAgICAgICAgaW1hZ2VTaXplLnNldEhlaWdodChzY2FsZSAqIHNpemVBbmRTY2Fs ZXMuc2l6ZS5oZWlnaHQoKSAvIHNpemVBbmRTY2FsZXMuem9vbSk7CiAgICAgICAgIH0KICAgICB9 CiAjZW5kaWYKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTkyOCkKKysrIExheW91dFRlc3RzL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA4LTE3ICBQaGlsaXAg Um9nZXJzICA8cGRyQGdvb2dsZS5jb20+CisKKyAgICAgICAgQ2FudmFzIGRyYXdJbWFnZSgpIHNo b3VsZCBkcmF3IFNWRyBhdCB0aGUgY29ycmVjdCBzY2FsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0Mzc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg VGltIEhvcnRvbi4KKworICAgICAgICAqIHN2Zy9hcy1pbWFnZS9yZXNvdXJjZXMvMTAwcHgtZ3Jl ZW4tcmVjdC5zdmc6IEFkZGVkLgorICAgICAgICAqIHN2Zy9hcy1pbWFnZS9zdmctYXMtaW1hZ2Ut Y2FudmFzLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHN2Zy9hcy1pbWFnZS9zdmct YXMtaW1hZ2UtY2FudmFzLmh0bWw6IEFkZGVkLgorCiAyMDEyLTA4LTE3ICBLaXJhbiBNdXBwYWxh ICA8Y211cHBhbGFAYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSB0ZXN0IGV4cGVjdGF0aW9u cyBmb3IgaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLWRlY29kZS1yZXNpemUuaHRtbCBvbiBt YWMKSW5kZXg6IExheW91dFRlc3RzL3N2Zy9hcy1pbWFnZS9zdmctYXMtaW1hZ2UtY2FudmFzLWV4 cGVjdGVkLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvc3ZnL2FzLWltYWdlL3N2Zy1h cy1pbWFnZS1jYW52YXMtZXhwZWN0ZWQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3Rz L3N2Zy9hcy1pbWFnZS9zdmctYXMtaW1hZ2UtY2FudmFzLWV4cGVjdGVkLmh0bWwJKHJldmlzaW9u IDApCkBAIC0wLDAgKzEsMjUgQEAKKzwhRE9DVFlQRSBIVE1MPgorPGh0bWw+Cis8Ym9keT4KKzxk aXY+CisgICAgVGhpcyB0ZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIDEwMCB4IDEwMCBncmVlbiBy ZWN0Ljxici8+CisgICAgPGNhbnZhcyBpZD0iY2FudmFzIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIw MCI+PC9jYW52YXM+Cis8L2Rpdj4KKzxzY3JpcHQ+CisgICAgZnVuY3Rpb24gZmluaXNoVGVzdCgp IHsKKyAgICAgICAgdmFyIGNhbnZhcyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjYW52YXMn KTsKKyAgICAgICAgdmFyIGNvbnRleHQgPSBjYW52YXMuZ2V0Q29udGV4dCgnMmQnKTsKKyAgICAg ICAgY29udGV4dC5maWxsU3R5bGUgPSAiZ3JlZW4iOworICAgICAgICBjb250ZXh0LmZpbGxSZWN0 KDAsIDAsIDEwMCwgMTAwKTsKKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAg ICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisgICAgfQorCisgICAgaWYgKHdpbmRvdy50 ZXN0UnVubmVyKSB7CisgICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgICAg ICB0ZXN0UnVubmVyLnNldEJhY2tpbmdTY2FsZUZhY3RvcigyLCBmaW5pc2hUZXN0KTsKKyAgICB9 IGVsc2UKKyAgICAgICAgZmluaXNoVGVzdCgpOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ CkluZGV4OiBMYXlvdXRUZXN0cy9zdmcvYXMtaW1hZ2Uvc3ZnLWFzLWltYWdlLWNhbnZhcy5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3N2Zy9hcy1pbWFnZS9zdmctYXMtaW1hZ2UtY2Fu dmFzLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9zdmcvYXMtaW1hZ2Uvc3ZnLWFz LWltYWdlLWNhbnZhcy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDM1IEBACis8IURPQ1RZ UEUgSFRNTD4KKzxodG1sPgorPGhlYWQ+CisgICAgPHRpdGxlPlRlc3QgZm9yIFdLOTQzNzc6IGNh bnZhcy5jb250ZXh0LmRyYXdJbWFnZSgpIHNob3VsZCBkcmF3IFNWRyBpbWFnZXMgYXQgdGhlIGNv cnJlY3Qgc2NhbGUuPC90aXRsZT4KKzwvaGVhZD4KKzxib2R5PgorPGRpdj4KKyAgICBUaGlzIHRl c3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgMTAwIHggMTAwIGdyZWVuIHJlY3QuPGJyLz4KKyAgICA8 Y2FudmFzIGlkPSJjYW52YXMiIHdpZHRoPSIyMDAiIGhlaWdodD0iMjAwIj48L2NhbnZhcz4KKyAg ICA8aW1nIGlkPSJpbWFnZSIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIyMDAiIHN0eWxlPSJ2aXNpYmls aXR5OiBoaWRkZW47IiBzcmM9InJlc291cmNlcy8xMDBweC1ncmVlbi1yZWN0LnN2ZyI+PC9pbWc+ Cis8L2Rpdj4KKzxzY3JpcHQ+CisgICAgZnVuY3Rpb24gZmluaXNoVGVzdCgpIHsKKyAgICAgICAg dmFyIGltYWdlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImltYWdlIik7CisgICAgICAgIHZh ciBjYW52YXMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY2FudmFzIik7CisgICAgICAgIHNl dFRpbWVvdXQoZnVuY3Rpb24oKSB7CisgICAgICAgICAgICB2YXIgY29udGV4dCA9IGNhbnZhcy5n ZXRDb250ZXh0KCcyZCcpOworICAgICAgICAgICAgLy8gV2UgZHJhdyB0aGUgMjAweDIwMCBpbWFn ZSB0aGF0IGNvbnRhaW5zIGEgMTAweDEwMCBncmVlbiByZWN0LgorICAgICAgICAgICAgY29udGV4 dC5kcmF3SW1hZ2UoaW1hZ2UsIDAsIDAsIDIwMCwgMjAwKTsKKworICAgICAgICAgICAgaWYgKHdp bmRvdy50ZXN0UnVubmVyKQorICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgp OworICAgICAgICB9LCAxKTsKKyAgICB9CisKKyAgICBpbWFnZS5vbmxvYWQgPSBmdW5jdGlvbigp IHsKKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAgICAgICB0ZXN0UnVu bmVyLndhaXRVbnRpbERvbmUoKTsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIuc2V0QmFja2luZ1Nj YWxlRmFjdG9yKDIsIGZpbmlzaFRlc3QpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIGZp bmlzaFRlc3QoKTsKKyAgICB9Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IExh eW91dFRlc3RzL3N2Zy9hcy1pbWFnZS9yZXNvdXJjZXMvMTAwcHgtZ3JlZW4tcmVjdC5zdmcKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvc3ZnL2FzLWltYWdlL3Jlc291cmNlcy8xMDBweC1ncmVl bi1yZWN0LnN2ZwkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3N2Zy9hcy1pbWFnZS9yZXNv dXJjZXMvMTAwcHgtZ3JlZW4tcmVjdC5zdmcJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMyBAQAor PHN2ZyB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIw MDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CisgICAg PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMHB4IiBoZWlnaHQ9IjEwMHB4IiBmaWxsPSJncmVl biIvPgorPC9zdmc+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQo=