42342 2010-07-15 00:51:17 -0700 Font download error for an @font-face rule invalidates other @font-face rules for the same font-family 2010-07-19 23:23:22 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yuzo yuzo hamaji hayato mitz ossy phiw2 oldest_to_newest 251725 0 yuzo 2010-07-15 00:51:17 -0700 Assume that we have the following file and CannotBeDownloaded.ttf cannot be downloaded while Ahem.ttf can. As per http://lists.w3.org/Archives/Public/www-style/2010Jul/0253.html , the first rule must remain in effect while the second rule must be ignored. WebKit r63408 ignores both rules. Note that if src: url(CannotBeDownloaded.ttf); is replaced with src: local(NonExistentLocalFont); or src: url(CannotBeDownloaded.ttf), local(Arial); , the first rule remains in effect and WebKit renders the file properly. <style> @font-face { font-family:myfont; src: url(Ahem.ttf); } @font-face { font-family:myfont; src: url(CannotBeDownloaded.ttf); unicode-range: U+30-39; } </style> <p> The first @font-face rule above should remain in effect even if the font for the second @font-face rule cannot be downloaded. Accordingly, the following text should be shown in Ahem. </p> <span style="font-family:myfont"> This must be shown in Ahem. </span> 251810 1 61641 yuzo 2010-07-15 04:47:45 -0700 Created attachment 61641 Proposed fix 252884 2 61641 mitz 2010-07-17 09:58:58 -0700 Comment on attachment 61641 Proposed fix Please fill in the WebCore change log. 253547 3 62032 yuzo 2010-07-19 21:49:17 -0700 Created attachment 62032 Patch 253548 4 yuzo 2010-07-19 21:52:11 -0700 Hi, Thank you for the review. In WebCore/ChangeLog, I've added a comment to each method. Yuzo 253550 5 yuzo 2010-07-19 22:10:26 -0700 Committed r63719: <http://trac.webkit.org/changeset/63719> 253568 6 ossy 2010-07-19 23:10:42 -0700 (In reply to comment #5) > Committed r63719: <http://trac.webkit.org/changeset/63719> fast/css/font-face-download-error.html introduced in r63719 fails on Qt bot: http://build.webkit.org/results/Qt%20Linux%20Release/r63720%20%2815746%29/fast/css/font-face-download-error-pretty-diff.html Could you check it, please? 253570 7 yuzo 2010-07-19 23:23:22 -0700 Committed r63722: <http://trac.webkit.org/changeset/63722> 61641 2010-07-15 04:47:45 -0700 2010-07-19 21:49:11 -0700 Proposed fix 42342.patch text/plain 9360 yuzo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3M2QzMmU4Li40MDljNzNhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDct MTUgIFl1em8gRnVqaXNoaW1hICA8eXV6b0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBmb3IgQnVnIDQyMzQyIC0gRm9udCBk b3dubG9hZCBlcnJvciBmb3IgYW4gQGZvbnQtZmFjZSBydWxlIGludmFsaWRhdGVzIG90aGVyIEBm b250LWZhY2UgcnVsZXMgZm9yIHRoZSBzYW1lIGZvbnQtZmFtaWx5CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjM0MgorCisgICAgICAgICogZmFzdC9j c3MvZm9udC1mYWNlLWRvd25sb2FkLWVycm9yLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg ICogZmFzdC9jc3MvZm9udC1mYWNlLWRvd25sb2FkLWVycm9yLmh0bWw6IEFkZGVkLgorCiAyMDEw LTA3LTE1ICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkByaW0uY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IERpcmsgU2NodWx6ZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvY3NzL2ZvbnQtZmFjZS1kb3dubG9hZC1lcnJvci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9mYXN0L2Nzcy9mb250LWZhY2UtZG93bmxvYWQtZXJyb3ItZXhwZWN0ZWQudHh0Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjkzNzdkMDQKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L2Nzcy9mb250LWZhY2UtZG93bmxvYWQtZXJyb3ItZXhwZWN0ZWQudHh0 CkBAIC0wLDAgKzEsMzYgQEAKK0lmIG5vIGZvbnQgcmVzb3VyY2VzIGFyZSBhdmFpbGFibGUgZm9y IGFuIEBmb250LWZhY2UgcnVsZSBkdWUgdG8gZG93bmxvYWQgZXJyb3JzLCB0aGUgcnVsZSBtdXN0 IGJlIGlnbm9yZWQgYnV0IG90aGVycyBtdXN0IHJlbWFpbiBpbiBlZmZlY3QuCisKK09uIHN1Y2Nl c3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5 ICJURVNUIENPTVBMRVRFIi4KKworaWlpaWlpaWlpaSB0ZXN0XzBfMAoraWlpaWlpaWlpaSByZWZf MF8wCitqampqampqampqIHRlc3RfMF8xCitqampqampqampqIHJlZl8wXzEKKworaWlpaWlpaWlp aSB0ZXN0XzFfMAoraWlpaWlpaWlpaSByZWZfMV8wCitqampqampqampqIHRlc3RfMV8xCitqampq ampqampqIHJlZl8xXzEKKworaWlpaWlpaWlpaSB0ZXN0XzJfMAoraWlpaWlpaWlpaSByZWZfMl8w CitqampqampqampqIHRlc3RfMl8xCitqampqampqampqIHJlZl8yXzEKKworaWlpaWlpaWlpaSB0 ZXN0XzNfMAoraWlpaWlpaWlpaSByZWZfM18wCitqampqampqampqIHRlc3RfM18xCitqampqampq ampqIHJlZl8zXzEKKworUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENP TVBMRVRFCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0XzBfMCcpLm9mZnNldFdp ZHRoIGlzIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdyZWZfMF8wJykub2Zmc2V0V2lkdGgKK1BB U1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RfMF8xJykub2Zmc2V0V2lkdGggaXMgZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3JlZl8wXzEnKS5vZmZzZXRXaWR0aAorUEFTUyBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgndGVzdF8xXzAnKS5vZmZzZXRXaWR0aCBpcyBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgncmVmXzFfMCcpLm9mZnNldFdpZHRoCitQQVNTIGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCd0ZXN0XzFfMScpLm9mZnNldFdpZHRoIGlzIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCdyZWZfMV8xJykub2Zmc2V0V2lkdGgKK1BBU1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rl c3RfMl8wJykub2Zmc2V0V2lkdGggaXMgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3JlZl8yXzAn KS5vZmZzZXRXaWR0aAorUEFTUyBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdF8yXzEnKS5v ZmZzZXRXaWR0aCBpcyBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgncmVmXzJfMScpLm9mZnNldFdp ZHRoCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0XzNfMCcpLm9mZnNldFdpZHRo IGlzIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdyZWZfM18wJykub2Zmc2V0V2lkdGgKK1BBU1Mg ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RfM18xJykub2Zmc2V0V2lkdGggaXMgZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoJ3JlZl8zXzEnKS5vZmZzZXRXaWR0aAorCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2Nzcy9mb250LWZhY2UtZG93bmxvYWQtZXJyb3IuaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvY3NzL2ZvbnQtZmFjZS1kb3dubG9hZC1lcnJvci5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmM0N2ZhYWUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L2Nzcy9mb250LWZhY2UtZG93bmxvYWQtZXJyb3IuaHRtbApAQCAtMCwwICsx LDEzNiBAQAorPCFkb2N0eXBlIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHRpdGxlPlRlc3QgZm9y IEJ1ZyA0MjM0MiAtIEZvbnQgZG93bmxvYWQgZXJyb3IgZm9yIGFuIEBmb250LWZhY2UgcnVsZSBp bnZhbGlkYXRlcyBvdGhlciBAZm9udC1mYWNlIHJ1bGVzIGZvciB0aGUgc2FtZSBmb250LWZhbWls eTwvdGl0bGU+Cis8c3R5bGU+CisudGVzdCB7CisgICAgZm9udC1mYW1pbHk6IFRpbWVzOworICAg IGJvcmRlcjogc29saWQgMXB4OworfQorCisvKiBUZXN0IDA6IERvd25sb2FkIHN1Y2VzcyAqLwor QGZvbnQtZmFjZSB7CisgICAgZm9udC1mYW1pbHk6bXlmb250XzA7CisgICAgc3JjOiBsb2NhbCgn Q291cmllcicpOworfQorQGZvbnQtZmFjZSB7CisgICAgZm9udC1mYW1pbHk6bXlmb250XzA7Cisg ICAgc3JjOiB1cmwoJ3Jlc291cmNlcy9BaGVtLm90ZicpOworICAgIHVuaWNvZGUtcmFuZ2U6IHUr Njk7IC8qICdpJyAqLworfQorCisvKiBUZXN0IDE6IERvd25sb2FkIGVycm9yICovCitAZm9udC1m YWNlIHsKKyAgICBmb250LWZhbWlseTpteWZvbnRfMTsKKyAgICBzcmM6IGxvY2FsKCdDb3VyaWVy Jyk7Cit9CitAZm9udC1mYWNlIHsKKyAgICBmb250LWZhbWlseTpteWZvbnRfMTsKKyAgICBzcmM6 IHVybCgncmVzb3VyY2VzL0Rvd25Mb2FkRXJyb3JBaGVtLm90ZicpOworICAgIHVuaWNvZGUtcmFu Z2U6IHUrNjk7IC8qICdpJyAqLworfQorCisvKiBUZXN0IDI6IERvd25sb2FkIGVycm9yIGZvbGxv d2VkIGJ5IHN1Y2Nlc3MgKi8KK0Bmb250LWZhY2UgeworICAgIGZvbnQtZmFtaWx5Om15Zm9udF8y OworICAgIHNyYzogbG9jYWwoJ0NvdXJpZXInKTsKK30KK0Bmb250LWZhY2UgeworICAgIGZvbnQt ZmFtaWx5Om15Zm9udF8yOworICAgIHNyYzogdXJsKCdyZXNvdXJjZXMvRG93bkxvYWRFcnJvckFo ZW0ub3RmJyksIHVybCgncmVzb3VyY2VzL0FoZW0ub3RmJyk7CisgICAgdW5pY29kZS1yYW5nZTog dSs2OTsgLyogJ2knICovCit9CisKKy8qIFRlc3QgMzogRG93bmxvYWQgZXJyb3IgZm9sbG93ZWQg YnkgZXhpc3RpbmcgbG9jYWwgZm9udCAqLworQGZvbnQtZmFjZSB7CisgICAgZm9udC1mYW1pbHk6 bXlmb250XzM7CisgICAgc3JjOiBsb2NhbCgnQ291cmllcicpOworfQorQGZvbnQtZmFjZSB7Cisg ICAgZm9udC1mYW1pbHk6bXlmb250XzM7CisgICAgc3JjOiB1cmwoJ3Jlc291cmNlcy9Eb3duTG9h ZEVycm9yQWhlbS5vdGYnKSwgbG9jYWwoQXJpYWwpOworICAgIHVuaWNvZGUtcmFuZ2U6IHUrNjk7 IC8qICdpJyAqLworfQorCis8L3N0eWxlPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIu Li9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiLz4KKzxzY3JpcHQgc3JjPSIuLi9qcy9y ZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2 IGlkPSJkZXNjcmlwdGlvbiI+PC9kaXY+Cis8ZGl2IGlkPSJ0ZXN0cyI+PC9kaXY+CisKKzxkaXYg aWQ9ImNvbnNvbGUiPjwvZGl2PgorPGRpdiBpZD0ib3V0Ij48L2Rpdj4KKzxzY3JpcHQ+CitpZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgIHdpbmRvdy5sYXlvdXRUZXN0Q29udHJv bGxlci53YWl0VW50aWxEb25lKCk7CisKK2Rlc2NyaXB0aW9uKCJJZiBubyBmb250IHJlc291cmNl cyBhcmUgYXZhaWxhYmxlIGZvciBhbiBAZm9udC1mYWNlIHJ1bGUgZHVlIHRvIGRvd25sb2FkIGVy cm9ycywgdGhlIHJ1bGUgbXVzdCBiZSBpZ25vcmVkIGJ1dCBvdGhlcnMgbXVzdCByZW1haW4gaW4g ZWZmZWN0LiIpOworCit2YXIgdGVzdHNFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo InRlc3RzIik7Cit2YXIgdGVzdFN0cmluZ3MgPSBbCisgICAgImlpaWlpaWlpaWkiLAorICAgICJq ampqampqampqIgorXTsKK3ZhciBleHBlY3RlZFJlc3VsdHMgPSBbCisgICAgLy8gRWZmZWN0aXZl IGZvbnQgZmFtaWx5IGZvciAiaSIgYW5kICJqIgorICAgIFsiQWhlbSIsICJDb3VyaWVyIl0sCisg ICAgWyJDb3VyaWVyIiwgIkNvdXJpZXIiXSwKKyAgICBbIkFoZW0iLCAiQ291cmllciJdLAorICAg IFsiQXJpYWwiLCAiQ291cmllciJdCitdOworCitmdW5jdGlvbiBjcmVhdGVBbmRBcHBlbmRTcGFu KGlkLCBzdWJJZCwgZm9udEZhbWlseSkKK3sKKyAgICB2YXIgc3BhbiA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoInNwYW4iKTsKKyAgICBzcGFuLmlkID0gaWQ7CisgICAgc3Bhbi5jbGFzc05hbWUg PSAidGVzdCI7CisgICAgc3Bhbi5zdHlsZS5mb250RmFtaWx5ID0gZm9udEZhbWlseTsKKyAgICBz cGFuLmlubmVySFRNTCA9IHRlc3RTdHJpbmdzW3N1YklkXTsKKyAgICB0ZXN0c0VsZW1lbnQuYXBw ZW5kQ2hpbGQoc3Bhbik7CisgICAgdGVzdHNFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNy ZWF0ZVRleHROb2RlKCIgIiArIGlkKSk7CisgICAgdGVzdHNFbGVtZW50LmFwcGVuZENoaWxkKGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImJyIikpOworfQorCitmdW5jdGlvbiB0ZXN0SWQobWFpblRl c3RJZCwgc3ViVGVzdElkKQoreworICAgIHJldHVybiAidGVzdF8iICsgbWFpblRlc3RJZCArICJf IiArIHN1YlRlc3RJZDsKK30KKworZnVuY3Rpb24gcmVmSWQobWFpblRlc3RJZCwgc3ViVGVzdElk KQoreworICAgIHJldHVybiAicmVmXyIgKyBtYWluVGVzdElkICsgIl8iICsgc3ViVGVzdElkOwor fQorCitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAgICBmb3IgKHZhciBtYWluVGVzdElkID0gMDsgbWFp blRlc3RJZCA8IGV4cGVjdGVkUmVzdWx0cy5sZW5ndGg7IG1haW5UZXN0SWQrKykgeworICAgICAg ICBmb3IgKHZhciBzdWJUZXN0SWQgPSAwOyBzdWJUZXN0SWQgPCB0ZXN0U3RyaW5ncy5sZW5ndGg7 IHN1YlRlc3RJZCsrKSB7CisgICAgICAgICAgICBzaG91bGRCZSgiZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoJyIgKyB0ZXN0SWQobWFpblRlc3RJZCwgc3ViVGVzdElkKSArICInKS5vZmZzZXRXaWR0 aCIsICJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnIiArIHJlZklkKG1haW5UZXN0SWQsIHN1YlRl c3RJZCkgKyAiJykub2Zmc2V0V2lkdGgiKTsKKyAgICAgICAgfQorICAgIH0KKyAgICBpZiAod2lu ZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICB3aW5kb3cubGF5b3V0VGVzdENvbnRy b2xsZXIubm90aWZ5RG9uZSgpOworfQorCitmb3IgKHZhciBtYWluVGVzdElkID0gMDsgbWFpblRl c3RJZCA8IGV4cGVjdGVkUmVzdWx0cy5sZW5ndGg7IG1haW5UZXN0SWQrKykgeworICAgIGZvciAo dmFyIHN1YlRlc3RJZCA9IDA7IHN1YlRlc3RJZCA8IHRlc3RTdHJpbmdzLmxlbmd0aDsgc3ViVGVz dElkKyspIHsKKyAgICAgICAgdmFyIHRlc3RGb250RmFtaWx5ID0gIm15Zm9udF8iICsgbWFpblRl c3RJZDsKKyAgICAgICAgY3JlYXRlQW5kQXBwZW5kU3Bhbih0ZXN0SWQobWFpblRlc3RJZCwgc3Vi VGVzdElkKSwgc3ViVGVzdElkLCB0ZXN0Rm9udEZhbWlseSk7CisgICAgICAgIHZhciByZWZGb250 RmFtaWx5ID0gZXhwZWN0ZWRSZXN1bHRzW21haW5UZXN0SWRdW3N1YlRlc3RJZF07CisgICAgICAg IGNyZWF0ZUFuZEFwcGVuZFNwYW4ocmVmSWQobWFpblRlc3RJZCwgc3ViVGVzdElkKSwgc3ViVGVz dElkLCByZWZGb250RmFtaWx5KTsKKyAgICB9CisgICAgdGVzdHNFbGVtZW50LmFwcGVuZENoaWxk KGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImJyIikpOworfQorCisvLyBXZSBuZWVkIHRvIHJ1biB0 ZXN0cyBhZnRlciB0aGUgZm9udCBkb3dubG9hZGluZyBzdWNjZWVkZWQgb3IgZmFpbGVkLgorLy8g VXNpbmcgYSB0aW1lciBpcyBub3QgaWRlYWwsIGJ1dCB0aGVyZSBzZWVtcyB0byBiZSBubyBiZXR0 ZXIgb3B0aW9ucy4KK3dpbmRvdy5zZXRUaW1lb3V0KHRlc3QsIDEwMCk7CisKK3ZhciBzdWNjZXNz ZnVsbHlQYXJzZWQgPSB0cnVlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3Vy Y2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CisKZGlmZiAt LWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmM4OWRl OS4uZWZlZjUyMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNy0xNSAgWXV6byBGdWppc2hpbWEgIDx5 dXpvQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRml4IGZvciBCdWcgNDIzNDIgLSBGb250IGRvd25sb2FkIGVycm9yIGZvciBhbiBA Zm9udC1mYWNlIHJ1bGUgaW52YWxpZGF0ZXMgb3RoZXIgQGZvbnQtZmFjZSBydWxlcyBmb3IgdGhl IHNhbWUgZm9udC1mYW1pbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQyMzQyCisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MvZm9udC1mYWNlLWRvd25s b2FkLWVycm9yLmh0bWwKKworICAgICAgICAqIGNzcy9DU1NTZWdtZW50ZWRGb250RmFjZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDU1NTZWdtZW50ZWRGb250RmFjZTo6aXNWYWxpZCk6CisgICAg ICAgIChXZWJDb3JlOjpDU1NTZWdtZW50ZWRGb250RmFjZTo6Z2V0Rm9udERhdGEpOgorICAgICAg ICAqIGNzcy9DU1NTZWdtZW50ZWRGb250RmFjZS5oOgorCiAyMDEwLTA3LTE1ICBOaWtvbGFzIFpp bW1lcm1hbm4gIDxuemltbWVybWFubkByaW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERp cmsgU2NodWx6ZS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvY3NzL0NTU1NlZ21lbnRlZEZvbnRGYWNl LmNwcCBiL1dlYkNvcmUvY3NzL0NTU1NlZ21lbnRlZEZvbnRGYWNlLmNwcAppbmRleCBiMTNkZDlj Li4xYTJmODliIDEwMDY0NAotLS0gYS9XZWJDb3JlL2Nzcy9DU1NTZWdtZW50ZWRGb250RmFjZS5j cHAKKysrIGIvV2ViQ29yZS9jc3MvQ1NTU2VnbWVudGVkRm9udEZhY2UuY3BwCkBAIC03MSwxMiAr NzEsMTMgQEAgYm9vbCBDU1NTZWdtZW50ZWRGb250RmFjZTo6aXNMb2FkZWQoKSBjb25zdAogCiBi b29sIENTU1NlZ21lbnRlZEZvbnRGYWNlOjppc1ZhbGlkKCkgY29uc3QKIHsKKyAgICAvLyBWYWxp ZCBpZiBhdCBsZWFzdCBvbmUgZm9udCBmYWNlIGlzIHZhbGlkLgogICAgIHVuc2lnbmVkIHNpemUg PSBtX2ZvbnRGYWNlcy5zaXplKCk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHNpemU7 IGkrKykgewotICAgICAgICBpZiAoIW1fZm9udEZhY2VzW2ldLT5pc1ZhbGlkKCkpCi0gICAgICAg ICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmIChtX2ZvbnRGYWNlc1tpXS0+aXNWYWxpZCgp KQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQotICAgIHJldHVybiB0cnVlOworICAg IHJldHVybiBmYWxzZTsKIH0KIAogdm9pZCBDU1NTZWdtZW50ZWRGb250RmFjZTo6Zm9udExvYWRl ZChDU1NGb250RmFjZSopCkBAIC0xMDcsNiArMTA4LDggQEAgRm9udERhdGEqIENTU1NlZ21lbnRl ZEZvbnRGYWNlOjpnZXRGb250RGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlw dGkKIAogICAgIHVuc2lnbmVkIHNpemUgPSBtX2ZvbnRGYWNlcy5zaXplKCk7CiAgICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IHNpemU7IGkrKykgeworICAgICAgICBpZiAoIW1fZm9udEZhY2Vz W2ldLT5pc1ZhbGlkKCkpCisgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgRm9udFRyYWl0 c01hc2sgdHJhaXRzTWFzayA9IG1fZm9udEZhY2VzW2ldLT50cmFpdHNNYXNrKCk7CiAgICAgICAg IGJvb2wgc3ludGhldGljQm9sZCA9ICEodHJhaXRzTWFzayAmIChGb250V2VpZ2h0NjAwTWFzayB8 IEZvbnRXZWlnaHQ3MDBNYXNrIHwgRm9udFdlaWdodDgwME1hc2sgfCBGb250V2VpZ2h0OTAwTWFz aykpICYmIChkZXNpcmVkVHJhaXRzTWFzayAmIChGb250V2VpZ2h0NjAwTWFzayB8IEZvbnRXZWln aHQ3MDBNYXNrIHwgRm9udFdlaWdodDgwME1hc2sgfCBGb250V2VpZ2h0OTAwTWFzaykpOwogICAg ICAgICBib29sIHN5bnRoZXRpY0l0YWxpYyA9ICEodHJhaXRzTWFzayAmIEZvbnRTdHlsZUl0YWxp Y01hc2spICYmIChkZXNpcmVkVHJhaXRzTWFzayAmIEZvbnRTdHlsZUl0YWxpY01hc2spOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9jc3MvQ1NTU2VnbWVudGVkRm9udEZhY2UuaCBiL1dlYkNvcmUvY3Nz L0NTU1NlZ21lbnRlZEZvbnRGYWNlLmgKaW5kZXggNTdhM2M1OC4uMTAyYThhYSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9jc3MvQ1NTU2VnbWVudGVkRm9udEZhY2UuaAorKysgYi9XZWJDb3JlL2Nzcy9D U1NTZWdtZW50ZWRGb250RmFjZS5oCkBAIC00Niw3ICs0Niw2IEBAIHB1YmxpYzoKICAgICB+Q1NT U2VnbWVudGVkRm9udEZhY2UoKTsKIAogICAgIGJvb2wgaXNMb2FkZWQoKSBjb25zdDsKLSAgICBi b29sIGlzVmFsaWQoKSBjb25zdDsKICAgICBDU1NGb250U2VsZWN0b3IqIGZvbnRTZWxlY3Rvcigp IGNvbnN0IHsgcmV0dXJuIG1fZm9udFNlbGVjdG9yOyB9CiAKICAgICB2b2lkIGZvbnRMb2FkZWQo Q1NTRm9udEZhY2UqKTsKQEAgLTU5LDYgKzU4LDcgQEAgcHJpdmF0ZToKICAgICBDU1NTZWdtZW50 ZWRGb250RmFjZShDU1NGb250U2VsZWN0b3IqKTsKIAogICAgIHZvaWQgcHJ1bmVUYWJsZSgpOwor ICAgIGJvb2wgaXNWYWxpZCgpIGNvbnN0OwogCiAgICAgQ1NTRm9udFNlbGVjdG9yKiBtX2ZvbnRT ZWxlY3RvcjsKICAgICBIYXNoTWFwPHVuc2lnbmVkLCBTZWdtZW50ZWRGb250RGF0YSo+IG1fZm9u dERhdGFUYWJsZTsK 62032 2010-07-19 21:49:17 -0700 2010-07-19 21:52:16 -0700 Patch bug-42342-20100719214915.patch text/plain 9943 yuzo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmZTlhOGZjY2Y4ODk2NmZlNzZiZmEyMDg3N2VjZDUxMDM2ZWE4MWM5Li5hM2Y2Yzgy YjhkYzc0NGJkNmNiYzhjNDFkYzliMDM3NDE3YzVmZGM1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDctMTUgIFl1em8gRnVqaXNoaW1hICA8eXV6b0Bnb29nbGUuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBmb3IgQnVnIDQyMzQy IC0gRm9udCBkb3dubG9hZCBlcnJvciBmb3IgYW4gQGZvbnQtZmFjZSBydWxlIGludmFsaWRhdGVz IG90aGVyIEBmb250LWZhY2UgcnVsZXMgZm9yIHRoZSBzYW1lIGZvbnQtZmFtaWx5CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjM0MgorCisgICAgICAg ICogZmFzdC9jc3MvZm9udC1mYWNlLWRvd25sb2FkLWVycm9yLWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogZmFzdC9jc3MvZm9udC1mYWNlLWRvd25sb2FkLWVycm9yLmh0bWw6IEFkZGVk LgorCiAyMDEwLTA3LTE5ICBEYW5pZWwgQmF0ZXMgIDxkYmF0ZXNAcmltLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBBZGFtIFJvYmVuLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9j c3MvZm9udC1mYWNlLWRvd25sb2FkLWVycm9yLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zh c3QvY3NzL2ZvbnQtZmFjZS1kb3dubG9hZC1lcnJvci1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u OTM3N2QwNGQ0MGExOTkwM2Y0NjA1ZjA4MWM3ZTFmMTU2NjhkOWFmYwotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2ZvbnQtZmFjZS1kb3dubG9hZC1lcnJvci1leHBlY3Rl ZC50eHQKQEAgLTAsMCArMSwzNiBAQAorSWYgbm8gZm9udCByZXNvdXJjZXMgYXJlIGF2YWlsYWJs ZSBmb3IgYW4gQGZvbnQtZmFjZSBydWxlIGR1ZSB0byBkb3dubG9hZCBlcnJvcnMsIHRoZSBydWxl IG11c3QgYmUgaWdub3JlZCBidXQgb3RoZXJzIG11c3QgcmVtYWluIGluIGVmZmVjdC4KKworT24g c3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93 ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCitpaWlpaWlpaWlpIHRlc3RfMF8wCitpaWlpaWlpaWlp IHJlZl8wXzAKK2pqampqampqamogdGVzdF8wXzEKK2pqampqampqamogcmVmXzBfMQorCitpaWlp aWlpaWlpIHRlc3RfMV8wCitpaWlpaWlpaWlpIHJlZl8xXzAKK2pqampqampqamogdGVzdF8xXzEK K2pqampqampqamogcmVmXzFfMQorCitpaWlpaWlpaWlpIHRlc3RfMl8wCitpaWlpaWlpaWlpIHJl Zl8yXzAKK2pqampqampqamogdGVzdF8yXzEKK2pqampqampqamogcmVmXzJfMQorCitpaWlpaWlp aWlpIHRlc3RfM18wCitpaWlpaWlpaWlpIHJlZl8zXzAKK2pqampqampqamogdGVzdF8zXzEKK2pq ampqampqamogcmVmXzNfMQorCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RF U1QgQ09NUExFVEUKK1BBU1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RfMF8wJykub2Zm c2V0V2lkdGggaXMgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3JlZl8wXzAnKS5vZmZzZXRXaWR0 aAorUEFTUyBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdF8wXzEnKS5vZmZzZXRXaWR0aCBp cyBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgncmVmXzBfMScpLm9mZnNldFdpZHRoCitQQVNTIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0XzFfMCcpLm9mZnNldFdpZHRoIGlzIGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCdyZWZfMV8wJykub2Zmc2V0V2lkdGgKK1BBU1MgZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoJ3Rlc3RfMV8xJykub2Zmc2V0V2lkdGggaXMgZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoJ3JlZl8xXzEnKS5vZmZzZXRXaWR0aAorUEFTUyBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgndGVzdF8yXzAnKS5vZmZzZXRXaWR0aCBpcyBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgncmVm XzJfMCcpLm9mZnNldFdpZHRoCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0XzJf MScpLm9mZnNldFdpZHRoIGlzIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdyZWZfMl8xJykub2Zm c2V0V2lkdGgKK1BBU1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RfM18wJykub2Zmc2V0 V2lkdGggaXMgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3JlZl8zXzAnKS5vZmZzZXRXaWR0aAor UEFTUyBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdF8zXzEnKS5vZmZzZXRXaWR0aCBpcyBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgncmVmXzNfMScpLm9mZnNldFdpZHRoCisKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2ZvbnQtZmFjZS1kb3dubG9hZC1lcnJvci5odG1sIGIv TGF5b3V0VGVzdHMvZmFzdC9jc3MvZm9udC1mYWNlLWRvd25sb2FkLWVycm9yLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uYzQ3ZmFhZTdkYzBjMTQzMDA5ZTFkMTU3ZjA0NWY0MTQ5NTAyOTVjMQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2ZvbnQtZmFjZS1kb3dubG9hZC1lcnJvci5o dG1sCkBAIC0wLDAgKzEsMTM2IEBACis8IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8 dGl0bGU+VGVzdCBmb3IgQnVnIDQyMzQyIC0gRm9udCBkb3dubG9hZCBlcnJvciBmb3IgYW4gQGZv bnQtZmFjZSBydWxlIGludmFsaWRhdGVzIG90aGVyIEBmb250LWZhY2UgcnVsZXMgZm9yIHRoZSBz YW1lIGZvbnQtZmFtaWx5PC90aXRsZT4KKzxzdHlsZT4KKy50ZXN0IHsKKyAgICBmb250LWZhbWls eTogVGltZXM7CisgICAgYm9yZGVyOiBzb2xpZCAxcHg7Cit9CisKKy8qIFRlc3QgMDogRG93bmxv YWQgc3VjZXNzICovCitAZm9udC1mYWNlIHsKKyAgICBmb250LWZhbWlseTpteWZvbnRfMDsKKyAg ICBzcmM6IGxvY2FsKCdDb3VyaWVyJyk7Cit9CitAZm9udC1mYWNlIHsKKyAgICBmb250LWZhbWls eTpteWZvbnRfMDsKKyAgICBzcmM6IHVybCgncmVzb3VyY2VzL0FoZW0ub3RmJyk7CisgICAgdW5p Y29kZS1yYW5nZTogdSs2OTsgLyogJ2knICovCit9CisKKy8qIFRlc3QgMTogRG93bmxvYWQgZXJy b3IgKi8KK0Bmb250LWZhY2UgeworICAgIGZvbnQtZmFtaWx5Om15Zm9udF8xOworICAgIHNyYzog bG9jYWwoJ0NvdXJpZXInKTsKK30KK0Bmb250LWZhY2UgeworICAgIGZvbnQtZmFtaWx5Om15Zm9u dF8xOworICAgIHNyYzogdXJsKCdyZXNvdXJjZXMvRG93bkxvYWRFcnJvckFoZW0ub3RmJyk7Cisg ICAgdW5pY29kZS1yYW5nZTogdSs2OTsgLyogJ2knICovCit9CisKKy8qIFRlc3QgMjogRG93bmxv YWQgZXJyb3IgZm9sbG93ZWQgYnkgc3VjY2VzcyAqLworQGZvbnQtZmFjZSB7CisgICAgZm9udC1m YW1pbHk6bXlmb250XzI7CisgICAgc3JjOiBsb2NhbCgnQ291cmllcicpOworfQorQGZvbnQtZmFj ZSB7CisgICAgZm9udC1mYW1pbHk6bXlmb250XzI7CisgICAgc3JjOiB1cmwoJ3Jlc291cmNlcy9E b3duTG9hZEVycm9yQWhlbS5vdGYnKSwgdXJsKCdyZXNvdXJjZXMvQWhlbS5vdGYnKTsKKyAgICB1 bmljb2RlLXJhbmdlOiB1KzY5OyAvKiAnaScgKi8KK30KKworLyogVGVzdCAzOiBEb3dubG9hZCBl cnJvciBmb2xsb3dlZCBieSBleGlzdGluZyBsb2NhbCBmb250ICovCitAZm9udC1mYWNlIHsKKyAg ICBmb250LWZhbWlseTpteWZvbnRfMzsKKyAgICBzcmM6IGxvY2FsKCdDb3VyaWVyJyk7Cit9CitA Zm9udC1mYWNlIHsKKyAgICBmb250LWZhbWlseTpteWZvbnRfMzsKKyAgICBzcmM6IHVybCgncmVz b3VyY2VzL0Rvd25Mb2FkRXJyb3JBaGVtLm90ZicpLCBsb2NhbChBcmlhbCk7CisgICAgdW5pY29k ZS1yYW5nZTogdSs2OTsgLyogJ2knICovCit9CisKKzwvc3R5bGU+Cis8bGluayByZWw9InN0eWxl c2hlZXQiIGhyZWY9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyIvPgorPHNjcmlw dCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+ Cis8Ym9keT4KKzxkaXYgaWQ9ImRlc2NyaXB0aW9uIj48L2Rpdj4KKzxkaXYgaWQ9InRlc3RzIj48 L2Rpdj4KKworPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8ZGl2IGlkPSJvdXQiPjwvZGl2Pgor PHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgd2luZG93Lmxh eW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKworZGVzY3JpcHRpb24oIklmIG5v IGZvbnQgcmVzb3VyY2VzIGFyZSBhdmFpbGFibGUgZm9yIGFuIEBmb250LWZhY2UgcnVsZSBkdWUg dG8gZG93bmxvYWQgZXJyb3JzLCB0aGUgcnVsZSBtdXN0IGJlIGlnbm9yZWQgYnV0IG90aGVycyBt dXN0IHJlbWFpbiBpbiBlZmZlY3QuIik7CisKK3ZhciB0ZXN0c0VsZW1lbnQgPSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgidGVzdHMiKTsKK3ZhciB0ZXN0U3RyaW5ncyA9IFsKKyAgICAiaWlpaWlp aWlpaSIsCisgICAgImpqampqampqamoiCitdOwordmFyIGV4cGVjdGVkUmVzdWx0cyA9IFsKKyAg ICAvLyBFZmZlY3RpdmUgZm9udCBmYW1pbHkgZm9yICJpIiBhbmQgImoiCisgICAgWyJBaGVtIiwg IkNvdXJpZXIiXSwKKyAgICBbIkNvdXJpZXIiLCAiQ291cmllciJdLAorICAgIFsiQWhlbSIsICJD b3VyaWVyIl0sCisgICAgWyJBcmlhbCIsICJDb3VyaWVyIl0KK107CisKK2Z1bmN0aW9uIGNyZWF0 ZUFuZEFwcGVuZFNwYW4oaWQsIHN1YklkLCBmb250RmFtaWx5KQoreworICAgIHZhciBzcGFuID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOworICAgIHNwYW4uaWQgPSBpZDsKKyAgICBz cGFuLmNsYXNzTmFtZSA9ICJ0ZXN0IjsKKyAgICBzcGFuLnN0eWxlLmZvbnRGYW1pbHkgPSBmb250 RmFtaWx5OworICAgIHNwYW4uaW5uZXJIVE1MID0gdGVzdFN0cmluZ3Nbc3ViSWRdOworICAgIHRl c3RzRWxlbWVudC5hcHBlbmRDaGlsZChzcGFuKTsKKyAgICB0ZXN0c0VsZW1lbnQuYXBwZW5kQ2hp bGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIiAiICsgaWQpKTsKKyAgICB0ZXN0c0VsZW1lbnQu YXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnIiKSk7Cit9CisKK2Z1bmN0aW9u IHRlc3RJZChtYWluVGVzdElkLCBzdWJUZXN0SWQpCit7CisgICAgcmV0dXJuICJ0ZXN0XyIgKyBt YWluVGVzdElkICsgIl8iICsgc3ViVGVzdElkOworfQorCitmdW5jdGlvbiByZWZJZChtYWluVGVz dElkLCBzdWJUZXN0SWQpCit7CisgICAgcmV0dXJuICJyZWZfIiArIG1haW5UZXN0SWQgKyAiXyIg KyBzdWJUZXN0SWQ7Cit9CisKK2Z1bmN0aW9uIHRlc3QoKQoreworICAgIGZvciAodmFyIG1haW5U ZXN0SWQgPSAwOyBtYWluVGVzdElkIDwgZXhwZWN0ZWRSZXN1bHRzLmxlbmd0aDsgbWFpblRlc3RJ ZCsrKSB7CisgICAgICAgIGZvciAodmFyIHN1YlRlc3RJZCA9IDA7IHN1YlRlc3RJZCA8IHRlc3RT dHJpbmdzLmxlbmd0aDsgc3ViVGVzdElkKyspIHsKKyAgICAgICAgICAgIHNob3VsZEJlKCJkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgnIiArIHRlc3RJZChtYWluVGVzdElkLCBzdWJUZXN0SWQpICsg IicpLm9mZnNldFdpZHRoIiwgImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCciICsgcmVmSWQobWFp blRlc3RJZCwgc3ViVGVzdElkKSArICInKS5vZmZzZXRXaWR0aCIpOworICAgICAgICB9CisgICAg fQorICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgIHdpbmRvdy5s YXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7Cit9CisKK2ZvciAodmFyIG1haW5UZXN0 SWQgPSAwOyBtYWluVGVzdElkIDwgZXhwZWN0ZWRSZXN1bHRzLmxlbmd0aDsgbWFpblRlc3RJZCsr KSB7CisgICAgZm9yICh2YXIgc3ViVGVzdElkID0gMDsgc3ViVGVzdElkIDwgdGVzdFN0cmluZ3Mu bGVuZ3RoOyBzdWJUZXN0SWQrKykgeworICAgICAgICB2YXIgdGVzdEZvbnRGYW1pbHkgPSAibXlm b250XyIgKyBtYWluVGVzdElkOworICAgICAgICBjcmVhdGVBbmRBcHBlbmRTcGFuKHRlc3RJZCht YWluVGVzdElkLCBzdWJUZXN0SWQpLCBzdWJUZXN0SWQsIHRlc3RGb250RmFtaWx5KTsKKyAgICAg ICAgdmFyIHJlZkZvbnRGYW1pbHkgPSBleHBlY3RlZFJlc3VsdHNbbWFpblRlc3RJZF1bc3ViVGVz dElkXTsKKyAgICAgICAgY3JlYXRlQW5kQXBwZW5kU3BhbihyZWZJZChtYWluVGVzdElkLCBzdWJU ZXN0SWQpLCBzdWJUZXN0SWQsIHJlZkZvbnRGYW1pbHkpOworICAgIH0KKyAgICB0ZXN0c0VsZW1l bnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnIiKSk7Cit9CisKKy8vIFdl IG5lZWQgdG8gcnVuIHRlc3RzIGFmdGVyIHRoZSBmb250IGRvd25sb2FkaW5nIHN1Y2NlZWRlZCBv ciBmYWlsZWQuCisvLyBVc2luZyBhIHRpbWVyIGlzIG5vdCBpZGVhbCwgYnV0IHRoZXJlIHNlZW1z IHRvIGJlIG5vIGJldHRlciBvcHRpb25zLgord2luZG93LnNldFRpbWVvdXQodGVzdCwgMTAwKTsK KwordmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3Jj PSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwv aHRtbD4KKwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCBiNmIwMTNiNjg0N2E5MjZjNzgzMWNhMjU0ZDMzN2YyOTQ3ZWZjNTliLi42ZTRlMjYz ZTEwNjllYzk3MjUxMDFjZTZiMDQ4NTMxNTNlMzg5ZTE4IDEwMDY0NAotLS0gYS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEwLTA3 LTE1ICBZdXpvIEZ1amlzaGltYSAgPHl1em9AZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZm9yIEJ1ZyA0MjM0MiAtIEZvbnQg ZG93bmxvYWQgZXJyb3IgZm9yIGFuIEBmb250LWZhY2UgcnVsZSBpbnZhbGlkYXRlcyBvdGhlciBA Zm9udC1mYWNlIHJ1bGVzIGZvciB0aGUgc2FtZSBmb250LWZhbWlseQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDIzNDIKKworICAgICAgICBUZXN0OiBm YXN0L2Nzcy9mb250LWZhY2UtZG93bmxvYWQtZXJyb3IuaHRtbAorCisgICAgICAgICogY3NzL0NT U1NlZ21lbnRlZEZvbnRGYWNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1NlZ21lbnRlZEZv bnRGYWNlOjppc1ZhbGlkKTogVmFsaWQgaWYgYXQgbGVhc3Qgb25lIGZvbnQKKyAgICAgICAgZmFj ZSBpcyB2YWxpZC4KKyAgICAgICAgKFdlYkNvcmU6OkNTU1NlZ21lbnRlZEZvbnRGYWNlOjpnZXRG b250RGF0YSk6IENoZWNrIHZhbGlkaXR5IGZvciBlYWNoCisgICAgICAgIGZvbnQgZmFjZS4KKyAg ICAgICAgKiBjc3MvQ1NTU2VnbWVudGVkRm9udEZhY2UuaDogTWFrZSBpc1ZhbGlkIHByaXZhdGUu CisKIDIwMTAtMDctMTkgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNvbT4KIAog ICAgICAgICBCdWlsZCBmaXguCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nzcy9DU1NTZWdtZW50ZWRG b250RmFjZS5jcHAgYi9XZWJDb3JlL2Nzcy9DU1NTZWdtZW50ZWRGb250RmFjZS5jcHAKaW5kZXgg MDc1ZDg4MTcwOGUzMjZjOTVlMTcwMTg5NzgwNjE3YzgwZGY2MzQyZi4uYmRhMjlmMDMwOGY5MDAz MjgyZWI0MzUxNWJkN2RhMGQ0ODIwYjgzOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9jc3MvQ1NTU2Vn bWVudGVkRm9udEZhY2UuY3BwCisrKyBiL1dlYkNvcmUvY3NzL0NTU1NlZ21lbnRlZEZvbnRGYWNl LmNwcApAQCAtNjEsMTIgKzYxLDEzIEBAIHZvaWQgQ1NTU2VnbWVudGVkRm9udEZhY2U6OnBydW5l VGFibGUoKQogCiBib29sIENTU1NlZ21lbnRlZEZvbnRGYWNlOjppc1ZhbGlkKCkgY29uc3QKIHsK KyAgICAvLyBWYWxpZCBpZiBhdCBsZWFzdCBvbmUgZm9udCBmYWNlIGlzIHZhbGlkLgogICAgIHVu c2lnbmVkIHNpemUgPSBtX2ZvbnRGYWNlcy5zaXplKCk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0g MDsgaSA8IHNpemU7IGkrKykgewotICAgICAgICBpZiAoIW1fZm9udEZhY2VzW2ldLT5pc1ZhbGlk KCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmIChtX2ZvbnRGYWNlc1tp XS0+aXNWYWxpZCgpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQotICAgIHJldHVy biB0cnVlOworICAgIHJldHVybiBmYWxzZTsKIH0KIAogdm9pZCBDU1NTZWdtZW50ZWRGb250RmFj ZTo6Zm9udExvYWRlZChDU1NGb250RmFjZSopCkBAIC05Nyw2ICs5OCw4IEBAIEZvbnREYXRhKiBD U1NTZWdtZW50ZWRGb250RmFjZTo6Z2V0Rm9udERhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBm b250RGVzY3JpcHRpCiAKICAgICB1bnNpZ25lZCBzaXplID0gbV9mb250RmFjZXMuc2l6ZSgpOwog ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzaXplOyBpKyspIHsKKyAgICAgICAgaWYgKCFt X2ZvbnRGYWNlc1tpXS0+aXNWYWxpZCgpKQorICAgICAgICAgICAgY29udGludWU7CiAgICAgICAg IEZvbnRUcmFpdHNNYXNrIHRyYWl0c01hc2sgPSBtX2ZvbnRGYWNlc1tpXS0+dHJhaXRzTWFzaygp OwogICAgICAgICBib29sIHN5bnRoZXRpY0JvbGQgPSAhKHRyYWl0c01hc2sgJiAoRm9udFdlaWdo dDYwME1hc2sgfCBGb250V2VpZ2h0NzAwTWFzayB8IEZvbnRXZWlnaHQ4MDBNYXNrIHwgRm9udFdl aWdodDkwME1hc2spKSAmJiAoZGVzaXJlZFRyYWl0c01hc2sgJiAoRm9udFdlaWdodDYwME1hc2sg fCBGb250V2VpZ2h0NzAwTWFzayB8IEZvbnRXZWlnaHQ4MDBNYXNrIHwgRm9udFdlaWdodDkwME1h c2spKTsKICAgICAgICAgYm9vbCBzeW50aGV0aWNJdGFsaWMgPSAhKHRyYWl0c01hc2sgJiBGb250 U3R5bGVJdGFsaWNNYXNrKSAmJiAoZGVzaXJlZFRyYWl0c01hc2sgJiBGb250U3R5bGVJdGFsaWNN YXNrKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvY3NzL0NTU1NlZ21lbnRlZEZvbnRGYWNlLmggYi9X ZWJDb3JlL2Nzcy9DU1NTZWdtZW50ZWRGb250RmFjZS5oCmluZGV4IGQ0NGRkYmFmOWUzNzgwMGIw NDA2OTJiN2U1OWMxMjM0NzA5NTQ1YWQuLjAzZWJlNGFhYjMxZjhkZTgxYjBmNjY2Mzk1ZmU3MDg2 MjUxZTliMTYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvY3NzL0NTU1NlZ21lbnRlZEZvbnRGYWNlLmgK KysrIGIvV2ViQ29yZS9jc3MvQ1NTU2VnbWVudGVkRm9udEZhY2UuaApAQCAtNDUsNyArNDUsNiBA QCBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8Q1NTU2VnbWVudGVkRm9udEZhY2U+IGNy ZWF0ZShDU1NGb250U2VsZWN0b3IqIHNlbGVjdG9yKSB7IHJldHVybiBhZG9wdFJlZihuZXcgQ1NT U2VnbWVudGVkRm9udEZhY2Uoc2VsZWN0b3IpKTsgfQogICAgIH5DU1NTZWdtZW50ZWRGb250RmFj ZSgpOwogCi0gICAgYm9vbCBpc1ZhbGlkKCkgY29uc3Q7CiAgICAgQ1NTRm9udFNlbGVjdG9yKiBm b250U2VsZWN0b3IoKSBjb25zdCB7IHJldHVybiBtX2ZvbnRTZWxlY3RvcjsgfQogCiAgICAgdm9p ZCBmb250TG9hZGVkKENTU0ZvbnRGYWNlKik7CkBAIC01OCw2ICs1Nyw3IEBAIHByaXZhdGU6CiAg ICAgQ1NTU2VnbWVudGVkRm9udEZhY2UoQ1NTRm9udFNlbGVjdG9yKik7CiAKICAgICB2b2lkIHBy dW5lVGFibGUoKTsKKyAgICBib29sIGlzVmFsaWQoKSBjb25zdDsKIAogICAgIENTU0ZvbnRTZWxl Y3RvciogbV9mb250U2VsZWN0b3I7CiAgICAgSGFzaE1hcDx1bnNpZ25lZCwgU2VnbWVudGVkRm9u dERhdGEqPiBtX2ZvbnREYXRhVGFibGU7Cg==