26183 2009-06-03 22:02:37 -0700 [@font-face] font-family descriptor with multiple names should be discarded 2011-01-05 01:35:48 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED http://devfiles.myopera.com/articles/695/webfonts.html P2 Normal --- 0 phiw2 yuzo commit-queue simon.fraser webkit.review.bot yuzo oldest_to_newest 124272 0 phiw2 2009-06-03 22:02:37 -0700 The linked page specifies an @font-face rule as: @font-face { font-family :'myfont', serif; src: 'myfont.ttf'; } p {font-family: 'myfont'; } http://dev.w3.org/csswg/css3-fonts/#font-family0 (latest editor draft) specifies font-family in a @font-face rule as Value: <family-name> only one <family-name> is allowed. On the testcase: Actual result: the font specified in the @font-face rule is used Expected: the default font is used. Gecko (INVALID) bug: https://bugzilla.mozilla.org/show_bug.cgi?id=496128 see the last two comments there. Opera 10b also suffers from the same issue. 280568 1 67890 yuzo 2010-09-17 00:57:02 -0700 Created attachment 67890 Patch 280572 2 67890 mitz 2010-09-17 01:29:45 -0700 Comment on attachment 67890 Patch Seems like this would break tests that use platform/win/css2.1/resources/Mac-compatible-font-fallback.css. 282108 3 68190 yuzo 2010-09-20 23:11:37 -0700 Created attachment 68190 Patch 282111 4 yuzo 2010-09-20 23:18:50 -0700 Thank you for the review. (In reply to comment #2) > (From update of attachment 67890 [details]) > Seems like this would break tests that use platform/win/css2.1/resources/Mac-compatible-font-fallback.css. Rewrote the rules not to specify multiple families. I didn't test it locally because running layout tests on Windows requires non-free font manipulation tool(s) as far as I can tell from http://trac.webkit.org/wiki/BuildingOnWindows I did search the files under LayoutTests and confirmed that I don't need to change other files. 301616 5 yuzo 2010-10-29 00:12:55 -0700 Ping? 312221 6 yuzo 2010-11-21 22:21:06 -0800 Ping again? 312473 7 ap 2010-11-22 12:58:14 -0800 Did you find a way to run regression tests? 316899 8 68190 eric 2010-12-03 10:53:37 -0800 Comment on attachment 68190 Patch Seems reasonable to me. The cq will run layout tests if that was the above concern? I'll set r+ and someone else can set cq+ to have the tests run and landed. 317428 9 68190 commit-queue 2010-12-05 18:19:00 -0800 Comment on attachment 68190 Patch Rejecting patch 68190 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=abarth-cq-sl', 'apply-attachment', '--force-clean', '--non-interactive', 68190]" exit_code: 2 Last 500 characters of output: escriptor.html patching file LayoutTests/platform/win/css2.1/resources/Mac-compatible-font-fallback.css patching file WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebCore/css/CSSParser.cpp Hunk #1 FAILED at 5493. Hunk #2 succeeded at 5573 (offset 73 lines). 1 out of 2 hunks FAILED -- saving rejects to file WebCore/css/CSSParser.cpp.rej Failed to run "[u'/Users/abarth/git/webkit-queue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Eric Seidel', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/6776048 317476 10 75655 yuzo 2010-12-06 00:37:09 -0800 Created attachment 75655 Resolve merge conflict 317493 11 75655 commit-queue 2010-12-06 01:35:14 -0800 Comment on attachment 75655 Resolve merge conflict Rejecting patch 75655 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=eseidel-cq-sl', 'land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 75655]" exit_code: 1 Last 500 characters of output: 75655&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=26183&ctype=xml Processing 1 patch from 1 bug. Cleaning working directory Updating working directory Processing patch 75655 from bug 26183. NOBODY (OOPS!) found in /Projects/CommitQueue/LayoutTests/ChangeLog does not appear to be a valid reviewer according to committers.py. ERROR: /Projects/CommitQueue/LayoutTests/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/6748071 317503 12 yuzo 2010-12-06 02:30:45 -0800 Update the patch to resolve merge conflict. Can you review again? 319956 13 75655 eric 2010-12-09 23:36:53 -0800 Comment on attachment 75655 Resolve merge conflict OK. 320029 14 75655 commit-queue 2010-12-10 01:58:24 -0800 Comment on attachment 75655 Resolve merge conflict Rejecting patch 75655 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=eseidel-sf', 'build', '--no-clean', '--no-update', '--build-style=both']" exit_code: 2 Last 500 characters of output: env YACC /Developer/usr/bin/yacc /bin/sh -c /Projects/CommitQueue/WebKitBuild/WebCore.build/Debug/WebCore.build/Script-5DF50887116F3077005202AB.sh ** BUILD FAILED ** The following build commands failed: WebCore: CompileC /Projects/CommitQueue/WebKitBuild/WebCore.build/Debug/WebCore.build/Objects-normal/x86_64/DOMSVGAnimatedInteger.o /Projects/CommitQueue/WebKitBuild/Debug/DerivedSources/WebCore/DOMSVGAnimatedInteger.mm normal x86_64 objective-c++ com.apple.compilers.gcc.4_2 (1 failure) Full output: http://queues.webkit.org/results/7025005 321752 15 68190 eric 2010-12-14 01:24:42 -0800 Comment on attachment 68190 Patch Cleared Eric Seidel's review+ from obsolete attachment 68190 so that this bug does not appear in http://webkit.org/pending-commit. 324824 16 75655 eric 2010-12-20 22:47:45 -0800 Comment on attachment 75655 Resolve merge conflict Looks like a cq flake. 324864 17 75655 commit-queue 2010-12-20 23:30:24 -0800 Comment on attachment 75655 Resolve merge conflict Clearing flags on attachment: 75655 Committed r74401: <http://trac.webkit.org/changeset/74401> 324865 18 commit-queue 2010-12-20 23:30:32 -0800 All reviewed patches have been landed. Closing bug. 324866 19 simon.fraser 2010-12-20 23:33:40 -0800 Have you tested against the relevant tests in the CSS 2.1 test suite? <http://test.csswg.org/suites/css2.1/20100917/> 329484 20 yuzo 2011-01-05 01:35:48 -0800 (In reply to comment #19) > Have you tested against the relevant tests in the CSS 2.1 test suite? <http://test.csswg.org/suites/css2.1/20100917/> No. I don't see any tests that are very relevant to this patch there. Comma-separated font-family "properties" (not "descriptor") seem to be working, as in http://test.csswg.org/suites/css2.1/20100917/html4/c522-font-family-000.htm . Any specific tests you are interested in testing? 67890 2010-09-17 00:57:02 -0700 2010-09-20 23:11:32 -0700 Patch bug-26183-20100917005700.patch text/plain 5889 yuzo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4NzI4MTQ5NzRlMjQxN2UyYzVlOGY2ZjFmZTk1MGYxMmJjOWRkOGM5Li45NjIwZDNm ZmQ4NDMzN2UxMjRjOWM0Nzk5MzEyYmRkOGFkNzkzMmU5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDktMTcgIFl1em8gRnVqaXNoaW1hICA8eXV6b0Bnb29nbGUuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBmb3IgQnVnIDI2MTgz IC0gW0Bmb250LWZhY2VdIGZvbnQtZmFtaWx5IGRlc2NyaXB0b3Igd2l0aCBtdWx0aXBsZSBuYW1l cyBzaG91bGQgYmUgZGlzY2FyZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yNjE4MworCisgICAgICAgICogZmFzdC9jc3MvZm9udC1mYWNlLWZvbnQt ZmFtaWx5LWRlc2NyaXB0b3ItZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nz cy9mb250LWZhY2UtZm9udC1mYW1pbHktZGVzY3JpcHRvci5odG1sOiBBZGRlZC4KKwogMjAxMC0w OS0xNSAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgS2VudCBUYW11cmEuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9m b250LWZhY2UtZm9udC1mYW1pbHktZGVzY3JpcHRvci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9mYXN0L2Nzcy9mb250LWZhY2UtZm9udC1mYW1pbHktZGVzY3JpcHRvci1leHBlY3RlZC50eHQK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uOGE4OTc5MDk0N2EwMDhlNTY4Y2Y1NTdkNmJiNjZmY2RmZDFlNGY0YgotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2ZvbnQtZmFjZS1mb250LWZhbWls eS1kZXNjcmlwdG9yLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDE2IEBACitmb250LWZhbWlseSBk ZXNjcmlwdG9yIGluIEBmb250LWZhY2UgcnVsZSBjYW4gdGFrZSBvbmx5IG9uZSBmYW1pbHkuIEhl bmNlIHRoZSBAZm9udC1mYWNlIHJ1bGUgaW4gdGhpcyB0ZXN0IG11c3QgYmUgaWdub3JlZC4KKwor T24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9s bG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCitUZXN0OgorVGV4dCBpaWkKK011c3QgbWF0Y2g6 CitUZXh0IGlpaQorTXVzdCBub3QgbWF0Y2g6CitUZXh0IGlpaQorUEFTUyBzdWNjZXNzZnVsbHlQ YXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCd0ZXN0VGV4dCcpLm9mZnNldFdpZHRoID09IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdt dXN0TWF0Y2gnKS5vZmZzZXRXaWR0aCBpcyB0cnVlCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCd0ZXN0VGV4dCcpLm9mZnNldFdpZHRoICE9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdt dXN0Tm90TWF0Y2gnKS5vZmZzZXRXaWR0aCBpcyB0cnVlCisKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvY3NzL2ZvbnQtZmFjZS1mb250LWZhbWlseS1kZXNjcmlwdG9yLmh0bWwgYi9MYXlv dXRUZXN0cy9mYXN0L2Nzcy9mb250LWZhY2UtZm9udC1mYW1pbHktZGVzY3JpcHRvci5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLjNhYmI3OWI0MjlhODc1YzQxMDg4MWQ5NzBiMzkwNTQ2NTdhZDU4MzEKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9mb250LWZhY2UtZm9udC1mYW1pbHkt ZGVzY3JpcHRvci5odG1sCkBAIC0wLDAgKzEsNDUgQEAKKzwhZG9jdHlwZSBodG1sPgorPGh0bWw+ Cis8aGVhZD4KKzx0aXRsZT5UZXN0IGZvciBCdWcgMjYxODMgLSBbQGZvbnQtZmFjZV0gZm9udC1m YW1pbHkgZGVzY3JpcHRvciB3aXRoIG11bHRpcGxlIG5hbWVzIHNob3VsZCBiZSBkaXNjYXJkZWQ8 L3RpdGxlPgorPHN0eWxlPgorLnRlc3R0ZXh0IHsKKyAgICBmb250LXNpemU6IDY0cHg7CisgICAg Zm9udC1mYW1pbHk6IEFyaWFsOworICAgIGJvcmRlcjogc29saWQgMXB4OworfQorQGZvbnQtZmFj ZSB7CisgICAgZm9udC1mYW1pbHk6IG15Zm9udDEsIG15Zm9udDI7CisgICAgc3JjOiBsb2NhbChD b3VyaWVyKTsKK30KKzwvc3R5bGU+Cis8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uL2pz L3Jlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyIvPgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291 cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InRl c3QoKSI+Cis8ZGl2IGlkPSJkZXNjcmlwdGlvbiI+PC9kaXY+CitUZXN0Ojxici8+Cis8c3BhbiBp ZD0idGVzdFRleHQiIGNsYXNzPSJ0ZXN0dGV4dCIgc3R5bGU9ImZvbnQtZmFtaWx5OiBteWZvbnQx LCBBcmlhbCI+VGV4dCBpaWk8L3NwYW4+PGJyLz4KK011c3QgbWF0Y2g6PGJyLz4KKzxzcGFuIGlk PSJtdXN0TWF0Y2giIGNsYXNzPSJ0ZXN0dGV4dCIgc3R5bGU9ImZvbnQtZmFtaWx5OiBBcmlhbCI+ VGV4dCBpaWk8L3NwYW4+PGJyLz4KK011c3Qgbm90IG1hdGNoOjxici8+Cis8c3BhbiBpZD0ibXVz dE5vdE1hdGNoIiBjbGFzcz0idGVzdHRleHQiIHN0eWxlPSJmb250LWZhbWlseTogQ291cmllciI+ VGV4dCBpaWk8L3NwYW4+PGJyLz4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdD4K K2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgd2luZG93LmxheW91dFRlc3RD b250cm9sbGVyLmR1bXBBc1RleHQoKTsKKworZGVzY3JpcHRpb24oImZvbnQtZmFtaWx5IGRlc2Ny aXB0b3IgaW4gQGZvbnQtZmFjZSBydWxlIGNhbiB0YWtlIG9ubHkgb25lIGZhbWlseS4gSGVuY2Ug dGhlIEBmb250LWZhY2UgcnVsZSBpbiB0aGlzIHRlc3QgbXVzdCBiZSBpZ25vcmVkLiIpOworCitm dW5jdGlvbiB0ZXN0KCkKK3sKKyAgICBzaG91bGRCZVRydWUoImRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCd0ZXN0VGV4dCcpLm9mZnNldFdpZHRoID09IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdt dXN0TWF0Y2gnKS5vZmZzZXRXaWR0aCIpOworICAgIHNob3VsZEJlVHJ1ZSgiZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoJ3Rlc3RUZXh0Jykub2Zmc2V0V2lkdGggIT0gZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoJ211c3ROb3RNYXRjaCcpLm9mZnNldFdpZHRoIik7Cit9CisKK3ZhciBzdWNjZXNzZnVs bHlQYXJzZWQgPSB0cnVlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2Vz L2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CisKZGlmZiAtLWdp dCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDMzYWNlNzE5 OGM1NzhlODVhMzhjMTRhN2QyZTg1MmU1YjFhNDkwMi4uODFhYWIyZGJhYjVjNzNkZjMwMzAyNWFh MjEwNDA4NDg3ZjU1ZmJiNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wOS0xNyAgWXV6byBGdWppc2hp bWEgIDx5dXpvQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRml4IGZvciBCdWcgMjYxODMgLSBbQGZvbnQtZmFjZV0gZm9udC1mYW1p bHkgZGVzY3JpcHRvciB3aXRoIG11bHRpcGxlIG5hbWVzIHNob3VsZCBiZSBkaXNjYXJkZWQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2MTgzCisKKyAg ICAgICAgVGVzdDogZmFzdC9jc3MvZm9udC1mYWNlLWZvbnQtZmFtaWx5LWRlc2NyaXB0b3IuaHRt bAorCisgICAgICAgICogY3NzL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQ YXJzZXI6OmNyZWF0ZUZvbnRGYWNlUnVsZSk6IENvbnNpZGVyIEBmb250LWZhY2UgcnVsZQorICAg ICAgICBpbnZhbGlkIGlmIGl0cyBmb250LWZhbWlseSBkZXNjcmlwdG9yIGhhcyBtdWx0aXBsZSAo b3IgemVybykgZmFtaWxpZXMuCisKIDIwMTAtMDktMTUgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1h bkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAgYi9XZWJDb3JlL2Nzcy9DU1NQ YXJzZXIuY3BwCmluZGV4IDdjMzU3MzllOWY0YjY4MWE3NTBjZWNmMDFmNzU4OTU1YWFhYWIyNGEu LjViZjkxMzY2ODQ1MDRhYzA4ZGYzNDRjNDQ4Y2EzZmJhNGQ5ZjI0NzAgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKKysrIGIvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcApA QCAtNTQyNyw3ICs1NDI3LDYgQEAgQ1NTUnVsZSogQ1NTUGFyc2VyOjpjcmVhdGVTdHlsZVJ1bGUo VmVjdG9yPENTU1NlbGVjdG9yKj4qIHNlbGVjdG9ycykKIENTU1J1bGUqIENTU1BhcnNlcjo6Y3Jl YXRlRm9udEZhY2VSdWxlKCkKIHsKICAgICBtX2FsbG93SW1wb3J0UnVsZXMgPSBtX2FsbG93TmFt ZXNwYWNlRGVjbGFyYXRpb25zID0gbV9hbGxvd1ZhcmlhYmxlc1J1bGVzID0gZmFsc2U7Ci0gICAg UmVmUHRyPENTU0ZvbnRGYWNlUnVsZT4gcnVsZSA9IENTU0ZvbnRGYWNlUnVsZTo6Y3JlYXRlKG1f c3R5bGVTaGVldCk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fbnVtUGFyc2VkUHJv cGVydGllczsgKytpKSB7CiAgICAgICAgIENTU1Byb3BlcnR5KiBwcm9wZXJ0eSA9IG1fcGFyc2Vk UHJvcGVydGllc1tpXTsKICAgICAgICAgaW50IGlkID0gcHJvcGVydHktPmlkKCk7CkBAIC01NDM1 LDggKzU0MzQsMTQgQEAgQ1NTUnVsZSogQ1NTUGFyc2VyOjpjcmVhdGVGb250RmFjZVJ1bGUoKQog ICAgICAgICAgICAgUmVmUHRyPENTU1ZhbHVlPiB2YWx1ZSA9IHByb3BlcnR5LT5tX3ZhbHVlLnJl bGVhc2UoKTsKICAgICAgICAgICAgIHByb3BlcnR5LT5tX3ZhbHVlID0gQ1NTVmFsdWVMaXN0Ojpj cmVhdGVDb21tYVNlcGFyYXRlZCgpOwogICAgICAgICAgICAgc3RhdGljX2Nhc3Q8Q1NTVmFsdWVM aXN0Kj4ocHJvcGVydHktPm1fdmFsdWUuZ2V0KCkpLT5hcHBlbmQodmFsdWUucmVsZWFzZSgpKTsK KyAgICAgICAgfSBlbHNlIGlmIChpZCA9PSBDU1NQcm9wZXJ0eUZvbnRGYW1pbHkgJiYgc3RhdGlj X2Nhc3Q8Q1NTVmFsdWVMaXN0Kj4ocHJvcGVydHktPm1fdmFsdWUuZ2V0KCkpLT5sZW5ndGgoKSAh PSAxKSB7CisgICAgICAgICAgICAvLyBVbmxpa2UgZm9udC1mYW1pbHkgcHJvcGVydHksIGZvbnQt ZmFtaWx5IGRlc2NyaXB0b3IgaW4gQGZvbnQtZmFjZSBydWxlIGNhbiB0YWtlIG9ubHkgb25lIGZh bWlseSBuYW1lLgorICAgICAgICAgICAgLy8gU2VlIGh0dHA6Ly9kZXYudzMub3JnL2Nzc3dnL2Nz czMtZm9udHMvI2ZvbnQtZmFtaWx5LWRlc2MKKyAgICAgICAgICAgIGNsZWFyUHJvcGVydGllcygp OworICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgIH0KICAgICB9CisgICAgUmVmUHRyPENT U0ZvbnRGYWNlUnVsZT4gcnVsZSA9IENTU0ZvbnRGYWNlUnVsZTo6Y3JlYXRlKG1fc3R5bGVTaGVl dCk7CiAgICAgcnVsZS0+c2V0RGVjbGFyYXRpb24oQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246 OmNyZWF0ZShydWxlLmdldCgpLCBtX3BhcnNlZFByb3BlcnRpZXMsIG1fbnVtUGFyc2VkUHJvcGVy dGllcykpOwogICAgIGNsZWFyUHJvcGVydGllcygpOwogICAgIENTU0ZvbnRGYWNlUnVsZSogcmVz dWx0ID0gcnVsZS5nZXQoKTsK 68190 2010-09-20 23:11:37 -0700 2010-12-14 01:24:42 -0800 Patch bug-26183-20100920231135.patch text/plain 7153 yuzo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlNmMwZmQzYTg3YmM4NTdiNDJjOWQ4NDhlN2M4MWFhZDhjZmY2NDM0Li44ZDUxMDMy M2JjYTk3YzZiMmY1NGYxZjUzZmMxOWI1ODlmMDE4Mzk1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMDktMjAgIFl1em8gRnVqaXNoaW1hICA8eXV6b0Bnb29nbGUuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBmb3IgQnVnIDI2MTgz IC0gW0Bmb250LWZhY2VdIGZvbnQtZmFtaWx5IGRlc2NyaXB0b3Igd2l0aCBtdWx0aXBsZSBuYW1l cyBzaG91bGQgYmUgZGlzY2FyZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yNjE4MworCisgICAgICAgICogZmFzdC9jc3MvZm9udC1mYWNlLWZvbnQt ZmFtaWx5LWRlc2NyaXB0b3ItZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nz cy9mb250LWZhY2UtZm9udC1mYW1pbHktZGVzY3JpcHRvci5odG1sOiBBZGRlZC4KKyAgICAgICAg KiBwbGF0Zm9ybS93aW4vY3NzMi4xL3Jlc291cmNlcy9NYWMtY29tcGF0aWJsZS1mb250LWZhbGxi YWNrLmNzczoKKyAgICAgICAgKEBmb250LWZhY2UpOiBSZXdyb3RlIEBmb250LWZhY2UgcnVsZXMg dGhhdCBzcGVjaWZ5IG11bHRpcGxlIGZvbnQgZmFtaWxpZXMuCisKIDIwMTAtMDktMjAgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2ZvbnQtZmFj ZS1mb250LWZhbWlseS1kZXNjcmlwdG9yLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3Qv Y3NzL2ZvbnQtZmFjZS1mb250LWZhbWlseS1kZXNjcmlwdG9yLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi44YTg5NzkwOTQ3YTAwOGU1NjhjZjU1N2Q2YmI2NmZjZGZkMWU0ZjRiCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZm9udC1mYWNlLWZvbnQtZmFtaWx5LWRlc2Ny aXB0b3ItZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTYgQEAKK2ZvbnQtZmFtaWx5IGRlc2NyaXB0 b3IgaW4gQGZvbnQtZmFjZSBydWxlIGNhbiB0YWtlIG9ubHkgb25lIGZhbWlseS4gSGVuY2UgdGhl IEBmb250LWZhY2UgcnVsZSBpbiB0aGlzIHRlc3QgbXVzdCBiZSBpZ25vcmVkLgorCitPbiBzdWNj ZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBi eSAiVEVTVCBDT01QTEVURSIuCisKK1Rlc3Q6CitUZXh0IGlpaQorTXVzdCBtYXRjaDoKK1RleHQg aWlpCitNdXN0IG5vdCBtYXRjaDoKK1RleHQgaWlpCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBp cyB0cnVlCisKK1RFU1QgQ09NUExFVEUKK1BBU1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rl c3RUZXh0Jykub2Zmc2V0V2lkdGggPT0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ211c3RNYXRj aCcpLm9mZnNldFdpZHRoIGlzIHRydWUKK1BBU1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rl c3RUZXh0Jykub2Zmc2V0V2lkdGggIT0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ211c3ROb3RN YXRjaCcpLm9mZnNldFdpZHRoIGlzIHRydWUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9jc3MvZm9udC1mYWNlLWZvbnQtZmFtaWx5LWRlc2NyaXB0b3IuaHRtbCBiL0xheW91dFRlc3Rz L2Zhc3QvY3NzL2ZvbnQtZmFjZS1mb250LWZhbWlseS1kZXNjcmlwdG9yLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uM2FiYjc5YjQyOWE4NzVjNDEwODgxZDk3MGIzOTA1NDY1N2FkNTgzMQotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2ZvbnQtZmFjZS1mb250LWZhbWlseS1kZXNjcmlw dG9yLmh0bWwKQEAgLTAsMCArMSw0NSBAQAorPCFkb2N0eXBlIGh0bWw+Cis8aHRtbD4KKzxoZWFk PgorPHRpdGxlPlRlc3QgZm9yIEJ1ZyAyNjE4MyAtIFtAZm9udC1mYWNlXSBmb250LWZhbWlseSBk ZXNjcmlwdG9yIHdpdGggbXVsdGlwbGUgbmFtZXMgc2hvdWxkIGJlIGRpc2NhcmRlZDwvdGl0bGU+ Cis8c3R5bGU+CisudGVzdHRleHQgeworICAgIGZvbnQtc2l6ZTogNjRweDsKKyAgICBmb250LWZh bWlseTogQXJpYWw7CisgICAgYm9yZGVyOiBzb2xpZCAxcHg7Cit9CitAZm9udC1mYWNlIHsKKyAg ICBmb250LWZhbWlseTogbXlmb250MSwgbXlmb250MjsKKyAgICBzcmM6IGxvY2FsKENvdXJpZXIp OworfQorPC9zdHlsZT4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vanMvcmVzb3Vy Y2VzL2pzLXRlc3Qtc3R5bGUuY3NzIi8+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pz LXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0idGVzdCgpIj4K KzxkaXYgaWQ9ImRlc2NyaXB0aW9uIj48L2Rpdj4KK1Rlc3Q6PGJyLz4KKzxzcGFuIGlkPSJ0ZXN0 VGV4dCIgY2xhc3M9InRlc3R0ZXh0IiBzdHlsZT0iZm9udC1mYW1pbHk6IG15Zm9udDEsIEFyaWFs Ij5UZXh0IGlpaTwvc3Bhbj48YnIvPgorTXVzdCBtYXRjaDo8YnIvPgorPHNwYW4gaWQ9Im11c3RN YXRjaCIgY2xhc3M9InRlc3R0ZXh0IiBzdHlsZT0iZm9udC1mYW1pbHk6IEFyaWFsIj5UZXh0IGlp aTwvc3Bhbj48YnIvPgorTXVzdCBub3QgbWF0Y2g6PGJyLz4KKzxzcGFuIGlkPSJtdXN0Tm90TWF0 Y2giIGNsYXNzPSJ0ZXN0dGV4dCIgc3R5bGU9ImZvbnQtZmFtaWx5OiBDb3VyaWVyIj5UZXh0IGlp aTwvc3Bhbj48YnIvPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0PgoraWYgKHdp bmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICB3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xs ZXIuZHVtcEFzVGV4dCgpOworCitkZXNjcmlwdGlvbigiZm9udC1mYW1pbHkgZGVzY3JpcHRvciBp biBAZm9udC1mYWNlIHJ1bGUgY2FuIHRha2Ugb25seSBvbmUgZmFtaWx5LiBIZW5jZSB0aGUgQGZv bnQtZmFjZSBydWxlIGluIHRoaXMgdGVzdCBtdXN0IGJlIGlnbm9yZWQuIik7CisKK2Z1bmN0aW9u IHRlc3QoKQoreworICAgIHNob3VsZEJlVHJ1ZSgiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rl c3RUZXh0Jykub2Zmc2V0V2lkdGggPT0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ211c3RNYXRj aCcpLm9mZnNldFdpZHRoIik7CisgICAgc2hvdWxkQmVUcnVlKCJkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgndGVzdFRleHQnKS5vZmZzZXRXaWR0aCAhPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn bXVzdE5vdE1hdGNoJykub2Zmc2V0V2lkdGgiKTsKK30KKwordmFyIHN1Y2Nlc3NmdWxseVBhcnNl ZCA9IHRydWU7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVz dC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KKwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vd2luL2NzczIuMS9yZXNvdXJjZXMvTWFjLWNvbXBhdGlibGUtZm9u dC1mYWxsYmFjay5jc3MgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vY3NzMi4xL3Jlc291cmNl cy9NYWMtY29tcGF0aWJsZS1mb250LWZhbGxiYWNrLmNzcwppbmRleCAxODgyNzc2ODdhOTFjMzY0 YWQ5N2MyMDQ5N2ZjYTQ1OTFjZDlhNTVkLi5mNjI5NDkzM2IzNjNkNTYzY2I5YmUzM2ExY2I3YTNi NDM1MWU1YTkzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vY3NzMi4xL3Jl c291cmNlcy9NYWMtY29tcGF0aWJsZS1mb250LWZhbGxiYWNrLmNzcworKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS93aW4vY3NzMi4xL3Jlc291cmNlcy9NYWMtY29tcGF0aWJsZS1mb250LWZhbGxi YWNrLmNzcwpAQCAtOSwxMyArOSwyNSBAQAogICAgaGVhdnkgbm9ydGggZWFzdCBhcnJvdyAqLwog CiBAZm9udC1mYWNlIHsKLSAgICBmb250LWZhbWlseTogJ3RpbWVzJyAnLXdlYmtpdC1zZXJpZic7 CisgICAgZm9udC1mYW1pbHk6ICctd2Via2l0LXNlcmlmJzsKKyAgICBzcmM6IGxvY2FsKCdXZWJL aXQgTGF5b3V0IFRlc3RzJyk7CisgICAgdW5pY29kZS1yYW5nZTogVSsyNUZFLCBVKzI2MkYsIFUr Mjc5OC0yNzlBOworfQorCitAZm9udC1mYWNlIHsKKyAgICBmb250LWZhbWlseTogJy13ZWJraXQt c2VyaWYnOworICAgIHNyYzogbG9jYWwoJ1dlYktpdCBMYXlvdXQgVGVzdHMgMicpOworICAgIHVu aWNvZGUtcmFuZ2U6IFUrMjFFNi0yMUU5OworfQorCitAZm9udC1mYWNlIHsKKyAgICBmb250LWZh bWlseTogJ3RpbWVzJzsKICAgICBzcmM6IGxvY2FsKCdXZWJLaXQgTGF5b3V0IFRlc3RzJyk7CiAg ICAgdW5pY29kZS1yYW5nZTogVSsyNUZFLCBVKzI2MkYsIFUrMjc5OC0yNzlBOwogfQogCiBAZm9u dC1mYWNlIHsKLSAgICBmb250LWZhbWlseTogJ3RpbWVzJyAnLXdlYmtpdC1zZXJpZic7CisgICAg Zm9udC1mYW1pbHk6ICd0aW1lcyc7CiAgICAgc3JjOiBsb2NhbCgnV2ViS2l0IExheW91dCBUZXN0 cyAyJyk7CiAgICAgdW5pY29kZS1yYW5nZTogVSsyMUU2LTIxRTk7CiB9CmRpZmYgLS1naXQgYS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGQyMDRmY2ZkYTI3YjJm MGFhYWJlNTRhZTNjYzUzNWFhZjgwZmQxNjkuLjY5Nzk4NDE1YmM1OTFiZDc5ZDBhYTExNjMxYmM1 M2ZlNDUyZmM2OGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDktMjAgIFl1em8gRnVqaXNoaW1hICA8 eXV6b0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZpeCBmb3IgQnVnIDI2MTgzIC0gW0Bmb250LWZhY2VdIGZvbnQtZmFtaWx5IGRl c2NyaXB0b3Igd2l0aCBtdWx0aXBsZSBuYW1lcyBzaG91bGQgYmUgZGlzY2FyZGVkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjE4MworCisgICAgICAg IFRlc3Q6IGZhc3QvY3NzL2ZvbnQtZmFjZS1mb250LWZhbWlseS1kZXNjcmlwdG9yLmh0bWwKKwor ICAgICAgICAqIGNzcy9DU1NQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2Vy OjpjcmVhdGVGb250RmFjZVJ1bGUpOiBDb25zaWRlciBAZm9udC1mYWNlIHJ1bGUKKyAgICAgICAg aW52YWxpZCBpZiBpdHMgZm9udC1mYW1pbHkgZGVzY3JpcHRvciBoYXMgbXVsdGlwbGUgKG9yIHpl cm8pIGZhbWlsaWVzLgorCiAyMDEwLTA5LTIwICBNaWhhaSBQYXJwYXJpdGEgIDxtaWhhaXBAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQ7IGFuIGF0dGVtcHQgdG8gZml4IFdpbmRv d3MgYnVpbGQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwIGIvV2ViQ29y ZS9jc3MvQ1NTUGFyc2VyLmNwcAppbmRleCA4NmJjZDBkMGRlMDgxMzIwYmFkZDY2MzA1ZDAwYmZj MjQwZThlOWI5Li42NzIwOTBhOTZjY2U4YTNjMmQ0MzMwNzIyZTg1MzdmYTk1Y2IzMzljIDEwMDY0 NAotLS0gYS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCisrKyBiL1dlYkNvcmUvY3NzL0NTU1Bh cnNlci5jcHAKQEAgLTU0OTMsNyArNTQ5Myw2IEBAIENTU1J1bGUqIENTU1BhcnNlcjo6Y3JlYXRl U3R5bGVSdWxlKFZlY3RvcjxDU1NTZWxlY3Rvcio+KiBzZWxlY3RvcnMpCiBDU1NSdWxlKiBDU1NQ YXJzZXI6OmNyZWF0ZUZvbnRGYWNlUnVsZSgpCiB7CiAgICAgbV9hbGxvd0ltcG9ydFJ1bGVzID0g bV9hbGxvd05hbWVzcGFjZURlY2xhcmF0aW9ucyA9IG1fYWxsb3dWYXJpYWJsZXNSdWxlcyA9IGZh bHNlOwotICAgIFJlZlB0cjxDU1NGb250RmFjZVJ1bGU+IHJ1bGUgPSBDU1NGb250RmFjZVJ1bGU6 OmNyZWF0ZShtX3N0eWxlU2hlZXQpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX251 bVBhcnNlZFByb3BlcnRpZXM7ICsraSkgewogICAgICAgICBDU1NQcm9wZXJ0eSogcHJvcGVydHkg PSBtX3BhcnNlZFByb3BlcnRpZXNbaV07CiAgICAgICAgIGludCBpZCA9IHByb3BlcnR5LT5pZCgp OwpAQCAtNTUwMSw4ICs1NTAwLDE0IEBAIENTU1J1bGUqIENTU1BhcnNlcjo6Y3JlYXRlRm9udEZh Y2VSdWxlKCkKICAgICAgICAgICAgIFJlZlB0cjxDU1NWYWx1ZT4gdmFsdWUgPSBwcm9wZXJ0eS0+ bV92YWx1ZS5yZWxlYXNlKCk7CiAgICAgICAgICAgICBwcm9wZXJ0eS0+bV92YWx1ZSA9IENTU1Zh bHVlTGlzdDo6Y3JlYXRlQ29tbWFTZXBhcmF0ZWQoKTsKICAgICAgICAgICAgIHN0YXRpY19jYXN0 PENTU1ZhbHVlTGlzdCo+KHByb3BlcnR5LT5tX3ZhbHVlLmdldCgpKS0+YXBwZW5kKHZhbHVlLnJl bGVhc2UoKSk7CisgICAgICAgIH0gZWxzZSBpZiAoaWQgPT0gQ1NTUHJvcGVydHlGb250RmFtaWx5 ICYmIHN0YXRpY19jYXN0PENTU1ZhbHVlTGlzdCo+KHByb3BlcnR5LT5tX3ZhbHVlLmdldCgpKS0+ bGVuZ3RoKCkgIT0gMSkgeworICAgICAgICAgICAgLy8gVW5saWtlIGZvbnQtZmFtaWx5IHByb3Bl cnR5LCBmb250LWZhbWlseSBkZXNjcmlwdG9yIGluIEBmb250LWZhY2UgcnVsZSBjYW4gdGFrZSBv bmx5IG9uZSBmYW1pbHkgbmFtZS4KKyAgICAgICAgICAgIC8vIFNlZSBodHRwOi8vZGV2LnczLm9y Zy9jc3N3Zy9jc3MzLWZvbnRzLyNmb250LWZhbWlseS1kZXNjCisgICAgICAgICAgICBjbGVhclBy b3BlcnRpZXMoKTsKKyAgICAgICAgICAgIHJldHVybiAwOwogICAgICAgICB9CiAgICAgfQorICAg IFJlZlB0cjxDU1NGb250RmFjZVJ1bGU+IHJ1bGUgPSBDU1NGb250RmFjZVJ1bGU6OmNyZWF0ZSht X3N0eWxlU2hlZXQpOwogICAgIHJ1bGUtPnNldERlY2xhcmF0aW9uKENTU011dGFibGVTdHlsZURl Y2xhcmF0aW9uOjpjcmVhdGUocnVsZS5nZXQoKSwgbV9wYXJzZWRQcm9wZXJ0aWVzLCBtX251bVBh cnNlZFByb3BlcnRpZXMpKTsKICAgICBjbGVhclByb3BlcnRpZXMoKTsKICAgICBDU1NGb250RmFj ZVJ1bGUqIHJlc3VsdCA9IHJ1bGUuZ2V0KCk7Cg== 75655 2010-12-06 00:37:09 -0800 2010-12-20 23:30:24 -0800 Resolve merge conflict bug-26183-20101206003707.patch text/plain 7116 yuzo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5ZGNjOGM2M2RiOWJjYWU4MWJlY2ZiNmNlZjc3NTQ3MGNkYzRkYTBiLi5jMTNjYTY0 ZTdkYTY0NDI1N2E0YjAxMGRjNGMzMjY4ZTVjOTMzNTViIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTItMDYgIFl1em8gRnVqaXNoaW1hICA8eXV6b0Bnb29nbGUuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBmb3IgQnVnIDI2MTgz IC0gW0Bmb250LWZhY2VdIGZvbnQtZmFtaWx5IGRlc2NyaXB0b3Igd2l0aCBtdWx0aXBsZSBuYW1l cyBzaG91bGQgYmUgZGlzY2FyZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yNjE4MworCisgICAgICAgICogZmFzdC9jc3MvZm9udC1mYWNlLWZvbnQt ZmFtaWx5LWRlc2NyaXB0b3ItZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nz cy9mb250LWZhY2UtZm9udC1mYW1pbHktZGVzY3JpcHRvci5odG1sOiBBZGRlZC4KKyAgICAgICAg KiBwbGF0Zm9ybS93aW4vY3NzMi4xL3Jlc291cmNlcy9NYWMtY29tcGF0aWJsZS1mb250LWZhbGxi YWNrLmNzczoKKyAgICAgICAgKEBmb250LWZhY2UpOiBSZXdyb3RlIEBmb250LWZhY2UgcnVsZXMg dGhhdCBzcGVjaWZ5IG11bHRpcGxlIGZvbnQgZmFtaWxpZXMuCisKIDIwMTAtMTItMDUgIFJvYiBC dWlzICA8cndsYnVpc0BnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTmlrb2xhcyBa aW1tZXJtYW5uLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZm9udC1mYWNlLWZv bnQtZmFtaWx5LWRlc2NyaXB0b3ItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mv Zm9udC1mYWNlLWZvbnQtZmFtaWx5LWRlc2NyaXB0b3ItZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LjhhODk3OTA5NDdhMDA4ZTU2OGNmNTU3ZDZiYjY2ZmNkZmQxZTRmNGIKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9mb250LWZhY2UtZm9udC1mYW1pbHktZGVzY3JpcHRv ci1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNiBAQAorZm9udC1mYW1pbHkgZGVzY3JpcHRvciBp biBAZm9udC1mYWNlIHJ1bGUgY2FuIHRha2Ugb25seSBvbmUgZmFtaWx5LiBIZW5jZSB0aGUgQGZv bnQtZmFjZSBydWxlIGluIHRoaXMgdGVzdCBtdXN0IGJlIGlnbm9yZWQuCisKK09uIHN1Y2Nlc3Ms IHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJU RVNUIENPTVBMRVRFIi4KKworVGVzdDoKK1RleHQgaWlpCitNdXN0IG1hdGNoOgorVGV4dCBpaWkK K011c3Qgbm90IG1hdGNoOgorVGV4dCBpaWkKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRy dWUKKworVEVTVCBDT01QTEVURQorUEFTUyBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdFRl eHQnKS5vZmZzZXRXaWR0aCA9PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnbXVzdE1hdGNoJyku b2Zmc2V0V2lkdGggaXMgdHJ1ZQorUEFTUyBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdFRl eHQnKS5vZmZzZXRXaWR0aCAhPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnbXVzdE5vdE1hdGNo Jykub2Zmc2V0V2lkdGggaXMgdHJ1ZQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nz cy9mb250LWZhY2UtZm9udC1mYW1pbHktZGVzY3JpcHRvci5odG1sIGIvTGF5b3V0VGVzdHMvZmFz dC9jc3MvZm9udC1mYWNlLWZvbnQtZmFtaWx5LWRlc2NyaXB0b3IuaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4z YWJiNzliNDI5YTg3NWM0MTA4ODFkOTcwYjM5MDU0NjU3YWQ1ODMxCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZm9udC1mYWNlLWZvbnQtZmFtaWx5LWRlc2NyaXB0b3Iu aHRtbApAQCAtMCwwICsxLDQ1IEBACis8IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8 dGl0bGU+VGVzdCBmb3IgQnVnIDI2MTgzIC0gW0Bmb250LWZhY2VdIGZvbnQtZmFtaWx5IGRlc2Ny aXB0b3Igd2l0aCBtdWx0aXBsZSBuYW1lcyBzaG91bGQgYmUgZGlzY2FyZGVkPC90aXRsZT4KKzxz dHlsZT4KKy50ZXN0dGV4dCB7CisgICAgZm9udC1zaXplOiA2NHB4OworICAgIGZvbnQtZmFtaWx5 OiBBcmlhbDsKKyAgICBib3JkZXI6IHNvbGlkIDFweDsKK30KK0Bmb250LWZhY2UgeworICAgIGZv bnQtZmFtaWx5OiBteWZvbnQxLCBteWZvbnQyOworICAgIHNyYzogbG9jYWwoQ291cmllcik7Cit9 Cis8L3N0eWxlPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi9qcy9yZXNvdXJjZXMv anMtdGVzdC1zdHlsZS5jc3MiLz4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVz dC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJ0ZXN0KCkiPgorPGRp diBpZD0iZGVzY3JpcHRpb24iPjwvZGl2PgorVGVzdDo8YnIvPgorPHNwYW4gaWQ9InRlc3RUZXh0 IiBjbGFzcz0idGVzdHRleHQiIHN0eWxlPSJmb250LWZhbWlseTogbXlmb250MSwgQXJpYWwiPlRl eHQgaWlpPC9zcGFuPjxici8+CitNdXN0IG1hdGNoOjxici8+Cis8c3BhbiBpZD0ibXVzdE1hdGNo IiBjbGFzcz0idGVzdHRleHQiIHN0eWxlPSJmb250LWZhbWlseTogQXJpYWwiPlRleHQgaWlpPC9z cGFuPjxici8+CitNdXN0IG5vdCBtYXRjaDo8YnIvPgorPHNwYW4gaWQ9Im11c3ROb3RNYXRjaCIg Y2xhc3M9InRlc3R0ZXh0IiBzdHlsZT0iZm9udC1mYW1pbHk6IENvdXJpZXIiPlRleHQgaWlpPC9z cGFuPjxici8+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQ+CitpZiAod2luZG93 LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgIHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlci5k dW1wQXNUZXh0KCk7CisKK2Rlc2NyaXB0aW9uKCJmb250LWZhbWlseSBkZXNjcmlwdG9yIGluIEBm b250LWZhY2UgcnVsZSBjYW4gdGFrZSBvbmx5IG9uZSBmYW1pbHkuIEhlbmNlIHRoZSBAZm9udC1m YWNlIHJ1bGUgaW4gdGhpcyB0ZXN0IG11c3QgYmUgaWdub3JlZC4iKTsKKworZnVuY3Rpb24gdGVz dCgpCit7CisgICAgc2hvdWxkQmVUcnVlKCJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdFRl eHQnKS5vZmZzZXRXaWR0aCA9PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnbXVzdE1hdGNoJyku b2Zmc2V0V2lkdGgiKTsKKyAgICBzaG91bGRCZVRydWUoImRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCd0ZXN0VGV4dCcpLm9mZnNldFdpZHRoICE9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdtdXN0 Tm90TWF0Y2gnKS5vZmZzZXRXaWR0aCIpOworfQorCit2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0g dHJ1ZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBv c3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgorCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS93aW4vY3NzMi4xL3Jlc291cmNlcy9NYWMtY29tcGF0aWJsZS1mb250LWZh bGxiYWNrLmNzcyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9jc3MyLjEvcmVzb3VyY2VzL01h Yy1jb21wYXRpYmxlLWZvbnQtZmFsbGJhY2suY3NzCmluZGV4IDE4ODI3NzY4N2E5MWMzNjRhZDk3 YzIwNDk3ZmNhNDU5MWNkOWE1NWQuLmY2Mjk0OTMzYjM2M2Q1NjNjYjliZTMzYTFjYjdhM2I0MzUx ZTVhOTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9jc3MyLjEvcmVzb3Vy Y2VzL01hYy1jb21wYXRpYmxlLWZvbnQtZmFsbGJhY2suY3NzCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL3dpbi9jc3MyLjEvcmVzb3VyY2VzL01hYy1jb21wYXRpYmxlLWZvbnQtZmFsbGJhY2su Y3NzCkBAIC05LDEzICs5LDI1IEBACiAgICBoZWF2eSBub3J0aCBlYXN0IGFycm93ICovCiAKIEBm b250LWZhY2UgewotICAgIGZvbnQtZmFtaWx5OiAndGltZXMnICctd2Via2l0LXNlcmlmJzsKKyAg ICBmb250LWZhbWlseTogJy13ZWJraXQtc2VyaWYnOworICAgIHNyYzogbG9jYWwoJ1dlYktpdCBM YXlvdXQgVGVzdHMnKTsKKyAgICB1bmljb2RlLXJhbmdlOiBVKzI1RkUsIFUrMjYyRiwgVSsyNzk4 LTI3OUE7Cit9CisKK0Bmb250LWZhY2UgeworICAgIGZvbnQtZmFtaWx5OiAnLXdlYmtpdC1zZXJp Zic7CisgICAgc3JjOiBsb2NhbCgnV2ViS2l0IExheW91dCBUZXN0cyAyJyk7CisgICAgdW5pY29k ZS1yYW5nZTogVSsyMUU2LTIxRTk7Cit9CisKK0Bmb250LWZhY2UgeworICAgIGZvbnQtZmFtaWx5 OiAndGltZXMnOwogICAgIHNyYzogbG9jYWwoJ1dlYktpdCBMYXlvdXQgVGVzdHMnKTsKICAgICB1 bmljb2RlLXJhbmdlOiBVKzI1RkUsIFUrMjYyRiwgVSsyNzk4LTI3OUE7CiB9CiAKIEBmb250LWZh Y2UgewotICAgIGZvbnQtZmFtaWx5OiAndGltZXMnICctd2Via2l0LXNlcmlmJzsKKyAgICBmb250 LWZhbWlseTogJ3RpbWVzJzsKICAgICBzcmM6IGxvY2FsKCdXZWJLaXQgTGF5b3V0IFRlc3RzIDIn KTsKICAgICB1bmljb2RlLXJhbmdlOiBVKzIxRTYtMjFFOTsKIH0KZGlmZiAtLWdpdCBhL1dlYkNv cmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjA4OGQ5YjQ1M2ZmZTFkOTgx YTQ3MWJlNWZlMDliYjA3OGRkMWEzOS4uOThjOWU3MTE1ZWI5YjcxYWNlMzIzNTU5MjJiNzU4OGM5 MjhiZmVkMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0xMi0wNiAgWXV6byBGdWppc2hpbWEgIDx5dXpv QGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRml4IGZvciBCdWcgMjYxODMgLSBbQGZvbnQtZmFjZV0gZm9udC1mYW1pbHkgZGVzY3Jp cHRvciB3aXRoIG11bHRpcGxlIG5hbWVzIHNob3VsZCBiZSBkaXNjYXJkZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2MTgzCisKKyAgICAgICAgVGVz dDogZmFzdC9jc3MvZm9udC1mYWNlLWZvbnQtZmFtaWx5LWRlc2NyaXB0b3IuaHRtbAorCisgICAg ICAgICogY3NzL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OmNy ZWF0ZUZvbnRGYWNlUnVsZSk6IENvbnNpZGVyIEBmb250LWZhY2UgcnVsZQorICAgICAgICBpbnZh bGlkIGlmIGl0cyBmb250LWZhbWlseSBkZXNjcmlwdG9yIGhhcyBtdWx0aXBsZSAob3IgemVybykg ZmFtaWxpZXMuCisKIDIwMTAtMTItMDUgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFVucmV2aWV3ZWQuIFJ1biBzb3J0LVhjb2RlLXByb2plY3QtZmlsZS4KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAgYi9XZWJDb3JlL2Nzcy9DU1NQYXJz ZXIuY3BwCmluZGV4IDEyYjhlZWExNDg2N2FjNjQ3ODU0MWRjNDMzZmZlMjdhYjBmNWFkZDEuLmI2 MzY2MmU4ODc3YzNmMTYwNzMwOWM0N2YzMzczODM0NGFjYTBhYmUgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvY3NzL0NTU1BhcnNlci5jcHAKKysrIGIvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcApAQCAt NTU2Niw3ICs1NTY2LDYgQEAgQ1NTUnVsZSogQ1NTUGFyc2VyOjpjcmVhdGVTdHlsZVJ1bGUoVmVj dG9yPENTU1NlbGVjdG9yKj4qIHNlbGVjdG9ycykKIENTU1J1bGUqIENTU1BhcnNlcjo6Y3JlYXRl Rm9udEZhY2VSdWxlKCkKIHsKICAgICBtX2FsbG93SW1wb3J0UnVsZXMgPSBtX2FsbG93TmFtZXNw YWNlRGVjbGFyYXRpb25zID0gZmFsc2U7Ci0gICAgUmVmUHRyPENTU0ZvbnRGYWNlUnVsZT4gcnVs ZSA9IENTU0ZvbnRGYWNlUnVsZTo6Y3JlYXRlKG1fc3R5bGVTaGVldCk7CiAgICAgZm9yICh1bnNp Z25lZCBpID0gMDsgaSA8IG1fbnVtUGFyc2VkUHJvcGVydGllczsgKytpKSB7CiAgICAgICAgIENT U1Byb3BlcnR5KiBwcm9wZXJ0eSA9IG1fcGFyc2VkUHJvcGVydGllc1tpXTsKICAgICAgICAgaW50 IGlkID0gcHJvcGVydHktPmlkKCk7CkBAIC01NTc0LDggKzU1NzMsMTQgQEAgQ1NTUnVsZSogQ1NT UGFyc2VyOjpjcmVhdGVGb250RmFjZVJ1bGUoKQogICAgICAgICAgICAgUmVmUHRyPENTU1ZhbHVl PiB2YWx1ZSA9IHByb3BlcnR5LT5tX3ZhbHVlLnJlbGVhc2UoKTsKICAgICAgICAgICAgIHByb3Bl cnR5LT5tX3ZhbHVlID0gQ1NTVmFsdWVMaXN0OjpjcmVhdGVDb21tYVNlcGFyYXRlZCgpOwogICAg ICAgICAgICAgc3RhdGljX2Nhc3Q8Q1NTVmFsdWVMaXN0Kj4ocHJvcGVydHktPm1fdmFsdWUuZ2V0 KCkpLT5hcHBlbmQodmFsdWUucmVsZWFzZSgpKTsKKyAgICAgICAgfSBlbHNlIGlmIChpZCA9PSBD U1NQcm9wZXJ0eUZvbnRGYW1pbHkgJiYgc3RhdGljX2Nhc3Q8Q1NTVmFsdWVMaXN0Kj4ocHJvcGVy dHktPm1fdmFsdWUuZ2V0KCkpLT5sZW5ndGgoKSAhPSAxKSB7CisgICAgICAgICAgICAvLyBVbmxp a2UgZm9udC1mYW1pbHkgcHJvcGVydHksIGZvbnQtZmFtaWx5IGRlc2NyaXB0b3IgaW4gQGZvbnQt ZmFjZSBydWxlIGNhbiB0YWtlIG9ubHkgb25lIGZhbWlseSBuYW1lLgorICAgICAgICAgICAgLy8g U2VlIGh0dHA6Ly9kZXYudzMub3JnL2Nzc3dnL2NzczMtZm9udHMvI2ZvbnQtZmFtaWx5LWRlc2MK KyAgICAgICAgICAgIGNsZWFyUHJvcGVydGllcygpOworICAgICAgICAgICAgcmV0dXJuIDA7CiAg ICAgICAgIH0KICAgICB9CisgICAgUmVmUHRyPENTU0ZvbnRGYWNlUnVsZT4gcnVsZSA9IENTU0Zv bnRGYWNlUnVsZTo6Y3JlYXRlKG1fc3R5bGVTaGVldCk7CiAgICAgcnVsZS0+c2V0RGVjbGFyYXRp b24oQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246OmNyZWF0ZShydWxlLmdldCgpLCBtX3BhcnNl ZFByb3BlcnRpZXMsIG1fbnVtUGFyc2VkUHJvcGVydGllcykpOwogICAgIGNsZWFyUHJvcGVydGll cygpOwogICAgIENTU0ZvbnRGYWNlUnVsZSogcmVzdWx0ID0gcnVsZS5nZXQoKTsK