99393 2012-10-15 17:22:01 -0700 Add support for 8 bit TextRuns for ports using HarfBuzz or HarfBuzz NG 2013-03-04 12:19:56 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 97378 100024 110896 111348 1 leviw leviw bashi benjamin buildbot cabanier d-r eae eric esprehn ggaren mitz msaboff rniwa schenney tony webkit.review.bot oldest_to_newest 742614 0 leviw 2012-10-15 17:22:01 -0700 See https://bugs.webkit.org/show_bug.cgi?id=97378 for reference. 742656 1 168822 leviw 2012-10-15 17:44:31 -0700 Created attachment 168822 Patch 742665 2 168822 bashi 2012-10-15 17:58:33 -0700 Comment on attachment 168822 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=168822&action=review > Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaperBase.h:60 > + return stringFor8BitRun.characters16(); m_stringFor8BitRuns.characters16()? If so, should we make sure that get16BitCharactersFor8BitRun() called only once? 743220 3 168822 tony 2012-10-16 09:46:48 -0700 Comment on attachment 168822 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=168822&action=review > Source/WebCore/ChangeLog:9 > + Adding support for 8 bit TextRuns for platforms using HarfBuzz and HarfBuzz NG. > + This involves converting 8 bit TextRuns to 16 bit in the complex text case, and Do you have some perf or memory usage numbers? 743233 4 leviw 2012-10-16 10:04:39 -0700 (In reply to comment #3) > Do you have some perf or memory usage numbers? I'm afraid not. Perhaps Michael Saboff does for the Mac port? Otherwise, if you have a suggestion on how to gather some good numbers I'd be happy to do it. 743240 5 eric 2012-10-16 10:14:09 -0700 I might start by running run-perf-tests Layout/line-breaking.html, that does ascii-fast-path line breaking and might notice a speedup from text runs using only half the memory. 743303 6 msaboff 2012-10-16 10:54:38 -0700 (In reply to comment #4) > (In reply to comment #3) > > Do you have some perf or memory usage numbers? > > I'm afraid not. Perhaps Michael Saboff does for the Mac port? Otherwise, if you have a suggestion on how to gather some good numbers I'd be happy to do it. I put performance numbers from running the PerformanceTests/Layout tests into comments for 96979, See https://bugs.webkit.org/show_bug.cgi?id=96979#c9. The final numbers were a little less than that, but basically follow the same trend. 743384 7 168822 benjamin 2012-10-16 11:56:48 -0700 Comment on attachment 168822 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=168822&action=review Is there no version of those function taking a character iterator? This defeat the purpose of WTF_USE_8BIT_TEXTRUN :( > Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaperBase.h:59 > + m_stringsFor8BitRuns.append(stringFor8BitRun); Is this your way of keeping the 16bits memory alive? If it is, you should be passing a buffer to the caller instead. If you have an other intent for m_stringsFor8BitRuns, what is it? 743399 8 leviw 2012-10-16 12:10:52 -0700 (In reply to comment #7) > (From update of attachment 168822 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=168822&action=review > > Is there no version of those function taking a character iterator? This defeat the purpose of WTF_USE_8BIT_TEXTRUN :( The purpose of using 8 bit text runs is to optimize the common cases where complex text uses 16 bit strings and simple text uses 8 bit. Unless I'm mistaken, the simple case should be properly handling 8 bit text runs without conversion and without change. 747807 9 eric 2012-10-22 13:14:03 -0700 (In reply to comment #6) > (In reply to comment #4) > > (In reply to comment #3) > > > Do you have some perf or memory usage numbers? > > > > I'm afraid not. Perhaps Michael Saboff does for the Mac port? Otherwise, if you have a suggestion on how to gather some good numbers I'd be happy to do it. > > I put performance numbers from running the PerformanceTests/Layout tests into comments for 96979, See https://bugs.webkit.org/show_bug.cgi?id=96979#c9. > > The final numbers were a little less than that, but basically follow the same trend. Yeah, I would expect line-layout to move, since we're now walking much smaller buffers in the fast-text-path. Sadly Layout/ doesn't have any complex-text cases as far as I can tell. I should talk to mitz about how to make some good ones. 748109 10 eric 2012-10-22 17:08:21 -0700 Looks like my fancy new test in bug 100024 likes this change: before: median= 91.8549262304 runs/s, stdev= 1.37209469605 runs/s, min= 87.2826661652 runs/s, max= 92.2565152857 runs/s after: median= 94.9297505045 runs/s, stdev= 0.410723301989 runs/s, min= 94.27891947 runs/s, max= 95.7165641127 runs/s I could re-run the before numbers to get more consistent results, but the "before" max seems outside of the "after" range anyway. :) 754677 11 eric 2012-10-30 14:52:01 -0700 I tried testing this on a Mac, but it seems we don't actually use HarfBuzz on Mac. I'll have to test this from my linux machine: http://code.google.com/p/chromium/issues/detail?id=158620 754688 12 168822 eric 2012-10-30 15:05:27 -0700 Comment on attachment 168822 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=168822&action=review > Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaperBase.h:74 > + Vector<String> m_stringsFor8BitRuns; I don't think this is necessary. We should chat about this patch when your'e back. 841386 13 190149 leviw 2013-02-25 16:13:40 -0800 Created attachment 190149 Patch 841388 14 leviw 2013-02-25 16:14:16 -0800 (In reply to comment #13) > Created an attachment (id=190149) [details] > Patch The Vector was unnecessary, as we already normalized to a separate buffer. 841394 15 190149 eric 2013-02-25 16:17:12 -0800 Comment on attachment 190149 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190149&action=review > Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaperBase.cpp:98 > + String stringFor8BitRun; So this lives long enough? normalize doesnt' try to hang onto the bytes? > Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp:164 > + String stringFor8BitRun; So long as this lives long enough. 841395 16 190149 eric 2013-02-25 16:17:25 -0800 Comment on attachment 190149 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190149&action=review > Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaperBase.h:36 > +#include <wtf/text/WTFString.h> Intentional? 841398 17 leviw 2013-02-25 16:21:03 -0800 (In reply to comment #16) > (From update of attachment 190149 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=190149&action=review > > > Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaperBase.h:36 > > +#include <wtf/text/WTFString.h> > > Intentional? Damn, no, that's vestigial. Fixing before landing. 841399 18 leviw 2013-02-25 16:21:37 -0800 (In reply to comment #15) > (From update of attachment 190149 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=190149&action=review > > > Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaperBase.cpp:98 > > + String stringFor8BitRun; > > So this lives long enough? normalize doesnt' try to hang onto the bytes? > > > Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp:164 > > + String stringFor8BitRun; > > So long as this lives long enough. It does, as it's copied into the normalized buffer inside this function. 841436 19 190160 leviw 2013-02-25 17:08:50 -0800 Created attachment 190160 Patch for landing 841580 20 190160 buildbot 2013-02-25 20:41:30 -0800 Comment on attachment 190160 Patch for landing Attachment 190160 did not pass mac-wk2-ews (mac-wk2): Output: http://queues.webkit.org/results/16751624 New failing tests: fast/xsl/xslt-missing-namespace-in-xslt.xml 841583 21 leviw 2013-02-25 20:43:24 -0800 I'm going to wait for the cr-bots to process this, but the mac-wk2 failure is flake :-/ 842065 22 190160 webkit.review.bot 2013-02-26 09:09:57 -0800 Comment on attachment 190160 Patch for landing Clearing flags on attachment: 190160 Committed r144065: <http://trac.webkit.org/changeset/144065> 842066 23 webkit.review.bot 2013-02-26 09:10:03 -0800 All reviewed patches have been landed. Closing bug. 842226 24 webkit.review.bot 2013-02-26 11:39:08 -0800 Re-opened since this is blocked by bug 110896 842233 25 schenney 2013-02-26 11:46:43 -0800 This broke Win7 and Win XP tests, in a rather serious manner. It was rolled out. Links coming shortly. 842235 26 schenney 2013-02-26 11:48:54 -0800 http://test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=fast%2Ftext%2Fcomplex-preferred-logical-widths.html%2Cfast%2Ftext%2Fword-space-with-kerning-2.html%2Cfast%2Ftext%2Ffont-kerning.html%2Cfast%2Ftext%2Ffont-variant-ligatures.html%2Cfast%2Ftext%2Fjustify-ideograph-leading-expansion.html%2Cfast%2Ftext%2Fword-space-with-kerning.html%2Cfast%2Ftext%2Fjustification-padding-mid-word.html http://test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=css3%2Ffont-feature-settings-rendering.html%20fast%2Fcss%2Ftext-rendering.html%20fast%2Ftext%2Finternational%2Ftext-spliced-font.html%20fast%2Ftext%2Fshaping%2Fshaping-selection-rect.html%20fast%2Fwriting-mode%2Ftext-orientation-basic.html 842236 27 eric 2013-02-26 11:50:28 -0800 Thanks Stephen 842255 28 leviw 2013-02-26 12:14:17 -0800 Likewise, thanks Stephen and sorry for the noise. Sadly, I don't have a Windows machine to debug this... I can re-land for non-windows platforms or wait till someone can figure out what's going wrong there. The backtrace from the bots isn't too useful, though there are only a few places that assert !is8Bit() crash log for DumpRenderTree (pid 2996): STDOUT: <empty> STDERR: ASSERTION FAILED: !is8Bit() STDERR: Backtrace: STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65CC5559+9851929] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65EDA062+12033826] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65E7D3FA+11653818] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65CC5185+9850949] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66A38C08+23956168] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66A36BF8+23947960] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66A3525B+23941403] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66A2E973+23914547] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66A2DFBF+23912063] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66A325D0+23930000] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66973B6D+23149101] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66972BEC+23145132] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66978FDB+23170715] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66978C92+23169874] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66973B83+23149123] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66972BEC+23145132] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66978FDB+23170715] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66978C92+23169874] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66973B83+23149123] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x66972BEC+23145132] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x6687A6F2+22128050] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x6687B563+22131747] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65F21A7C+12327228] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x659A8061+6586145] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65F43744+12465668] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65F43419+12464857] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65F430DE+12464030] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x659B1A69+6625577] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65CA09F7+9701559] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65C62FB1+9449073] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65BF3DE1+8993953] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65BF3EAC+8994156] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65BEFCC1+8977281] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65BF3F19+8994265] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65BF4226+8995046] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65F1D5A3+12309603] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x660859C7+13785223] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x6642B2FE+17609150] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x6642B51F+17609695] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x6603B6E4+13481380] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x6603B7F7+13481655] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x6656B9E5+18921637] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x667E071D+21497309] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x665D3A57+19347735] STDERR: WebKit::WebFilterOperation::WebFilterOperation [0x65EF53EE+12145326] STDERR: webkit::ppapi::NPObjectToPPVar [0x61083CC9+545024] STDERR: (No symbol) [0x0042177B] STDERR: (No symbol) [0x0042B58C] STDERR: (No symbol) [0x0042B1E1] STDERR: (No symbol) [0x0042AC2C] STDERR: base::win::OSInfo::processors [0x6426C91F+378667] STDERR: base::win::OSInfo::processors [0x64278313+426271] STDERR: base::win::OSInfo::processors [0x64278804+427536] STDERR: base::win::OSInfo::processors [0x642796C6+431314] STDERR: base::win::OSInfo::processors [0x64287FF4+491008] STDERR: base::win::OSInfo::processors [0x64287102+487182] STDERR: base::win::OSInfo::processors [0x642269EC+92152] STDERR: base::win::OSInfo::processors [0x64277E59+425061] STDERR: base::win::OSInfo::processors [0x64277BAE+424378] STDERR: base::win::OSInfo::processors [0x64248DE9+232437] STDERR: base::win::OSInfo::processors [0x64276E81+421005] STDERR: (No symbol) [0x00364B6D] 845514 29 leviw 2013-03-01 14:40:18 -0800 I'm going to try enabling this just for Linux & Mac, that way I can just file a bug for the Windows issue and try to find an owner for it. 845619 30 191067 leviw 2013-03-01 16:43:32 -0800 Created attachment 191067 Patch 845637 31 191067 eric 2013-03-01 17:01:46 -0800 Comment on attachment 191067 Patch Fantastic. YOu might add a comment to the gypi linking to the windows bug. 845664 32 leviw 2013-03-01 17:18:33 -0800 (In reply to comment #31) > (From update of attachment 191067 [details]) > Fantastic. YOu might add a comment to the gypi linking to the windows bug. Will do before landing. This'll make it easier for whoever is willing to take the Windows one... 845702 33 191067 buildbot 2013-03-01 18:49:23 -0800 Comment on attachment 191067 Patch Attachment 191067 did not pass mac-ews (mac): Output: http://webkit-commit-queue.appspot.com/results/16778896 New failing tests: editing/selection/selection-invalid-offset.html 846716 34 leviw 2013-03-04 12:19:46 -0800 http://trac.webkit.org/changeset/144646 846717 35 191067 leviw 2013-03-04 12:19:56 -0800 Comment on attachment 191067 Patch That buildbot failure is unrelated. 168822 2012-10-15 17:44:31 -0700 2013-02-25 16:13:37 -0800 Patch bug-99393-20121015174321.patch text/plain 5998 leviw SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMzEzODYpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEyLTEwLTE1ICBMZXZpIFdlaW50cmF1YiAgPGxl dml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3IgOCBiaXQgVGV4dFJ1 bnMgZm9yIHBvcnRzIHVzaW5nIEhhcmZCdXp6IG9yIEhhcmZCdXp6IE5HCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTM5MworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsaW5nIFdURl9VU0VfOEJJVF9U RVhUUlVOIGZvciBMaW51eCwgTWFjLCBhbmQgQW5kcm9pZCBDaHJvbWl1bS4gVGVjaG5pY2FsbHks CisgICAgICAgIHRoaXMgc2hvdWxkIGJlIGFsbCBIYXJmQnV6eiBwbGF0Zm9ybXMsIGJ1dCB0aGVy ZSdzIG5vIFVTRShIQVJGQlVaWikgZmxhZy4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgor CiAyMDEyLTEwLTE1ICBBbmRyZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KIAogICAgICAg ICBSZW1vdmUgV1RGOjpmYXN0RGVsZXRlQWxsVmFsdWVzKCkuCkluZGV4OiBTb3VyY2UvV1RGL3d0 Zi9QbGF0Zm9ybS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgJKHJl dmlzaW9uIDEzMTMyNCkKKysrIFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgJKHdvcmtpbmcgY29w eSkKQEAgLTEwMjYsNyArMTAyNiw3IEBACiAjZW5kaWYKIAogLypBZGQgb3RoZXIgcGxhdGZvcm1z IGFzIHRoZXkgdXBkYXRlIHRoZWlyIHBsYXRmcm9tIHNwZWNpZmljIGNvZGUgdG8gaGFuZGxlIFRl eHRSdW4ncyB3aXRoIDggYml0IGRhdGEuICovCi0jaWYgUExBVEZPUk0oTUFDKQorI2lmIFBMQVRG T1JNKE1BQykgfHwgKFBMQVRGT1JNKENIUk9NSVVNKSAmJiAoT1MoREFSV0lOKSB8fCBPUyhMSU5V WCkgfHwgT1MoQU5EUk9JRCkpKQogI2RlZmluZSBXVEZfVVNFXzhCSVRfVEVYVFJVTiAxCiAjZW5k aWYKIApJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTMxMzg2KQorKysgU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTItMTAtMTUgIExl dmkgV2VpbnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFkZCBzdXBwb3J0 IGZvciA4IGJpdCBUZXh0UnVucyBmb3IgcG9ydHMgdXNpbmcgSGFyZkJ1enogb3IgSGFyZkJ1enog TkcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5Mzkz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkaW5n IHN1cHBvcnQgZm9yIDggYml0IFRleHRSdW5zIGZvciBwbGF0Zm9ybXMgdXNpbmcgSGFyZkJ1enog YW5kIEhhcmZCdXp6IE5HLgorICAgICAgICBUaGlzIGludm9sdmVzIGNvbnZlcnRpbmcgOCBiaXQg VGV4dFJ1bnMgdG8gMTYgYml0IGluIHRoZSBjb21wbGV4IHRleHQgY2FzZSwgYW5kCisgICAgICAg IHN0b3JpbmcgdGhlIHJlc3VsdGluZyBzdHJpbmdzIGluIGEgdmVjdG9yIGluIEhhcmZCdXp6U2hh cGVyQmFzZSBzbyB0aGUgZGF0YQorICAgICAgICBpc24ndCBmcmVlZC4KKworICAgICAgICBObyBu ZXcgdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6U2hhcGVyQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIYXJmQnV6elNoYXBlckJhc2U6OnNldE5vcm1hbGl6ZWRCdWZmZXIpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6U2hhcGVyQmFzZS5oOgorICAgICAgICAo V2ViQ29yZTo6SGFyZkJ1enpTaGFwZXJCYXNlOjpnZXQxNkJpdENoYXJhY3RlcnNGb3I4Qml0UnVu KToKKyAgICAgICAgKEhhcmZCdXp6U2hhcGVyQmFzZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvaGFyZmJ1enovbmcvSGFyZkJ1enpTaGFwZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SGFyZkJ1enpTaGFwZXI6OkhhcmZCdXp6U2hhcGVyKToKKwogMjAxMi0xMC0xNSAgVG9ueSBDaGFu ZyAgPHRvbnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0 IHIxMzEzNjcuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6 ei9IYXJmQnV6elNoYXBlckJhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6U2hhcGVyQmFzZS5jcHAJKHJldmlzaW9u IDEzMTMyNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hh cmZCdXp6U2hhcGVyQmFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk0LDEwICs5NCwxNiBAQCB2 b2lkIEhhcmZCdXp6U2hhcGVyQmFzZTo6c2V0Tm9ybWFsaXplZEJ1CiAgICAgaWN1OjpVbmljb2Rl U3RyaW5nIG5vcm1hbGl6ZWRTdHJpbmc7CiAgICAgVUVycm9yQ29kZSBlcnJvciA9IFVfWkVST19F UlJPUjsKIAorICAgIGNvbnN0IFVDaGFyKiBydW5DaGFyYWN0ZXJzOworICAgIGlmIChtX3J1bi5p czhCaXQoKSkKKyAgICAgICAgcnVuQ2hhcmFjdGVycyA9IGdldDE2Qml0Q2hhcmFjdGVyc0ZvcjhC aXRSdW4oKTsKKyAgICBlbHNlCisgICAgICAgIHJ1bkNoYXJhY3RlcnMgPSBtX3J1bi5jaGFyYWN0 ZXJzMTYoKTsKKwogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbV9ydW4ubGVuZ3RoKCk7ICsraSkg ewotICAgICAgICBVQ2hhciBjaCA9IG1fcnVuW2ldOworICAgICAgICBVQ2hhciBjaCA9IHJ1bkNo YXJhY3RlcnNbaV07CiAgICAgICAgIGlmICg6OnVibG9ja19nZXRDb2RlKGNoKSA9PSBVQkxPQ0tf Q09NQklOSU5HX0RJQUNSSVRJQ0FMX01BUktTKSB7Ci0gICAgICAgICAgICBpY3U6Ok5vcm1hbGl6 ZXI6Om5vcm1hbGl6ZShpY3U6OlVuaWNvZGVTdHJpbmcobV9ydW4uY2hhcmFjdGVyczE2KCksCisg ICAgICAgICAgICBpY3U6Ok5vcm1hbGl6ZXI6Om5vcm1hbGl6ZShpY3U6OlVuaWNvZGVTdHJpbmco cnVuQ2hhcmFjdGVycywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1f cnVuLmxlbmd0aCgpKSwgVU5PUk1fTkZDLCAwIC8qIG5vIG9wdGlvbnMgKi8sCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub3JtYWxpemVkU3RyaW5nLCBlcnJvcik7CiAg ICAgICAgICAgICBpZiAoVV9GQUlMVVJFKGVycm9yKSkKQEAgLTEwOSw3ICsxMTUsNyBAQCB2b2lk IEhhcmZCdXp6U2hhcGVyQmFzZTo6c2V0Tm9ybWFsaXplZEJ1CiAgICAgY29uc3QgVUNoYXIqIHNv dXJjZVRleHQ7CiAgICAgaWYgKG5vcm1hbGl6ZWRTdHJpbmcuaXNFbXB0eSgpKSB7CiAgICAgICAg IG1fbm9ybWFsaXplZEJ1ZmZlckxlbmd0aCA9IG1fcnVuLmxlbmd0aCgpOwotICAgICAgICBzb3Vy Y2VUZXh0ID0gbV9ydW4uY2hhcmFjdGVyczE2KCk7CisgICAgICAgIHNvdXJjZVRleHQgPSBydW5D aGFyYWN0ZXJzOwogICAgIH0gZWxzZSB7CiAgICAgICAgIG1fbm9ybWFsaXplZEJ1ZmZlckxlbmd0 aCA9IG5vcm1hbGl6ZWRTdHJpbmcubGVuZ3RoKCk7CiAgICAgICAgIHNvdXJjZVRleHQgPSBub3Jt YWxpemVkU3RyaW5nLmdldEJ1ZmZlcigpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpTaGFwZXJCYXNlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpTaGFwZXJCYXNl LmgJKHJldmlzaW9uIDEzMTMyNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2hhcmZidXp6L0hhcmZCdXp6U2hhcGVyQmFzZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICsz Myw3IEBACiAKICNpbmNsdWRlICJUZXh0UnVuLmgiCiAjaW5jbHVkZSA8d3RmL093bkFycmF5UHRy Lmg+CisjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAjaW5jbHVkZSA8d3RmL3VuaWNv ZGUvQ2hhcmFjdGVyTmFtZXMuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNTEsNiArNTIs MTMgQEAgcHVibGljOgogCiBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBzZXROb3JtYWxpemVkQnVmZmVy KE5vcm1hbGl6ZU1vZGUgPSBEb05vdE5vcm1hbGl6ZU1pcnJvckNoYXJzKTsKKyAgICBjb25zdCBV Q2hhciogZ2V0MTZCaXRDaGFyYWN0ZXJzRm9yOEJpdFJ1bigpCisgICAgeworICAgICAgICBBU1NF UlQobV9ydW4uaXM4Qml0KCkpOworICAgICAgICBTdHJpbmcgc3RyaW5nRm9yOEJpdFJ1biA9IFN0 cmluZzo6bWFrZTE2Qml0RnJvbThCaXRTb3VyY2UobV9ydW4uY2hhcmFjdGVyczgoKSwgbV9ydW4u bGVuZ3RoKCkpOworICAgICAgICBtX3N0cmluZ3NGb3I4Qml0UnVucy5hcHBlbmQoc3RyaW5nRm9y OEJpdFJ1bik7CisgICAgICAgIHJldHVybiBzdHJpbmdGb3I4Qml0UnVuLmNoYXJhY3RlcnMxNigp OworICAgIH0KIAogICAgIGJvb2wgaXNXb3JkRW5kKHVuc2lnbmVkKTsKICAgICBpbnQgZGV0ZXJt aW5lV29yZEJyZWFrU3BhY2luZygpOwpAQCAtNjMsNiArNzEsNyBAQCBwcm90ZWN0ZWQ6CiAKICAg ICBjb25zdCBGb250KiBtX2ZvbnQ7CiAgICAgT3duQXJyYXlQdHI8VUNoYXI+IG1fbm9ybWFsaXpl ZEJ1ZmZlcjsKKyAgICBWZWN0b3I8U3RyaW5nPiBtX3N0cmluZ3NGb3I4Qml0UnVuczsKICAgICB1 bnNpZ25lZCBtX25vcm1hbGl6ZWRCdWZmZXJMZW5ndGg7CiAgICAgY29uc3QgVGV4dFJ1biYgbV9y dW47CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L25n L0hhcmZCdXp6U2hhcGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9oYXJmYnV6ei9uZy9IYXJmQnV6elNoYXBlci5jcHAJKHJldmlzaW9uIDEzMTMy NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L25nL0hhcmZC dXp6U2hhcGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTgxLDcgKzE4MSw3IEBAIEhhcmZCdXp6 U2hhcGVyOjpIYXJmQnV6elNoYXBlcihjb25zdCBGb24KIHsKICAgICBtX25vcm1hbGl6ZWRCdWZm ZXIgPSBhZG9wdEFycmF5UHRyKG5ldyBVQ2hhclttX3J1bi5sZW5ndGgoKSArIDFdKTsKICAgICBt X25vcm1hbGl6ZWRCdWZmZXJMZW5ndGggPSBtX3J1bi5sZW5ndGgoKTsKLSAgICBub3JtYWxpemVD aGFyYWN0ZXJzKG1fcnVuLmNoYXJhY3RlcnMxNigpLCBtX25vcm1hbGl6ZWRCdWZmZXIuZ2V0KCks IG1fbm9ybWFsaXplZEJ1ZmZlckxlbmd0aCk7CisgICAgbm9ybWFsaXplQ2hhcmFjdGVycyhtX3J1 bi5pczhCaXQoKSA/IGdldDE2Qml0Q2hhcmFjdGVyc0ZvcjhCaXRSdW4oKSA6IG1fcnVuLmNoYXJh Y3RlcnMxNigpLCBtX25vcm1hbGl6ZWRCdWZmZXIuZ2V0KCksIG1fbm9ybWFsaXplZEJ1ZmZlckxl bmd0aCk7CiAgICAgc2V0UGFkZGluZyhtX3J1bi5leHBhbnNpb24oKSk7CiAgICAgc2V0Rm9udEZl YXR1cmVzKCk7CiB9Cg== 190149 2013-02-25 16:13:40 -0800 2013-02-25 17:08:46 -0800 Patch bug-99393-20130225160955.patch text/plain 5904 leviw SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNDM5ODIpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEzLTAyLTI1ICBMZXZpIFdlaW50cmF1YiAgPGxl dml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3IgOCBiaXQgVGV4dFJ1 bnMgZm9yIHBvcnRzIHVzaW5nIEhhcmZCdXp6IG9yIEhhcmZCdXp6IE5HCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTM5MworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsaW5nIFdURl9VU0VfOEJJVF9U RVhUUlVOIGZvciBDaHJvbWl1bS4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgorCiAyMDEz LTAyLTIzICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBOYXRpdmUgTWVtb3J5IEluc3RydW1lbnRhdGlvbjogcmVwbGFjZSBT dHJpbmcgd2l0aCBjb25zdCBjaGFyKiBpbiBNZW1vcnlPYmplY3RJbmZvCkluZGV4OiBTb3VyY2Uv V1RGL3d0Zi9QbGF0Zm9ybS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL1BsYXRmb3Jt LmgJKHJldmlzaW9uIDE0MDk1NikKKysrIFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgJKHdvcmtp bmcgY29weSkKQEAgLTEwNDAsNyArMTA0MCw3IEBACiAjZW5kaWYKIAogLypBZGQgb3RoZXIgcGxh dGZvcm1zIGFzIHRoZXkgdXBkYXRlIHRoZWlyIHBsYXRmcm9tIHNwZWNpZmljIGNvZGUgdG8gaGFu ZGxlIFRleHRSdW4ncyB3aXRoIDggYml0IGRhdGEuICovCi0jaWYgUExBVEZPUk0oTUFDKQorI2lm IFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oQ0hST01JVU0pCiAjZGVmaW5lIEVOQUJMRV84QklU X1RFWFRSVU4gMQogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0Mzk4MikKKysr IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBA CisyMDEzLTAyLTI1ICBMZXZpIFdlaW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAg ICAgICBBZGQgc3VwcG9ydCBmb3IgOCBiaXQgVGV4dFJ1bnMgZm9yIHBvcnRzIHVzaW5nIEhhcmZC dXp6IG9yIEhhcmZCdXp6IE5HCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05OTM5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZGluZyBzdXBwb3J0IGZvciA4IGJpdCBUZXh0UnVucyBmb3IgcGxhdGZvcm1z IHVzaW5nIEhhcmZCdXp6IGFuZCBIYXJmQnV6eiBORy4KKyAgICAgICAgVGhpcyBpbnZvbHZlcyBj b252ZXJ0aW5nIDggYml0IFRleHRSdW5zIHRvIDE2IGJpdCBpbiB0aGUgY29tcGxleCB0ZXh0IGNh c2UsIGFuZAorICAgICAgICBzdG9yaW5nIHRoZSByZXN1bHRpbmcgc3RyaW5ncyBpbiBhIHZlY3Rv ciBpbiBIYXJmQnV6elNoYXBlckJhc2Ugc28gdGhlIGRhdGEKKyAgICAgICAgaXNuJ3QgZnJlZWQu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBlckJhc2UuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SGFyZkJ1enpTaGFwZXJCYXNlOjpzZXROb3JtYWxpemVkQnVmZmVy KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBlckJh c2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9uZy9IYXJmQnV6elNo YXBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpub3JtYWxpemVDaGFyYWN0ZXJzKToKKyAgICAg ICAgKFdlYkNvcmU6OkhhcmZCdXp6U2hhcGVyOjpIYXJmQnV6elNoYXBlcik6CisKIDIwMTMtMDIt MjUgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUGFn ZTo6bV9pc0luV2luZG93IGlzIHVuaW5pdGlhbGl6ZWQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6U2hhcGVyQmFzZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpT aGFwZXJCYXNlLmNwcAkocmV2aXNpb24gMTQwOTU2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpTaGFwZXJCYXNlLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtOTQsMTAgKzk0LDE4IEBAIHZvaWQgSGFyZkJ1enpTaGFwZXJCYXNlOjpzZXROb3JtYWxp emVkQnUKICAgICBpY3U6OlVuaWNvZGVTdHJpbmcgbm9ybWFsaXplZFN0cmluZzsKICAgICBVRXJy b3JDb2RlIGVycm9yID0gVV9aRVJPX0VSUk9SOwogCisgICAgY29uc3QgVUNoYXIqIHJ1bkNoYXJh Y3RlcnM7CisgICAgU3RyaW5nIHN0cmluZ0ZvcjhCaXRSdW47CisgICAgaWYgKG1fcnVuLmlzOEJp dCgpKSB7CisgICAgICAgIHN0cmluZ0ZvcjhCaXRSdW4gPSBTdHJpbmc6Om1ha2UxNkJpdEZyb204 Qml0U291cmNlKG1fcnVuLmNoYXJhY3RlcnM4KCksIG1fcnVuLmxlbmd0aCgpKTsKKyAgICAgICAg cnVuQ2hhcmFjdGVycyA9IHN0cmluZ0ZvcjhCaXRSdW4uY2hhcmFjdGVyczE2KCk7CisgICAgfSBl bHNlCisgICAgICAgIHJ1bkNoYXJhY3RlcnMgPSBtX3J1bi5jaGFyYWN0ZXJzMTYoKTsKKwogICAg IGZvciAoaW50IGkgPSAwOyBpIDwgbV9ydW4ubGVuZ3RoKCk7ICsraSkgewotICAgICAgICBVQ2hh ciBjaCA9IG1fcnVuW2ldOworICAgICAgICBVQ2hhciBjaCA9IHJ1bkNoYXJhY3RlcnNbaV07CiAg ICAgICAgIGlmICg6OnVibG9ja19nZXRDb2RlKGNoKSA9PSBVQkxPQ0tfQ09NQklOSU5HX0RJQUNS SVRJQ0FMX01BUktTKSB7Ci0gICAgICAgICAgICBpY3U6Ok5vcm1hbGl6ZXI6Om5vcm1hbGl6ZShp Y3U6OlVuaWNvZGVTdHJpbmcobV9ydW4uY2hhcmFjdGVyczE2KCksCisgICAgICAgICAgICBpY3U6 Ok5vcm1hbGl6ZXI6Om5vcm1hbGl6ZShpY3U6OlVuaWNvZGVTdHJpbmcocnVuQ2hhcmFjdGVycywK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fcnVuLmxlbmd0aCgpKSwg VU5PUk1fTkZDLCAwIC8qIG5vIG9wdGlvbnMgKi8sCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBub3JtYWxpemVkU3RyaW5nLCBlcnJvcik7CiAgICAgICAgICAgICBpZiAo VV9GQUlMVVJFKGVycm9yKSkKQEAgLTEwOSw3ICsxMTcsNyBAQCB2b2lkIEhhcmZCdXp6U2hhcGVy QmFzZTo6c2V0Tm9ybWFsaXplZEJ1CiAgICAgY29uc3QgVUNoYXIqIHNvdXJjZVRleHQ7CiAgICAg aWYgKG5vcm1hbGl6ZWRTdHJpbmcuaXNFbXB0eSgpKSB7CiAgICAgICAgIG1fbm9ybWFsaXplZEJ1 ZmZlckxlbmd0aCA9IG1fcnVuLmxlbmd0aCgpOwotICAgICAgICBzb3VyY2VUZXh0ID0gbV9ydW4u Y2hhcmFjdGVyczE2KCk7CisgICAgICAgIHNvdXJjZVRleHQgPSBydW5DaGFyYWN0ZXJzOwogICAg IH0gZWxzZSB7CiAgICAgICAgIG1fbm9ybWFsaXplZEJ1ZmZlckxlbmd0aCA9IG5vcm1hbGl6ZWRT dHJpbmcubGVuZ3RoKCk7CiAgICAgICAgIHNvdXJjZVRleHQgPSBub3JtYWxpemVkU3RyaW5nLmdl dEJ1ZmZlcigpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1 enovSGFyZkJ1enpTaGFwZXJCYXNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpTaGFwZXJCYXNlLmgJKHJldmlzaW9uIDE0 MDk1NikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZC dXp6U2hhcGVyQmFzZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAKICNpbmNs dWRlICJUZXh0UnVuLmgiCiAjaW5jbHVkZSA8d3RmL093bkFycmF5UHRyLmg+CisjaW5jbHVkZSA8 d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAjaW5jbHVkZSA8d3RmL3VuaWNvZGUvQ2hhcmFjdGVyTmFt ZXMuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvaGFyZmJ1enovbmcvSGFyZkJ1enpTaGFwZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L25nL0hhcmZCdXp6U2hh cGVyLmNwcAkocmV2aXNpb24gMTQwOTU2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvaGFyZmJ1enovbmcvSGFyZkJ1enpTaGFwZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x NTYsMTAgKzE1NiwxOCBAQCBmbG9hdCBIYXJmQnV6elNoYXBlcjo6SGFyZkJ1enpSdW46OnhQb3Np CiAgICAgcmV0dXJuIHBvc2l0aW9uOwogfQogCi1zdGF0aWMgdm9pZCBub3JtYWxpemVDaGFyYWN0 ZXJzKGNvbnN0IFVDaGFyKiBzb3VyY2UsIFVDaGFyKiBkZXN0aW5hdGlvbiwgaW50IGxlbmd0aCkK K3N0YXRpYyB2b2lkIG5vcm1hbGl6ZUNoYXJhY3RlcnMoY29uc3QgVGV4dFJ1biYgcnVuLCBVQ2hh ciogZGVzdGluYXRpb24sIGludCBsZW5ndGgpCiB7CiAgICAgaW50IHBvc2l0aW9uID0gMDsKICAg ICBib29sIGVycm9yID0gZmFsc2U7CisgICAgY29uc3QgVUNoYXIqIHNvdXJjZTsKKyAgICBTdHJp bmcgc3RyaW5nRm9yOEJpdFJ1bjsKKyAgICBpZiAocnVuLmlzOEJpdCgpKSB7CisgICAgICAgIHN0 cmluZ0ZvcjhCaXRSdW4gPSBTdHJpbmc6Om1ha2UxNkJpdEZyb204Qml0U291cmNlKHJ1bi5jaGFy YWN0ZXJzOCgpLCBydW4ubGVuZ3RoKCkpOworICAgICAgICBzb3VyY2UgPSBzdHJpbmdGb3I4Qml0 UnVuLmNoYXJhY3RlcnMxNigpOworICAgIH0gZWxzZQorICAgICAgICBzb3VyY2UgPSBydW4uY2hh cmFjdGVyczE2KCk7CisKICAgICB3aGlsZSAocG9zaXRpb24gPCBsZW5ndGgpIHsKICAgICAgICAg VUNoYXIzMiBjaGFyYWN0ZXI7CiAgICAgICAgIGludCBuZXh0UG9zaXRpb24gPSBwb3NpdGlvbjsK QEAgLTE4Miw3ICsxOTAsNyBAQCBIYXJmQnV6elNoYXBlcjo6SGFyZkJ1enpTaGFwZXIoY29uc3Qg Rm9uCiB7CiAgICAgbV9ub3JtYWxpemVkQnVmZmVyID0gYWRvcHRBcnJheVB0cihuZXcgVUNoYXJb bV9ydW4ubGVuZ3RoKCkgKyAxXSk7CiAgICAgbV9ub3JtYWxpemVkQnVmZmVyTGVuZ3RoID0gbV9y dW4ubGVuZ3RoKCk7Ci0gICAgbm9ybWFsaXplQ2hhcmFjdGVycyhtX3J1bi5jaGFyYWN0ZXJzMTYo KSwgbV9ub3JtYWxpemVkQnVmZmVyLmdldCgpLCBtX25vcm1hbGl6ZWRCdWZmZXJMZW5ndGgpOwor ICAgIG5vcm1hbGl6ZUNoYXJhY3RlcnMobV9ydW4sIG1fbm9ybWFsaXplZEJ1ZmZlci5nZXQoKSwg bV9ub3JtYWxpemVkQnVmZmVyTGVuZ3RoKTsKICAgICBzZXRQYWRkaW5nKG1fcnVuLmV4cGFuc2lv bigpKTsKICAgICBzZXRGb250RmVhdHVyZXMoKTsKIH0K 190160 2013-02-25 17:08:50 -0800 2013-03-01 16:43:26 -0800 Patch for landing bug-99393-20130225170505.patch text/plain 5310 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0Mzk4NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAyLTI1ICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig OCBiaXQgVGV4dFJ1bnMgZm9yIENocm9taXVtL0hhcmZCdXp6CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTM5MworCisgICAgICAgIFJldmlld2VkIGJ5 IEVyaWMgU2VpZGVsLgorCisgICAgICAgIEFkZGluZyBzdXBwb3J0IGZvciA4IGJpdCBUZXh0UnVu cyBmb3IgcGxhdGZvcm1zIHVzaW5nIEhhcmZCdXp6LiBUbyBhY2NvbXBsaXNoIHRoaXMsCisgICAg ICAgIDggYml0IHRleHQgcnVucyBhcmUgdXBjb252ZXJ0ZWQgdG8gMTYgYml0IGluIHRoZSBjb21w bGV4IHRleHQgcGF0aCBkdXJpbmcgc3RyaW5nCisgICAgICAgIG5vcm1hbGl6YXRpb24sIGFzIEhh cmZCdXp6IG9wZXJhdGVzIG9uIFVDaGFycy4KKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGNo YW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAoV2ViQ29yZTo6SGFyZkJ1enpTaGFwZXJCYXNl OjpzZXROb3JtYWxpemVkQnVmZmVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9oYXJm YnV6ei9IYXJmQnV6elNoYXBlckJhc2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9o YXJmYnV6ei9IYXJmQnV6elNoYXBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpub3JtYWxpemVD aGFyYWN0ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkhhcmZCdXp6U2hhcGVyOjpIYXJmQnV6elNo YXBlcik6CisKIDIwMTMtMDItMjEgIEplZmZyZXkgUGZhdSAgPGpwZmF1QGFwcGxlLmNvbT4KIAog ICAgICAgICBPcHRpb25hbGx5IHBhcnRpdGlvbiBjYWNoZSB0byBwcmV2ZW50IHVzaW5nIGNhY2hl IGZvciB0cmFja2luZwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFy ZmJ1enovSGFyZkJ1enpTaGFwZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6U2hhcGVyLmNwcAkocmV2aXNpb24gMTQz OTg2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1 enpTaGFwZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTYsMTAgKzE1NiwxOCBAQCBmbG9hdCBI YXJmQnV6elNoYXBlcjo6SGFyZkJ1enpSdW46OnhQb3NpCiAgICAgcmV0dXJuIHBvc2l0aW9uOwog fQogCi1zdGF0aWMgdm9pZCBub3JtYWxpemVDaGFyYWN0ZXJzKGNvbnN0IFVDaGFyKiBzb3VyY2Us IFVDaGFyKiBkZXN0aW5hdGlvbiwgaW50IGxlbmd0aCkKK3N0YXRpYyB2b2lkIG5vcm1hbGl6ZUNo YXJhY3RlcnMoY29uc3QgVGV4dFJ1biYgcnVuLCBVQ2hhciogZGVzdGluYXRpb24sIGludCBsZW5n dGgpCiB7CiAgICAgaW50IHBvc2l0aW9uID0gMDsKICAgICBib29sIGVycm9yID0gZmFsc2U7Cisg ICAgY29uc3QgVUNoYXIqIHNvdXJjZTsKKyAgICBTdHJpbmcgc3RyaW5nRm9yOEJpdFJ1bjsKKyAg ICBpZiAocnVuLmlzOEJpdCgpKSB7CisgICAgICAgIHN0cmluZ0ZvcjhCaXRSdW4gPSBTdHJpbmc6 Om1ha2UxNkJpdEZyb204Qml0U291cmNlKHJ1bi5jaGFyYWN0ZXJzOCgpLCBydW4ubGVuZ3RoKCkp OworICAgICAgICBzb3VyY2UgPSBzdHJpbmdGb3I4Qml0UnVuLmNoYXJhY3RlcnMxNigpOworICAg IH0gZWxzZQorICAgICAgICBzb3VyY2UgPSBydW4uY2hhcmFjdGVyczE2KCk7CisKICAgICB3aGls ZSAocG9zaXRpb24gPCBsZW5ndGgpIHsKICAgICAgICAgVUNoYXIzMiBjaGFyYWN0ZXI7CiAgICAg ICAgIGludCBuZXh0UG9zaXRpb24gPSBwb3NpdGlvbjsKQEAgLTE4Miw3ICsxOTAsNyBAQCBIYXJm QnV6elNoYXBlcjo6SGFyZkJ1enpTaGFwZXIoY29uc3QgRm9uCiB7CiAgICAgbV9ub3JtYWxpemVk QnVmZmVyID0gYWRvcHRBcnJheVB0cihuZXcgVUNoYXJbbV9ydW4ubGVuZ3RoKCkgKyAxXSk7CiAg ICAgbV9ub3JtYWxpemVkQnVmZmVyTGVuZ3RoID0gbV9ydW4ubGVuZ3RoKCk7Ci0gICAgbm9ybWFs aXplQ2hhcmFjdGVycyhtX3J1bi5jaGFyYWN0ZXJzMTYoKSwgbV9ub3JtYWxpemVkQnVmZmVyLmdl dCgpLCBtX25vcm1hbGl6ZWRCdWZmZXJMZW5ndGgpOworICAgIG5vcm1hbGl6ZUNoYXJhY3RlcnMo bV9ydW4sIG1fbm9ybWFsaXplZEJ1ZmZlci5nZXQoKSwgbV9ub3JtYWxpemVkQnVmZmVyTGVuZ3Ro KTsKICAgICBzZXRQYWRkaW5nKG1fcnVuLmV4cGFuc2lvbigpKTsKICAgICBzZXRGb250RmVhdHVy ZXMoKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6 L0hhcmZCdXp6U2hhcGVyQmFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpTaGFwZXJCYXNlLmNwcAkocmV2aXNpb24g MTQzOTg2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFy ZkJ1enpTaGFwZXJCYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTQsMTAgKzk0LDE4IEBAIHZv aWQgSGFyZkJ1enpTaGFwZXJCYXNlOjpzZXROb3JtYWxpemVkQnUKICAgICBpY3U6OlVuaWNvZGVT dHJpbmcgbm9ybWFsaXplZFN0cmluZzsKICAgICBVRXJyb3JDb2RlIGVycm9yID0gVV9aRVJPX0VS Uk9SOwogCisgICAgY29uc3QgVUNoYXIqIHJ1bkNoYXJhY3RlcnM7CisgICAgU3RyaW5nIHN0cmlu Z0ZvcjhCaXRSdW47CisgICAgaWYgKG1fcnVuLmlzOEJpdCgpKSB7CisgICAgICAgIHN0cmluZ0Zv cjhCaXRSdW4gPSBTdHJpbmc6Om1ha2UxNkJpdEZyb204Qml0U291cmNlKG1fcnVuLmNoYXJhY3Rl cnM4KCksIG1fcnVuLmxlbmd0aCgpKTsKKyAgICAgICAgcnVuQ2hhcmFjdGVycyA9IHN0cmluZ0Zv cjhCaXRSdW4uY2hhcmFjdGVyczE2KCk7CisgICAgfSBlbHNlCisgICAgICAgIHJ1bkNoYXJhY3Rl cnMgPSBtX3J1bi5jaGFyYWN0ZXJzMTYoKTsKKwogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbV9y dW4ubGVuZ3RoKCk7ICsraSkgewotICAgICAgICBVQ2hhciBjaCA9IG1fcnVuW2ldOworICAgICAg ICBVQ2hhciBjaCA9IHJ1bkNoYXJhY3RlcnNbaV07CiAgICAgICAgIGlmICg6OnVibG9ja19nZXRD b2RlKGNoKSA9PSBVQkxPQ0tfQ09NQklOSU5HX0RJQUNSSVRJQ0FMX01BUktTKSB7Ci0gICAgICAg ICAgICBpY3U6Ok5vcm1hbGl6ZXI6Om5vcm1hbGl6ZShpY3U6OlVuaWNvZGVTdHJpbmcobV9ydW4u Y2hhcmFjdGVyczE2KCksCisgICAgICAgICAgICBpY3U6Ok5vcm1hbGl6ZXI6Om5vcm1hbGl6ZShp Y3U6OlVuaWNvZGVTdHJpbmcocnVuQ2hhcmFjdGVycywKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG1fcnVuLmxlbmd0aCgpKSwgVU5PUk1fTkZDLCAwIC8qIG5vIG9wdGlv bnMgKi8sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub3JtYWxpemVk U3RyaW5nLCBlcnJvcik7CiAgICAgICAgICAgICBpZiAoVV9GQUlMVVJFKGVycm9yKSkKQEAgLTEw OSw3ICsxMTcsNyBAQCB2b2lkIEhhcmZCdXp6U2hhcGVyQmFzZTo6c2V0Tm9ybWFsaXplZEJ1CiAg ICAgY29uc3QgVUNoYXIqIHNvdXJjZVRleHQ7CiAgICAgaWYgKG5vcm1hbGl6ZWRTdHJpbmcuaXNF bXB0eSgpKSB7CiAgICAgICAgIG1fbm9ybWFsaXplZEJ1ZmZlckxlbmd0aCA9IG1fcnVuLmxlbmd0 aCgpOwotICAgICAgICBzb3VyY2VUZXh0ID0gbV9ydW4uY2hhcmFjdGVyczE2KCk7CisgICAgICAg IHNvdXJjZVRleHQgPSBydW5DaGFyYWN0ZXJzOwogICAgIH0gZWxzZSB7CiAgICAgICAgIG1fbm9y bWFsaXplZEJ1ZmZlckxlbmd0aCA9IG5vcm1hbGl6ZWRTdHJpbmcubGVuZ3RoKCk7CiAgICAgICAg IHNvdXJjZVRleHQgPSBub3JtYWxpemVkU3RyaW5nLmdldEJ1ZmZlcigpOwpJbmRleDogU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0Mzk4NikKKysrIFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMDIt MjUgIExldmkgV2VpbnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFkZCBz dXBwb3J0IGZvciA4IGJpdCBUZXh0UnVucyBmb3IgQ2hyb21pdW0vSGFyZkJ1enoKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5MzkzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCisKKyAgICAgICAgRW5hYmxpbmcgOCBiaXQgdGV4dCBy dW5zIGZvciBDaHJvbWl1bS4KKworICAgICAgICAqIGZlYXR1cmVzLmd5cGk6CisKIDIwMTMtMDIt MjUgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hy b21pdW1dIFBsdW1iIFdlYlZpZXdJbXBsJ3MgY29tcG9zaXRvciBzY2hlZHVsaW5nIHN1cHByZXNz aW9uIG91dCB0byBXZWJXaWRnZXRDbGllbnQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0v ZmVhdHVyZXMuZ3lwaQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL2ZlYXR1 cmVzLmd5cGkJKHJldmlzaW9uIDE0Mzk4NikKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vZmVh dHVyZXMuZ3lwaQkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMsNyBAQAogICAndmFyaWFibGVz JzogewogICAgICdmZWF0dXJlX2RlZmluZXMnOiBbCiAgICAgICAnRU5BQkxFXzNEX1BMVUdJTj0x JywKKyAgICAgICdFTkFCTEVfOEJJVF9URVhUUlVOPTEnLAogICAgICAgJ0VOQUJMRV9CQVRURVJZ X1NUQVRVUz0wJywKICAgICAgICdFTkFCTEVfQkxPQj0xJywKICAgICAgICdFTkFCTEVfQkxPQl9T TElDRT0xJywK 191067 2013-03-01 16:43:32 -0800 2013-03-04 12:19:56 -0800 Patch bug-99393-20130301163943.patch text/plain 5438 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NDUxMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAzLTAxICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig OCBiaXQgVGV4dFJ1bnMgb24gQ2hyb21pdW0gTGludXggJiBNYWMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5MzkzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgRXJpYyBTZWlkZWwuCisKKyAgICAgICAgQWRkaW5nIHN1cHBvcnQgZm9yIDggYml0IFRleHRS dW5zIGZvciBNYWMgYW5kIExpbnV4IENocm9taXVtLiBUbyBhY2NvbXBsaXNoIHRoaXMsCisgICAg ICAgIDggYml0IHRleHQgcnVucyBhcmUgdXBjb252ZXJ0ZWQgdG8gMTYgYml0IGluIHRoZSBjb21w bGV4IHRleHQgcGF0aCBkdXJpbmcgc3RyaW5nCisgICAgICAgIG5vcm1hbGl6YXRpb24sIGFzIEhh cmZCdXp6IG9wZXJhdGVzIG9uIFVDaGFycy4KKworICAgICAgICBXaW5kb3dzIGhhcyBwbGF0Zm9t IGFzc3VtcHRpb25zIHRoYXQgVGV4dFJ1bnMgYXJlIDE2IGJpdCB0aGF0IG5lZWQgdG8gYmUgYWRk cmVzc2VkCisgICAgICAgIGJlZm9yZSBlbmFibGluZyB0aGlzIG9wdGltaXphdGlvbi4KKworICAg ICAgICBObyBuZXcgdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAoV2Vi Q29yZTo6SGFyZkJ1enpTaGFwZXJCYXNlOjpzZXROb3JtYWxpemVkQnVmZmVyKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBlckJhc2UuaDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpub3JtYWxpemVDaGFyYWN0ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6Okhh cmZCdXp6U2hhcGVyOjpIYXJmQnV6elNoYXBlcik6CisKIDIwMTMtMDMtMDEgIFZpY3RvciBDYXJi dW5lICA8dmNhcmJ1bmVAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFN1cHBvcnQgcGFkZGluZywg bWFyZ2luIGFuZCBib3JkZXIgZm9yIGludGVybmFsIFVBIGN1ZSBzdHlsaW5nCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enov SGFyZkJ1enpTaGFwZXIuY3BwCShyZXZpc2lvbiAxNDQ1MTMpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBlci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE1NiwxMCArMTU2LDE4IEBAIGZsb2F0IEhhcmZCdXp6U2hhcGVyOjpIYXJmQnV6elJ1 bjo6eFBvc2kKICAgICByZXR1cm4gcG9zaXRpb247CiB9CiAKLXN0YXRpYyB2b2lkIG5vcm1hbGl6 ZUNoYXJhY3RlcnMoY29uc3QgVUNoYXIqIHNvdXJjZSwgVUNoYXIqIGRlc3RpbmF0aW9uLCBpbnQg bGVuZ3RoKQorc3RhdGljIHZvaWQgbm9ybWFsaXplQ2hhcmFjdGVycyhjb25zdCBUZXh0UnVuJiBy dW4sIFVDaGFyKiBkZXN0aW5hdGlvbiwgaW50IGxlbmd0aCkKIHsKICAgICBpbnQgcG9zaXRpb24g PSAwOwogICAgIGJvb2wgZXJyb3IgPSBmYWxzZTsKKyAgICBjb25zdCBVQ2hhciogc291cmNlOwor ICAgIFN0cmluZyBzdHJpbmdGb3I4Qml0UnVuOworICAgIGlmIChydW4uaXM4Qml0KCkpIHsKKyAg ICAgICAgc3RyaW5nRm9yOEJpdFJ1biA9IFN0cmluZzo6bWFrZTE2Qml0RnJvbThCaXRTb3VyY2Uo cnVuLmNoYXJhY3RlcnM4KCksIHJ1bi5sZW5ndGgoKSk7CisgICAgICAgIHNvdXJjZSA9IHN0cmlu Z0ZvcjhCaXRSdW4uY2hhcmFjdGVyczE2KCk7CisgICAgfSBlbHNlCisgICAgICAgIHNvdXJjZSA9 IHJ1bi5jaGFyYWN0ZXJzMTYoKTsKKwogICAgIHdoaWxlIChwb3NpdGlvbiA8IGxlbmd0aCkgewog ICAgICAgICBVQ2hhcjMyIGNoYXJhY3RlcjsKICAgICAgICAgaW50IG5leHRQb3NpdGlvbiA9IHBv c2l0aW9uOwpAQCAtMTgyLDcgKzE5MCw3IEBAIEhhcmZCdXp6U2hhcGVyOjpIYXJmQnV6elNoYXBl cihjb25zdCBGb24KIHsKICAgICBtX25vcm1hbGl6ZWRCdWZmZXIgPSBhZG9wdEFycmF5UHRyKG5l dyBVQ2hhclttX3J1bi5sZW5ndGgoKSArIDFdKTsKICAgICBtX25vcm1hbGl6ZWRCdWZmZXJMZW5n dGggPSBtX3J1bi5sZW5ndGgoKTsKLSAgICBub3JtYWxpemVDaGFyYWN0ZXJzKG1fcnVuLmNoYXJh Y3RlcnMxNigpLCBtX25vcm1hbGl6ZWRCdWZmZXIuZ2V0KCksIG1fbm9ybWFsaXplZEJ1ZmZlckxl bmd0aCk7CisgICAgbm9ybWFsaXplQ2hhcmFjdGVycyhtX3J1biwgbV9ub3JtYWxpemVkQnVmZmVy LmdldCgpLCBtX25vcm1hbGl6ZWRCdWZmZXJMZW5ndGgpOwogICAgIHNldFBhZGRpbmcobV9ydW4u ZXhwYW5zaW9uKCkpOwogICAgIHNldEZvbnRGZWF0dXJlcygpOwogfQpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpTaGFwZXJCYXNlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9I YXJmQnV6elNoYXBlckJhc2UuY3BwCShyZXZpc2lvbiAxNDQ1MTMpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBlckJhc2UuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC05NCwxMCArOTQsMTggQEAgdm9pZCBIYXJmQnV6elNoYXBlckJhc2U6OnNl dE5vcm1hbGl6ZWRCdQogICAgIGljdTo6VW5pY29kZVN0cmluZyBub3JtYWxpemVkU3RyaW5nOwog ICAgIFVFcnJvckNvZGUgZXJyb3IgPSBVX1pFUk9fRVJST1I7CiAKKyAgICBjb25zdCBVQ2hhciog cnVuQ2hhcmFjdGVyczsKKyAgICBTdHJpbmcgc3RyaW5nRm9yOEJpdFJ1bjsKKyAgICBpZiAobV9y dW4uaXM4Qml0KCkpIHsKKyAgICAgICAgc3RyaW5nRm9yOEJpdFJ1biA9IFN0cmluZzo6bWFrZTE2 Qml0RnJvbThCaXRTb3VyY2UobV9ydW4uY2hhcmFjdGVyczgoKSwgbV9ydW4ubGVuZ3RoKCkpOwor ICAgICAgICBydW5DaGFyYWN0ZXJzID0gc3RyaW5nRm9yOEJpdFJ1bi5jaGFyYWN0ZXJzMTYoKTsK KyAgICB9IGVsc2UKKyAgICAgICAgcnVuQ2hhcmFjdGVycyA9IG1fcnVuLmNoYXJhY3RlcnMxNigp OworCiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBtX3J1bi5sZW5ndGgoKTsgKytpKSB7Ci0gICAg ICAgIFVDaGFyIGNoID0gbV9ydW5baV07CisgICAgICAgIFVDaGFyIGNoID0gcnVuQ2hhcmFjdGVy c1tpXTsKICAgICAgICAgaWYgKDo6dWJsb2NrX2dldENvZGUoY2gpID09IFVCTE9DS19DT01CSU5J TkdfRElBQ1JJVElDQUxfTUFSS1MpIHsKLSAgICAgICAgICAgIGljdTo6Tm9ybWFsaXplcjo6bm9y bWFsaXplKGljdTo6VW5pY29kZVN0cmluZyhtX3J1bi5jaGFyYWN0ZXJzMTYoKSwKKyAgICAgICAg ICAgIGljdTo6Tm9ybWFsaXplcjo6bm9ybWFsaXplKGljdTo6VW5pY29kZVN0cmluZyhydW5DaGFy YWN0ZXJzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9ydW4ubGVu Z3RoKCkpLCBVTk9STV9ORkMsIDAgLyogbm8gb3B0aW9ucyAqLywKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG5vcm1hbGl6ZWRTdHJpbmcsIGVycm9yKTsKICAgICAgICAg ICAgIGlmIChVX0ZBSUxVUkUoZXJyb3IpKQpAQCAtMTA5LDcgKzExNyw3IEBAIHZvaWQgSGFyZkJ1 enpTaGFwZXJCYXNlOjpzZXROb3JtYWxpemVkQnUKICAgICBjb25zdCBVQ2hhciogc291cmNlVGV4 dDsKICAgICBpZiAobm9ybWFsaXplZFN0cmluZy5pc0VtcHR5KCkpIHsKICAgICAgICAgbV9ub3Jt YWxpemVkQnVmZmVyTGVuZ3RoID0gbV9ydW4ubGVuZ3RoKCk7Ci0gICAgICAgIHNvdXJjZVRleHQg PSBtX3J1bi5jaGFyYWN0ZXJzMTYoKTsKKyAgICAgICAgc291cmNlVGV4dCA9IHJ1bkNoYXJhY3Rl cnM7CiAgICAgfSBlbHNlIHsKICAgICAgICAgbV9ub3JtYWxpemVkQnVmZmVyTGVuZ3RoID0gbm9y bWFsaXplZFN0cmluZy5sZW5ndGgoKTsKICAgICAgICAgc291cmNlVGV4dCA9IG5vcm1hbGl6ZWRT dHJpbmcuZ2V0QnVmZmVyKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNp b24gMTQ0NTEzKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxMy0wMy0wMSAgTGV2aSBXZWludHJhdWIgIDxsZXZp d0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIDggYml0IFRleHRSdW5z IG9uIENocm9taXVtIExpbnV4ICYgTWFjCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05OTM5MworCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVs LgorCisgICAgICAgIEVuYWJsaW5nIDggYml0IHRleHQgcnVucyBmb3IgTGludXggYW5kIE1hYyBw bGF0Zm9ybXMuCisKKyAgICAgICAgKiBmZWF0dXJlcy5neXBpOgorCiAyMDEzLTAzLTAxICBTaGVy aWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByMTQ0NDIyIGFuZCByMTQ0NDI0LgpJbmRleDogU291cmNlL1dlYktp dC9jaHJvbWl1bS9mZWF0dXJlcy5neXBpCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vZmVhdHVyZXMuZ3lwaQkocmV2aXNpb24gMTQ0NTEzKQorKysgU291cmNlL1dlYktpdC9j aHJvbWl1bS9mZWF0dXJlcy5neXBpCSh3b3JraW5nIGNvcHkpCkBAIC0yMDcsNiArMjA3LDcgQEAK ICAgICAgIH1dLAogICAgICAgWydPUz09ImxpbnV4IiBvciBPUz09Im1hYyInLCB7CiAgICAgICAg ICdmZWF0dXJlX2RlZmluZXMnOiBbCisgICAgICAgICAgJ0VOQUJMRV84QklUX1RFWFRSVU49MScs CiAgICAgICAgICAgJ0VOQUJMRV9CSU5ESU5HX0lOVEVHUklUWT0xJywKICAgICAgICAgXSwKICAg ICAgIH0sIHsgIyBPUyE9ImxpbnV4Igo=