114829 2013-04-18 13:34:21 -0700 [CSS Regions][CSS Shapes] Content in region doesn't respect shape-outside after initial layout pass 2013-11-04 18:32:27 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 98664 1 gammon zoltan betravis bjonesbe commit-queue esprehn+autocc glenn kondapallykalyan mihnea WebkitBugTracker zoltan oldest_to_newest 878057 0 198760 gammon 2013-04-18 13:34:21 -0700 Created attachment 198760 there should be a shape outside applied to the float showing a circular hole in the content. When there is an exclusion applied to a float, living inside a region flow, the exclusion does not render if there is a delay of the content being appended to the DOM. 878064 1 betravis 2013-04-18 13:50:02 -0700 Adding Bem. The problem appears to be that percentages are not correctly resolved in this case. If the shape-outside uses px values, or is not present, the layout happens correctly. Bem, can you take a look at this when you get the chance? 878083 2 bjonesbe 2013-04-18 14:32:13 -0700 Added to my list. Also created a chromium bug, since we're going to want this in Blink as well. That Chromium issue is: https://code.google.com/p/chromium/issues/detail?id=233339 898689 3 204175 bjonesbe 2013-06-10 11:26:20 -0700 Created attachment 204175 Simplified test case that doesn't use a delay at all. It looks like it doesn't need to be a delay, it just has to be changed after the initial layout pass. 943155 4 bjonesbe 2013-10-24 09:17:00 -0700 Hey Zoltan, any chance that you have an idea of what is causing this? I figured that since you've been immersed in float + regions land, you might have a quick idea as to what is going on here. I was hoping that this would be fixed after Bear fixed dynamic setting of shape-outside, but it still seems to be broken, unfortunately. 946750 5 215937 zoltan 2013-11-04 11:34:46 -0800 Created attachment 215937 Patch 946759 6 215937 bjonesbe 2013-11-04 12:01:18 -0800 Comment on attachment 215937 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=215937&action=review > Source/WebCore/ChangeLog:6 > + We set the size of the shape for shape-outside in RenderBlockFlow::insertFloatingObject. In that function the floating container's height is not always You have two very long sentences in this description, which makes it very hard to read and understand. Can you try breaking it up into more sentences to make it easier to understand what you are describing? Also, mostly a nit, but can you wrap the description to 80 columns? It's also hard to read these really long lines. > Source/WebCore/ChangeLog:9 > + logic to RenderBlockFlow::insertFloatingObject function, after it sets the height for the float, this way we're going to save some unneccessary layout passes I think you mean RenderBlockFlow::positionNewFloats here. > Source/WebCore/ChangeLog:10 > + with not yet defined heights and fix a layout error which came from a zero height layout pass with ellipses. Is this specific to ellipses, or any shape-outside? If it is specific to ellipses, can you explain how? It isn't clear to me. > LayoutTests/ChangeLog:10 > + with not yet defined heights and fix a layout error which came from a zero height layout pass with ellipses. Shouldn't you be describing what the tests are doing here? I don't see the value in repeating the description from the ChangeLog for the C++ change. Also, line wrapping and less run-on sentences would be good, as I mentioned earlier. :-) > LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass-expected.html:10 > + -webkit-shape-outside: ellipse(50px, 50px, 50%, 50%); ideally, you shouldn't be using shape-outside in the ref test. If this doesn't require an ellipse, it would be better to do it with a rectangle so that it's really easy to create a simple ref. If it does require an ellipse, might be worth taking a look at LayoutTests/fast/shapes/resources/rounded-rectangle.js and the rounded rectangle/ellipse/circle tests to see about testing without using shape-outside. > LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass-expected.html:11 > + -webkit-clip-path: ellipse(50%, 50%, 50%, 50%); This same effect can also be achieved by the following: border-radius: 50%; overflow: hidden; Which I'm starting to like better than using clip-path, since it is even more independent of the shapes code, and arguably simpler. I don't feel particularly strongly about it, though, so if you really like sticking with clip-path, go ahead. > LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass.html:10 > + -webkit-shape-outside: ellipse(50px, 50px, 50%, 50%); See my previous comment about the use of ellipse. > LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass.html:11 > + -webkit-clip-path: ellipse(50%, 50%, 50%, 50%); See my previous comment about clip-path. 946807 7 215948 zoltan 2013-11-04 14:01:46 -0800 Created attachment 215948 Patch 946809 8 zoltan 2013-11-04 14:09:32 -0800 (In reply to comment #6) > (From update of attachment 215937 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=215937&action=review > > > Source/WebCore/ChangeLog:6 > > + We set the size of the shape for shape-outside in RenderBlockFlow::insertFloatingObject. In that function the floating container's height is not always > > You have two very long sentences in this description, which makes it very hard to read and understand. Can you try breaking it up into more sentences to make it easier to understand what you are describing? Fixed. > Also, mostly a nit, but can you wrap the description to 80 columns? It's also hard to read these really long lines. I reduced the columns size a bit. > > Source/WebCore/ChangeLog:9 > > + logic to RenderBlockFlow::insertFloatingObject function, after it sets the height for the float, this way we're going to save some unneccessary layout passes > > I think you mean RenderBlockFlow::positionNewFloats here. Copy/paste, sorry! I fixed. > > Source/WebCore/ChangeLog:10 > > + with not yet defined heights and fix a layout error which came from a zero height layout pass with ellipses. > > Is this specific to ellipses, or any shape-outside? If it is specific to ellipses, can you explain how? It isn't clear to me. The problem showed up with ellipses. I explained in the changelog. > > LayoutTests/ChangeLog:10 > > + with not yet defined heights and fix a layout error which came from a zero height layout pass with ellipses. > > Shouldn't you be describing what the tests are doing here? I don't see the value in repeating the description from the ChangeLog for the C++ change. Also, line wrapping and less run-on sentences would be good, as I mentioned earlier. :-) Historically, we needed include the same content. I removed it, it's unnecessary. > > LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass-expected.html:10 > > + -webkit-shape-outside: ellipse(50px, 50px, 50%, 50%); > > ideally, you shouldn't be using shape-outside in the ref test. If this doesn't require an ellipse, it would be better to do it with a rectangle so that it's really easy to create a simple ref. The test tests the relayout behavior, so I don't see why it's ideal to not use it in the ref test. I also don't see why would a rectangle test better then and an ellipse. The problem showed up only for ellipses because of the incorrect radius computation. > If it does require an ellipse, might be worth taking a look at LayoutTests/fast/shapes/resources/rounded-rectangle.js and the rounded rectangle/ellipse/circle tests to see about testing without using shape-outside. > > > LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass-expected.html:11 > > + -webkit-clip-path: ellipse(50%, 50%, 50%, 50%); > > This same effect can also be achieved by the following: > > border-radius: 50%; > overflow: hidden; > > Which I'm starting to like better than using clip-path, since it is even more independent of the shapes code, and arguably simpler. I don't feel particularly strongly about it, though, so if you really like sticking with clip-path, go ahead. I modified to use the border-radius and overflow, however I thin the clip-path is more straightforward (1 property over 2), and this thing is just helps to visualize the test. It has nothing to do with testing the behavior itself. Thanks for the review! 946817 9 215948 bjonesbe 2013-11-04 14:24:56 -0800 Comment on attachment 215948 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=215948&action=review > Source/WebCore/ChangeLog:14 > + with JavaScript into a region flow. The contet has been layed out based on the 0 border radius, and relayout hasn't been s/contet/content > LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass-expected.html:12 > + overflow: hidden; I thought you said you were going to stick with the clip-path? Either way is fine with me. Also, I was mentioning that if you were going to create a ref test without using a shape-outside, then using a rectangle would be easier than using an ellipse, since emulating a rectangle is really easy (as opposed to emulating an ellipse, which involves a whole bunch of JS). Anyways, you are correct that it is still a valid test using the shape-outside. It is just my preference to have my refs to be as simple as possible (thus using rectangles over more complex shapes if possible, etc), because I've found that makes it easier to debug and understand what the test is actually testing. Note that I'm just explaining my thinking; I'm also fine with you keeping the shape-outside as you have, since it is indeed a valid test as is. 946938 10 215978 zoltan 2013-11-04 17:40:04 -0800 Created attachment 215978 Incorporating Bem's review 946942 11 zoltan 2013-11-04 17:42:59 -0800 (In reply to comment #9) > > LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass-expected.html:12 > > + overflow: hidden; > > I thought you said you were going to stick with the clip-path? Either way is fine with me. > > Also, I was mentioning that if you were going to create a ref test without using a shape-outside, then using a rectangle would be easier than using an ellipse, since emulating a rectangle is really easy (as opposed to emulating an ellipse, which involves a whole bunch of JS). > > Anyways, you are correct that it is still a valid test using the shape-outside. It is just my preference to have my refs to be as simple as possible (thus using rectangles over more complex shapes if possible, etc), because I've found that makes it easier to debug and understand what the test is actually testing. Note that I'm just explaining my thinking; I'm also fine with you keeping the shape-outside as you have, since it is indeed a valid test as is. Fair enough! Good point, you convinced me. I updated the test to use a simple rectangle. The expected doesn't use shape-outside anymore. The patch now perfectly incorporate with your review! Thanks for looking at it. 946951 12 215978 hyatt 2013-11-04 18:07:06 -0800 Comment on attachment 215978 Incorporating Bem's review r=me 946955 13 215978 commit-queue 2013-11-04 18:32:24 -0800 Comment on attachment 215978 Incorporating Bem's review Clearing flags on attachment: 215978 Committed r158630: <http://trac.webkit.org/changeset/158630> 946956 14 commit-queue 2013-11-04 18:32:27 -0800 All reviewed patches have been landed. Closing bug. 198760 2013-04-18 13:34:21 -0700 2013-04-18 13:34:21 -0700 there should be a shape outside applied to the float showing a circular hole in the content. exclusion-delay-bug.zip application/zip 1880 gammon UEsDBAoAAAAAACFokkIAAAAAAAAAAAAAAAAUABAAZXhjbHVzaW9uLWRlbGF5LWJ1Zy9VWAwA6lBw Uf5QcFH1ARQAUEsDBBQACAAIAKNqkkIAAAAAAAAAAAAAAAAeABAAZXhjbHVzaW9uLWRlbGF5LWJ1 Zy9pbmRleC5odG1sVVgMAMxVcFGxVXBR9QEUAG1U4Y7jNBD+3X2KodJpe1Kadu9Ax5Vs/yAkkOB0 EvsCbjJJhjq2sZ2WgJB4DV6PJ+GzkxZ0utUqdWbGM998802qLxpbx8kx9XHQx4cq/ZBWpntes1kf Hx5WVc+qOT6sVtXAUVHdKx84Pq/H2G6/zhGrKkrUfDSWQpy0mK7azZbkS6Z8WpWNt25bKxf+SK+E v1ZbFQ+kuY3f3GyD8p2YbbTuQOUTD9mxaq2J2yC/84HeL7YUfJUm9gd6erN3v92NPUvXI+3T2/9b T6o+d96OptnKoDokGr3elOVOBTQUdtkYdspHqTU/7e5oy3DpXn8ujWfHCb6xy/EetL3y6SwA3CvH WzvGIA0KstbiAm++2r8q6L/Hl29fzfn/TI9MVY122cRM1OqWDWxdt2KiPSTirp9c8dyJNZ+50Xo7 fHKj2t3GUu2W+VYn20x5Yo1cqNZg5Xk951wfqx2MOXqJqkLtxUWccKMdTR0RR53dvKaM4KI8pTzP BIGNA1opaw+G+DvN6W3zCO/j3DVOZa73QQ2MG+ul+fXdK8aw//7lpx/hfazcDV0rPkSAC06Zm+0+ tQQ6OY6GFHVIp5mCtpC6OtkLnhS9Ek2/3MCLoZ/519GKog8qWZSmj8qfi3RhjPSu2O/31DLHJUNg BeVeWKersYcBYT175BH2Hmn4ohpVkLZ2CCh4YT/RSTpUZi7phxhwGs2ZJJAfMRHy3BRIJfWZDTdQ d+ypYXZYyYl9INtSO3pvr3CeZmymoTfvZliA0Qg4jOxJxQzppMJSqbU2Og/10NWOuqEaLXia7JgG ZbC05AGzpBc/pZdoqdMyQK0kCac4N8HoCrKeaq/MEhSY596T0hO+FF0DoSlQIhXqBFyhDggI1jMZ rs8o0wOhhNxtyIQkFoLN/KToGjMNtfI16ykxeE4tCbjXOjVEvUqUGrRbZAAfPaclM7GgE4eYKZoH 935PE+OrRapD+olUM4hP8PtxUCakbP/89XfK1okCP2FWAbilgYcTWEJblRwXdaAGRAaxS4doHodq J0fQYnL7AYLwUE4Y/UUuqUpwXAvn2WG8V2ubUFY7d3yc5X1bj7RYpXIO2b/tRTcbCD/vR9pX/OMb 9SIDo6FNZwt6ghiTGyJfNhGbnL/h/wJQSwcIy2GKXFIDAADUBQAAUEsDBAoAAAAAALBqkkIAAAAA AAAAAAAAAAAJABAAX19NQUNPU1gvVVgMAMxVcFHMVXBR9QEUAFBLAwQKAAAAAACwapJCAAAAAAAA AAAAAAAAHQAQAF9fTUFDT1NYL2V4Y2x1c2lvbi1kZWxheS1idWcvVVgMAMxVcFHMVXBR9QEUAFBL AwQUAAgACACjapJCAAAAAAAAAAAAAAAAKQAQAF9fTUFDT1NYL2V4Y2x1c2lvbi1kZWxheS1idWcv Ll9pbmRleC5odG1sVVgMAMxVcFGxVXBR9QEUAGNgFWNnYGJg8E1MVvAPVohQgAKQGAMnEBsB8Xsg BvIZFRmIAo4hIUEQFljHDiDORFPCBBV3Y2AQTc7P1UssKMhJ1SssTSxKzCvJzEsFqfkHxMpQ+dzE 5KL83MSS1GK95MSi1BKGQn0DAxNDa1ODtNQU45Qka/f8/PSc1JgKIwPnDKDKVGtXR1MnUwNLS11D FyMXXRM3EyddJ0dDE11nczdzI1NzE0c3E0OGai6QX5Pzc0pz8xRsFYzMrcECOUAXgLiW1ly1AFBL BwhqIAflxgAAACEBAABQSwECFQMKAAAAAAAhaJJCAAAAAAAAAAAAAAAAFAAMAAAAAAAAAABA7UEA AAAAZXhjbHVzaW9uLWRlbGF5LWJ1Zy9VWAgA6lBwUf5QcFFQSwECFQMUAAgACACjapJCy2GKXFID AADUBQAAHgAMAAAAAAAAAABA7YFCAAAAZXhjbHVzaW9uLWRlbGF5LWJ1Zy9pbmRleC5odG1sVVgI AMxVcFGxVXBRUEsBAhUDCgAAAAAAsGqSQgAAAAAAAAAAAAAAAAkADAAAAAAAAAAAQP1B8AMAAF9f TUFDT1NYL1VYCADMVXBRzFVwUVBLAQIVAwoAAAAAALBqkkIAAAAAAAAAAAAAAAAdAAwAAAAAAAAA AED9QScEAABfX01BQ09TWC9leGNsdXNpb24tZGVsYXktYnVnL1VYCADMVXBRzFVwUVBLAQIVAxQA CAAIAKNqkkJqIAflxgAAACEBAAApAAwAAAAAAAAAAECkgXIEAABfX01BQ09TWC9leGNsdXNpb24t ZGVsYXktYnVnLy5faW5kZXguaHRtbFVYCADMVXBRsVVwUVBLBQYAAAAABQAFAKMBAACfBQAAAAA= 204175 2013-06-10 11:26:20 -0700 2013-06-10 11:26:20 -0700 Simplified test case that doesn't use a delay at all. index.html text/html 1588 bjonesbe PCFkb2N0eXBlIGh0bWw+CjxodG1sIGxhbmc9ImVuIj4KCiAgICA8aGVhZD4KICAgICAgICA8bWV0 YSBjaGFyc2V0PSJ1dGYtOCI+CgogICAgICAgIDx0aXRsZT5ubyBzdHlsaW5nPC90aXRsZT4KICAg ICAgICA8c3R5bGU+CiAgICAgICAgICAgIC5kcm9wLWNhcHN7CiAgICAgICAgICAgICAgICBmbG9h dDogbGVmdDsKICAgICAgICAgICAgICAgIHdpZHRoOiAxMjBweDsKICAgICAgICAgICAgICAgIGhl aWdodDogMTMwcHg7CiAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDAsIDI1 NSwgMCwgMC41KTsKICAgICAgICAgICAgICAgIC13ZWJraXQtY2xpcC1wYXRoOiBlbGxpcHNlKDUw JSwgNTAlLCA1MCUsIDQzJSk7CiAgICAgICAgICAgICAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6 IGVsbGlwc2UoNTAlLCA1MCUsIDUwJSwgNDMlKTsKICAgICAgICAgICAgfQogICAgICAgICAgICAK ICAgICAgICAgICAgI2NvbnRlbnR7CiAgICAgICAgICAgICAgICAtd2Via2l0LWZsb3ctaW50bzog ZmxvdzsKICAgICAgICAgICAgfQogICAgICAgICAgICAKICAgICAgICAgICAgI3JlZ2lvbnsKICAg ICAgICAgICAgICAgIC13ZWJraXQtZmxvdy1mcm9tOiBmbG93OwogICAgICAgICAgICB9CiAgICAg ICAgPC9zdHlsZT4KICAgIDwvaGVhZD4KICAgIDxib2R5PgogICAgICAgIDxkaXYgaWQ9InJlZ2lv biI+PC9kaXY+CiAgICAgICAgPGRpdiBpZD0iY29udGVudCI+PC9kaXY+CiAgICA8L2JvZHk+CiAg ICA8c2NyaXB0PgogICAgICAgIGRvY3VtZW50LmJvZHkub2Zmc2V0VG9wOwoKICAgICAgICB2YXIg ZGl2ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2NvbnRlbnQnKTsKICAgICAgICBkaXYuaW5u ZXJIVE1MID0gJzxwPjxzcGFuIGNsYXNzPSJkcm9wLWNhcHMiPjwvc3Bhbj5uIGEgZ2VudGxlIHNs b3BlIGFib3ZlIGEgdHJhaWwganVuY3Rpb24gaW4gU2VxdW9pYSBOYXRpb25hbCBQYXJrLCBhYm91 dCA3LDAwMCBmZWV0IGFib3ZlIHNlYSBsZXZlbCBpbiB0aGUgc291dGhlcm4gU2llcnJhIE5ldmFk YSwgbG9vbXMgYSB2ZXJ5IGJpZyB0cmVlLiBJdHMgdHJ1bmsgaXMgcnVzdHkgcmVkLCB0aGlja2Vu ZWQgd2l0aCBkZWVwIGxheWVycyBvZiBmdXJyb3dlZCBiYXJrLCBhbmQgMjcgZmVldCBpbiBkaWFt ZXRlciBhdCB0aGUgYmFzZS4gSXRzIGZvb3RwcmludCB3b3VsZCBjb3ZlciB5b3VyIGRpbmluZyBy b29tLiBUcnlpbmcgdG8gZ2xpbXBzZSBpdHMgdGlwcHkgdG9wLCBvciBjcmFuaW5nIHRvIHNlZSB0 aGUgc2hhcGUgb2YgaXRzIGNyb3duLCBjb3VsZCBnaXZlIHlvdSBhIHNvcmUgbmVjay4gVGhhdCBp cywgdGhpcyB0cmVlIGlzIHNvIGJpZyB5b3UgY2FuIHNjYXJjZWx5IGxvb2sgYXQgaXQgYWxsLiBJ dCBoYXMgYSBuYW1lLCB0aGUgUHJlc2lkZW50LCBiZXN0b3dlZCBhYm91dCA5MCB5ZWFycyBhZ28g YnkgYWRtaXJpbmcgaHVtYW5zLiBJdOKAmXMgYSBnaWFudCBzZXF1b2lhLCBhIG1lbWJlciBvZiA8 aT5TZXF1b2lhZGVuZHJvbiBnaWdhbnRldW08L2k+LCBvbmUgb2Ygc2V2ZXJhbCBzdXJ2aXZpbmcg c3BlY2llcyBvZiByZWR3b29kcy48L3A+JzsKICAgIDwvc2NyaXB0Pgo8L2h0bWw+Cg== 215937 2013-11-04 11:34:46 -0800 2013-11-04 14:01:42 -0800 Patch bug-114829-20131104113445.patch text/plain 7756 zoltan U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4NTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Y3ZjBlYjYzNWM3MWQ1 YzIwNmJkZTVmYTI0MmZiM2QwYTdiMTc3ZS4uNjgyMTU4MmY1ZTYwOTY5NDJkZWM4N2U5NGE2NDI1 NzdmYTc3ZTVhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTExLTA0ICBab2x0 YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MgUmVnaW9uc11b Q1NTIFNoYXBlc10gQ29udGVudCBpbiByZWdpb24gZG9lc24ndCByZXNwZWN0IHNoYXBlLW91dHNp ZGUgYWZ0ZXIgaW5pdGlhbCBsYXlvdXQgcGFzcworICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3Jn L2IvMTE0ODI5PgorCisgICAgICAgIFdlIHNldCB0aGUgc2l6ZSBvZiB0aGUgc2hhcGUgZm9yIHNo YXBlLW91dHNpZGUgaW4gUmVuZGVyQmxvY2tGbG93OjppbnNlcnRGbG9hdGluZ09iamVjdC4gSW4g dGhhdCBmdW5jdGlvbiB0aGUgZmxvYXRpbmcgY29udGFpbmVyJ3MgaGVpZ2h0IGlzIG5vdCBhbHdh eXMKKyAgICAgICAgcmVzb2x2ZWQgKGUuZy4gcGVyY2VudGFnZSBiYXNlZCBoZWlnaHQvcmFkaXVz IGZvciB0aGUgc2hhcGUpLCB0aGVyZWZvcmUgd2UgZGlkIHNvbWUgZXh0cmEgbGF5b3V0IHBhc3Nl cyBmb3IgdGhlc2UgY2FzZXMgd2l0aCAwIGhlaWdodCwgd2hpY2ggZGlkbid0IG1ha2Ugc2Vuc2Us CisgICAgICAgIHNpbmNlIHdoZW4gdGhlIGZsb2F0aW5nIGNvbnRhaW5lcnMgaGVpZ2h0IGhhcyBi ZWVuIHNldCB0byB0aGUgY29ycmVjdCB2YWx1ZSBpdCBoYXMgdHJpZ2dlcmVkIGEgbmV3IGxheW91 dCBwYXNzIGFueXdheS4gVGhpcyBjaGFuZ2UgbW92ZXMgdGhlIHNoYXBlIHNpemUgc2V0dGluZwor ICAgICAgICBsb2dpYyB0byBSZW5kZXJCbG9ja0Zsb3c6Omluc2VydEZsb2F0aW5nT2JqZWN0IGZ1 bmN0aW9uLCBhZnRlciBpdCBzZXRzIHRoZSBoZWlnaHQgZm9yIHRoZSBmbG9hdCwgdGhpcyB3YXkg d2UncmUgZ29pbmcgdG8gc2F2ZSBzb21lIHVubmVjY2Vzc2FyeSBsYXlvdXQgcGFzc2VzCisgICAg ICAgIHdpdGggbm90IHlldCBkZWZpbmVkIGhlaWdodHMgYW5kIGZpeCBhIGxheW91dCBlcnJvciB3 aGljaCBjYW1lIGZyb20gYSB6ZXJvIGhlaWdodCBsYXlvdXQgcGFzcyB3aXRoIGVsbGlwc2VzLgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZh c3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWxheW91 dC1hZnRlci1pbml0aWFsLWxheW91dC1wYXNzLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJCbG9ja0Zsb3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93Ojpp bnNlcnRGbG9hdGluZ09iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6 OnBvc2l0aW9uTmV3RmxvYXRzKToKKwogMjAxMy0xMS0wNCAgUHJ6ZW15c2xhdyBTenltYW5za2kg IDxwLnN6eW1hbnNraTNAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW1RleG1hcF0gUmVtb3ZlIHJl ZHVuZGFudCBjYWxscyBpbiBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKaW5kZXggNmVjMjVjYWU1YmQ1NTBhOTE0 Y2VhZGMzZDFiNzI1YmQ0MjNiYjljMC4uODg2NWMwMDY3NWY1YWM3YmRiMzRiMTA1OTYwMzRmZDQ2 MGJmYTg1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr Rmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5j cHAKQEAgLTE5NzMsMTEgKzE5NzMsNiBAQCBGbG9hdGluZ09iamVjdCogUmVuZGVyQmxvY2tGbG93 OjppbnNlcnRGbG9hdGluZ09iamVjdChSZW5kZXJCb3gmIGZsb2F0Qm94KQogCiAgICAgc2V0TG9n aWNhbFdpZHRoRm9yRmxvYXQoZmxvYXRpbmdPYmplY3QuZ2V0KCksIGxvZ2ljYWxXaWR0aEZvckNo aWxkKGZsb2F0Qm94KSArIG1hcmdpblN0YXJ0Rm9yQ2hpbGQoZmxvYXRCb3gpICsgbWFyZ2luRW5k Rm9yQ2hpbGQoZmxvYXRCb3gpKTsKIAotI2lmIEVOQUJMRShDU1NfU0hBUEVTKQotICAgIGlmIChT aGFwZU91dHNpZGVJbmZvKiBzaGFwZU91dHNpZGUgPSBmbG9hdEJveC5zaGFwZU91dHNpZGVJbmZv KCkpCi0gICAgICAgIHNoYXBlT3V0c2lkZS0+c2V0U2hhcGVTaXplKGxvZ2ljYWxXaWR0aEZvckNo aWxkKGZsb2F0Qm94KSwgbG9naWNhbEhlaWdodEZvckNoaWxkKGZsb2F0Qm94KSk7Ci0jZW5kaWYK LQogICAgIHJldHVybiBtX2Zsb2F0aW5nT2JqZWN0cy0+YWRkKHN0ZDo6bW92ZShmbG9hdGluZ09i amVjdCkpOwogfQogCkBAIC0yMjE3LDYgKzIyMTIsMTAgQEAgYm9vbCBSZW5kZXJCbG9ja0Zsb3c6 OnBvc2l0aW9uTmV3RmxvYXRzKCkKIAogICAgICAgICBtX2Zsb2F0aW5nT2JqZWN0cy0+YWRkUGxh Y2VkT2JqZWN0KGZsb2F0aW5nT2JqZWN0KTsKIAorI2lmIEVOQUJMRShDU1NfU0hBUEVTKQorICAg ICAgICBpZiAoU2hhcGVPdXRzaWRlSW5mbyogc2hhcGVPdXRzaWRlID0gY2hpbGRCb3guc2hhcGVP dXRzaWRlSW5mbygpKQorICAgICAgICAgICAgc2hhcGVPdXRzaWRlLT5zZXRTaGFwZVNpemUobG9n aWNhbFdpZHRoRm9yQ2hpbGQoY2hpbGRCb3gpLCBsb2dpY2FsSGVpZ2h0Rm9yQ2hpbGQoY2hpbGRC b3gpKTsKKyNlbmRpZgogICAgICAgICAvLyBJZiB0aGUgY2hpbGQgbW92ZWQsIHdlIGhhdmUgdG8g cmVwYWludCBpdC4KICAgICAgICAgaWYgKGNoaWxkQm94LmNoZWNrRm9yUmVwYWludER1cmluZ0xh eW91dCgpKQogICAgICAgICAgICAgY2hpbGRCb3gucmVwYWludER1cmluZ0xheW91dElmTW92ZWQo b2xkUmVjdCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggYTFiZjYxZWQ3NGVmZDRlNDAwMjJmYTk1OTY0ZTYwMjNlMDhjMzkx Yi4uMDg2MzQzNTU0ZGRhNjI0MmIyYzhlYTYxYTVhODZkYjg4NmVlZWRlNCAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE5IEBACisyMDEzLTExLTA0ICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3Jn PgorCisgICAgICAgIFtDU1MgUmVnaW9uc11bQ1NTIFNoYXBlc10gQ29udGVudCBpbiByZWdpb24g ZG9lc24ndCByZXNwZWN0IHNoYXBlLW91dHNpZGUgYWZ0ZXIgaW5pdGlhbCBsYXlvdXQgcGFzcwor ICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTE0ODI5PgorCisgICAgICAgIFdlIHNldCB0 aGUgc2l6ZSBvZiB0aGUgc2hhcGUgZm9yIHNoYXBlLW91dHNpZGUgaW4gUmVuZGVyQmxvY2tGbG93 OjppbnNlcnRGbG9hdGluZ09iamVjdC4gSW4gdGhhdCBmdW5jdGlvbiB0aGUgZmxvYXRpbmcgY29u dGFpbmVyJ3MgaGVpZ2h0IGlzIG5vdCBhbHdheXMKKyAgICAgICAgcmVzb2x2ZWQgKGUuZy4gcGVy Y2VudGFnZSBiYXNlZCBoZWlnaHQvcmFkaXVzIGZvciB0aGUgc2hhcGUpLCB0aGVyZWZvcmUgd2Ug ZGlkIHNvbWUgZXh0cmEgbGF5b3V0IHBhc3NlcyBmb3IgdGhlc2UgY2FzZXMgd2l0aCAwIGhlaWdo dCwgd2hpY2ggZGlkbid0IG1ha2Ugc2Vuc2UsCisgICAgICAgIHNpbmNlIHdoZW4gdGhlIGZsb2F0 aW5nIGNvbnRhaW5lcnMgaGVpZ2h0IGhhcyBiZWVuIHNldCB0byB0aGUgY29ycmVjdCB2YWx1ZSBp dCBoYXMgdHJpZ2dlcmVkIGEgbmV3IGxheW91dCBwYXNzIGFueXdheS4gVGhpcyBjaGFuZ2UgbW92 ZXMgdGhlIHNoYXBlIHNpemUgc2V0dGluZworICAgICAgICBsb2dpYyB0byBSZW5kZXJCbG9ja0Zs b3c6Omluc2VydEZsb2F0aW5nT2JqZWN0IGZ1bmN0aW9uLCBhZnRlciBpdCBzZXRzIHRoZSBoZWln aHQgZm9yIHRoZSBmbG9hdCwgdGhpcyB3YXkgd2UncmUgZ29pbmcgdG8gc2F2ZSBzb21lIHVubmVj Y2Vzc2FyeSBsYXlvdXQgcGFzc2VzCisgICAgICAgIHdpdGggbm90IHlldCBkZWZpbmVkIGhlaWdo dHMgYW5kIGZpeCBhIGxheW91dCBlcnJvciB3aGljaCBjYW1lIGZyb20gYSB6ZXJvIGhlaWdodCBs YXlvdXQgcGFzcyB3aXRoIGVsbGlwc2VzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hh cGUtb3V0c2lkZS1mbG9hdHMtbGF5b3V0LWFmdGVyLWluaXRpYWwtbGF5b3V0LXBhc3MtZXhwZWN0 ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9h dHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtbGF5b3V0LWFmdGVyLWluaXRpYWwtbGF5b3V0LXBhc3Mu aHRtbDogQWRkZWQuCisKIDIwMTMtMTEtMDQgIFJvYmVydCBQbG9jaWVubmlrICA8ci5wbG9jaWVu bmlrQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdIGFjY2Vzc2liaWxpdHkvdGV4dGFyZWEt bGluZS1mb3ItaW5kZXguaHRtbCBpcyBmYWlsaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1sYXlv dXQtYWZ0ZXItaW5pdGlhbC1sYXlvdXQtcGFzcy1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtbGF5 b3V0LWFmdGVyLWluaXRpYWwtbGF5b3V0LXBhc3MtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5l MTI2YTliNGM3NTdjMjdhYmFlN2I5YzkyYzgzNzRlYzAyNWJiMzI4Ci0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0 c2lkZS1mbG9hdHMtbGF5b3V0LWFmdGVyLWluaXRpYWwtbGF5b3V0LXBhc3MtZXhwZWN0ZWQuaHRt bApAQCAtMCwwICsxLDM0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c3R5 bGU+Cisuc2hhcGUtb3V0c2lkZSB7CisgICAgZmxvYXQ6IGxlZnQ7CisgICAgd2lkdGg6IDEwMHB4 OworICAgIGhlaWdodDogMTAwcHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAg LXdlYmtpdC1zaGFwZS1vdXRzaWRlOiBlbGxpcHNlKDUwcHgsIDUwcHgsIDUwJSwgNTAlKTsKKyAg ICAtd2Via2l0LWNsaXAtcGF0aDogZWxsaXBzZSg1MCUsIDUwJSwgNTAlLCA1MCUpOworfQorCisj Y29udGVudCB7CisgICAgZm9udDogMjBweC8xIEFoZW0sIHNhbnMtc2VyaWY7CisgICAgd2lkdGg6 IDIwMHB4OworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB0b3A6IDBweDsKKyAgICBsZWZ0 OiAwcHg7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorCis8Ym9keT4KKyAgICA8ZGl2IGlkPSJjb250 ZW50Ij4KKyAgICAgICAgPHA+PGRpdiBjbGFzcz0ic2hhcGUtb3V0c2lkZSI+PC9kaXY+WCBYIFgg WCBYIFggWCBYIFggWCBYIFggWCBYIFg8L3A+CisgICAgPC9kaXY+Cis8L2JvZHk+CisKKzxwIHN0 eWxlPSJtYXJnaW4tdG9wOiAxNTBweDsiPgorICAgIFRoZXJlIGlzIGEgZ3JlZW4gZmxvYXQgd2l0 aCBhIGNpcmNsZSAoZGVmaW5lZCBieSBhbiBlbGxpcHNlKSBzaGFwZS1vdXRzaWRlIGFuZCBpbmxp bmUgY29udGVudC4gVGhlIHdob2xlIGNvbnRlbnQgZmxvd3MgaW50byBhIHJlZ2lvbi4gVGhlIHJl Y3RhbmdsZXMgc2hvdWxkIHdyYXAgYXJvdW5kIHRoZSBlbGxpcHNlJ3MgYm91bmRhcmllcy4KKzwv cD4KKzxwPkJ1ZyA8YSBocmVmPSJodHRwOi8vd2Via2l0Lm9yZy9iLzExNDgyOSI+MTE0ODI5PC9h PjogW0NTUyBSZWdpb25zXVtDU1MgU2hhcGVzXSBDb250ZW50IGluIHJlZ2lvbiBkb2Vzbid0IHJl c3BlY3Qgc2hhcGUtb3V0c2lkZSBhZnRlciBpbml0aWFsIGxheW91dCBwYXNzPC9wPgorPC9odG1s PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9h dHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtbGF5b3V0LWFmdGVyLWluaXRpYWwtbGF5b3V0LXBhc3Mu aHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBl LW91dHNpZGUtZmxvYXRzLWxheW91dC1hZnRlci1pbml0aWFsLWxheW91dC1wYXNzLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uYzZlODQ1OTM1MjEwYTRiNjQ4YmIwY2I2Yzg1ZTE5MDQ5YmEwMTA5ZgotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRz L3NoYXBlLW91dHNpZGUtZmxvYXRzLWxheW91dC1hZnRlci1pbml0aWFsLWxheW91dC1wYXNzLmh0 bWwKQEAgLTAsMCArMSw0MiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0 eWxlPgorLnNoYXBlLW91dHNpZGUgeworICAgIGZsb2F0OiBsZWZ0OworICAgIHdpZHRoOiAxMDBw eDsKKyAgICBoZWlnaHQ6IDEwMHB4OworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAg IC13ZWJraXQtc2hhcGUtb3V0c2lkZTogZWxsaXBzZSg1MHB4LCA1MHB4LCA1MCUsIDUwJSk7Cisg ICAgLXdlYmtpdC1jbGlwLXBhdGg6IGVsbGlwc2UoNTAlLCA1MCUsIDUwJSwgNTAlKTsKK30KKwor I2NvbnRlbnQgeworICAgIGZvbnQ6IDIwcHgvMSBBaGVtLCBzYW5zLXNlcmlmOworICAgIC13ZWJr aXQtZmxvdy1pbnRvOiBmbG93OworfQorI3JlZ2lvbiB7CisgICAgcG9zaXRpb246IGFic29sdXRl OworICAgIHRvcDogMHB4OworICAgIGxlZnQ6MHB4OworICAgIHdpZHRoOiAyMDBweDsKKyAgICAt d2Via2l0LWZsb3ctZnJvbTogZmxvdzsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAg ICA8ZGl2IGlkPSJyZWdpb24iPjwvZGl2PgorICAgIDxkaXYgaWQ9ImNvbnRlbnQiPjwvZGl2Pgor PC9ib2R5PgorCis8c2NyaXB0PgorICAgIGRvY3VtZW50LmJvZHkub2Zmc2V0VG9wOyAvLyBGb3Jj ZSBsYXlvdXQKKyAgICB2YXIgZGl2ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2NvbnRlbnQn KTsKKyAgICBkaXYuaW5uZXJIVE1MID0gJzxwPjxkaXYgY2xhc3M9InNoYXBlLW91dHNpZGUiPjwv ZGl2PlggWCBYIFggWCBYIFggWCBYIFggWCBYIFggWCBYPC9wPic7Cis8L3NjcmlwdD4KKworPHAg c3R5bGU9Im1hcmdpbi10b3A6IDE1MHB4OyI+CisgICAgVGhlcmUgaXMgYSBncmVlbiBmbG9hdCB3 aXRoIGEgY2lyY2xlIChkZWZpbmVkIGJ5IGFuIGVsbGlwc2UpIHNoYXBlLW91dHNpZGUgYW5kIGlu bGluZSBjb250ZW50LiBUaGUgd2hvbGUgY29udGVudCBmbG93cyBpbnRvIGEgcmVnaW9uLiBUaGUg cmVjdGFuZ2xlcyBzaG91bGQgd3JhcCBhcm91bmQgdGhlIGVsbGlwc2UncyBib3VuZGFyaWVzLgor PC9wPgorPHA+QnVnIDxhIGhyZWY9Imh0dHA6Ly93ZWJraXQub3JnL2IvMTE0ODI5Ij4xMTQ4Mjk8 L2E+OiBbQ1NTIFJlZ2lvbnNdW0NTUyBTaGFwZXNdIENvbnRlbnQgaW4gcmVnaW9uIGRvZXNuJ3Qg cmVzcGVjdCBzaGFwZS1vdXRzaWRlIGFmdGVyIGluaXRpYWwgbGF5b3V0IHBhc3M8L3A+Cis8L2h0 bWw+Cg== 215948 2013-11-04 14:01:46 -0800 2013-11-04 17:40:01 -0800 Patch bug-114829-20131104140145.patch text/plain 7511 zoltan U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4NTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Y3ZjBlYjYzNWM3MWQ1 YzIwNmJkZTVmYTI0MmZiM2QwYTdiMTc3ZS4uNjRiZjg3MTA4ZTQ1Y2RhMWYwNjYzMDE5OWJiOTBk MDNiMjNiYTZiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTExLTA0ICBab2x0 YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MgUmVnaW9uc11b Q1NTIFNoYXBlc10gQ29udGVudCBpbiByZWdpb24gZG9lc24ndCByZXNwZWN0IHNoYXBlLW91dHNp ZGUgYWZ0ZXIgaW5pdGlhbCBsYXlvdXQgcGFzcworICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3Jn L2IvMTE0ODI5PgorCisgICAgICAgIEFsdGhvdWdoIHdlIHNldCB0aGUgc2l6ZSBvZiBhIHNoYXBl IGZvciBzaGFwZS1vdXRzaWRlIGluIFJlbmRlckJsb2NrRmxvdzo6aW5zZXJ0RmxvYXRpbmdPYmpl Y3QgYmFzZWQgb24gdGhlCisgICAgICAgIGZsb2F0J3Mgc2l6ZSwgdGhlIGFjdHVhbCBoZWlnaHQg b2YgdGhlIGZsb2F0IGlzIG5vdCBhbHdheXMgcmVzb2x2ZWQgYXQgdGhhdCBwb2ludC4gKExvb2sg YXQgY2FzZXMgd2hlbiB0aGUgc2hhcGUKKyAgICAgICAgaGFzIHBlcmNlbnRhZ2UgYmFzZWQgaGVp Z2h0IG9yIHBlcmNlbnRhZ2UgYmFzZWQgcmFkaXVzLikgU2hhcGVJbmZvOjpzZXRTaGFwZVNpemUg dHJpZ2dlcnMgYSBsYXlvdXQgZm9yIDAgaGVpZ2h0CisgICAgICAgIHZhbHVlLCB3aGljaCB3aWxs IGJlIG92ZXJyaWRlbiBsYXRlciwgd2hlbiBSZW5kZXJCbG9ja0Zsb3c6OnBvc2l0aW9uTmV3Rmxv YXRzIHNldHMgdGhlIGFjdHVhbCBzaXplIG9mIHRoZSBmbG9hdCAoc2hhcGUpLgorICAgICAgICBU aHVzIGl0IGRvZXNuJ3QgbWFrZSBzZW5zZSB0byBzZXQgdGhlIHNoYXBlJ3Mgc2l6ZSBpbiBpbnNl cnRGbG9hdGluZ09iamVjdCBhbmQgcnVuIHRob3NlIGV4dHJhIHVubmVjZXNzYXJ5IGxheW91dCBw YXNzZXMsCisgICAgICAgIHNpbmNlIGl0J2xsIGJlIG92ZXJyaWRlbiBhbnl3YXlzLiBJIG1vdmVk IHRoZSBzaGFwZSBzaXplIHNldHRpbmcgbG9naWMgaW50byBSZW5kZXJCbG9ja0Zsb3c6OnBvc2l0 aW9uTmV3RmxvYXRzLgorCisgICAgICAgIFRoZSBwcm9ibGVtIHNob3dlZCB1cCB3aGVuIHdlIGhh ZCBhIHNoYXBlLW91dHNpZGUgZWxsaXBzZSB3aXRoIHBlcmNlbnRhZ2UgYmFzZWQgcmFkaXVzLCBh bmQgd2UgaW5zZXJ0ZWQgdGhlIGNvbnRlbnQKKyAgICAgICAgd2l0aCBKYXZhU2NyaXB0IGludG8g YSByZWdpb24gZmxvdy4gVGhlIGNvbnRldCBoYXMgYmVlbiBsYXllZCBvdXQgYmFzZWQgb24gdGhl IDAgYm9yZGVyIHJhZGl1cywgYW5kIHJlbGF5b3V0IGhhc24ndCBiZWVuCisgICAgICAgIHRyaWdn ZXJlZCB3aGVuIGl0IGZsZXcgaW50byB0aGUgZmxvdy4gVGhpcyBjaGFuZ2Ugc2V0cyB0aGUgc2hh cGUgc2l6ZSBvbmx5IHdoZW4gd2UgYWxyZWFkeSBoYXZlIHRoZSBoZWlnaHQgb2YgdGhlIGZsb2F0 LAorICAgICAgICBzbyB0aGUgcmFkaXVzKGVzKSBjYW4gYmUgcmVzb2x2ZWQgY29ycmVjdGx5LCB0 aHVzIG5vIHVubmVjZXNzYXJ5IGxheW91dCBwYXNzZXMgd2lsbCBoYXBwZW4gYW5kIHRoZSBsYXlv dXQgd2lsbCBiZSBjb3JyZWN0IGFzIHdlbGwuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGVzdDogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9h dHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtbGF5b3V0LWFmdGVyLWluaXRpYWwtbGF5b3V0LXBhc3Mu aHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6Omluc2VydEZsb2F0aW5nT2JqZWN0KTogUmVtb3Zl IHNldHRpbmcgdGhlIHNpemUgb2YgdGhlIHNoYXBlLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy QmxvY2tGbG93Ojpwb3NpdGlvbk5ld0Zsb2F0cyk6IFNldCB0aGUgc2l6ZSBvZiB0aGUgc2hhcGUg aGVyZS4KKwogMjAxMy0xMS0wNCAgUHJ6ZW15c2xhdyBTenltYW5za2kgIDxwLnN6eW1hbnNraTNA c2Ftc3VuZy5jb20+CiAKICAgICAgICAgW1RleG1hcF0gUmVtb3ZlIHJlZHVuZGFudCBjYWxscyBp biBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrRmxvdy5jcHAKaW5kZXggNmVjMjVjYWU1YmQ1NTBhOTE0Y2VhZGMzZDFiNzI1YmQ0 MjNiYjljMC4uODg2NWMwMDY3NWY1YWM3YmRiMzRiMTA1OTYwMzRmZDQ2MGJmYTg1MiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTE5NzMsMTEg KzE5NzMsNiBAQCBGbG9hdGluZ09iamVjdCogUmVuZGVyQmxvY2tGbG93OjppbnNlcnRGbG9hdGlu Z09iamVjdChSZW5kZXJCb3gmIGZsb2F0Qm94KQogCiAgICAgc2V0TG9naWNhbFdpZHRoRm9yRmxv YXQoZmxvYXRpbmdPYmplY3QuZ2V0KCksIGxvZ2ljYWxXaWR0aEZvckNoaWxkKGZsb2F0Qm94KSAr IG1hcmdpblN0YXJ0Rm9yQ2hpbGQoZmxvYXRCb3gpICsgbWFyZ2luRW5kRm9yQ2hpbGQoZmxvYXRC b3gpKTsKIAotI2lmIEVOQUJMRShDU1NfU0hBUEVTKQotICAgIGlmIChTaGFwZU91dHNpZGVJbmZv KiBzaGFwZU91dHNpZGUgPSBmbG9hdEJveC5zaGFwZU91dHNpZGVJbmZvKCkpCi0gICAgICAgIHNo YXBlT3V0c2lkZS0+c2V0U2hhcGVTaXplKGxvZ2ljYWxXaWR0aEZvckNoaWxkKGZsb2F0Qm94KSwg bG9naWNhbEhlaWdodEZvckNoaWxkKGZsb2F0Qm94KSk7Ci0jZW5kaWYKLQogICAgIHJldHVybiBt X2Zsb2F0aW5nT2JqZWN0cy0+YWRkKHN0ZDo6bW92ZShmbG9hdGluZ09iamVjdCkpOwogfQogCkBA IC0yMjE3LDYgKzIyMTIsMTAgQEAgYm9vbCBSZW5kZXJCbG9ja0Zsb3c6OnBvc2l0aW9uTmV3Rmxv YXRzKCkKIAogICAgICAgICBtX2Zsb2F0aW5nT2JqZWN0cy0+YWRkUGxhY2VkT2JqZWN0KGZsb2F0 aW5nT2JqZWN0KTsKIAorI2lmIEVOQUJMRShDU1NfU0hBUEVTKQorICAgICAgICBpZiAoU2hhcGVP dXRzaWRlSW5mbyogc2hhcGVPdXRzaWRlID0gY2hpbGRCb3guc2hhcGVPdXRzaWRlSW5mbygpKQor ICAgICAgICAgICAgc2hhcGVPdXRzaWRlLT5zZXRTaGFwZVNpemUobG9naWNhbFdpZHRoRm9yQ2hp bGQoY2hpbGRCb3gpLCBsb2dpY2FsSGVpZ2h0Rm9yQ2hpbGQoY2hpbGRCb3gpKTsKKyNlbmRpZgog ICAgICAgICAvLyBJZiB0aGUgY2hpbGQgbW92ZWQsIHdlIGhhdmUgdG8gcmVwYWludCBpdC4KICAg ICAgICAgaWYgKGNoaWxkQm94LmNoZWNrRm9yUmVwYWludER1cmluZ0xheW91dCgpKQogICAgICAg ICAgICAgY2hpbGRCb3gucmVwYWludER1cmluZ0xheW91dElmTW92ZWQob2xkUmVjdCk7CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggYTFiZjYxZWQ3NGVmZDRlNDAwMjJmYTk1OTY0ZTYwMjNlMDhjMzkxYi4uY2I2MTY3MTgzY2Ez M2Q1ODZmMDYwZTgyM2MwNWU5N2Y3ZWIxMmE1MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEz LTExLTA0ICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgorCisgICAgICAgIFtD U1MgUmVnaW9uc11bQ1NTIFNoYXBlc10gQ29udGVudCBpbiByZWdpb24gZG9lc24ndCByZXNwZWN0 IHNoYXBlLW91dHNpZGUgYWZ0ZXIgaW5pdGlhbCBsYXlvdXQgcGFzcworICAgICAgICA8aHR0cHM6 Ly93ZWJraXQub3JnL2IvMTE0ODI5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUt b3V0c2lkZS1mbG9hdHMtbGF5b3V0LWFmdGVyLWluaXRpYWwtbGF5b3V0LXBhc3MtZXhwZWN0ZWQu aHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMv c2hhcGUtb3V0c2lkZS1mbG9hdHMtbGF5b3V0LWFmdGVyLWluaXRpYWwtbGF5b3V0LXBhc3MuaHRt bDogQWRkZWQuCisKIDIwMTMtMTEtMDQgIFJvYmVydCBQbG9jaWVubmlrICA8ci5wbG9jaWVubmlr QHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdIGFjY2Vzc2liaWxpdHkvdGV4dGFyZWEtbGlu ZS1mb3ItaW5kZXguaHRtbCBpcyBmYWlsaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1sYXlvdXQt YWZ0ZXItaW5pdGlhbC1sYXlvdXQtcGFzcy1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFz dC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtbGF5b3V0 LWFmdGVyLWluaXRpYWwtbGF5b3V0LXBhc3MtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zNDA5 NzQwYzQ5ZTZhYzYyYWQ4NTMyOGM1ZDgxNGNkMjZlZWJlY2ZhCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lk ZS1mbG9hdHMtbGF5b3V0LWFmdGVyLWluaXRpYWwtbGF5b3V0LXBhc3MtZXhwZWN0ZWQuaHRtbApA QCAtMCwwICsxLDM0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c3R5bGU+ Cisuc2hhcGUtb3V0c2lkZSB7CisgICAgZmxvYXQ6IGxlZnQ7CisgICAgd2lkdGg6IDEwMHB4Owor ICAgIGhlaWdodDogMTAwcHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAgLXdl YmtpdC1zaGFwZS1vdXRzaWRlOiBlbGxpcHNlKDUwcHgsIDUwcHgsIDUwJSwgNTAlKTsKKyAgICBi b3JkZXItcmFkaXVzOiA1MCU7CisgICAgb3ZlcmZsb3c6IGhpZGRlbjsKK30KKyNjb250ZW50IHsK KyAgICBmb250OiAyMHB4LzEgQWhlbSwgc2Fucy1zZXJpZjsKKyAgICB3aWR0aDogMjAwcHg7Cisg ICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHRvcDogMHB4OworICAgIGxlZnQ6IDBweDsKK30K Kzwvc3R5bGU+Cis8L2hlYWQ+CisKKzxib2R5PgorICAgIDxkaXYgaWQ9ImNvbnRlbnQiPgorICAg ICAgICA8cD48ZGl2IGNsYXNzPSJzaGFwZS1vdXRzaWRlIj48L2Rpdj5YIFggWCBYIFggWCBYIFgg WCBYIFggWCBYIFggWDwvcD4KKyAgICA8L2Rpdj4KKzwvYm9keT4KKworPHAgc3R5bGU9Im1hcmdp bi10b3A6IDE1MHB4OyI+CisgICAgVGhlcmUgaXMgYSBncmVlbiBmbG9hdCB3aXRoIGEgY2lyY2xl IChkZWZpbmVkIGJ5IGFuIGVsbGlwc2UpIHNoYXBlLW91dHNpZGUgYW5kIGlubGluZSBjb250ZW50 LiBUaGUgd2hvbGUgY29udGVudCBmbG93cyBpbnRvIGEgcmVnaW9uLiBUaGUgcmVjdGFuZ2xlcyBz aG91bGQgd3JhcCBhcm91bmQgdGhlIGVsbGlwc2UncyBib3VuZGFyaWVzLgorPC9wPgorPHA+QnVn IDxhIGhyZWY9Imh0dHA6Ly93ZWJraXQub3JnL2IvMTE0ODI5Ij4xMTQ4Mjk8L2E+OiBbQ1NTIFJl Z2lvbnNdW0NTUyBTaGFwZXNdIENvbnRlbnQgaW4gcmVnaW9uIGRvZXNuJ3QgcmVzcGVjdCBzaGFw ZS1vdXRzaWRlIGFmdGVyIGluaXRpYWwgbGF5b3V0IHBhc3M8L3A+Cis8L2h0bWw+CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1v dXRzaWRlLWZsb2F0cy1sYXlvdXQtYWZ0ZXItaW5pdGlhbC1sYXlvdXQtcGFzcy5odG1sIGIvTGF5 b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1m bG9hdHMtbGF5b3V0LWFmdGVyLWluaXRpYWwtbGF5b3V0LXBhc3MuaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4x NjI5NjEwM2ZiNGQ1NmFmNDM5ZTZiYWIwZWJjNjBkNTBlOGUwMTM4Ci0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0 c2lkZS1mbG9hdHMtbGF5b3V0LWFmdGVyLWluaXRpYWwtbGF5b3V0LXBhc3MuaHRtbApAQCAtMCww ICsxLDQyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c3R5bGU+Cisuc2hh cGUtb3V0c2lkZSB7CisgICAgZmxvYXQ6IGxlZnQ7CisgICAgd2lkdGg6IDEwMHB4OworICAgIGhl aWdodDogMTAwcHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAgLXdlYmtpdC1z aGFwZS1vdXRzaWRlOiBlbGxpcHNlKDUwcHgsIDUwcHgsIDUwJSwgNTAlKTsKKyAgICBib3JkZXIt cmFkaXVzOiA1MCU7CisgICAgb3ZlcmZsb3c6IGhpZGRlbjsKK30KKyNjb250ZW50IHsKKyAgICBm b250OiAyMHB4LzEgQWhlbSwgc2Fucy1zZXJpZjsKKyAgICAtd2Via2l0LWZsb3ctaW50bzogZmxv dzsKK30KKyNyZWdpb24geworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB0b3A6IDBweDsK KyAgICBsZWZ0OjBweDsKKyAgICB3aWR0aDogMjAwcHg7CisgICAgLXdlYmtpdC1mbG93LWZyb206 IGZsb3c7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdiBpZD0icmVnaW9u Ij48L2Rpdj4KKyAgICA8ZGl2IGlkPSJjb250ZW50Ij48L2Rpdj4KKzwvYm9keT4KKworPHNjcmlw dD4KKyAgICBkb2N1bWVudC5ib2R5Lm9mZnNldFRvcDsgLy8gRm9yY2UgbGF5b3V0CisgICAgdmFy IGRpdiA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb250ZW50Jyk7CisgICAgZGl2LmlubmVy SFRNTCA9ICc8cD48ZGl2IGNsYXNzPSJzaGFwZS1vdXRzaWRlIj48L2Rpdj5YIFggWCBYIFggWCBY IFggWCBYIFggWCBYIFggWDwvcD4nOworPC9zY3JpcHQ+CisKKzxwIHN0eWxlPSJtYXJnaW4tdG9w OiAxNTBweDsiPgorICAgIFRoZXJlIGlzIGEgZ3JlZW4gZmxvYXQgd2l0aCBhIGNpcmNsZSAoZGVm aW5lZCBieSBhbiBlbGxpcHNlKSBzaGFwZS1vdXRzaWRlIGFuZCBpbmxpbmUgY29udGVudC4gVGhl IHdob2xlIGNvbnRlbnQgZmxvd3MgaW50byBhIHJlZ2lvbi4gVGhlIHJlY3RhbmdsZXMgc2hvdWxk IHdyYXAgYXJvdW5kIHRoZSBlbGxpcHNlJ3MgYm91bmRhcmllcy4KKzwvcD4KKzxwPkJ1ZyA8YSBo cmVmPSJodHRwOi8vd2Via2l0Lm9yZy9iLzExNDgyOSI+MTE0ODI5PC9hPjogW0NTUyBSZWdpb25z XVtDU1MgU2hhcGVzXSBDb250ZW50IGluIHJlZ2lvbiBkb2Vzbid0IHJlc3BlY3Qgc2hhcGUtb3V0 c2lkZSBhZnRlciBpbml0aWFsIGxheW91dCBwYXNzPC9wPgorPC9odG1sPgo= 215978 2013-11-04 17:40:04 -0800 2013-11-04 18:32:24 -0800 Incorporating Bem's review bug-114829-20131104174003.patch text/plain 7603 zoltan U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4NTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Y3ZjBlYjYzNWM3MWQ1 YzIwNmJkZTVmYTI0MmZiM2QwYTdiMTc3ZS4uNzdiMGQzODZhYzRhMDkyMjY4NWVhNzRlMzVmYzY0 NmE3MjA5Y2MzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTExLTA0ICBab2x0 YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MgUmVnaW9uc11b Q1NTIFNoYXBlc10gQ29udGVudCBpbiByZWdpb24gZG9lc24ndCByZXNwZWN0IHNoYXBlLW91dHNp ZGUgYWZ0ZXIgaW5pdGlhbCBsYXlvdXQgcGFzcworICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3Jn L2IvMTE0ODI5PgorCisgICAgICAgIEFsdGhvdWdoIHdlIHNldCB0aGUgc2l6ZSBvZiBhIHNoYXBl IGZvciBzaGFwZS1vdXRzaWRlIGluIFJlbmRlckJsb2NrRmxvdzo6aW5zZXJ0RmxvYXRpbmdPYmpl Y3QgYmFzZWQgb24gdGhlCisgICAgICAgIGZsb2F0J3Mgc2l6ZSwgdGhlIGFjdHVhbCBoZWlnaHQg b2YgdGhlIGZsb2F0IGlzIG5vdCBhbHdheXMgcmVzb2x2ZWQgYXQgdGhhdCBwb2ludC4gKExvb2sg YXQgY2FzZXMgd2hlbiB0aGUgc2hhcGUKKyAgICAgICAgaGFzIHBlcmNlbnRhZ2UgYmFzZWQgaGVp Z2h0IG9yIHBlcmNlbnRhZ2UgYmFzZWQgcmFkaXVzLikgU2hhcGVJbmZvOjpzZXRTaGFwZVNpemUg dHJpZ2dlcnMgYSBsYXlvdXQgZm9yIDAgaGVpZ2h0CisgICAgICAgIHZhbHVlLCB3aGljaCB3aWxs IGJlIG92ZXJyaWRlbiBsYXRlciwgd2hlbiBSZW5kZXJCbG9ja0Zsb3c6OnBvc2l0aW9uTmV3Rmxv YXRzIHNldHMgdGhlIGFjdHVhbCBzaXplIG9mIHRoZSBmbG9hdCAoc2hhcGUpLgorICAgICAgICBU aHVzIGl0IGRvZXNuJ3QgbWFrZSBzZW5zZSB0byBzZXQgdGhlIHNoYXBlJ3Mgc2l6ZSBpbiBpbnNl cnRGbG9hdGluZ09iamVjdCBhbmQgcnVuIHRob3NlIGV4dHJhIHVubmVjZXNzYXJ5IGxheW91dCBw YXNzZXMsCisgICAgICAgIHNpbmNlIGl0J2xsIGJlIG92ZXJyaWRlbiBhbnl3YXlzLiBJIG1vdmVk IHRoZSBzaGFwZSBzaXplIHNldHRpbmcgbG9naWMgaW50byBSZW5kZXJCbG9ja0Zsb3c6OnBvc2l0 aW9uTmV3RmxvYXRzLgorCisgICAgICAgIFRoZSBwcm9ibGVtIHNob3dlZCB1cCB3aGVuIHdlIGhh ZCBhIHNoYXBlLW91dHNpZGUgZWxsaXBzZSB3aXRoIHBlcmNlbnRhZ2UgYmFzZWQgcmFkaXVzLCBh bmQgd2UgaW5zZXJ0ZWQgdGhlIGNvbnRlbnQKKyAgICAgICAgd2l0aCBKYXZhU2NyaXB0IGludG8g YSByZWdpb24gZmxvdy4gVGhlIGNvbnRlbnQgaGFzIGJlZW4gbGF5ZWQgb3V0IGJhc2VkIG9uIHRo ZSAwIGJvcmRlciByYWRpdXMsIGFuZCByZWxheW91dCBoYXNuJ3QgYmVlbgorICAgICAgICB0cmln Z2VyZWQgd2hlbiBpdCBmbGV3IGludG8gdGhlIGZsb3cuIFRoaXMgY2hhbmdlIHNldHMgdGhlIHNo YXBlIHNpemUgb25seSB3aGVuIHdlIGFscmVhZHkgaGF2ZSB0aGUgaGVpZ2h0IG9mIHRoZSBmbG9h dCwKKyAgICAgICAgc28gdGhlIHJhZGl1cyhlcykgY2FuIGJlIHJlc29sdmVkIGNvcnJlY3RseSwg dGh1cyBubyB1bm5lY2Vzc2FyeSBsYXlvdXQgcGFzc2VzIHdpbGwgaGFwcGVuIGFuZCB0aGUgbGF5 b3V0IHdpbGwgYmUgY29ycmVjdCBhcyB3ZWxsLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxv YXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWxheW91dC1hZnRlci1pbml0aWFsLWxheW91dC1wYXNz Lmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjppbnNlcnRGbG9hdGluZ09iamVjdCk6IFJlbW92 ZSBzZXR0aW5nIHRoZSBzaXplIG9mIHRoZSBzaGFwZS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrRmxvdzo6cG9zaXRpb25OZXdGbG9hdHMpOiBTZXQgdGhlIHNpemUgb2YgdGhlIHNoYXBl IGhlcmUuCisKIDIwMTMtMTEtMDQgIFByemVteXNsYXcgU3p5bWFuc2tpICA8cC5zenltYW5za2kz QHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtUZXhtYXBdIFJlbW92ZSByZWR1bmRhbnQgY2FsbHMg aW4gQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9ja0Zsb3cuY3BwCmluZGV4IDZlYzI1Y2FlNWJkNTUwYTkxNGNlYWRjM2QxYjcyNWJk NDIzYmI5YzAuLjg4NjVjMDA2NzVmNWFjN2JkYjM0YjEwNTk2MDM0ZmQ0NjBiZmE4NTIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC0xOTczLDEx ICsxOTczLDYgQEAgRmxvYXRpbmdPYmplY3QqIFJlbmRlckJsb2NrRmxvdzo6aW5zZXJ0RmxvYXRp bmdPYmplY3QoUmVuZGVyQm94JiBmbG9hdEJveCkKIAogICAgIHNldExvZ2ljYWxXaWR0aEZvckZs b2F0KGZsb2F0aW5nT2JqZWN0LmdldCgpLCBsb2dpY2FsV2lkdGhGb3JDaGlsZChmbG9hdEJveCkg KyBtYXJnaW5TdGFydEZvckNoaWxkKGZsb2F0Qm94KSArIG1hcmdpbkVuZEZvckNoaWxkKGZsb2F0 Qm94KSk7CiAKLSNpZiBFTkFCTEUoQ1NTX1NIQVBFUykKLSAgICBpZiAoU2hhcGVPdXRzaWRlSW5m byogc2hhcGVPdXRzaWRlID0gZmxvYXRCb3guc2hhcGVPdXRzaWRlSW5mbygpKQotICAgICAgICBz aGFwZU91dHNpZGUtPnNldFNoYXBlU2l6ZShsb2dpY2FsV2lkdGhGb3JDaGlsZChmbG9hdEJveCks IGxvZ2ljYWxIZWlnaHRGb3JDaGlsZChmbG9hdEJveCkpOwotI2VuZGlmCi0KICAgICByZXR1cm4g bV9mbG9hdGluZ09iamVjdHMtPmFkZChzdGQ6Om1vdmUoZmxvYXRpbmdPYmplY3QpKTsKIH0KIApA QCAtMjIxNyw2ICsyMjEyLDEwIEBAIGJvb2wgUmVuZGVyQmxvY2tGbG93Ojpwb3NpdGlvbk5ld0Zs b2F0cygpCiAKICAgICAgICAgbV9mbG9hdGluZ09iamVjdHMtPmFkZFBsYWNlZE9iamVjdChmbG9h dGluZ09iamVjdCk7CiAKKyNpZiBFTkFCTEUoQ1NTX1NIQVBFUykKKyAgICAgICAgaWYgKFNoYXBl T3V0c2lkZUluZm8qIHNoYXBlT3V0c2lkZSA9IGNoaWxkQm94LnNoYXBlT3V0c2lkZUluZm8oKSkK KyAgICAgICAgICAgIHNoYXBlT3V0c2lkZS0+c2V0U2hhcGVTaXplKGxvZ2ljYWxXaWR0aEZvckNo aWxkKGNoaWxkQm94KSwgbG9naWNhbEhlaWdodEZvckNoaWxkKGNoaWxkQm94KSk7CisjZW5kaWYK ICAgICAgICAgLy8gSWYgdGhlIGNoaWxkIG1vdmVkLCB3ZSBoYXZlIHRvIHJlcGFpbnQgaXQuCiAg ICAgICAgIGlmIChjaGlsZEJveC5jaGVja0ZvclJlcGFpbnREdXJpbmdMYXlvdXQoKSkKICAgICAg ICAgICAgIGNoaWxkQm94LnJlcGFpbnREdXJpbmdMYXlvdXRJZk1vdmVkKG9sZFJlY3QpOwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmlu ZGV4IGExYmY2MWVkNzRlZmQ0ZTQwMDIyZmE5NTk2NGU2MDIzZTA4YzM5MWIuLmNiNjE2NzE4M2Nh MzNkNTg2ZjA2MGU4MjNjMDVlOTdmN2ViMTJhNTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0No YW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAx My0xMS0wNCAgWm9sdGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBb Q1NTIFJlZ2lvbnNdW0NTUyBTaGFwZXNdIENvbnRlbnQgaW4gcmVnaW9uIGRvZXNuJ3QgcmVzcGVj dCBzaGFwZS1vdXRzaWRlIGFmdGVyIGluaXRpYWwgbGF5b3V0IHBhc3MKKyAgICAgICAgPGh0dHBz Oi8vd2Via2l0Lm9yZy9iLzExNDgyOT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBl LW91dHNpZGUtZmxvYXRzLWxheW91dC1hZnRlci1pbml0aWFsLWxheW91dC1wYXNzLWV4cGVjdGVk Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRz L3NoYXBlLW91dHNpZGUtZmxvYXRzLWxheW91dC1hZnRlci1pbml0aWFsLWxheW91dC1wYXNzLmh0 bWw6IEFkZGVkLgorCiAyMDEzLTExLTA0ICBSb2JlcnQgUGxvY2llbm5payAgPHIucGxvY2llbm5p a0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXSBhY2Nlc3NpYmlsaXR5L3RleHRhcmVhLWxp bmUtZm9yLWluZGV4Lmh0bWwgaXMgZmFpbGluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtbGF5b3V0 LWFmdGVyLWluaXRpYWwtbGF5b3V0LXBhc3MtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zh c3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWxheW91 dC1hZnRlci1pbml0aWFsLWxheW91dC1wYXNzLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGVj MDhkNjlhN2I1YWMyZmJkNzMyMmFjMzg4NTJlMDU0NDI5ZGZhZAotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNp ZGUtZmxvYXRzLWxheW91dC1hZnRlci1pbml0aWFsLWxheW91dC1wYXNzLWV4cGVjdGVkLmh0bWwK QEAgLTAsMCArMSwzMiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxl PgorLnNoYXBlLW91dHNpZGUgeworICAgIGZsb2F0OiBsZWZ0OworICAgIHdpZHRoOiA1MHB4Owor ICAgIGhlaWdodDogMTAwcHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cit9CisjY29u dGVudCB7CisgICAgZm9udDogMjVweC8xIEFoZW0sIHNhbnMtc2VyaWY7CisgICAgd2lkdGg6IDIw MHB4OworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB0b3A6IDBweDsKKyAgICBsZWZ0OiAw cHg7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorCis8Ym9keT4KKyAgICA8ZGl2IGlkPSJjb250ZW50 Ij4KKyAgICAgICAgPHA+PGRpdiBjbGFzcz0ic2hhcGUtb3V0c2lkZSI+PC9kaXY+WFhYWCBYWFhY IFhYWFggWFhYWDwvcD4KKyAgICA8L2Rpdj4KKzwvYm9keT4KKworPHAgc3R5bGU9Im1hcmdpbi10 b3A6IDE1MHB4OyI+CisgICAgVGhlcmUgaXMgYSBncmVlbiBsZWZ0IGZsb2F0aW5nIGNvbnRhaW5l ciB3aXRoIHNoYXBlLW91dHNpZGUgKDUwcHggd2lkZSwgMTAwcHggdGFsbCkgYW5kIGlubGluZSBj b250ZW50IChibGFjayByZWN0YW5nbGUpLiBUaGUgd2hvbGUgY29udGVudCBmbG93cyBpbnRvIGEg cmVnaW9uLgorICAgIFRoZSBibGFjayByZWN0YW5nbGUgc2hvdWxkIHJlc3BlY3QgdGhlIHNoYXBl LW91dHNpZGUsIHRodXMgdGhlIGJsYWNrIHJlY3RhbmdsZSBzaG91bGQgaGF2ZSA1MHB4IGxlZnQg b2Zmc2V0LCB3aGljaCBpcyByZXByZXNlbnRlZCBieSB0aGUgZ3JlZW4gcmVjdGFuZ3VsYXIgYXJl YS4KKzwvcD4KKzxwPkJ1ZyA8YSBocmVmPSJodHRwOi8vd2Via2l0Lm9yZy9iLzExNDgyOSI+MTE0 ODI5PC9hPjogW0NTUyBSZWdpb25zXVtDU1MgU2hhcGVzXSBDb250ZW50IGluIHJlZ2lvbiBkb2Vz bid0IHJlc3BlY3Qgc2hhcGUtb3V0c2lkZSBhZnRlciBpbml0aWFsIGxheW91dCBwYXNzPC9wPgor PC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lk ZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtbGF5b3V0LWFmdGVyLWluaXRpYWwtbGF5b3V0 LXBhc3MuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRz L3NoYXBlLW91dHNpZGUtZmxvYXRzLWxheW91dC1hZnRlci1pbml0aWFsLWxheW91dC1wYXNzLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uZDdkODI4YjNlOWU0MGJjN2QwNTRmOGRjNDVhYzFiMTcyNWY1MjIxNgot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUt ZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWxheW91dC1hZnRlci1pbml0aWFsLWxheW91dC1w YXNzLmh0bWwKQEAgLTAsMCArMSw0MSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFk PgorPHN0eWxlPgorLnNoYXBlLW91dHNpZGUgeworICAgIGZsb2F0OiBsZWZ0OworICAgIHdpZHRo OiAxMDBweDsKKyAgICBoZWlnaHQ6IDEwMHB4OworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVu OworICAgIC13ZWJraXQtc2hhcGUtb3V0c2lkZTogcmVjdGFuZ2xlKDBweCwgMHB4LCA1MCUsIDEw MCUpOworfQorI2NvbnRlbnQgeworICAgIGZvbnQ6IDI1cHgvMSBBaGVtLCBzYW5zLXNlcmlmOwor ICAgIC13ZWJraXQtZmxvdy1pbnRvOiBmbG93OworfQorI3JlZ2lvbiB7CisgICAgcG9zaXRpb246 IGFic29sdXRlOworICAgIHRvcDogMHB4OworICAgIGxlZnQ6MHB4OworICAgIHdpZHRoOiAyMDBw eDsKKyAgICAtd2Via2l0LWZsb3ctZnJvbTogZmxvdzsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8 Ym9keT4KKyAgICA8ZGl2IGlkPSJyZWdpb24iPjwvZGl2PgorICAgIDxkaXYgaWQ9ImNvbnRlbnQi PjwvZGl2PgorPC9ib2R5PgorCis8c2NyaXB0PgorICAgIGRvY3VtZW50LmJvZHkub2Zmc2V0VG9w OyAvLyBGb3JjZSBsYXlvdXQKKyAgICB2YXIgZGl2ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo J2NvbnRlbnQnKTsKKyAgICBkaXYuaW5uZXJIVE1MID0gJzxwPjxkaXYgY2xhc3M9InNoYXBlLW91 dHNpZGUiPjwvZGl2PlhYWFggWFhYWCBYWFhYIFhYWFg8L3A+JzsKKzwvc2NyaXB0PgorCis8cCBz dHlsZT0ibWFyZ2luLXRvcDogMTUwcHg7Ij4KKyAgICBUaGVyZSBpcyBhIGdyZWVuIGxlZnQgZmxv YXRpbmcgY29udGFpbmVyIHdpdGggc2hhcGUtb3V0c2lkZSAoNTBweCB3aWRlLCAxMDBweCB0YWxs KSBhbmQgaW5saW5lIGNvbnRlbnQgKGJsYWNrIHJlY3RhbmdsZSkuIFRoZSB3aG9sZSBjb250ZW50 IGZsb3dzIGludG8gYSByZWdpb24uCisgICAgVGhlIGJsYWNrIHJlY3RhbmdsZSBzaG91bGQgcmVz cGVjdCB0aGUgc2hhcGUtb3V0c2lkZSwgdGh1cyB0aGUgYmxhY2sgcmVjdGFuZ2xlIHNob3VsZCBo YXZlIDUwcHggbGVmdCBvZmZzZXQsIHdoaWNoIGlzIHJlcHJlc2VudGVkIGJ5IHRoZSBncmVlbiBy ZWN0YW5ndWxhciBhcmVhLgorPC9wPgorPHA+QnVnIDxhIGhyZWY9Imh0dHA6Ly93ZWJraXQub3Jn L2IvMTE0ODI5Ij4xMTQ4Mjk8L2E+OiBbQ1NTIFJlZ2lvbnNdW0NTUyBTaGFwZXNdIENvbnRlbnQg aW4gcmVnaW9uIGRvZXNuJ3QgcmVzcGVjdCBzaGFwZS1vdXRzaWRlIGFmdGVyIGluaXRpYWwgbGF5 b3V0IHBhc3M8L3A+Cis8L2h0bWw+Cg==