52333 2011-01-12 16:14:12 -0800 Add support to DumpRenderTree to use the GPU rather than software renderer 2011-01-14 10:09:35 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 scheib webkit-unassigned commit-queue dglazkov dpranke eric kbr mihaip tkent webkit.review.bot oldest_to_newest 333394 0 scheib 2011-01-12 16:14:12 -0800 Add support to DumpRenderTree to use the GPU rather than software renderer 333405 1 78754 scheib 2011-01-12 16:24:52 -0800 Created attachment 78754 Patch 333409 2 webkit.review.bot 2011-01-12 16:29:36 -0800 Attachment 78754 did not build on chromium: Build output: http://queues.webkit.org/results/7571001 333410 3 scheib 2011-01-12 16:31:32 -0800 Initial review for work in progress, The chromium changes will need to land before the webkit changes. http://codereview.chromium.org/6258001 https://bugs.webkit.org/show_bug.cgi?id=52333 333413 4 scheib 2011-01-12 16:34:09 -0800 Dirk, could you check on the simple switch additions to Tools/Scripts/webkitpy/layout_tests/... 333483 5 78754 dpranke 2011-01-12 18:30:37 -0800 Comment on attachment 78754 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78754&action=review The change looks fine. Semi-unrelated note: will we be able to remove the --accelerated-* flags (to new-run-webkit-tests, not to DRT/TestShell) at some point soon because those code paths should always be on? > Tools/Scripts/webkitpy/layout_tests/port/chromium.py:396 > + cmd.append('--test-on-GPU-hardware') Typically we wouldn't use mixed-case for this. I might call the switch something shorter like --use-hardware-gpu . > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:249 > + help="Run OpenGL commands on real GPU hardware vs software"), For now, this way of declaring things is fine. If we do something like what I discussed earlier, where default should vary depending on whether you use --platform chromium-win or --platform chromium-gpu-win, then you would want a default=None (not setting default= as an argument has the same effect) and then test for None explicitly in the Port code to see if the flag was set on the command line or if we need to specify the default. This is a result of the unfortunate fact of argument parsing happening before we get to execute any Port code (which I'll fix at some point, but not now). 333485 6 dpranke 2011-01-12 18:31:00 -0800 Mihai, you want to take a look at / review this? 333490 7 78754 mihaip 2011-01-12 18:39:04 -0800 Comment on attachment 78754 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78754&action=review > Tools/DumpRenderTree/chromium/DumpRenderTree.cpp:54 > +static const char optionHardwareAcceleratedGL[] = "--test-on-GPU-hardware"; I agree with Dirk, the flag name should be all lowercase. 333737 8 78818 scheib 2011-01-13 09:20:19 -0800 Created attachment 78818 Patch 333739 9 scheib 2011-01-13 09:22:14 -0800 Command line switch changed to --enable-hardware-gpu 333740 10 webkit.review.bot 2011-01-13 09:24:33 -0800 Attachment 78818 did not build on chromium: Build output: http://queues.webkit.org/results/7567011 333808 11 78818 kbr 2011-01-13 11:07:06 -0800 Comment on attachment 78818 Patch The code changes look good. You need to roll forward the Chromium revision in WebKit/chromium/DEPS to the revision where you checked in the new webkit_support API in order for this to compile on the webkit.org Chromium builders. 333828 12 78834 scheib 2011-01-13 11:27:40 -0800 Created attachment 78834 Patch 333835 13 78834 mihaip 2011-01-13 11:30:45 -0800 Comment on attachment 78834 Patch Please wait for the cr-linux EWS bot to process this patch before landing. View in context: https://bugs.webkit.org/attachment.cgi?id=78834&action=review > WebKit/chromium/ChangeLog:8 > + * WebKit.gyp: DumpRenderTree depends on Angle on windows Should update the ChangeLog to include the DEPS file. 333849 14 78837 scheib 2011-01-13 11:53:57 -0800 Created attachment 78837 Patch 333860 15 webkit.review.bot 2011-01-13 12:05:50 -0800 Attachment 78837 did not build on chromium: Build output: http://queues.webkit.org/results/7579020 333904 16 mihaip 2011-01-13 13:12:15 -0800 (In reply to comment #15) > Attachment 78837 [details] did not build on chromium: > Build output: http://queues.webkit.org/results/7579020 Not sure I understand why this is happening: In file included from WebKit/chromium/webkit/tools/test_shell/mock_webclipboard_impl.cc:5: WebKit/chromium/webkit/tools/test_shell/mock_webclipboard_impl.h:13: fatal error: third_party/WebKit/WebKit/chromium/public/WebClipboard.h: No such file or directory If I roll to 71332 locally, things build fine. Perhaps the EWS bot is sick (if it's missing a file)? 334024 17 tkent 2011-01-13 16:38:43 -0800 (In reply to comment #16) > (In reply to comment #15) > > Attachment 78837 [details] [details] did not build on chromium: > > Build output: http://queues.webkit.org/results/7579020 > > Not sure I understand why this is happening: > > In file included from WebKit/chromium/webkit/tools/test_shell/mock_webclipboard_impl.cc:5: > WebKit/chromium/webkit/tools/test_shell/mock_webclipboard_impl.h:13: fatal error: third_party/WebKit/WebKit/chromium/public/WebClipboard.h: No such file or directory It looks my failure. webkit_support_common library should depend on setup_third_party.gyp:third_party_headers. I'll check it and fix. 334054 18 tkent 2011-01-13 17:41:59 -0800 > webkit_support_common library should depend on setup_third_party.gyp:third_party_headers. > I'll check it and fix. Fixed. Please use Chromium r71405 or later. 334340 19 78947 scheib 2011-01-14 09:04:17 -0800 Created attachment 78947 Patch 334341 20 scheib 2011-01-14 09:04:57 -0800 Chromium revision bumped to 71405 334378 21 78947 commit-queue 2011-01-14 10:09:30 -0800 Comment on attachment 78947 Patch Clearing flags on attachment: 78947 Committed r75800: <http://trac.webkit.org/changeset/75800> 334379 22 commit-queue 2011-01-14 10:09:35 -0800 All reviewed patches have been landed. Closing bug. 78754 2011-01-12 16:24:52 -0800 2011-01-13 09:20:16 -0800 Patch bug-52333-20110112162450.patch text/plain 5733 scheib ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNjRl OTQxNjcyODYwOTRhZWVmNTcyMjI2ZGQ4MGNkZGQ2NjdhYzYwLi5kYjJkNDMwMWQyNTRmNzRmMjkx MWRlNDdhNDY3MGI0OTk1Mjg5Zjg0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDEtMTIgIFZpbmNlbnQgU2No ZWliICA8c2NoZWliQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCB0byBEdW1wUmVuZGVyVHJlZSB0byB1c2Ug dGhlIEdQVSByYXRoZXIgdGhhbiBzb2Z0d2FyZSByZW5kZXJlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTIzMzMKKworICAgICAgICAqIER1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKG1haW4pOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5w eToKKwogMjAxMS0wMS0wOCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAg ICAgIFRlYWNoIHN2bi1hcHBseSBob3cgdG8gcmUtd3JpdGUgV2ViQ29yZSB0byBTb3VyY2UvV2Vi Q29yZS4KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5k ZXJUcmVlLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVl LmNwcAppbmRleCA2NTIyNDUwYzMxZTg2NzY4ODMxNWVhYjJmNzYwYjJlNDg0Zjg3ODM4Li40NGZj ZTA2OTEzZjEzYWRmMjdjMmJkMzVkMTgzNzFlNWZjYzUwN2UzIDEwMDY0NAotLS0gYS9Ub29scy9E dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9EdW1wUmVuZGVyVHJlZS5jcHAKKysrIGIvVG9vbHMvRHVt cFJlbmRlclRyZWUvY2hyb21pdW0vRHVtcFJlbmRlclRyZWUuY3BwCkBAIC01MCw2ICs1MCw4IEBA IHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvblRlc3RTaGVsbFtdID0gIi0tdGVzdC1zaGVsbCI7CiBz dGF0aWMgY29uc3QgY2hhciBvcHRpb25BbGxvd0V4dGVybmFsUGFnZXNbXSA9ICItLWFsbG93LWV4 dGVybmFsLXBhZ2VzIjsKIHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvblN0YXJ0dXBEaWFsb2dbXSA9 ICItLXRlc3RzaGVsbC1zdGFydHVwLWRpYWxvZyI7CiBzdGF0aWMgY29uc3QgY2hhciBvcHRpb25D aGVja0xheW91dFRlc3RTeXN0ZW1EZXBzW10gPSAiLS1jaGVjay1sYXlvdXQtdGVzdC1zeXMtZGVw cyI7CisKK3N0YXRpYyBjb25zdCBjaGFyIG9wdGlvbkhhcmR3YXJlQWNjZWxlcmF0ZWRHTFtdID0g Ii0tdGVzdC1vbi1HUFUtaGFyZHdhcmUiOwogc3RhdGljIGNvbnN0IGNoYXIgb3B0aW9uRW5hYmxl QWNjZWxlcmF0ZWRDb21wb3NpdGluZ1tdID0gIi0tZW5hYmxlLWFjY2VsZXJhdGVkLWNvbXBvc2l0 aW5nIjsKIHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvbkVuYWJsZUFjY2VsZXJhdGVkMkRDYW52YXNb XSA9ICItLWVuYWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXMiOwogCkBAIC0xMTksNiArMTIxLDcg QEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKICAgICBib29sIGFjY2VsZXJhdGVk MkRDYW52YXNFbmFibGVkID0gZmFsc2U7CiAgICAgYm9vbCBzdHJlc3NPcHQgPSBmYWxzZTsKICAg ICBib29sIHN0cmVzc0Rlb3B0ID0gZmFsc2U7CisgICAgYm9vbCBoYXJkd2FyZUFjY2VsZXJhdGVk R0wgPSBmYWxzZTsKICAgICBzdHJpbmcgamF2YVNjcmlwdEZsYWdzOwogICAgIGZvciAoaW50IGkg PSAxOyBpIDwgYXJnYzsgKytpKSB7CiAgICAgICAgIHN0cmluZyBhcmd1bWVudChhcmd2W2ldKTsK QEAgLTE0MCw2ICsxNDMsOCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAg ICAgICAgICAgc3RhcnR1cERpYWxvZyA9IHRydWU7CiAgICAgICAgIGVsc2UgaWYgKGFyZ3VtZW50 ID09IG9wdGlvbkNoZWNrTGF5b3V0VGVzdFN5c3RlbURlcHMpCiAgICAgICAgICAgICBleGl0KGNo ZWNrTGF5b3V0VGVzdFN5c3RlbURlcGVuZGVuY2llcygpID8gRVhJVF9TVUNDRVNTIDogRVhJVF9G QUlMVVJFKTsKKyAgICAgICAgZWxzZSBpZiAoYXJndW1lbnQgPT0gb3B0aW9uSGFyZHdhcmVBY2Nl bGVyYXRlZEdMKQorICAgICAgICAgICAgaGFyZHdhcmVBY2NlbGVyYXRlZEdMID0gdHJ1ZTsKICAg ICAgICAgZWxzZSBpZiAoYXJndW1lbnQgPT0gb3B0aW9uRW5hYmxlQWNjZWxlcmF0ZWRDb21wb3Np dGluZykKICAgICAgICAgICAgIGFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkID0gdHJ1ZTsK ICAgICAgICAgZWxzZSBpZiAoYXJndW1lbnQgPT0gb3B0aW9uRW5hYmxlQWNjZWxlcmF0ZWQyRENh bnZhcykKQEAgLTE2NCw2ICsxNjksOCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltd KQogICAgICAgICByZXR1cm4gRVhJVF9GQUlMVVJFOwogICAgIH0KIAorICAgIHdlYmtpdF9zdXBw b3J0OjpTZXRVcEdMQmluZGluZ3MoaGFyZHdhcmVBY2NlbGVyYXRlZEdMID8gd2Via2l0X3N1cHBv cnQ6OmtHTEJpbmRpbmdzRGVmYXVsdCA6IHdlYmtpdF9zdXBwb3J0OjprR0xCaW5kaW5nc1NvZnR3 YXJlUmVuZGVyZXIpOworCiAgICAgaWYgKHN0YXJ0dXBEaWFsb2cpCiAgICAgICAgIG9wZW5TdGFy dHVwRGlhbG9nKCk7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtLnB5CmluZGV4IGI5MDQyMWFkZmViMDhiMDk0MzAxMTlmZjJlZmJk ZTI4NDg1YzMyOGYuLmI2ZWZiMjE5NmM3ZDY2M2IzMGI2ZjI4ZmZiMDc4NmE4OWE3NjIzZGUgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21p dW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bS5weQpAQCAtMzkyLDYgKzM5Miw4IEBAIGNsYXNzIENocm9taXVtRHJpdmVyKGJhc2UuRHJp dmVyKToKICAgICAgICAgICAgICAgICBjbWQuYXBwZW5kKCctLWVuYWJsZS1hY2NlbGVyYXRlZC1j b21wb3NpdGluZycpCiAgICAgICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2FjY2Vs ZXJhdGVkXzJkX2NhbnZhcycpOgogICAgICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tZW5hYmxl LWFjY2VsZXJhdGVkLTJkLWNhbnZhcycpCisgICAgICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9v cHRpb24oJ3Rlc3Rfb25fR1BVX2hhcmR3YXJlJyk6CisgICAgICAgICAgICAgICAgY21kLmFwcGVu ZCgnLS10ZXN0LW9uLUdQVS1oYXJkd2FyZScpCiAgICAgICAgIHJldHVybiBjbWQKIAogICAgIGRl ZiBzdGFydChzZWxmKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IGM0MzE3NjVhZTJjZmQ5YzcwNzEwZDgz YzlkNTk5YTk3OGI1MmUzMTYuLjdjMGRkZTI2YTYyNmY3NzA2MDczYjllZTQxMGZjY2VkN2Q2NjA5 Y2IgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93 ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMjQzLDYgKzI0MywxMCBAQCBkZWYgcGFyc2VfYXJncyhh cmdzPU5vbmUpOgogICAgICAgICAgICAgYWN0aW9uPSJzdG9yZV9mYWxzZSIsCiAgICAgICAgICAg ICBkZXN0PSJhY2NlbGVyYXRlZF8yZF9jYW52YXMiLAogICAgICAgICAgICAgaGVscD0iRG9uJ3Qg dXNlIGhhcmR3YXJlLWFjY2VsZXJhdGVkIDJEIENhbnZhcyBjYWxscyIpLAorICAgICAgICBvcHRw YXJzZS5tYWtlX29wdGlvbigiLS10ZXN0LW9uLUdQVS1oYXJkd2FyZSIsCisgICAgICAgICAgICBh Y3Rpb249InN0b3JlX3RydWUiLAorICAgICAgICAgICAgZGVmYXVsdD1GYWxzZSwKKyAgICAgICAg ICAgIGhlbHA9IlJ1biBPcGVuR0wgY29tbWFuZHMgb24gcmVhbCBHUFUgaGFyZHdhcmUgdnMgc29m dHdhcmUiKSwKICAgICBdCiAKICAgICAjIE1pc3NpbmcgTWFjLXNwZWNpZmljIG9sZC1ydW4td2Vi a2l0LXRlc3RzIG9wdGlvbnM6CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n IGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA1NGNhOGNlNzkzOWE4NTZlNzBjMTBh ZjAwM2I5YWM5MzZhMzJlMzExLi4xYTNjN2Q3ZjRlNjYwZmFkYjVlYjE2MzAwMzRiMDVlMjIxMGI4 ZTNkIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMS0wMS0xMiAgVmluY2VudCBT Y2hlaWIgIDxzY2hlaWJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBzdXBwb3J0IHRvIER1bXBSZW5kZXJUcmVlIHRvIHVz ZSB0aGUgR1BVIHJhdGhlciB0aGFuIHNvZnR3YXJlIHJlbmRlcmVyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjMzMworCisgICAgICAgICogV2ViS2l0 Lmd5cDogRHVtcFJlbmRlclRyZWUgZGVwZW5kcyBvbiBBbmdsZSBvbiB3aW5kb3dzCisKIDIwMTEt MDEtMDcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSdWJiZXIt c3RhbXBlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9XZWJL aXQuZ3lwIGIvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKaW5kZXggOTM4NTc3OGYxYmM2YzUz MDA4NThkZWFjOWI4NWMwNWI2NzFmMWY4Ni4uNTgxMzRkMjkxYjAwYTEzMzdlYjVmYTZiY2MwODg3 NmIxNjVlYTNlNCAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKKysrIGIv V2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKQEAgLTkyOCw3ICs5MjgsMTEgQEAKICAgICAgICAg ICAgIF0sCiAgICAgICAgICAgICAnY29uZGl0aW9ucyc6IFsKICAgICAgICAgICAgICAgICBbJ09T PT0id2luIicsIHsKLSAgICAgICAgICAgICAgICAgICAgJ2RlcGVuZGVuY2llcyc6IFsnTGF5b3V0 VGVzdEhlbHBlciddLAorICAgICAgICAgICAgICAgICAgICAnZGVwZW5kZW5jaWVzJzogWworICAg ICAgICAgICAgICAgICAgICAgICAgJ0xheW91dFRlc3RIZWxwZXInLAorICAgICAgICAgICAgICAg ICAgICAgICAgJzwoY2hyb21pdW1fc3JjX2RpcikvdGhpcmRfcGFydHkvYW5nbGUvc3JjL2J1aWxk X2FuZ2xlLmd5cDpsaWJFR0wnLAorICAgICAgICAgICAgICAgICAgICAgICAgJzwoY2hyb21pdW1f c3JjX2RpcikvdGhpcmRfcGFydHkvYW5nbGUvc3JjL2J1aWxkX2FuZ2xlLmd5cDpsaWJHTEVTdjIn LAorICAgICAgICAgICAgICAgICAgICBdLAogCiAgICAgICAgICAgICAgICAgICAgICdyZXNvdXJj ZV9pbmNsdWRlX2RpcnMnOiBbJzwoU0hBUkVEX0lOVEVSTUVESUFURV9ESVIpL3dlYmtpdCddLAog ICAgICAgICAgICAgICAgICAgICAnc291cmNlcyc6IFsK 78818 2011-01-13 09:20:19 -0800 2011-01-13 11:27:36 -0800 Patch bug-52333-20110113092018.patch text/plain 5729 scheib ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNjRl OTQxNjcyODYwOTRhZWVmNTcyMjI2ZGQ4MGNkZGQ2NjdhYzYwLi5kYjJkNDMwMWQyNTRmNzRmMjkx MWRlNDdhNDY3MGI0OTk1Mjg5Zjg0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDEtMTIgIFZpbmNlbnQgU2No ZWliICA8c2NoZWliQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCB0byBEdW1wUmVuZGVyVHJlZSB0byB1c2Ug dGhlIEdQVSByYXRoZXIgdGhhbiBzb2Z0d2FyZSByZW5kZXJlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTIzMzMKKworICAgICAgICAqIER1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKG1haW4pOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5w eToKKwogMjAxMS0wMS0wOCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAg ICAgIFRlYWNoIHN2bi1hcHBseSBob3cgdG8gcmUtd3JpdGUgV2ViQ29yZSB0byBTb3VyY2UvV2Vi Q29yZS4KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5k ZXJUcmVlLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVl LmNwcAppbmRleCA2NTIyNDUwYzMxZTg2NzY4ODMxNWVhYjJmNzYwYjJlNDg0Zjg3ODM4Li5iZDUw NzVjM2MyZGE3MmYwZmU1ZmNhOGU1YzRmMDE4MDg1MWYyM2QwIDEwMDY0NAotLS0gYS9Ub29scy9E dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9EdW1wUmVuZGVyVHJlZS5jcHAKKysrIGIvVG9vbHMvRHVt cFJlbmRlclRyZWUvY2hyb21pdW0vRHVtcFJlbmRlclRyZWUuY3BwCkBAIC01MCw2ICs1MCw4IEBA IHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvblRlc3RTaGVsbFtdID0gIi0tdGVzdC1zaGVsbCI7CiBz dGF0aWMgY29uc3QgY2hhciBvcHRpb25BbGxvd0V4dGVybmFsUGFnZXNbXSA9ICItLWFsbG93LWV4 dGVybmFsLXBhZ2VzIjsKIHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvblN0YXJ0dXBEaWFsb2dbXSA9 ICItLXRlc3RzaGVsbC1zdGFydHVwLWRpYWxvZyI7CiBzdGF0aWMgY29uc3QgY2hhciBvcHRpb25D aGVja0xheW91dFRlc3RTeXN0ZW1EZXBzW10gPSAiLS1jaGVjay1sYXlvdXQtdGVzdC1zeXMtZGVw cyI7CisKK3N0YXRpYyBjb25zdCBjaGFyIG9wdGlvbkhhcmR3YXJlQWNjZWxlcmF0ZWRHTFtdID0g Ii0tZW5hYmxlLWhhcmR3YXJlLWdwdSI7CiBzdGF0aWMgY29uc3QgY2hhciBvcHRpb25FbmFibGVB Y2NlbGVyYXRlZENvbXBvc2l0aW5nW10gPSAiLS1lbmFibGUtYWNjZWxlcmF0ZWQtY29tcG9zaXRp bmciOwogc3RhdGljIGNvbnN0IGNoYXIgb3B0aW9uRW5hYmxlQWNjZWxlcmF0ZWQyRENhbnZhc1td ID0gIi0tZW5hYmxlLWFjY2VsZXJhdGVkLTJkLWNhbnZhcyI7CiAKQEAgLTExOSw2ICsxMjEsNyBA QCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgIGJvb2wgYWNjZWxlcmF0ZWQy RENhbnZhc0VuYWJsZWQgPSBmYWxzZTsKICAgICBib29sIHN0cmVzc09wdCA9IGZhbHNlOwogICAg IGJvb2wgc3RyZXNzRGVvcHQgPSBmYWxzZTsKKyAgICBib29sIGhhcmR3YXJlQWNjZWxlcmF0ZWRH TCA9IGZhbHNlOwogICAgIHN0cmluZyBqYXZhU2NyaXB0RmxhZ3M7CiAgICAgZm9yIChpbnQgaSA9 IDE7IGkgPCBhcmdjOyArK2kpIHsKICAgICAgICAgc3RyaW5nIGFyZ3VtZW50KGFyZ3ZbaV0pOwpA QCAtMTQwLDYgKzE0Myw4IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAgICAg ICAgICAgICBzdGFydHVwRGlhbG9nID0gdHJ1ZTsKICAgICAgICAgZWxzZSBpZiAoYXJndW1lbnQg PT0gb3B0aW9uQ2hlY2tMYXlvdXRUZXN0U3lzdGVtRGVwcykKICAgICAgICAgICAgIGV4aXQoY2hl Y2tMYXlvdXRUZXN0U3lzdGVtRGVwZW5kZW5jaWVzKCkgPyBFWElUX1NVQ0NFU1MgOiBFWElUX0ZB SUxVUkUpOworICAgICAgICBlbHNlIGlmIChhcmd1bWVudCA9PSBvcHRpb25IYXJkd2FyZUFjY2Vs ZXJhdGVkR0wpCisgICAgICAgICAgICBoYXJkd2FyZUFjY2VsZXJhdGVkR0wgPSB0cnVlOwogICAg ICAgICBlbHNlIGlmIChhcmd1bWVudCA9PSBvcHRpb25FbmFibGVBY2NlbGVyYXRlZENvbXBvc2l0 aW5nKQogICAgICAgICAgICAgYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQgPSB0cnVlOwog ICAgICAgICBlbHNlIGlmIChhcmd1bWVudCA9PSBvcHRpb25FbmFibGVBY2NlbGVyYXRlZDJEQ2Fu dmFzKQpAQCAtMTY0LDYgKzE2OSw4IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10p CiAgICAgICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CiAgICAgfQogCisgICAgd2Via2l0X3N1cHBv cnQ6OlNldFVwR0xCaW5kaW5ncyhoYXJkd2FyZUFjY2VsZXJhdGVkR0wgPyB3ZWJraXRfc3VwcG9y dDo6R0xfQklORElOR19ERUZBVUxUIDogd2Via2l0X3N1cHBvcnQ6OkdMX0JJTkRJTkdfU09GVFdB UkVfUkVOREVSRVIpOworCiAgICAgaWYgKHN0YXJ0dXBEaWFsb2cpCiAgICAgICAgIG9wZW5TdGFy dHVwRGlhbG9nKCk7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtLnB5CmluZGV4IGI5MDQyMWFkZmViMDhiMDk0MzAxMTlmZjJlZmJk ZTI4NDg1YzMyOGYuLjdlOTM0YTgyMGYzOTdjNTIyMDI3NDc0ZTE5YTU3YmJhNjllNzRhY2MgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21p dW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bS5weQpAQCAtMzkyLDYgKzM5Miw4IEBAIGNsYXNzIENocm9taXVtRHJpdmVyKGJhc2UuRHJp dmVyKToKICAgICAgICAgICAgICAgICBjbWQuYXBwZW5kKCctLWVuYWJsZS1hY2NlbGVyYXRlZC1j b21wb3NpdGluZycpCiAgICAgICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2FjY2Vs ZXJhdGVkXzJkX2NhbnZhcycpOgogICAgICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tZW5hYmxl LWFjY2VsZXJhdGVkLTJkLWNhbnZhcycpCisgICAgICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9v cHRpb24oJ2VuYWJsZV9oYXJkd2FyZV9ncHUnKToKKyAgICAgICAgICAgICAgICBjbWQuYXBwZW5k KCctLWVuYWJsZS1oYXJkd2FyZS1ncHUnKQogICAgICAgICByZXR1cm4gY21kCiAKICAgICBkZWYg c3RhcnQoc2VsZik6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCBjNDMxNzY1YWUyY2ZkOWM3MDcxMGQ4M2M5 ZDU5OWE5NzhiNTJlMzE2Li5hMTQxNjYxZmU4NTc0Zjc3MDliMmE2NzVlNTU4YWQ4ZGY2ZDA4Yzdi IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Vi a2l0X3Rlc3RzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1 bl93ZWJraXRfdGVzdHMucHkKQEAgLTI0Myw2ICsyNDMsMTAgQEAgZGVmIHBhcnNlX2FyZ3MoYXJn cz1Ob25lKToKICAgICAgICAgICAgIGFjdGlvbj0ic3RvcmVfZmFsc2UiLAogICAgICAgICAgICAg ZGVzdD0iYWNjZWxlcmF0ZWRfMmRfY2FudmFzIiwKICAgICAgICAgICAgIGhlbHA9IkRvbid0IHVz ZSBoYXJkd2FyZS1hY2NlbGVyYXRlZCAyRCBDYW52YXMgY2FsbHMiKSwKKyAgICAgICAgb3B0cGFy c2UubWFrZV9vcHRpb24oIi0tZW5hYmxlLWhhcmR3YXJlLWdwdSIsCisgICAgICAgICAgICBhY3Rp b249InN0b3JlX3RydWUiLAorICAgICAgICAgICAgZGVmYXVsdD1GYWxzZSwKKyAgICAgICAgICAg IGhlbHA9IlJ1biBncmFwaGljcyB0ZXN0cyBvbiByZWFsIEdQVSBoYXJkd2FyZSB2cyBzb2Z0d2Fy ZSIpLAogICAgIF0KIAogICAgICMgTWlzc2luZyBNYWMtc3BlY2lmaWMgb2xkLXJ1bi13ZWJraXQt dGVzdHMgb3B0aW9uczoKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDU0Y2E4Y2U3OTM5YTg1NmU3MGMxMGFmMDAz YjlhYzkzNmEzMmUzMTEuLjFhM2M3ZDdmNGU2NjBmYWRiNWViMTYzMDAzNGIwNWUyMjEwYjhlM2Qg MTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDExLTAxLTEyICBWaW5jZW50IFNjaGVp YiAgPHNjaGVpYkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIHN1cHBvcnQgdG8gRHVtcFJlbmRlclRyZWUgdG8gdXNlIHRo ZSBHUFUgcmF0aGVyIHRoYW4gc29mdHdhcmUgcmVuZGVyZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyMzMzCisKKyAgICAgICAgKiBXZWJLaXQuZ3lw OiBEdW1wUmVuZGVyVHJlZSBkZXBlbmRzIG9uIEFuZ2xlIG9uIHdpbmRvd3MKKwogMjAxMS0wMS0w NyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJ1YmJlci1zdGFt cGVkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5n eXAgYi9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAppbmRleCA5Mzg1Nzc4ZjFiYzZjNTMwMDg1 OGRlYWM5Yjg1YzA1YjY3MWYxZjg2Li41ODEzNGQyOTFiMDBhMTMzN2ViNWZhNmJjYzA4ODc2YjE2 NWVhM2U0IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAorKysgYi9XZWJL aXQvY2hyb21pdW0vV2ViS2l0Lmd5cApAQCAtOTI4LDcgKzkyOCwxMSBAQAogICAgICAgICAgICAg XSwKICAgICAgICAgICAgICdjb25kaXRpb25zJzogWwogICAgICAgICAgICAgICAgIFsnT1M9PSJ3 aW4iJywgewotICAgICAgICAgICAgICAgICAgICAnZGVwZW5kZW5jaWVzJzogWydMYXlvdXRUZXN0 SGVscGVyJ10sCisgICAgICAgICAgICAgICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCisgICAgICAg ICAgICAgICAgICAgICAgICAnTGF5b3V0VGVzdEhlbHBlcicsCisgICAgICAgICAgICAgICAgICAg ICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS90aGlyZF9wYXJ0eS9hbmdsZS9zcmMvYnVpbGRfYW5n bGUuZ3lwOmxpYkVHTCcsCisgICAgICAgICAgICAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNf ZGlyKS90aGlyZF9wYXJ0eS9hbmdsZS9zcmMvYnVpbGRfYW5nbGUuZ3lwOmxpYkdMRVN2MicsCisg ICAgICAgICAgICAgICAgICAgIF0sCiAKICAgICAgICAgICAgICAgICAgICAgJ3Jlc291cmNlX2lu Y2x1ZGVfZGlycyc6IFsnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0J10sCiAgICAg ICAgICAgICAgICAgICAgICdzb3VyY2VzJzogWwo= 78834 2011-01-13 11:27:40 -0800 2011-01-13 11:53:53 -0800 Patch bug-52333-20110113112739.patch text/plain 6095 scheib ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNjRl OTQxNjcyODYwOTRhZWVmNTcyMjI2ZGQ4MGNkZGQ2NjdhYzYwLi5kYjJkNDMwMWQyNTRmNzRmMjkx MWRlNDdhNDY3MGI0OTk1Mjg5Zjg0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDEtMTIgIFZpbmNlbnQgU2No ZWliICA8c2NoZWliQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCB0byBEdW1wUmVuZGVyVHJlZSB0byB1c2Ug dGhlIEdQVSByYXRoZXIgdGhhbiBzb2Z0d2FyZSByZW5kZXJlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTIzMzMKKworICAgICAgICAqIER1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKG1haW4pOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5w eToKKwogMjAxMS0wMS0wOCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAg ICAgIFRlYWNoIHN2bi1hcHBseSBob3cgdG8gcmUtd3JpdGUgV2ViQ29yZSB0byBTb3VyY2UvV2Vi Q29yZS4KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5k ZXJUcmVlLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVl LmNwcAppbmRleCA2NTIyNDUwYzMxZTg2NzY4ODMxNWVhYjJmNzYwYjJlNDg0Zjg3ODM4Li5iZDUw NzVjM2MyZGE3MmYwZmU1ZmNhOGU1YzRmMDE4MDg1MWYyM2QwIDEwMDY0NAotLS0gYS9Ub29scy9E dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9EdW1wUmVuZGVyVHJlZS5jcHAKKysrIGIvVG9vbHMvRHVt cFJlbmRlclRyZWUvY2hyb21pdW0vRHVtcFJlbmRlclRyZWUuY3BwCkBAIC01MCw2ICs1MCw4IEBA IHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvblRlc3RTaGVsbFtdID0gIi0tdGVzdC1zaGVsbCI7CiBz dGF0aWMgY29uc3QgY2hhciBvcHRpb25BbGxvd0V4dGVybmFsUGFnZXNbXSA9ICItLWFsbG93LWV4 dGVybmFsLXBhZ2VzIjsKIHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvblN0YXJ0dXBEaWFsb2dbXSA9 ICItLXRlc3RzaGVsbC1zdGFydHVwLWRpYWxvZyI7CiBzdGF0aWMgY29uc3QgY2hhciBvcHRpb25D aGVja0xheW91dFRlc3RTeXN0ZW1EZXBzW10gPSAiLS1jaGVjay1sYXlvdXQtdGVzdC1zeXMtZGVw cyI7CisKK3N0YXRpYyBjb25zdCBjaGFyIG9wdGlvbkhhcmR3YXJlQWNjZWxlcmF0ZWRHTFtdID0g Ii0tZW5hYmxlLWhhcmR3YXJlLWdwdSI7CiBzdGF0aWMgY29uc3QgY2hhciBvcHRpb25FbmFibGVB Y2NlbGVyYXRlZENvbXBvc2l0aW5nW10gPSAiLS1lbmFibGUtYWNjZWxlcmF0ZWQtY29tcG9zaXRp bmciOwogc3RhdGljIGNvbnN0IGNoYXIgb3B0aW9uRW5hYmxlQWNjZWxlcmF0ZWQyRENhbnZhc1td ID0gIi0tZW5hYmxlLWFjY2VsZXJhdGVkLTJkLWNhbnZhcyI7CiAKQEAgLTExOSw2ICsxMjEsNyBA QCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgIGJvb2wgYWNjZWxlcmF0ZWQy RENhbnZhc0VuYWJsZWQgPSBmYWxzZTsKICAgICBib29sIHN0cmVzc09wdCA9IGZhbHNlOwogICAg IGJvb2wgc3RyZXNzRGVvcHQgPSBmYWxzZTsKKyAgICBib29sIGhhcmR3YXJlQWNjZWxlcmF0ZWRH TCA9IGZhbHNlOwogICAgIHN0cmluZyBqYXZhU2NyaXB0RmxhZ3M7CiAgICAgZm9yIChpbnQgaSA9 IDE7IGkgPCBhcmdjOyArK2kpIHsKICAgICAgICAgc3RyaW5nIGFyZ3VtZW50KGFyZ3ZbaV0pOwpA QCAtMTQwLDYgKzE0Myw4IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAgICAg ICAgICAgICBzdGFydHVwRGlhbG9nID0gdHJ1ZTsKICAgICAgICAgZWxzZSBpZiAoYXJndW1lbnQg PT0gb3B0aW9uQ2hlY2tMYXlvdXRUZXN0U3lzdGVtRGVwcykKICAgICAgICAgICAgIGV4aXQoY2hl Y2tMYXlvdXRUZXN0U3lzdGVtRGVwZW5kZW5jaWVzKCkgPyBFWElUX1NVQ0NFU1MgOiBFWElUX0ZB SUxVUkUpOworICAgICAgICBlbHNlIGlmIChhcmd1bWVudCA9PSBvcHRpb25IYXJkd2FyZUFjY2Vs ZXJhdGVkR0wpCisgICAgICAgICAgICBoYXJkd2FyZUFjY2VsZXJhdGVkR0wgPSB0cnVlOwogICAg ICAgICBlbHNlIGlmIChhcmd1bWVudCA9PSBvcHRpb25FbmFibGVBY2NlbGVyYXRlZENvbXBvc2l0 aW5nKQogICAgICAgICAgICAgYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQgPSB0cnVlOwog ICAgICAgICBlbHNlIGlmIChhcmd1bWVudCA9PSBvcHRpb25FbmFibGVBY2NlbGVyYXRlZDJEQ2Fu dmFzKQpAQCAtMTY0LDYgKzE2OSw4IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10p CiAgICAgICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CiAgICAgfQogCisgICAgd2Via2l0X3N1cHBv cnQ6OlNldFVwR0xCaW5kaW5ncyhoYXJkd2FyZUFjY2VsZXJhdGVkR0wgPyB3ZWJraXRfc3VwcG9y dDo6R0xfQklORElOR19ERUZBVUxUIDogd2Via2l0X3N1cHBvcnQ6OkdMX0JJTkRJTkdfU09GVFdB UkVfUkVOREVSRVIpOworCiAgICAgaWYgKHN0YXJ0dXBEaWFsb2cpCiAgICAgICAgIG9wZW5TdGFy dHVwRGlhbG9nKCk7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtLnB5CmluZGV4IGI5MDQyMWFkZmViMDhiMDk0MzAxMTlmZjJlZmJk ZTI4NDg1YzMyOGYuLjdlOTM0YTgyMGYzOTdjNTIyMDI3NDc0ZTE5YTU3YmJhNjllNzRhY2MgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21p dW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bS5weQpAQCAtMzkyLDYgKzM5Miw4IEBAIGNsYXNzIENocm9taXVtRHJpdmVyKGJhc2UuRHJp dmVyKToKICAgICAgICAgICAgICAgICBjbWQuYXBwZW5kKCctLWVuYWJsZS1hY2NlbGVyYXRlZC1j b21wb3NpdGluZycpCiAgICAgICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2FjY2Vs ZXJhdGVkXzJkX2NhbnZhcycpOgogICAgICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tZW5hYmxl LWFjY2VsZXJhdGVkLTJkLWNhbnZhcycpCisgICAgICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9v cHRpb24oJ2VuYWJsZV9oYXJkd2FyZV9ncHUnKToKKyAgICAgICAgICAgICAgICBjbWQuYXBwZW5k KCctLWVuYWJsZS1oYXJkd2FyZS1ncHUnKQogICAgICAgICByZXR1cm4gY21kCiAKICAgICBkZWYg c3RhcnQoc2VsZik6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCBjNDMxNzY1YWUyY2ZkOWM3MDcxMGQ4M2M5 ZDU5OWE5NzhiNTJlMzE2Li5hMTQxNjYxZmU4NTc0Zjc3MDliMmE2NzVlNTU4YWQ4ZGY2ZDA4Yzdi IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Vi a2l0X3Rlc3RzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1 bl93ZWJraXRfdGVzdHMucHkKQEAgLTI0Myw2ICsyNDMsMTAgQEAgZGVmIHBhcnNlX2FyZ3MoYXJn cz1Ob25lKToKICAgICAgICAgICAgIGFjdGlvbj0ic3RvcmVfZmFsc2UiLAogICAgICAgICAgICAg ZGVzdD0iYWNjZWxlcmF0ZWRfMmRfY2FudmFzIiwKICAgICAgICAgICAgIGhlbHA9IkRvbid0IHVz ZSBoYXJkd2FyZS1hY2NlbGVyYXRlZCAyRCBDYW52YXMgY2FsbHMiKSwKKyAgICAgICAgb3B0cGFy c2UubWFrZV9vcHRpb24oIi0tZW5hYmxlLWhhcmR3YXJlLWdwdSIsCisgICAgICAgICAgICBhY3Rp b249InN0b3JlX3RydWUiLAorICAgICAgICAgICAgZGVmYXVsdD1GYWxzZSwKKyAgICAgICAgICAg IGhlbHA9IlJ1biBncmFwaGljcyB0ZXN0cyBvbiByZWFsIEdQVSBoYXJkd2FyZSB2cyBzb2Z0d2Fy ZSIpLAogICAgIF0KIAogICAgICMgTWlzc2luZyBNYWMtc3BlY2lmaWMgb2xkLXJ1bi13ZWJraXQt dGVzdHMgb3B0aW9uczoKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDU0Y2E4Y2U3OTM5YTg1NmU3MGMxMGFmMDAz YjlhYzkzNmEzMmUzMTEuLjFhM2M3ZDdmNGU2NjBmYWRiNWViMTYzMDAzNGIwNWUyMjEwYjhlM2Qg MTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDExLTAxLTEyICBWaW5jZW50IFNjaGVp YiAgPHNjaGVpYkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIHN1cHBvcnQgdG8gRHVtcFJlbmRlclRyZWUgdG8gdXNlIHRo ZSBHUFUgcmF0aGVyIHRoYW4gc29mdHdhcmUgcmVuZGVyZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyMzMzCisKKyAgICAgICAgKiBXZWJLaXQuZ3lw OiBEdW1wUmVuZGVyVHJlZSBkZXBlbmRzIG9uIEFuZ2xlIG9uIHdpbmRvd3MKKwogMjAxMS0wMS0w NyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJ1YmJlci1zdGFt cGVkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0RFUFMgYi9X ZWJLaXQvY2hyb21pdW0vREVQUwppbmRleCA3ZmJjYmNkZGZjMzUwMThjNWEzNTc0MzNlMjAyM2Vl YThjMmExMzUwLi4xODViYzBjYTkwYmE1YzYwNDRiOTk5ZmVjNTdjMDcyOTg0Mzc3ZDk0IDEwMDY0 NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vREVQUworKysgYi9XZWJLaXQvY2hyb21pdW0vREVQUwpA QCAtMzIsNyArMzIsNyBAQAogCiB2YXJzID0gewogICAnY2hyb21pdW1fc3ZuJzogJ2h0dHA6Ly9z cmMuY2hyb21pdW0ub3JnL3N2bi90cnVuay9zcmMnLAotICAnY2hyb21pdW1fcmV2JzogJzcwODQw JworICAnY2hyb21pdW1fcmV2JzogJzcxMzMyJwogfQogCiBkZXBzID0gewpkaWZmIC0tZ2l0IGEv V2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAgYi9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cApp bmRleCA5Mzg1Nzc4ZjFiYzZjNTMwMDg1OGRlYWM5Yjg1YzA1YjY3MWYxZjg2Li41ODEzNGQyOTFi MDBhMTMzN2ViNWZhNmJjYzA4ODc2YjE2NWVhM2U0IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21p dW0vV2ViS2l0Lmd5cAorKysgYi9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cApAQCAtOTI4LDcg KzkyOCwxMSBAQAogICAgICAgICAgICAgXSwKICAgICAgICAgICAgICdjb25kaXRpb25zJzogWwog ICAgICAgICAgICAgICAgIFsnT1M9PSJ3aW4iJywgewotICAgICAgICAgICAgICAgICAgICAnZGVw ZW5kZW5jaWVzJzogWydMYXlvdXRUZXN0SGVscGVyJ10sCisgICAgICAgICAgICAgICAgICAgICdk ZXBlbmRlbmNpZXMnOiBbCisgICAgICAgICAgICAgICAgICAgICAgICAnTGF5b3V0VGVzdEhlbHBl cicsCisgICAgICAgICAgICAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS90aGlyZF9w YXJ0eS9hbmdsZS9zcmMvYnVpbGRfYW5nbGUuZ3lwOmxpYkVHTCcsCisgICAgICAgICAgICAgICAg ICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS90aGlyZF9wYXJ0eS9hbmdsZS9zcmMvYnVpbGRf YW5nbGUuZ3lwOmxpYkdMRVN2MicsCisgICAgICAgICAgICAgICAgICAgIF0sCiAKICAgICAgICAg ICAgICAgICAgICAgJ3Jlc291cmNlX2luY2x1ZGVfZGlycyc6IFsnPChTSEFSRURfSU5URVJNRURJ QVRFX0RJUikvd2Via2l0J10sCiAgICAgICAgICAgICAgICAgICAgICdzb3VyY2VzJzogWwo= 78837 2011-01-13 11:53:57 -0800 2011-01-14 09:04:13 -0800 Patch bug-52333-20110113115355.patch text/plain 6139 scheib ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkMGQ4 NTEyMDg1N2JjMWE4MTI2MGExMTI4Mzg5NTU2MWMwZGNlNmQwLi45N2Q5Zjg4MDU2OTExMmQ3Yjk2 ZWJjZmQxMjcyNjI0N2VjNzRlMWVkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDEtMTIgIFZpbmNlbnQgU2No ZWliICA8c2NoZWliQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCB0byBEdW1wUmVuZGVyVHJlZSB0byB1c2Ug dGhlIEdQVSByYXRoZXIgdGhhbiBzb2Z0d2FyZSByZW5kZXJlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTIzMzMKKworICAgICAgICAqIER1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKG1haW4pOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5w eToKKwogMjAxMS0wMS0xMyAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVt cFJlbmRlclRyZWUvY2hyb21pdW0vRHVtcFJlbmRlclRyZWUuY3BwIGIvVG9vbHMvRHVtcFJlbmRl clRyZWUvY2hyb21pdW0vRHVtcFJlbmRlclRyZWUuY3BwCmluZGV4IDY1MjI0NTBjMzFlODY3Njg4 MzE1ZWFiMmY3NjBiMmU0ODRmODc4MzguLmJkNTA3NWMzYzJkYTcyZjBmZTVmY2E4ZTVjNGYwMTgw ODUxZjIzZDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBS ZW5kZXJUcmVlLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9EdW1wUmVu ZGVyVHJlZS5jcHAKQEAgLTUwLDYgKzUwLDggQEAgc3RhdGljIGNvbnN0IGNoYXIgb3B0aW9uVGVz dFNoZWxsW10gPSAiLS10ZXN0LXNoZWxsIjsKIHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvbkFsbG93 RXh0ZXJuYWxQYWdlc1tdID0gIi0tYWxsb3ctZXh0ZXJuYWwtcGFnZXMiOwogc3RhdGljIGNvbnN0 IGNoYXIgb3B0aW9uU3RhcnR1cERpYWxvZ1tdID0gIi0tdGVzdHNoZWxsLXN0YXJ0dXAtZGlhbG9n IjsKIHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvbkNoZWNrTGF5b3V0VGVzdFN5c3RlbURlcHNbXSA9 ICItLWNoZWNrLWxheW91dC10ZXN0LXN5cy1kZXBzIjsKKworc3RhdGljIGNvbnN0IGNoYXIgb3B0 aW9uSGFyZHdhcmVBY2NlbGVyYXRlZEdMW10gPSAiLS1lbmFibGUtaGFyZHdhcmUtZ3B1IjsKIHN0 YXRpYyBjb25zdCBjaGFyIG9wdGlvbkVuYWJsZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdbXSA9ICIt LWVuYWJsZS1hY2NlbGVyYXRlZC1jb21wb3NpdGluZyI7CiBzdGF0aWMgY29uc3QgY2hhciBvcHRp b25FbmFibGVBY2NlbGVyYXRlZDJEQ2FudmFzW10gPSAiLS1lbmFibGUtYWNjZWxlcmF0ZWQtMmQt Y2FudmFzIjsKIApAQCAtMTE5LDYgKzEyMSw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBh cmd2W10pCiAgICAgYm9vbCBhY2NlbGVyYXRlZDJEQ2FudmFzRW5hYmxlZCA9IGZhbHNlOwogICAg IGJvb2wgc3RyZXNzT3B0ID0gZmFsc2U7CiAgICAgYm9vbCBzdHJlc3NEZW9wdCA9IGZhbHNlOwor ICAgIGJvb2wgaGFyZHdhcmVBY2NlbGVyYXRlZEdMID0gZmFsc2U7CiAgICAgc3RyaW5nIGphdmFT Y3JpcHRGbGFnczsKICAgICBmb3IgKGludCBpID0gMTsgaSA8IGFyZ2M7ICsraSkgewogICAgICAg ICBzdHJpbmcgYXJndW1lbnQoYXJndltpXSk7CkBAIC0xNDAsNiArMTQzLDggQEAgaW50IG1haW4o aW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKICAgICAgICAgICAgIHN0YXJ0dXBEaWFsb2cgPSB0cnVl OwogICAgICAgICBlbHNlIGlmIChhcmd1bWVudCA9PSBvcHRpb25DaGVja0xheW91dFRlc3RTeXN0 ZW1EZXBzKQogICAgICAgICAgICAgZXhpdChjaGVja0xheW91dFRlc3RTeXN0ZW1EZXBlbmRlbmNp ZXMoKSA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJTFVSRSk7CisgICAgICAgIGVsc2UgaWYgKGFy Z3VtZW50ID09IG9wdGlvbkhhcmR3YXJlQWNjZWxlcmF0ZWRHTCkKKyAgICAgICAgICAgIGhhcmR3 YXJlQWNjZWxlcmF0ZWRHTCA9IHRydWU7CiAgICAgICAgIGVsc2UgaWYgKGFyZ3VtZW50ID09IG9w dGlvbkVuYWJsZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmcpCiAgICAgICAgICAgICBhY2NlbGVyYXRl ZENvbXBvc2l0aW5nRW5hYmxlZCA9IHRydWU7CiAgICAgICAgIGVsc2UgaWYgKGFyZ3VtZW50ID09 IG9wdGlvbkVuYWJsZUFjY2VsZXJhdGVkMkRDYW52YXMpCkBAIC0xNjQsNiArMTY5LDggQEAgaW50 IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKICAgICAgICAgcmV0dXJuIEVYSVRfRkFJTFVS RTsKICAgICB9CiAKKyAgICB3ZWJraXRfc3VwcG9ydDo6U2V0VXBHTEJpbmRpbmdzKGhhcmR3YXJl QWNjZWxlcmF0ZWRHTCA/IHdlYmtpdF9zdXBwb3J0OjpHTF9CSU5ESU5HX0RFRkFVTFQgOiB3ZWJr aXRfc3VwcG9ydDo6R0xfQklORElOR19TT0ZUV0FSRV9SRU5ERVJFUik7CisKICAgICBpZiAoc3Rh cnR1cERpYWxvZykKICAgICAgICAgb3BlblN0YXJ0dXBEaWFsb2coKTsKIApkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKaW5kZXgg YjkwNDIxYWRmZWIwOGIwOTQzMDExOWZmMmVmYmRlMjg0ODVjMzI4Zi4uN2U5MzRhODIwZjM5N2M1 MjIwMjc0NzRlMTlhNTdiYmE2OWU3NGFjYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CkBAIC0zOTIsNiArMzkyLDggQEAg Y2xhc3MgQ2hyb21pdW1Ecml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICAgICAgICAgIGNtZC5h cHBlbmQoJy0tZW5hYmxlLWFjY2VsZXJhdGVkLWNvbXBvc2l0aW5nJykKICAgICAgICAgICAgIGlm IHNlbGYuX3BvcnQuZ2V0X29wdGlvbignYWNjZWxlcmF0ZWRfMmRfY2FudmFzJyk6CiAgICAgICAg ICAgICAgICAgY21kLmFwcGVuZCgnLS1lbmFibGUtYWNjZWxlcmF0ZWQtMmQtY2FudmFzJykKKyAg ICAgICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlvbignZW5hYmxlX2hhcmR3YXJlX2dwdScp OgorICAgICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tZW5hYmxlLWhhcmR3YXJlLWdwdScpCiAg ICAgICAgIHJldHVybiBjbWQKIAogICAgIGRlZiBzdGFydChzZWxmKToKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5Cmlu ZGV4IGM0MzE3NjVhZTJjZmQ5YzcwNzEwZDgzYzlkNTk5YTk3OGI1MmUzMTYuLmExNDE2NjFmZTg1 NzRmNzcwOWIyYTY3NWU1NThhZDhkZjZkMDhjN2IgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMjQzLDYg KzI0MywxMCBAQCBkZWYgcGFyc2VfYXJncyhhcmdzPU5vbmUpOgogICAgICAgICAgICAgYWN0aW9u PSJzdG9yZV9mYWxzZSIsCiAgICAgICAgICAgICBkZXN0PSJhY2NlbGVyYXRlZF8yZF9jYW52YXMi LAogICAgICAgICAgICAgaGVscD0iRG9uJ3QgdXNlIGhhcmR3YXJlLWFjY2VsZXJhdGVkIDJEIENh bnZhcyBjYWxscyIpLAorICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1lbmFibGUtaGFy ZHdhcmUtZ3B1IiwKKyAgICAgICAgICAgIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsCisgICAgICAgICAg ICBkZWZhdWx0PUZhbHNlLAorICAgICAgICAgICAgaGVscD0iUnVuIGdyYXBoaWNzIHRlc3RzIG9u IHJlYWwgR1BVIGhhcmR3YXJlIHZzIHNvZnR3YXJlIiksCiAgICAgXQogCiAgICAgIyBNaXNzaW5n IE1hYy1zcGVjaWZpYyBvbGQtcnVuLXdlYmtpdC10ZXN0cyBvcHRpb25zOgpkaWZmIC0tZ2l0IGEv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5k ZXggNjcxMDc4NWJhMjNjZDRjZTJlOGRhZDQxMWIzMGJmMTk2MDE2Y2I1Yy4uY2ZjMzJiYjAzNGVi MGVmYWEyMDFkMGI0NThmMWMyMWUwYTY1NDg3YSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDEtMTIgIFZpbmNlbnQgU2NoZWliICA8c2NoZWliQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9y dCB0byBEdW1wUmVuZGVyVHJlZSB0byB1c2UgdGhlIEdQVSByYXRoZXIgdGhhbiBzb2Z0d2FyZSBy ZW5kZXJlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTIzMzMKKworICAgICAgICAqIERFUFM6IE1vdmVkIGZvcndhcmQgdG8gdGFrZSByZXF1aXJlZCBz dXBwb3J0IGZyb20gd2Via2l0X3N1cHBvcnQuaAorICAgICAgICAqIFdlYktpdC5neXA6IER1bXBS ZW5kZXJUcmVlIGRlcGVuZHMgb24gQW5nbGUgb24gd2luZG93cworCiAyMDExLTAxLTEzICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VudCBU YW11cmEuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vREVQUyBiL1dlYktpdC9jaHJvbWl1 bS9ERVBTCmluZGV4IGYyZDU2ZmJmYWQ0M2Q3OWRjYjcyZmMxYTU0NjNhZTU5MTZjMTkwZDEuLjY0 MDU2NTFjZjVmODE0M2ViMGZjNjI3OTVkMmQ3ODViNTllMjVjODggMTAwNjQ0Ci0tLSBhL1dlYktp dC9jaHJvbWl1bS9ERVBTCisrKyBiL1dlYktpdC9jaHJvbWl1bS9ERVBTCkBAIC0zMiw3ICszMiw3 IEBACiAKIHZhcnMgPSB7CiAgICdjaHJvbWl1bV9zdm4nOiAnaHR0cDovL3NyYy5jaHJvbWl1bS5v cmcvc3ZuL3RydW5rL3NyYycsCi0gICdjaHJvbWl1bV9yZXYnOiAnNzEyNDknCisgICdjaHJvbWl1 bV9yZXYnOiAnNzEzMzInCiB9CiAKIGRlcHMgPSB7CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21p dW0vV2ViS2l0Lmd5cCBiL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCmluZGV4IDNmMjA1Yjdl OTBkMzVhM2JmZTAxMGM2M2ViNDMwNDBmNWU0OTJhMWYuLjkwNGEyMzgwZjNiOGEyYjlmOTQ4Njcy ODQ3YWRlZDk4MWFhYzg5NzIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lw CisrKyBiL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCkBAIC05MDAsNyArOTAwLDExIEBACiAg ICAgICAgICAgICBdLAogICAgICAgICAgICAgJ2NvbmRpdGlvbnMnOiBbCiAgICAgICAgICAgICAg ICAgWydPUz09IndpbiInLCB7Ci0gICAgICAgICAgICAgICAgICAgICdkZXBlbmRlbmNpZXMnOiBb J0xheW91dFRlc3RIZWxwZXInXSwKKyAgICAgICAgICAgICAgICAgICAgJ2RlcGVuZGVuY2llcyc6 IFsKKyAgICAgICAgICAgICAgICAgICAgICAgICdMYXlvdXRUZXN0SGVscGVyJywKKyAgICAgICAg ICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3RoaXJkX3BhcnR5L2FuZ2xlL3Ny Yy9idWlsZF9hbmdsZS5neXA6bGliRUdMJywKKyAgICAgICAgICAgICAgICAgICAgICAgICc8KGNo cm9taXVtX3NyY19kaXIpL3RoaXJkX3BhcnR5L2FuZ2xlL3NyYy9idWlsZF9hbmdsZS5neXA6bGli R0xFU3YyJywKKyAgICAgICAgICAgICAgICAgICAgXSwKIAogICAgICAgICAgICAgICAgICAgICAn cmVzb3VyY2VfaW5jbHVkZV9kaXJzJzogWyc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS93ZWJr aXQnXSwKICAgICAgICAgICAgICAgICAgICAgJ3NvdXJjZXMnOiBbCg== 78947 2011-01-14 09:04:17 -0800 2011-01-14 10:09:29 -0800 Patch bug-52333-20110114090415.patch text/plain 6179 scheib ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1MTRl NDgyNDZhODgxOWM4YmMzYzg3MmViNzEyMGI4ZmFiNDJiNDk3Li5hYzZlNzM1MmVhNTcwMGZmMzA0 ODk0MmZlNTQwNjUxYTBhNWJhYTEyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDEtMTIgIFZpbmNlbnQgU2No ZWliICA8c2NoZWliQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCB0byBEdW1wUmVuZGVyVHJlZSB0byB1c2Ug dGhlIEdQVSByYXRoZXIgdGhhbiBzb2Z0d2FyZSByZW5kZXJlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTIzMzMKKworICAgICAgICAqIER1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKG1haW4pOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5w eToKKwogMjAxMS0wMS0xNCAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgT3JpZ2luYWwgcGF0Y2ggZnJvbSBQZXRlciBHYWwgIDxnYWxwYXRlckBpbmYudS1zemVnZWQu aHU+CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9EdW1wUmVuZGVy VHJlZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9EdW1wUmVuZGVyVHJlZS5j cHAKaW5kZXggNjUyMjQ1MGMzMWU4Njc2ODgzMTVlYWIyZjc2MGIyZTQ4NGY4NzgzOC4uYmQ1MDc1 YzNjMmRhNzJmMGZlNWZjYThlNWM0ZjAxODA4NTFmMjNkMCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVt cFJlbmRlclRyZWUvY2hyb21pdW0vRHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtNTAsNiArNTAsOCBAQCBz dGF0aWMgY29uc3QgY2hhciBvcHRpb25UZXN0U2hlbGxbXSA9ICItLXRlc3Qtc2hlbGwiOwogc3Rh dGljIGNvbnN0IGNoYXIgb3B0aW9uQWxsb3dFeHRlcm5hbFBhZ2VzW10gPSAiLS1hbGxvdy1leHRl cm5hbC1wYWdlcyI7CiBzdGF0aWMgY29uc3QgY2hhciBvcHRpb25TdGFydHVwRGlhbG9nW10gPSAi LS10ZXN0c2hlbGwtc3RhcnR1cC1kaWFsb2ciOwogc3RhdGljIGNvbnN0IGNoYXIgb3B0aW9uQ2hl Y2tMYXlvdXRUZXN0U3lzdGVtRGVwc1tdID0gIi0tY2hlY2stbGF5b3V0LXRlc3Qtc3lzLWRlcHMi OworCitzdGF0aWMgY29uc3QgY2hhciBvcHRpb25IYXJkd2FyZUFjY2VsZXJhdGVkR0xbXSA9ICIt LWVuYWJsZS1oYXJkd2FyZS1ncHUiOwogc3RhdGljIGNvbnN0IGNoYXIgb3B0aW9uRW5hYmxlQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ1tdID0gIi0tZW5hYmxlLWFjY2VsZXJhdGVkLWNvbXBvc2l0aW5n IjsKIHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvbkVuYWJsZUFjY2VsZXJhdGVkMkRDYW52YXNbXSA9 ICItLWVuYWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXMiOwogCkBAIC0xMTksNiArMTIxLDcgQEAg aW50IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKICAgICBib29sIGFjY2VsZXJhdGVkMkRD YW52YXNFbmFibGVkID0gZmFsc2U7CiAgICAgYm9vbCBzdHJlc3NPcHQgPSBmYWxzZTsKICAgICBi b29sIHN0cmVzc0Rlb3B0ID0gZmFsc2U7CisgICAgYm9vbCBoYXJkd2FyZUFjY2VsZXJhdGVkR0wg PSBmYWxzZTsKICAgICBzdHJpbmcgamF2YVNjcmlwdEZsYWdzOwogICAgIGZvciAoaW50IGkgPSAx OyBpIDwgYXJnYzsgKytpKSB7CiAgICAgICAgIHN0cmluZyBhcmd1bWVudChhcmd2W2ldKTsKQEAg LTE0MCw2ICsxNDMsOCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgICAg ICAgICAgc3RhcnR1cERpYWxvZyA9IHRydWU7CiAgICAgICAgIGVsc2UgaWYgKGFyZ3VtZW50ID09 IG9wdGlvbkNoZWNrTGF5b3V0VGVzdFN5c3RlbURlcHMpCiAgICAgICAgICAgICBleGl0KGNoZWNr TGF5b3V0VGVzdFN5c3RlbURlcGVuZGVuY2llcygpID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlM VVJFKTsKKyAgICAgICAgZWxzZSBpZiAoYXJndW1lbnQgPT0gb3B0aW9uSGFyZHdhcmVBY2NlbGVy YXRlZEdMKQorICAgICAgICAgICAgaGFyZHdhcmVBY2NlbGVyYXRlZEdMID0gdHJ1ZTsKICAgICAg ICAgZWxzZSBpZiAoYXJndW1lbnQgPT0gb3B0aW9uRW5hYmxlQWNjZWxlcmF0ZWRDb21wb3NpdGlu ZykKICAgICAgICAgICAgIGFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkID0gdHJ1ZTsKICAg ICAgICAgZWxzZSBpZiAoYXJndW1lbnQgPT0gb3B0aW9uRW5hYmxlQWNjZWxlcmF0ZWQyRENhbnZh cykKQEAgLTE2NCw2ICsxNjksOCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQog ICAgICAgICByZXR1cm4gRVhJVF9GQUlMVVJFOwogICAgIH0KIAorICAgIHdlYmtpdF9zdXBwb3J0 OjpTZXRVcEdMQmluZGluZ3MoaGFyZHdhcmVBY2NlbGVyYXRlZEdMID8gd2Via2l0X3N1cHBvcnQ6 OkdMX0JJTkRJTkdfREVGQVVMVCA6IHdlYmtpdF9zdXBwb3J0OjpHTF9CSU5ESU5HX1NPRlRXQVJF X1JFTkRFUkVSKTsKKwogICAgIGlmIChzdGFydHVwRGlhbG9nKQogICAgICAgICBvcGVuU3RhcnR1 cERpYWxvZygpOwogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jaHJvbWl1bS5weQppbmRleCBiOTA0MjFhZGZlYjA4YjA5NDMwMTE5ZmYyZWZiZGUy ODQ4NWMzMjhmLi43ZTkzNGE4MjBmMzk3YzUyMjAyNzQ3NGUxOWE1N2JiYTY5ZTc0YWNjIDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVt LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21p dW0ucHkKQEAgLTM5Miw2ICszOTIsOCBAQCBjbGFzcyBDaHJvbWl1bURyaXZlcihiYXNlLkRyaXZl cik6CiAgICAgICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1lbmFibGUtYWNjZWxlcmF0ZWQtY29t cG9zaXRpbmcnKQogICAgICAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCdhY2NlbGVy YXRlZF8yZF9jYW52YXMnKToKICAgICAgICAgICAgICAgICBjbWQuYXBwZW5kKCctLWVuYWJsZS1h Y2NlbGVyYXRlZC0yZC1jYW52YXMnKQorICAgICAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0 aW9uKCdlbmFibGVfaGFyZHdhcmVfZ3B1Jyk6CisgICAgICAgICAgICAgICAgY21kLmFwcGVuZCgn LS1lbmFibGUtaGFyZHdhcmUtZ3B1JykKICAgICAgICAgcmV0dXJuIGNtZAogCiAgICAgZGVmIHN0 YXJ0KHNlbGYpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcnVuX3dlYmtpdF90ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3J1bl93ZWJraXRfdGVzdHMucHkKaW5kZXggYzQzMTc2NWFlMmNmZDljNzA3MTBkODNjOWQ1 OTlhOTc4YjUyZTMxNi4uYTE0MTY2MWZlODU3NGY3NzA5YjJhNjc1ZTU1OGFkOGRmNmQwOGM3YiAx MDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtp dF90ZXN0cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5f d2Via2l0X3Rlc3RzLnB5CkBAIC0yNDMsNiArMjQzLDEwIEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3M9 Tm9uZSk6CiAgICAgICAgICAgICBhY3Rpb249InN0b3JlX2ZhbHNlIiwKICAgICAgICAgICAgIGRl c3Q9ImFjY2VsZXJhdGVkXzJkX2NhbnZhcyIsCiAgICAgICAgICAgICBoZWxwPSJEb24ndCB1c2Ug aGFyZHdhcmUtYWNjZWxlcmF0ZWQgMkQgQ2FudmFzIGNhbGxzIiksCisgICAgICAgIG9wdHBhcnNl Lm1ha2Vfb3B0aW9uKCItLWVuYWJsZS1oYXJkd2FyZS1ncHUiLAorICAgICAgICAgICAgYWN0aW9u PSJzdG9yZV90cnVlIiwKKyAgICAgICAgICAgIGRlZmF1bHQ9RmFsc2UsCisgICAgICAgICAgICBo ZWxwPSJSdW4gZ3JhcGhpY3MgdGVzdHMgb24gcmVhbCBHUFUgaGFyZHdhcmUgdnMgc29mdHdhcmUi KSwKICAgICBdCiAKICAgICAjIE1pc3NpbmcgTWFjLXNwZWNpZmljIG9sZC1ydW4td2Via2l0LXRl c3RzIG9wdGlvbnM6CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA2ZmI2NzA2ZTUzY2Y3MzUzNGNjNDVlOGY5NjRj MGI3MjhlODU4YzMzLi5iNDdkNGI0MzNjN2E0NDFlZTY3MTQ1ZTY1M2I3MjM2NTYwYjAyZjE2IDEw MDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0wMS0xMiAgVmluY2VudCBTY2hlaWIg IDxzY2hlaWJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBzdXBwb3J0IHRvIER1bXBSZW5kZXJUcmVlIHRvIHVzZSB0aGUg R1BVIHJhdGhlciB0aGFuIHNvZnR3YXJlIHJlbmRlcmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjMzMworCisgICAgICAgICogREVQUzogTW92ZWQg Zm9yd2FyZCB0byB0YWtlIHJlcXVpcmVkIHN1cHBvcnQgZnJvbSB3ZWJraXRfc3VwcG9ydC5oCisg ICAgICAgICogV2ViS2l0Lmd5cDogRHVtcFJlbmRlclRyZWUgZGVwZW5kcyBvbiBBbmdsZSBvbiB3 aW5kb3dzCisKIDIwMTEtMDEtMTQgIEZpbm51ciBUaG9yYXJpbnNzb24gIDxmaW5udXIud2Via2l0 QGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBPamFuIFZhZmFpLgpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2Nocm9taXVtL0RFUFMgYi9XZWJLaXQvY2hyb21pdW0vREVQUwppbmRleCBmMmQ1 NmZiZmFkNDNkNzlkY2I3MmZjMWE1NDYzYWU1OTE2YzE5MGQxLi5jMmQxOThmN2Q3NmQzNWQ1Njkw YTdkZGJjY2E3ZTU0MDgyYjM3MWY2IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vREVQUwor KysgYi9XZWJLaXQvY2hyb21pdW0vREVQUwpAQCAtMzIsNyArMzIsNyBAQAogCiB2YXJzID0gewog ICAnY2hyb21pdW1fc3ZuJzogJ2h0dHA6Ly9zcmMuY2hyb21pdW0ub3JnL3N2bi90cnVuay9zcmMn LAotICAnY2hyb21pdW1fcmV2JzogJzcxMjQ5JworICAnY2hyb21pdW1fcmV2JzogJzcxNDA1Jwog fQogCiBkZXBzID0gewpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAgYi9X ZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAppbmRleCAzZjIwNWI3ZTkwZDM1YTNiZmUwMTBjNjNl YjQzMDQwZjVlNDkyYTFmLi45MDRhMjM4MGYzYjhhMmI5Zjk0ODY3Mjg0N2FkZWQ5ODFhYWM4OTcy IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAorKysgYi9XZWJLaXQvY2hy b21pdW0vV2ViS2l0Lmd5cApAQCAtOTAwLDcgKzkwMCwxMSBAQAogICAgICAgICAgICAgXSwKICAg ICAgICAgICAgICdjb25kaXRpb25zJzogWwogICAgICAgICAgICAgICAgIFsnT1M9PSJ3aW4iJywg ewotICAgICAgICAgICAgICAgICAgICAnZGVwZW5kZW5jaWVzJzogWydMYXlvdXRUZXN0SGVscGVy J10sCisgICAgICAgICAgICAgICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCisgICAgICAgICAgICAg ICAgICAgICAgICAnTGF5b3V0VGVzdEhlbHBlcicsCisgICAgICAgICAgICAgICAgICAgICAgICAn PChjaHJvbWl1bV9zcmNfZGlyKS90aGlyZF9wYXJ0eS9hbmdsZS9zcmMvYnVpbGRfYW5nbGUuZ3lw OmxpYkVHTCcsCisgICAgICAgICAgICAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS90 aGlyZF9wYXJ0eS9hbmdsZS9zcmMvYnVpbGRfYW5nbGUuZ3lwOmxpYkdMRVN2MicsCisgICAgICAg ICAgICAgICAgICAgIF0sCiAKICAgICAgICAgICAgICAgICAgICAgJ3Jlc291cmNlX2luY2x1ZGVf ZGlycyc6IFsnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0J10sCiAgICAgICAgICAg ICAgICAgICAgICdzb3VyY2VzJzogWwo=