89759 2012-06-22 06:52:45 -0700 [CSSRegions]Change display values that allow regions 2012-06-27 11:25:36 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 andreionea3000 webkit-unassigned eric stearns tony webkit.review.bot oldest_to_newest 655418 0 andreionea3000 2012-06-22 06:52:45 -0700 Current CSSRegions draft permits non-replaced elements with display values of block, inline-block, table-cell, table-caption, and list-item to become regions. See: http://dev.w3.org/csswg/css3-regions (Note 5). 655478 1 149034 andreionea3000 2012-06-22 08:37:38 -0700 Created attachment 149034 patch 655850 2 149034 tony 2012-06-22 15:36:38 -0700 Comment on attachment 149034 patch View in context: https://bugs.webkit.org/attachment.cgi?id=149034&action=review Are there existing tests for changing the display type dynamically in javascript? Do we properly re-create the RenderObject in that case? > Source/WebCore/ChangeLog:9 > + Allow only elements with display values of block, inline-block, > + table-cell, table-caption and list-item to become regions. Can you include a link to the spec here? > Source/WebCore/rendering/style/RenderStyle.h:1511 > + { // Only non-replaced block elements can become a region. > + return display() == BLOCK || display() == INLINE_BLOCK > + || display() == TABLE_CELL || display() == TABLE_CAPTION > + || display() == LIST_ITEM; What about table, box, flexbox, grid and their inline versions? 656600 3 andreionea3000 2012-06-25 08:55:16 -0700 > Are there existing tests for changing the display type dynamically in javascript? Do we properly re-create the RenderObject in that case? Not yet. I will add a test in the next iteration of the patch. The RenderObject, however, is always recreated when changing the display property value. (Node::diff checks for different display values, and forces the node to detach when they are different). > > Source/WebCore/ChangeLog:9 > > + Allow only elements with display values of block, inline-block, > > + table-cell, table-caption and list-item to become regions. > > Can you include a link to the spec here? Will do. > > Source/WebCore/rendering/style/RenderStyle.h:1511 > > + { // Only non-replaced block elements can become a region. > > + return display() == BLOCK || display() == INLINE_BLOCK > > + || display() == TABLE_CELL || display() == TABLE_CAPTION > > + || display() == LIST_ITEM; > > What about table, box, flexbox, grid and their inline versions? I'm not sure about that yet, I will come back on it. 656952 4 stearns 2012-06-25 15:56:48 -0700 (In reply to comment #2) > > What about table, box, flexbox, grid and their inline versions? The current spec says that flow-from applies to non-replaced block containers. A table is a block-level box but it is not a block-level container (according to CSS 2.1 section 9.2.1) so it is not a valid flow-from target. I am not familiar with display:box. Grid might work. The "Grid Layout" version of the specification is not specific about whether display:grid creates a block container, but the "Grid Template Layout" version does say that a grid is a block container. I'll add that value to the note. The flexbox specification says that it is definitely not a block container. So for now it's not a valid flow-from target. Inline versions of anything are not valid flow-from targets. 656976 5 tony 2012-06-25 16:14:21 -0700 (In reply to comment #4) > I am not familiar with display:box. It's the old flexbox spec. If we can't flow-from a display:flex, then we probably shouldn't flow from a display: box. > Grid might work. The "Grid Layout" version of the specification is not specific about whether display:grid creates a block container, but the "Grid Template Layout" version does say that a grid is a block container. I'll add that value to the note. This might be an oversight. It probably doesn't make sense to flow from a display:grid for the same reasons you can't flow from a flexbox (the grid itself doesn't have content, it just controls placement of its children). 656984 6 stearns 2012-06-25 16:18:55 -0700 (In reply to comment #5) >It probably doesn't make sense to flow from a display:grid After thinking about how this might work for a few minutes, I think I agree. Let's not do display:grid for now. We're leaving open the possibility of allowing flow-from to apply to more things in the future. 657431 7 149492 andreionea3000 2012-06-26 02:21:50 -0700 Created attachment 149492 patch 657929 8 149492 tony 2012-06-26 13:35:03 -0700 Comment on attachment 149492 patch View in context: https://bugs.webkit.org/attachment.cgi?id=149492&action=review > LayoutTests/fast/regions/script-tests/region-element-display-change.js:26 > +shouldBeFalse('testElement(element, "inline-table")'); > +shouldBeTrue('testElement(element, "table-cell")'); > +shouldBeTrue('testElement(element, "table-caption")'); > +shouldBeTrue('testElement(element, "list-item")'); Nit: I would go ahead and add all the other display types here. > Source/WebCore/rendering/RenderObject.cpp:154 > + if (doc->cssRegionsEnabled() && style->isDisplayRegionType() && !style->regionThread().isEmpty() && doc->renderView()) > + return new (arena) RenderRegion(node, doc->renderView()->flowThreadController()->ensureRenderFlowThreadWithName(style->regionThread())); Please watch the perf results at http://webkit-perf.appspot.com/ after this lands. I don't expect there to be a regression, but it's good to be ready. 657931 9 149492 tony 2012-06-26 13:36:10 -0700 Comment on attachment 149492 patch View in context: https://bugs.webkit.org/attachment.cgi?id=149492&action=review >> LayoutTests/fast/regions/script-tests/region-element-display-change.js:26 >> +shouldBeFalse('testElement(element, "inline-table")'); >> +shouldBeTrue('testElement(element, "table-cell")'); >> +shouldBeTrue('testElement(element, "table-caption")'); >> +shouldBeTrue('testElement(element, "list-item")'); > > Nit: I would go ahead and add all the other display types here. Nit: I would go ahead and add all the other display types here. >> Source/WebCore/rendering/RenderObject.cpp:154 >> + if (doc->cssRegionsEnabled() && style->isDisplayRegionType() && !style->regionThread().isEmpty() && doc->renderView()) >> + return new (arena) RenderRegion(node, doc->renderView()->flowThreadController()->ensureRenderFlowThreadWithName(style->regionThread())); > > Please watch the perf results at http://webkit-perf.appspot.com/ after this lands. I don't expect there to be a regression, but it's good to be ready. Please watch the perf results at http://webkit-perf.appspot.com/ after this lands. I don't expect there to be a regression, but it's good to be ready. > Source/WebCore/rendering/style/RenderStyle.h:1510 > + { // Only non-replaced block elements can become a region. Nit: I would probably remove this comment since it doesn't really explain 'why'. The ChangeLog explains the why. 658636 10 149756 andreionea3000 2012-06-27 08:46:08 -0700 Created attachment 149756 patch 658716 11 tony 2012-06-27 11:02:10 -0700 After you get an r+, you can use 'webkit-patch land-safely' to upload a patch that any committer can cq+. 658728 12 149756 webkit.review.bot 2012-06-27 11:25:30 -0700 Comment on attachment 149756 patch Clearing flags on attachment: 149756 Committed r121352: <http://trac.webkit.org/changeset/121352> 658729 13 webkit.review.bot 2012-06-27 11:25:36 -0700 All reviewed patches have been landed. Closing bug. 149034 2012-06-22 08:37:38 -0700 2012-06-26 02:21:50 -0700 patch 89759.patch text/plain 6520 andreionea3000 ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhZWY4NTFkLi4zODQwNGZiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDYt MjIgIEFuZHJlaSBPbmVhICA8b25lYUBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTU1JlZ2lvbnNd Q2hhbmdlIGRpc3BsYXkgdmFsdWVzIHRoYXQgYWxsb3cgcmVnaW9ucworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk3NTkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBjaGVja3MgZm9yIHRhYmxlLWNl bGwsIHRhYmxlLWNhcHRpb24gYW5kIGxpc3QtaXRlbS4gTW9kaWZpZWQgY29ycmVjdCAKKyAgICAg ICAgcmVzdWx0cyBmb3IgcnVuLWluIGFuZCBjb21wYWN0LgorCisgICAgICAgICogZmFzdC9yZWdp b25zL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXktcmVzdHJpY3Rpb24tZXhwZWN0ZWQudHh0OgorICAg ICAgICAqIGZhc3QvcmVnaW9ucy9zY3JpcHQtdGVzdHMvcmVnaW9uLWVsZW1lbnQtZGlzcGxheS1y ZXN0cmljdGlvbi5qczoKKwogMjAxMi0wNi0yMiAgWW9zaGlmdW1pIElub3VlICA8eW9zaW5AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjExNzczOCk6W0Zvcm1zXSB2YWxpZGF0 aW9uTWVzc2FnZSBJREwgYXR0cmlidXRlIHNob3VsZCBub3QgaGF2ZSByYW5nZSBvdmVyZmxvdyBt ZXNzYWdlIGlmIHZhbHVlIGlzbid0IHJhbmdlIG92ZXJmbG93CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L3JlZ2lvbnMvcmVnaW9uLWVsZW1lbnQtZGlzcGxheS1yZXN0cmljdGlvbi1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvcmVnaW9uLWVsZW1lbnQtZGlzcGxh eS1yZXN0cmljdGlvbi1leHBlY3RlZC50eHQKaW5kZXggNWM4YjUyNy4uMWVjYTQ5OCAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXktcmVz dHJpY3Rpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9yZWdp b24tZWxlbWVudC1kaXNwbGF5LXJlc3RyaWN0aW9uLWV4cGVjdGVkLnR4dApAQCAtNiwxMSArNiwx NCBAQCBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2Vz LCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURQogUEFTUyBjcmVhdGVSZWdpb25FbGVtZW50KCJk aXYiLCAibm9uZSIpIGlzIGZhbHNlCiBQQVNTIGNyZWF0ZVJlZ2lvbkVsZW1lbnQoImRpdiIsICJi bG9jayIpIGlzIHRydWUKIFBBU1MgY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgImlubGluZS1i bG9jayIpIGlzIHRydWUKLVBBU1MgY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgInJ1bi1pbiIp IGlzIHRydWUKLVBBU1MgY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgImNvbXBhY3QiKSBpcyB0 cnVlCitQQVNTIGNyZWF0ZVJlZ2lvbkVsZW1lbnQoImRpdiIsICJydW4taW4iKSBpcyBmYWxzZQor UEFTUyBjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAiY29tcGFjdCIpIGlzIGZhbHNlCiBQQVNT IGNyZWF0ZVJlZ2lvbkVsZW1lbnQoImRpdiIsICJpbmxpbmUiKSBpcyBmYWxzZQogUEFTUyBjcmVh dGVSZWdpb25FbGVtZW50KCJkaXYiLCAidGFibGUiKSBpcyBmYWxzZQogUEFTUyBjcmVhdGVSZWdp b25FbGVtZW50KCJkaXYiLCAiaW5saW5lLXRhYmxlIikgaXMgZmFsc2UKK1BBU1MgY3JlYXRlUmVn aW9uRWxlbWVudCgiZGl2IiwgInRhYmxlLWNlbGwiKSBpcyB0cnVlCitQQVNTIGNyZWF0ZVJlZ2lv bkVsZW1lbnQoImRpdiIsICJ0YWJsZS1jYXB0aW9uIikgaXMgdHJ1ZQorUEFTUyBjcmVhdGVSZWdp b25FbGVtZW50KCJkaXYiLCAibGlzdC1pdGVtIikgaXMgdHJ1ZQogUEFTUyBzdWNjZXNzZnVsbHlQ YXJzZWQgaXMgdHJ1ZQogCiBURVNUIENPTVBMRVRFCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L3JlZ2lvbnMvc2NyaXB0LXRlc3RzL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXktcmVzdHJpY3Rp b24uanMgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc2NyaXB0LXRlc3RzL3JlZ2lvbi1lbGVt ZW50LWRpc3BsYXktcmVzdHJpY3Rpb24uanMKaW5kZXggOWE0N2JhYy4uY2MzZDU5YyAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3NjcmlwdC10ZXN0cy9yZWdpb24tZWxlbWVu dC1kaXNwbGF5LXJlc3RyaWN0aW9uLmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9z Y3JpcHQtdGVzdHMvcmVnaW9uLWVsZW1lbnQtZGlzcGxheS1yZXN0cmljdGlvbi5qcwpAQCAtMjIs OCArMjIsMTEgQEAgZnVuY3Rpb24gY3JlYXRlUmVnaW9uRWxlbWVudChlbGVtZW50VHlwZSwgZGlz cGxheVR5cGUpCiBzaG91bGRCZUZhbHNlKCdjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAibm9u ZSIpJyk7CiBzaG91bGRCZVRydWUoJ2NyZWF0ZVJlZ2lvbkVsZW1lbnQoImRpdiIsICJibG9jayIp Jyk7CiBzaG91bGRCZVRydWUoJ2NyZWF0ZVJlZ2lvbkVsZW1lbnQoImRpdiIsICJpbmxpbmUtYmxv Y2siKScpOwotc2hvdWxkQmVUcnVlKCdjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAicnVuLWlu IiknKTsKLXNob3VsZEJlVHJ1ZSgnY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgImNvbXBhY3Qi KScpOworc2hvdWxkQmVGYWxzZSgnY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgInJ1bi1pbiIp Jyk7CitzaG91bGRCZUZhbHNlKCdjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAiY29tcGFjdCIp Jyk7CiBzaG91bGRCZUZhbHNlKCdjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAiaW5saW5lIikn KTsKIHNob3VsZEJlRmFsc2UoJ2NyZWF0ZVJlZ2lvbkVsZW1lbnQoImRpdiIsICJ0YWJsZSIpJyk7 CiBzaG91bGRCZUZhbHNlKCdjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAiaW5saW5lLXRhYmxl IiknKTsKK3Nob3VsZEJlVHJ1ZSgnY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgInRhYmxlLWNl bGwiKScpOworc2hvdWxkQmVUcnVlKCdjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAidGFibGUt Y2FwdGlvbiIpJyk7CitzaG91bGRCZVRydWUoJ2NyZWF0ZVJlZ2lvbkVsZW1lbnQoImRpdiIsICJs aXN0LWl0ZW0iKScpOwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBm NjE0NTE5Li45ZmRkNTNmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA2LTIy ICBBbmRyZWkgT25lYSAgPG9uZWFAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1NSZWdpb25zXUNo YW5nZSBkaXNwbGF5IHZhbHVlcyB0aGF0IGFsbG93IHJlZ2lvbnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5NzU5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsb3cgb25seSBlbGVtZW50cyB3aXRoIGRp c3BsYXkgdmFsdWVzIG9mIGJsb2NrLCBpbmxpbmUtYmxvY2ssCisgICAgICAgIHRhYmxlLWNlbGws IHRhYmxlLWNhcHRpb24gYW5kIGxpc3QtaXRlbSB0byBiZWNvbWUgcmVnaW9ucy4KKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9i amVjdDo6Y3JlYXRlT2JqZWN0KToKKyAgICAgICAgTW92ZWQgY2hlY2sgZm9yIHJlZ2lvbiBvdXRz aWRlIG9mIHN3aXRjaC4KKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoK KyAgICAgICAgQWRkZWQgbWV0aG9kIGZvciBjaGVja2luZyB3aGV0aGVyIGEgZGlzcGxheSB2YWx1 ZSBhbGxvd3MgcmVnaW9uIGNyZWF0aW9uLgorCiAyMDEyLTA2LTIyICBJbHlhIFRpa2hvbm92c2t5 ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBwYXJ0aWFs bHkgaW5zdHJ1bWVudCBET00gVHJlZSBuYXRpdmUgbWVtb3J5LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCAwNTkwYjhjLi4yYTZkMzc5IDEwMDc1NQotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAtMTUwLDcgKzE1MCw4IEBAIFJl bmRlck9iamVjdCogUmVuZGVyT2JqZWN0OjpjcmVhdGVPYmplY3QoTm9kZSogbm9kZSwgUmVuZGVy U3R5bGUqIHN0eWxlKQogICAgIC8vIHRyZWF0IDxydD4gYXMgcnVieSB0ZXh0IE9OTFkgaWYgaXQg c3RpbGwgaGFzIGl0cyBkZWZhdWx0IHRyZWF0bWVudCBvZiBibG9jawogICAgIGlmIChub2RlLT5o YXNUYWdOYW1lKHJ0VGFnKSAmJiBzdHlsZS0+ZGlzcGxheSgpID09IEJMT0NLKQogICAgICAgICBy ZXR1cm4gbmV3IChhcmVuYSkgUmVuZGVyUnVieVRleHQobm9kZSk7Ci0KKyAgICBpZiAoZG9jLT5j c3NSZWdpb25zRW5hYmxlZCgpICYmIHN0eWxlLT5pc0Rpc3BsYXlSZWdpb25UeXBlKCkgJiYgIXN0 eWxlLT5yZWdpb25UaHJlYWQoKS5pc0VtcHR5KCkgJiYgZG9jLT5yZW5kZXJWaWV3KCkpCisgICAg ICAgIHJldHVybiBuZXcgKGFyZW5hKSBSZW5kZXJSZWdpb24obm9kZSwgZG9jLT5yZW5kZXJWaWV3 KCktPmZsb3dUaHJlYWRDb250cm9sbGVyKCktPmVuc3VyZVJlbmRlckZsb3dUaHJlYWRXaXRoTmFt ZShzdHlsZS0+cmVnaW9uVGhyZWFkKCkpKTsKICAgICBzd2l0Y2ggKHN0eWxlLT5kaXNwbGF5KCkp IHsKICAgICBjYXNlIE5PTkU6CiAgICAgICAgIHJldHVybiAwOwpAQCAtMTYxLDggKzE2Miw2IEBA IFJlbmRlck9iamVjdCogUmVuZGVyT2JqZWN0OjpjcmVhdGVPYmplY3QoTm9kZSogbm9kZSwgUmVu ZGVyU3R5bGUqIHN0eWxlKQogICAgIGNhc2UgUlVOX0lOOgogICAgIGNhc2UgQ09NUEFDVDoKICAg ICAgICAgLy8gT25seSBub24tcmVwbGFjZWQgYmxvY2sgZWxlbWVudHMgY2FuIGJlY29tZSBhIHJl Z2lvbi4KLSAgICAgICAgaWYgKGRvYy0+Y3NzUmVnaW9uc0VuYWJsZWQoKSAmJiAhc3R5bGUtPnJl Z2lvblRocmVhZCgpLmlzRW1wdHkoKSAmJiBkb2MtPnJlbmRlclZpZXcoKSkKLSAgICAgICAgICAg IHJldHVybiBuZXcgKGFyZW5hKSBSZW5kZXJSZWdpb24obm9kZSwgZG9jLT5yZW5kZXJWaWV3KCkt PmZsb3dUaHJlYWRDb250cm9sbGVyKCktPmVuc3VyZVJlbmRlckZsb3dUaHJlYWRXaXRoTmFtZShz dHlsZS0+cmVnaW9uVGhyZWFkKCkpKTsKICAgICAgICAgaWYgKCghc3R5bGUtPmhhc0F1dG9Db2x1 bW5Db3VudCgpIHx8ICFzdHlsZS0+aGFzQXV0b0NvbHVtbldpZHRoKCkpICYmIGRvYy0+cmVnaW9u QmFzZWRDb2x1bW5zRW5hYmxlZCgpKQogICAgICAgICAgICAgcmV0dXJuIG5ldyAoYXJlbmEpIFJl bmRlck11bHRpQ29sdW1uQmxvY2sobm9kZSk7CiAgICAgICAgIHJldHVybiBuZXcgKGFyZW5hKSBS ZW5kZXJCbG9jayhub2RlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRl clN0eWxlLmgKaW5kZXggZGNiMzAxZC4uYzA3MmY1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKQEAgLTE1MDQsNiArMTUwNCwxMyBAQCBwdWJsaWM6 CiAgICAgICAgICAgICB8fCBvcmlnaW5hbERpc3BsYXkoKSA9PSBJTkxJTkVfQk9YIHx8IG9yaWdp bmFsRGlzcGxheSgpID09IElOTElORV9UQUJMRSB8fCBvcmlnaW5hbERpc3BsYXkoKSA9PSBJTkxJ TkVfR1JJRDsKICAgICB9CiAKKyAgICBib29sIGlzRGlzcGxheVJlZ2lvblR5cGUoKSBjb25zdAor ICAgIHsgLy8gT25seSBub24tcmVwbGFjZWQgYmxvY2sgZWxlbWVudHMgY2FuIGJlY29tZSBhIHJl Z2lvbi4KKyAgICAgICAgcmV0dXJuIGRpc3BsYXkoKSA9PSBCTE9DSyB8fCBkaXNwbGF5KCkgPT0g SU5MSU5FX0JMT0NLCisgICAgICAgICAgICB8fCBkaXNwbGF5KCkgPT0gVEFCTEVfQ0VMTCB8fCBk aXNwbGF5KCkgPT0gVEFCTEVfQ0FQVElPTgorICAgICAgICAgICAgfHwgZGlzcGxheSgpID09IExJ U1RfSVRFTTsKKyAgICB9CisKICAgICB2b2lkIHNldFdyaXRpbmdNb2RlKFdyaXRpbmdNb2RlIHYp IHsgaW5oZXJpdGVkX2ZsYWdzLm1fd3JpdGluZ01vZGUgPSB2OyB9CiAKICAgICAvLyBUbyB0ZWxs IGlmIHRoaXMgc3R5bGUgbWF0Y2hlZCBhdHRyaWJ1dGUgc2VsZWN0b3JzLiBUaGlzIG1ha2VzIGl0 IGltcG9zc2libGUgdG8gc2hhcmUuCg== 149492 2012-06-26 02:21:50 -0700 2012-06-27 11:02:17 -0700 patch bug89759.patch text/plain 9955 andreionea3000 ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlOWQyNzY2Li5kMjZmMzEzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTItMDYt MjYgIEFuZHJlaSBPbmVhICA8b25lYUBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTU1JlZ2lvbnNd Q2hhbmdlIGRpc3BsYXkgdmFsdWVzIHRoYXQgYWxsb3cgcmVnaW9ucworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk3NTkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBjaGVja3MgZm9yIHRhYmxlLWNl bGwsIHRhYmxlLWNhcHRpb24gYW5kIGxpc3QtaXRlbS4gTW9kaWZpZWQgY29ycmVjdCByZXN1bHRz IGZvcgorICAgICAgICBydW4taW4gYW5kIGNvbXBhY3QuCisgICAgICAgIEFkZGVkIG5ldyB0ZXN0 IGZvciBjaGVja2luZyBkaXNwbGF5IHZhbHVlIGNoYW5naW5nLgorCisgICAgICAgICogZmFzdC9y ZWdpb25zL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXktY2hhbmdlLWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogZmFzdC9yZWdpb25zL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXktY2hhbmdlLmh0 bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvcmVnaW9ucy9yZWdpb24tZWxlbWVudC1kaXNwbGF5 LXJlc3RyaWN0aW9uLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L3JlZ2lvbnMvc2NyaXB0 LXRlc3RzL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXktY2hhbmdlLmpzOiBBZGRlZC4KKyAgICAgICAg KHRlc3RFbGVtZW50KToKKyAgICAgICAgKiBmYXN0L3JlZ2lvbnMvc2NyaXB0LXRlc3RzL3JlZ2lv bi1lbGVtZW50LWRpc3BsYXktcmVzdHJpY3Rpb24uanM6CisKIDIwMTItMDYtMjYgIE1hcmlvIFNh bmNoZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQg Z2FyZGVuaW5nIGFmdGVyIHIxMjA4NDUuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Jl Z2lvbnMvcmVnaW9uLWVsZW1lbnQtZGlzcGxheS1jaGFuZ2UtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvZmFzdC9yZWdpb25zL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXktY2hhbmdlLWV4cGVjdGVk LnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44NDRmN2Y2Ci0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3JlZ2lvbi1lbGVtZW50LWRpc3Bs YXktY2hhbmdlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIwIEBACitUZXN0IHRoYXQgUmVuZGVy T2JqZWN0IGlzIHJlY3JlYXRlZCBjb3JyZWN0bHkgYWZ0ZXIgY2hhbmdpbmcgZGlzcGxheSB0eXBl LgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2Vz LCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyB0ZXN0RWxlbWVudChlbGVt ZW50LCAibm9uZSIpIGlzIGZhbHNlCitQQVNTIHRlc3RFbGVtZW50KGVsZW1lbnQsICJibG9jayIp IGlzIHRydWUKK1BBU1MgdGVzdEVsZW1lbnQoZWxlbWVudCwgImlubGluZS1ibG9jayIpIGlzIHRy dWUKK1BBU1MgdGVzdEVsZW1lbnQoZWxlbWVudCwgInJ1bi1pbiIpIGlzIGZhbHNlCitQQVNTIHRl c3RFbGVtZW50KGVsZW1lbnQsICJjb21wYWN0IikgaXMgZmFsc2UKK1BBU1MgdGVzdEVsZW1lbnQo ZWxlbWVudCwgImlubGluZSIpIGlzIGZhbHNlCitQQVNTIHRlc3RFbGVtZW50KGVsZW1lbnQsICJ0 YWJsZSIpIGlzIGZhbHNlCitQQVNTIHRlc3RFbGVtZW50KGVsZW1lbnQsICJpbmxpbmUtdGFibGUi KSBpcyBmYWxzZQorUEFTUyB0ZXN0RWxlbWVudChlbGVtZW50LCAidGFibGUtY2VsbCIpIGlzIHRy dWUKK1BBU1MgdGVzdEVsZW1lbnQoZWxlbWVudCwgInRhYmxlLWNhcHRpb24iKSBpcyB0cnVlCitQ QVNTIHRlc3RFbGVtZW50KGVsZW1lbnQsICJsaXN0LWl0ZW0iKSBpcyB0cnVlCitQQVNTIHN1Y2Nl c3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9yZWdpb25zL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXktY2hhbmdlLmh0bWwg Yi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvcmVnaW9uLWVsZW1lbnQtZGlzcGxheS1jaGFuZ2Uu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iMjA4ODYzCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3JlZ2lvbi1lbGVtZW50LWRpc3Bs YXktY2hhbmdlLmh0bWwKQEAgLTAsMCArMSwxMCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICIt Ly9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8u Li9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8 Ym9keT4KKzxzY3JpcHQgc3JjPSJzY3JpcHQtdGVzdHMvcmVnaW9uLWVsZW1lbnQtZGlzcGxheS1j aGFuZ2UuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2Vz L2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvcmVnaW9uLWVsZW1lbnQtZGlzcGxheS1yZXN0cmlj dGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvcmVnaW9uLWVsZW1l bnQtZGlzcGxheS1yZXN0cmljdGlvbi1leHBlY3RlZC50eHQKaW5kZXggNWM4YjUyNy4uMWVjYTQ5 OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3JlZ2lvbi1lbGVtZW50LWRp c3BsYXktcmVzdHJpY3Rpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVn aW9ucy9yZWdpb24tZWxlbWVudC1kaXNwbGF5LXJlc3RyaWN0aW9uLWV4cGVjdGVkLnR4dApAQCAt NiwxMSArNiwxNCBAQCBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1Mi IG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURQogUEFTUyBjcmVhdGVSZWdpb25F bGVtZW50KCJkaXYiLCAibm9uZSIpIGlzIGZhbHNlCiBQQVNTIGNyZWF0ZVJlZ2lvbkVsZW1lbnQo ImRpdiIsICJibG9jayIpIGlzIHRydWUKIFBBU1MgY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2Iiwg ImlubGluZS1ibG9jayIpIGlzIHRydWUKLVBBU1MgY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2Iiwg InJ1bi1pbiIpIGlzIHRydWUKLVBBU1MgY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgImNvbXBh Y3QiKSBpcyB0cnVlCitQQVNTIGNyZWF0ZVJlZ2lvbkVsZW1lbnQoImRpdiIsICJydW4taW4iKSBp cyBmYWxzZQorUEFTUyBjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAiY29tcGFjdCIpIGlzIGZh bHNlCiBQQVNTIGNyZWF0ZVJlZ2lvbkVsZW1lbnQoImRpdiIsICJpbmxpbmUiKSBpcyBmYWxzZQog UEFTUyBjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAidGFibGUiKSBpcyBmYWxzZQogUEFTUyBj cmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAiaW5saW5lLXRhYmxlIikgaXMgZmFsc2UKK1BBU1Mg Y3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgInRhYmxlLWNlbGwiKSBpcyB0cnVlCitQQVNTIGNy ZWF0ZVJlZ2lvbkVsZW1lbnQoImRpdiIsICJ0YWJsZS1jYXB0aW9uIikgaXMgdHJ1ZQorUEFTUyBj cmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAibGlzdC1pdGVtIikgaXMgdHJ1ZQogUEFTUyBzdWNj ZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCiBURVNUIENPTVBMRVRFCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L3JlZ2lvbnMvc2NyaXB0LXRlc3RzL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXkt Y2hhbmdlLmpzIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3NjcmlwdC10ZXN0cy9yZWdpb24t ZWxlbWVudC1kaXNwbGF5LWNoYW5nZS5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi44MjUyNDE2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25z L3NjcmlwdC10ZXN0cy9yZWdpb24tZWxlbWVudC1kaXNwbGF5LWNoYW5nZS5qcwpAQCAtMCwwICsx LDI3IEBACitkZXNjcmlwdGlvbigiVGVzdCB0aGF0IFJlbmRlck9iamVjdCBpcyByZWNyZWF0ZWQg Y29ycmVjdGx5IGFmdGVyIGNoYW5naW5nIGRpc3BsYXkgdHlwZS4iKTsKKworZnVuY3Rpb24gdGVz dEVsZW1lbnQoZWxlbWVudCwgZGlzcGxheVR5cGUpCit7CisJZWxlbWVudC5zdHlsZS5zZXRQcm9w ZXJ0eSgiZGlzcGxheSIsIGRpc3BsYXlUeXBlKTsKKwkvLyBUaGUgcmVnaW9uIGVsZW1lbnQgd2Fz IGNyZWF0ZWQgaWYgdGhlIGxlbmd0aCBvZiBpbm5lciB0ZXh0IGlzIDAuCisgICAgdmFyIHJlZ2lv bkNyZWF0ZWQgPSBlbGVtZW50LmlubmVyVGV4dC5sZW5ndGggPT0gMDsKKwlyZXR1cm4gcmVnaW9u Q3JlYXRlZDsKK30KKwordmFyIGVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYi KTsKK3ZhciB0ZXh0RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCJpbnNpZGUgZWxl bWVudCIpOworZWxlbWVudC5hcHBlbmRDaGlsZCh0ZXh0RWxlbWVudCk7CitlbGVtZW50LnN0eWxl LnNldFByb3BlcnR5KCItd2Via2l0LWZsb3ctZnJvbSIsICJmbG93Iik7Citkb2N1bWVudC5ib2R5 LmFwcGVuZENoaWxkKGVsZW1lbnQpOworc2hvdWxkQmVGYWxzZSgndGVzdEVsZW1lbnQoZWxlbWVu dCwgIm5vbmUiKScpOworc2hvdWxkQmVUcnVlKCd0ZXN0RWxlbWVudChlbGVtZW50LCAiYmxvY2si KScpOworc2hvdWxkQmVUcnVlKCd0ZXN0RWxlbWVudChlbGVtZW50LCAiaW5saW5lLWJsb2NrIikn KTsKK3Nob3VsZEJlRmFsc2UoJ3Rlc3RFbGVtZW50KGVsZW1lbnQsICJydW4taW4iKScpOworc2hv dWxkQmVGYWxzZSgndGVzdEVsZW1lbnQoZWxlbWVudCwgImNvbXBhY3QiKScpOworc2hvdWxkQmVG YWxzZSgndGVzdEVsZW1lbnQoZWxlbWVudCwgImlubGluZSIpJyk7CitzaG91bGRCZUZhbHNlKCd0 ZXN0RWxlbWVudChlbGVtZW50LCAidGFibGUiKScpOworc2hvdWxkQmVGYWxzZSgndGVzdEVsZW1l bnQoZWxlbWVudCwgImlubGluZS10YWJsZSIpJyk7CitzaG91bGRCZVRydWUoJ3Rlc3RFbGVtZW50 KGVsZW1lbnQsICJ0YWJsZS1jZWxsIiknKTsKK3Nob3VsZEJlVHJ1ZSgndGVzdEVsZW1lbnQoZWxl bWVudCwgInRhYmxlLWNhcHRpb24iKScpOworc2hvdWxkQmVUcnVlKCd0ZXN0RWxlbWVudChlbGVt ZW50LCAibGlzdC1pdGVtIiknKTsKK2RvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQoZWxlbWVudCk7 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc2NyaXB0LXRlc3RzL3JlZ2lv bi1lbGVtZW50LWRpc3BsYXktcmVzdHJpY3Rpb24uanMgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lv bnMvc2NyaXB0LXRlc3RzL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXktcmVzdHJpY3Rpb24uanMKaW5k ZXggOWE0N2JhYy4uZGUwZWU1OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25z L3NjcmlwdC10ZXN0cy9yZWdpb24tZWxlbWVudC1kaXNwbGF5LXJlc3RyaWN0aW9uLmpzCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9zY3JpcHQtdGVzdHMvcmVnaW9uLWVsZW1lbnQtZGlz cGxheS1yZXN0cmljdGlvbi5qcwpAQCAtMjIsOCArMjIsMTEgQEAgZnVuY3Rpb24gY3JlYXRlUmVn aW9uRWxlbWVudChlbGVtZW50VHlwZSwgZGlzcGxheVR5cGUpCiBzaG91bGRCZUZhbHNlKCdjcmVh dGVSZWdpb25FbGVtZW50KCJkaXYiLCAibm9uZSIpJyk7CiBzaG91bGRCZVRydWUoJ2NyZWF0ZVJl Z2lvbkVsZW1lbnQoImRpdiIsICJibG9jayIpJyk7CiBzaG91bGRCZVRydWUoJ2NyZWF0ZVJlZ2lv bkVsZW1lbnQoImRpdiIsICJpbmxpbmUtYmxvY2siKScpOwotc2hvdWxkQmVUcnVlKCdjcmVhdGVS ZWdpb25FbGVtZW50KCJkaXYiLCAicnVuLWluIiknKTsKLXNob3VsZEJlVHJ1ZSgnY3JlYXRlUmVn aW9uRWxlbWVudCgiZGl2IiwgImNvbXBhY3QiKScpOworc2hvdWxkQmVGYWxzZSgnY3JlYXRlUmVn aW9uRWxlbWVudCgiZGl2IiwgInJ1bi1pbiIpJyk7CitzaG91bGRCZUZhbHNlKCdjcmVhdGVSZWdp b25FbGVtZW50KCJkaXYiLCAiY29tcGFjdCIpJyk7CiBzaG91bGRCZUZhbHNlKCdjcmVhdGVSZWdp b25FbGVtZW50KCJkaXYiLCAiaW5saW5lIiknKTsKIHNob3VsZEJlRmFsc2UoJ2NyZWF0ZVJlZ2lv bkVsZW1lbnQoImRpdiIsICJ0YWJsZSIpJyk7CiBzaG91bGRCZUZhbHNlKCdjcmVhdGVSZWdpb25F bGVtZW50KCJkaXYiLCAiaW5saW5lLXRhYmxlIiknKTsKK3Nob3VsZEJlVHJ1ZSgnY3JlYXRlUmVn aW9uRWxlbWVudCgiZGl2IiwgInRhYmxlLWNlbGwiKScpOworc2hvdWxkQmVUcnVlKCdjcmVhdGVS ZWdpb25FbGVtZW50KCJkaXYiLCAidGFibGUtY2FwdGlvbiIpJyk7CitzaG91bGRCZVRydWUoJ2Ny ZWF0ZVJlZ2lvbkVsZW1lbnQoImRpdiIsICJsaXN0LWl0ZW0iKScpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDQ2 ZGYxMDQuLmZmMjgyNmEgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMi0wNi0yNiAg QW5kcmVpIE9uZWEgIDxvbmVhQGFkb2JlLmNvbT4KKworICAgICAgICBbQ1NTUmVnaW9uc11DaGFu Z2UgZGlzcGxheSB2YWx1ZXMgdGhhdCBhbGxvdyByZWdpb25zCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTc1OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbG93IG9ubHkgZWxlbWVudHMgd2l0aCBkaXNw bGF5IHZhbHVlcyBvZiBibG9jaywgaW5saW5lLWJsb2NrLAorICAgICAgICB0YWJsZS1jZWxsLCB0 YWJsZS1jYXB0aW9uIGFuZCBsaXN0LWl0ZW0gdG8gYmVjb21lIHJlZ2lvbnMsIGFzIHBlcgorICAg ICAgICBDU1NSZWdpb25zIHNwZWM6IGh0dHA6Ly9kZXYudzMub3JnL2Nzc3dnL2NzczMtcmVnaW9u cyAuCisgICAgICAgIEFsc28gYWRkZWQgdGVzdCBmb3IgY2hlY2tpbmcgd2hldGhlciByZWdpb25z IGFyZSBkZXN0cm95ZWQgYW5kL29yIGNyZWF0ZWQKKyAgICAgICAgd2hlbiBjaGFuZ2luZyBkaXNw bGF5IHZhbHVlLgorCisgICAgICAgIFRlc3Q6IGZhc3QvcmVnaW9ucy9yZWdpb24tZWxlbWVudC1k aXNwbGF5LWNoYW5nZS5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6Y3JlYXRlT2JqZWN0KToKKyAgICAg ICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKwogMjAxMi0wNi0yNiAgS2VudCBU YW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVmYWN0b3Jpbmc6IFNpbXBs aWZ5IEZvcm1Db250cm9sbGVyIGludGVyZmFjZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyT2JqZWN0LmNwcAppbmRleCBiNWNhOTJiLi4xOTE2ZmEwIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAtMTUwLDcgKzE1MCw4IEBAIFJlbmRlck9iamVj dCogUmVuZGVyT2JqZWN0OjpjcmVhdGVPYmplY3QoTm9kZSogbm9kZSwgUmVuZGVyU3R5bGUqIHN0 eWxlKQogICAgIC8vIHRyZWF0IDxydD4gYXMgcnVieSB0ZXh0IE9OTFkgaWYgaXQgc3RpbGwgaGFz IGl0cyBkZWZhdWx0IHRyZWF0bWVudCBvZiBibG9jawogICAgIGlmIChub2RlLT5oYXNUYWdOYW1l KHJ0VGFnKSAmJiBzdHlsZS0+ZGlzcGxheSgpID09IEJMT0NLKQogICAgICAgICByZXR1cm4gbmV3 IChhcmVuYSkgUmVuZGVyUnVieVRleHQobm9kZSk7Ci0KKyAgICBpZiAoZG9jLT5jc3NSZWdpb25z RW5hYmxlZCgpICYmIHN0eWxlLT5pc0Rpc3BsYXlSZWdpb25UeXBlKCkgJiYgIXN0eWxlLT5yZWdp b25UaHJlYWQoKS5pc0VtcHR5KCkgJiYgZG9jLT5yZW5kZXJWaWV3KCkpCisgICAgICAgIHJldHVy biBuZXcgKGFyZW5hKSBSZW5kZXJSZWdpb24obm9kZSwgZG9jLT5yZW5kZXJWaWV3KCktPmZsb3dU aHJlYWRDb250cm9sbGVyKCktPmVuc3VyZVJlbmRlckZsb3dUaHJlYWRXaXRoTmFtZShzdHlsZS0+ cmVnaW9uVGhyZWFkKCkpKTsKICAgICBzd2l0Y2ggKHN0eWxlLT5kaXNwbGF5KCkpIHsKICAgICBj YXNlIE5PTkU6CiAgICAgICAgIHJldHVybiAwOwpAQCAtMTYwLDkgKzE2MSw2IEBAIFJlbmRlck9i amVjdCogUmVuZGVyT2JqZWN0OjpjcmVhdGVPYmplY3QoTm9kZSogbm9kZSwgUmVuZGVyU3R5bGUq IHN0eWxlKQogICAgIGNhc2UgSU5MSU5FX0JMT0NLOgogICAgIGNhc2UgUlVOX0lOOgogICAgIGNh c2UgQ09NUEFDVDoKLSAgICAgICAgLy8gT25seSBub24tcmVwbGFjZWQgYmxvY2sgZWxlbWVudHMg Y2FuIGJlY29tZSBhIHJlZ2lvbi4KLSAgICAgICAgaWYgKGRvYy0+Y3NzUmVnaW9uc0VuYWJsZWQo KSAmJiAhc3R5bGUtPnJlZ2lvblRocmVhZCgpLmlzRW1wdHkoKSAmJiBkb2MtPnJlbmRlclZpZXco KSkKLSAgICAgICAgICAgIHJldHVybiBuZXcgKGFyZW5hKSBSZW5kZXJSZWdpb24obm9kZSwgZG9j LT5yZW5kZXJWaWV3KCktPmZsb3dUaHJlYWRDb250cm9sbGVyKCktPmVuc3VyZVJlbmRlckZsb3dU aHJlYWRXaXRoTmFtZShzdHlsZS0+cmVnaW9uVGhyZWFkKCkpKTsKICAgICAgICAgaWYgKCghc3R5 bGUtPmhhc0F1dG9Db2x1bW5Db3VudCgpIHx8ICFzdHlsZS0+aGFzQXV0b0NvbHVtbldpZHRoKCkp ICYmIGRvYy0+cmVnaW9uQmFzZWRDb2x1bW5zRW5hYmxlZCgpKQogICAgICAgICAgICAgcmV0dXJu IG5ldyAoYXJlbmEpIFJlbmRlck11bHRpQ29sdW1uQmxvY2sobm9kZSk7CiAgICAgICAgIHJldHVy biBuZXcgKGFyZW5hKSBSZW5kZXJCbG9jayhub2RlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKaW5kZXggZDA3MDI2OS4uNjZhMDRhZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKQEAgLTE1MDYsNiArMTUw NiwxMyBAQCBwdWJsaWM6CiAgICAgICAgICAgICB8fCBvcmlnaW5hbERpc3BsYXkoKSA9PSBJTkxJ TkVfQk9YIHx8IG9yaWdpbmFsRGlzcGxheSgpID09IElOTElORV9UQUJMRSB8fCBvcmlnaW5hbERp c3BsYXkoKSA9PSBJTkxJTkVfR1JJRDsKICAgICB9CiAKKyAgICBib29sIGlzRGlzcGxheVJlZ2lv blR5cGUoKSBjb25zdAorICAgIHsgLy8gT25seSBub24tcmVwbGFjZWQgYmxvY2sgZWxlbWVudHMg Y2FuIGJlY29tZSBhIHJlZ2lvbi4KKyAgICAgICAgcmV0dXJuIGRpc3BsYXkoKSA9PSBCTE9DSyB8 fCBkaXNwbGF5KCkgPT0gSU5MSU5FX0JMT0NLCisgICAgICAgICAgICB8fCBkaXNwbGF5KCkgPT0g VEFCTEVfQ0VMTCB8fCBkaXNwbGF5KCkgPT0gVEFCTEVfQ0FQVElPTgorICAgICAgICAgICAgfHwg ZGlzcGxheSgpID09IExJU1RfSVRFTTsKKyAgICB9CisKICAgICB2b2lkIHNldFdyaXRpbmdNb2Rl KFdyaXRpbmdNb2RlIHYpIHsgaW5oZXJpdGVkX2ZsYWdzLm1fd3JpdGluZ01vZGUgPSB2OyB9CiAK ICAgICAvLyBUbyB0ZWxsIGlmIHRoaXMgc3R5bGUgbWF0Y2hlZCBhdHRyaWJ1dGUgc2VsZWN0b3Jz LiBUaGlzIG1ha2VzIGl0IGltcG9zc2libGUgdG8gc2hhcmUuCg== 149756 2012-06-27 08:46:08 -0700 2012-06-27 11:25:30 -0700 patch bug89759.patch text/plain 11189 andreionea3000 ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkMWY1ZWEzLi5lZDdmZTg5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMDYt MjcgIEFuZHJlaSBPbmVhICA8b25lYUBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTU1JlZ2lvbnNd Q2hhbmdlIGRpc3BsYXkgdmFsdWVzIHRoYXQgYWxsb3cgcmVnaW9ucworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk3NTkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBjaGVja3MgZm9yIG1vcmUgZGlz cGxheSB2YWx1ZXMsIGFuZCBtb2RpZmllZCByZXN1bHRzIHRvIHJlZmxlY3QgcHJvcGVyIHZhbHVl cyB0aGF0IGNhbiBiZWNvbWUKKyAgICAgICAgcmVnaW9ucy4gQWxzbyBjcmVhdGVkIG5ldyB0ZXN0 IGZvciBkeW5hbWljYWxseSBjaGFuZ2luZyBkaXNwbGF5IHZhbHVlcywgbWFraW5nIHN1cmUgcmVn aW9ucyBhcmUKKyAgICAgICAgY3JlYXRlZCBvciBkZXN0cm95ZWQgY29ycmVjdGx5LgorICAgICAg ICAqIGZhc3QvcmVnaW9ucy9yZWdpb24tZWxlbWVudC1kaXNwbGF5LWNoYW5nZS1leHBlY3RlZC50 eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvcmVnaW9ucy9yZWdpb24tZWxlbWVudC1kaXNwbGF5 LWNoYW5nZS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3JlZ2lvbnMvcmVnaW9uLWVsZW1l bnQtZGlzcGxheS1yZXN0cmljdGlvbi1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9yZWdp b25zL3NjcmlwdC10ZXN0cy9yZWdpb24tZWxlbWVudC1kaXNwbGF5LWNoYW5nZS5qczogQWRkZWQu CisgICAgICAgICh0ZXN0RWxlbWVudCk6CisgICAgICAgICogZmFzdC9yZWdpb25zL3NjcmlwdC10 ZXN0cy9yZWdpb24tZWxlbWVudC1kaXNwbGF5LXJlc3RyaWN0aW9uLmpzOgorCiAyMDEyLTA2LTI3 ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5l eHBlY3RlZCBlbmQgb2Ygc3R5bGUgc2hlZXQgaW4gQGZvbnQtZmFjZSBydWxlIGRpc2NhcmRzIGl0 IHJhdGhlciB0aGFuIGNsb3NlcyBhbGwgb3BlbiBjb25zdHJ1Y3RzCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L3JlZ2lvbnMvcmVnaW9uLWVsZW1lbnQtZGlzcGxheS1jaGFuZ2UtZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXkt Y2hhbmdlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4y NmU1Zjg3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3JlZ2lv bi1lbGVtZW50LWRpc3BsYXktY2hhbmdlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI0IEBACitU ZXN0IHRoYXQgUmVuZGVyT2JqZWN0IGlzIHJlY3JlYXRlZCBjb3JyZWN0bHkgYWZ0ZXIgY2hhbmdp bmcgZGlzcGxheSB0eXBlLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2Yg IlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyB0 ZXN0RWxlbWVudChlbGVtZW50LCAibm9uZSIpIGlzIGZhbHNlCitQQVNTIHRlc3RFbGVtZW50KGVs ZW1lbnQsICJibG9jayIpIGlzIHRydWUKK1BBU1MgdGVzdEVsZW1lbnQoZWxlbWVudCwgImlubGlu ZS1ibG9jayIpIGlzIHRydWUKK1BBU1MgdGVzdEVsZW1lbnQoZWxlbWVudCwgInJ1bi1pbiIpIGlz IGZhbHNlCitQQVNTIHRlc3RFbGVtZW50KGVsZW1lbnQsICJjb21wYWN0IikgaXMgZmFsc2UKK1BB U1MgdGVzdEVsZW1lbnQoZWxlbWVudCwgImlubGluZSIpIGlzIGZhbHNlCitQQVNTIHRlc3RFbGVt ZW50KGVsZW1lbnQsICJ0YWJsZSIpIGlzIGZhbHNlCitQQVNTIHRlc3RFbGVtZW50KGVsZW1lbnQs ICJpbmxpbmUtdGFibGUiKSBpcyBmYWxzZQorUEFTUyB0ZXN0RWxlbWVudChlbGVtZW50LCAidGFi bGUtY2VsbCIpIGlzIHRydWUKK1BBU1MgdGVzdEVsZW1lbnQoZWxlbWVudCwgInRhYmxlLWNhcHRp b24iKSBpcyB0cnVlCitQQVNTIHRlc3RFbGVtZW50KGVsZW1lbnQsICJsaXN0LWl0ZW0iKSBpcyB0 cnVlCitQQVNTIHRlc3RFbGVtZW50KGVsZW1lbnQsICItd2Via2l0LWJveCIpIGlzIGZhbHNlCitQ QVNTIHRlc3RFbGVtZW50KGVsZW1lbnQsICItd2Via2l0LWlubGluZS1ib3giKSBpcyBmYWxzZQor UEFTUyB0ZXN0RWxlbWVudChlbGVtZW50LCAiLXdlYmtpdC1mbGV4IikgaXMgZmFsc2UKK1BBU1Mg dGVzdEVsZW1lbnQoZWxlbWVudCwgIi13ZWJraXQtaW5saW5lLWZsZXgiKSBpcyBmYWxzZQorUEFT UyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9yZWdpb24tZWxlbWVudC1kaXNwbGF5LWNoYW5n ZS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXkt Y2hhbmdlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYjIwODg2Mwot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9yZWdpb24tZWxlbWVu dC1kaXNwbGF5LWNoYW5nZS5odG1sCkBAIC0wLDAgKzEsMTAgQEAKKzwhRE9DVFlQRSBIVE1MIFBV QkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNy Yz0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9o ZWFkPgorPGJvZHk+Cis8c2NyaXB0IHNyYz0ic2NyaXB0LXRlc3RzL3JlZ2lvbi1lbGVtZW50LWRp c3BsYXktY2hhbmdlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9mYXN0L2pzL3Jl c291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXkt cmVzdHJpY3Rpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3JlZ2lv bi1lbGVtZW50LWRpc3BsYXktcmVzdHJpY3Rpb24tZXhwZWN0ZWQudHh0CmluZGV4IDVjOGI1Mjcu LjI3ZDBjNWMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9yZWdpb24tZWxl bWVudC1kaXNwbGF5LXJlc3RyaWN0aW9uLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L3JlZ2lvbnMvcmVnaW9uLWVsZW1lbnQtZGlzcGxheS1yZXN0cmljdGlvbi1leHBlY3RlZC50 eHQKQEAgLTYsMTEgKzYsMTggQEAgT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9m ICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUKIFBBU1MgY3JlYXRl UmVnaW9uRWxlbWVudCgiZGl2IiwgIm5vbmUiKSBpcyBmYWxzZQogUEFTUyBjcmVhdGVSZWdpb25F bGVtZW50KCJkaXYiLCAiYmxvY2siKSBpcyB0cnVlCiBQQVNTIGNyZWF0ZVJlZ2lvbkVsZW1lbnQo ImRpdiIsICJpbmxpbmUtYmxvY2siKSBpcyB0cnVlCi1QQVNTIGNyZWF0ZVJlZ2lvbkVsZW1lbnQo ImRpdiIsICJydW4taW4iKSBpcyB0cnVlCi1QQVNTIGNyZWF0ZVJlZ2lvbkVsZW1lbnQoImRpdiIs ICJjb21wYWN0IikgaXMgdHJ1ZQorUEFTUyBjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAicnVu LWluIikgaXMgZmFsc2UKK1BBU1MgY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgImNvbXBhY3Qi KSBpcyBmYWxzZQogUEFTUyBjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAiaW5saW5lIikgaXMg ZmFsc2UKIFBBU1MgY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgInRhYmxlIikgaXMgZmFsc2UK IFBBU1MgY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgImlubGluZS10YWJsZSIpIGlzIGZhbHNl CitQQVNTIGNyZWF0ZVJlZ2lvbkVsZW1lbnQoImRpdiIsICJ0YWJsZS1jZWxsIikgaXMgdHJ1ZQor UEFTUyBjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAidGFibGUtY2FwdGlvbiIpIGlzIHRydWUK K1BBU1MgY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgImxpc3QtaXRlbSIpIGlzIHRydWUKK1BB U1MgY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgIi13ZWJraXQtYm94IikgaXMgZmFsc2UKK1BB U1MgY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgIi13ZWJraXQtaW5saW5lLWJveCIpIGlzIGZh bHNlCitQQVNTIGNyZWF0ZVJlZ2lvbkVsZW1lbnQoImRpdiIsICItd2Via2l0LWZsZXgiKSBpcyBm YWxzZQorUEFTUyBjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAiLXdlYmtpdC1pbmxpbmUtZmxl eCIpIGlzIGZhbHNlCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCiAKIFRFU1QgQ09N UExFVEUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9zY3JpcHQtdGVzdHMv cmVnaW9uLWVsZW1lbnQtZGlzcGxheS1jaGFuZ2UuanMgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lv bnMvc2NyaXB0LXRlc3RzL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXktY2hhbmdlLmpzCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjNkN2RjNDAKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc2NyaXB0LXRlc3RzL3JlZ2lvbi1lbGVtZW50LWRpc3Bs YXktY2hhbmdlLmpzCkBAIC0wLDAgKzEsMzIgQEAKK2Rlc2NyaXB0aW9uKCJUZXN0IHRoYXQgUmVu ZGVyT2JqZWN0IGlzIHJlY3JlYXRlZCBjb3JyZWN0bHkgYWZ0ZXIgY2hhbmdpbmcgZGlzcGxheSB0 eXBlLiIpOworCitmdW5jdGlvbiB0ZXN0RWxlbWVudChlbGVtZW50LCBkaXNwbGF5VHlwZSkKK3sK KwllbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCJkaXNwbGF5IiwgZGlzcGxheVR5cGUpOworCS8v IFRoZSByZWdpb24gZWxlbWVudCB3YXMgY3JlYXRlZCBpZiB0aGUgbGVuZ3RoIG9mIGlubmVyIHRl eHQgaXMgMC4KKyAgICB2YXIgcmVnaW9uQ3JlYXRlZCA9IGVsZW1lbnQuaW5uZXJUZXh0Lmxlbmd0 aCA9PSAwOworCXJldHVybiByZWdpb25DcmVhdGVkOworfQorCit2YXIgZWxlbWVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwordmFyIHRleHRFbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlVGV4dE5vZGUoImluc2lkZSBlbGVtZW50Iik7CitlbGVtZW50LmFwcGVuZENoaWxkKHRleHRF bGVtZW50KTsKK2VsZW1lbnQuc3R5bGUuc2V0UHJvcGVydHkoIi13ZWJraXQtZmxvdy1mcm9tIiwg ImZsb3ciKTsKK2RvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoZWxlbWVudCk7CitzaG91bGRCZUZh bHNlKCd0ZXN0RWxlbWVudChlbGVtZW50LCAibm9uZSIpJyk7CitzaG91bGRCZVRydWUoJ3Rlc3RF bGVtZW50KGVsZW1lbnQsICJibG9jayIpJyk7CitzaG91bGRCZVRydWUoJ3Rlc3RFbGVtZW50KGVs ZW1lbnQsICJpbmxpbmUtYmxvY2siKScpOworc2hvdWxkQmVGYWxzZSgndGVzdEVsZW1lbnQoZWxl bWVudCwgInJ1bi1pbiIpJyk7CitzaG91bGRCZUZhbHNlKCd0ZXN0RWxlbWVudChlbGVtZW50LCAi Y29tcGFjdCIpJyk7CitzaG91bGRCZUZhbHNlKCd0ZXN0RWxlbWVudChlbGVtZW50LCAiaW5saW5l IiknKTsKK3Nob3VsZEJlRmFsc2UoJ3Rlc3RFbGVtZW50KGVsZW1lbnQsICJ0YWJsZSIpJyk7Citz aG91bGRCZUZhbHNlKCd0ZXN0RWxlbWVudChlbGVtZW50LCAiaW5saW5lLXRhYmxlIiknKTsKK3No b3VsZEJlVHJ1ZSgndGVzdEVsZW1lbnQoZWxlbWVudCwgInRhYmxlLWNlbGwiKScpOworc2hvdWxk QmVUcnVlKCd0ZXN0RWxlbWVudChlbGVtZW50LCAidGFibGUtY2FwdGlvbiIpJyk7CitzaG91bGRC ZVRydWUoJ3Rlc3RFbGVtZW50KGVsZW1lbnQsICJsaXN0LWl0ZW0iKScpOworc2hvdWxkQmVGYWxz ZSgndGVzdEVsZW1lbnQoZWxlbWVudCwgIi13ZWJraXQtYm94IiknKTsKK3Nob3VsZEJlRmFsc2Uo J3Rlc3RFbGVtZW50KGVsZW1lbnQsICItd2Via2l0LWlubGluZS1ib3giKScpOworc2hvdWxkQmVG YWxzZSgndGVzdEVsZW1lbnQoZWxlbWVudCwgIi13ZWJraXQtZmxleCIpJyk7CitzaG91bGRCZUZh bHNlKCd0ZXN0RWxlbWVudChlbGVtZW50LCAiLXdlYmtpdC1pbmxpbmUtZmxleCIpJyk7CisvLyBG SVhNRTogQWxzbyBhZGQgZ3JpZCBhbmQgaW5saW5lIGdyaWQgd2hlbiBpdCBpcyBlbmFibGVkIGJ5 IGRlZmF1bHQKK2RvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQoZWxlbWVudCk7CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc2NyaXB0LXRlc3RzL3JlZ2lvbi1lbGVtZW50LWRp c3BsYXktcmVzdHJpY3Rpb24uanMgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc2NyaXB0LXRl c3RzL3JlZ2lvbi1lbGVtZW50LWRpc3BsYXktcmVzdHJpY3Rpb24uanMKaW5kZXggOWE0N2JhYy4u MjU1MzE4ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3NjcmlwdC10ZXN0 cy9yZWdpb24tZWxlbWVudC1kaXNwbGF5LXJlc3RyaWN0aW9uLmpzCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvcmVnaW9ucy9zY3JpcHQtdGVzdHMvcmVnaW9uLWVsZW1lbnQtZGlzcGxheS1yZXN0cmlj dGlvbi5qcwpAQCAtMjIsOCArMjIsMTYgQEAgZnVuY3Rpb24gY3JlYXRlUmVnaW9uRWxlbWVudChl bGVtZW50VHlwZSwgZGlzcGxheVR5cGUpCiBzaG91bGRCZUZhbHNlKCdjcmVhdGVSZWdpb25FbGVt ZW50KCJkaXYiLCAibm9uZSIpJyk7CiBzaG91bGRCZVRydWUoJ2NyZWF0ZVJlZ2lvbkVsZW1lbnQo ImRpdiIsICJibG9jayIpJyk7CiBzaG91bGRCZVRydWUoJ2NyZWF0ZVJlZ2lvbkVsZW1lbnQoImRp diIsICJpbmxpbmUtYmxvY2siKScpOwotc2hvdWxkQmVUcnVlKCdjcmVhdGVSZWdpb25FbGVtZW50 KCJkaXYiLCAicnVuLWluIiknKTsKLXNob3VsZEJlVHJ1ZSgnY3JlYXRlUmVnaW9uRWxlbWVudCgi ZGl2IiwgImNvbXBhY3QiKScpOworc2hvdWxkQmVGYWxzZSgnY3JlYXRlUmVnaW9uRWxlbWVudCgi ZGl2IiwgInJ1bi1pbiIpJyk7CitzaG91bGRCZUZhbHNlKCdjcmVhdGVSZWdpb25FbGVtZW50KCJk aXYiLCAiY29tcGFjdCIpJyk7CiBzaG91bGRCZUZhbHNlKCdjcmVhdGVSZWdpb25FbGVtZW50KCJk aXYiLCAiaW5saW5lIiknKTsKIHNob3VsZEJlRmFsc2UoJ2NyZWF0ZVJlZ2lvbkVsZW1lbnQoImRp diIsICJ0YWJsZSIpJyk7CiBzaG91bGRCZUZhbHNlKCdjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYi LCAiaW5saW5lLXRhYmxlIiknKTsKK3Nob3VsZEJlVHJ1ZSgnY3JlYXRlUmVnaW9uRWxlbWVudCgi ZGl2IiwgInRhYmxlLWNlbGwiKScpOworc2hvdWxkQmVUcnVlKCdjcmVhdGVSZWdpb25FbGVtZW50 KCJkaXYiLCAidGFibGUtY2FwdGlvbiIpJyk7CitzaG91bGRCZVRydWUoJ2NyZWF0ZVJlZ2lvbkVs ZW1lbnQoImRpdiIsICJsaXN0LWl0ZW0iKScpOworc2hvdWxkQmVGYWxzZSgnY3JlYXRlUmVnaW9u RWxlbWVudCgiZGl2IiwgIi13ZWJraXQtYm94IiknKTsKK3Nob3VsZEJlRmFsc2UoJ2NyZWF0ZVJl Z2lvbkVsZW1lbnQoImRpdiIsICItd2Via2l0LWlubGluZS1ib3giKScpOworc2hvdWxkQmVGYWxz ZSgnY3JlYXRlUmVnaW9uRWxlbWVudCgiZGl2IiwgIi13ZWJraXQtZmxleCIpJyk7CitzaG91bGRC ZUZhbHNlKCdjcmVhdGVSZWdpb25FbGVtZW50KCJkaXYiLCAiLXdlYmtpdC1pbmxpbmUtZmxleCIp Jyk7CisvLyBGSVhNRTogQWxzbyBhZGQgZ3JpZCBhbmQgaW5saW5lIGdyaWQgd2hlbiBpdCBpcyBl bmFibGVkIGJ5IGRlZmF1bHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxNmM3ODcyLi5hN2Q5NGJlIDEwMDc1NQot LS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTItMDYtMjcgIEFuZHJlaSBPbmVhICA8b25lYUBhZG9i ZS5jb20+CisKKyAgICAgICAgW0NTU1JlZ2lvbnNdQ2hhbmdlIGRpc3BsYXkgdmFsdWVzIHRoYXQg YWxsb3cgcmVnaW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODk3NTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBbGxvdyBvbmx5IGVsZW1lbnRzIHdpdGggZGlzcGxheSB2YWx1ZXMgb2YgYmxvY2ssIGlu bGluZS1ibG9jaywKKyAgICAgICAgdGFibGUtY2VsbCwgdGFibGUtY2FwdGlvbiBhbmQgbGlzdC1p dGVtIHRvIGJlY29tZSByZWdpb25zLCBhcyBwZXIKKyAgICAgICAgQ1NTUmVnaW9ucyBzcGVjOiBo dHRwOi8vZGV2LnczLm9yZy9jc3N3Zy9jc3MzLXJlZ2lvbnMgLgorICAgICAgICBBbHNvIGFkZGVk IHRlc3QgZm9yIGNoZWNraW5nIHdoZXRoZXIgcmVnaW9ucyBhcmUgZGVzdHJveWVkIGFuZC9vciBj cmVhdGVkCisgICAgICAgIHdoZW4gY2hhbmdpbmcgZGlzcGxheSB2YWx1ZS4KKworICAgICAgICBU ZXN0OiBmYXN0L3JlZ2lvbnMvcmVnaW9uLWVsZW1lbnQtZGlzcGxheS1jaGFuZ2UuaHRtbAorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJPYmplY3Q6OmNyZWF0ZU9iamVjdCk6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlLmg6CisKIDIwMTItMDYtMjcgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBVbmV4cGVjdGVkIGVuZCBvZiBzdHlsZSBzaGVldCBpbiBA Zm9udC1mYWNlIHJ1bGUgZGlzY2FyZHMgaXQgcmF0aGVyIHRoYW4gY2xvc2VzIGFsbCBvcGVuIGNv bnN0cnVjdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXgg YjVjYTkyYi4uMTkxNmZhMCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dC5jcHAKQEAgLTE1MCw3ICsxNTAsOCBAQCBSZW5kZXJPYmplY3QqIFJlbmRlck9iamVjdDo6Y3Jl YXRlT2JqZWN0KE5vZGUqIG5vZGUsIFJlbmRlclN0eWxlKiBzdHlsZSkKICAgICAvLyB0cmVhdCA8 cnQ+IGFzIHJ1YnkgdGV4dCBPTkxZIGlmIGl0IHN0aWxsIGhhcyBpdHMgZGVmYXVsdCB0cmVhdG1l bnQgb2YgYmxvY2sKICAgICBpZiAobm9kZS0+aGFzVGFnTmFtZShydFRhZykgJiYgc3R5bGUtPmRp c3BsYXkoKSA9PSBCTE9DSykKICAgICAgICAgcmV0dXJuIG5ldyAoYXJlbmEpIFJlbmRlclJ1YnlU ZXh0KG5vZGUpOwotCisgICAgaWYgKGRvYy0+Y3NzUmVnaW9uc0VuYWJsZWQoKSAmJiBzdHlsZS0+ aXNEaXNwbGF5UmVnaW9uVHlwZSgpICYmICFzdHlsZS0+cmVnaW9uVGhyZWFkKCkuaXNFbXB0eSgp ICYmIGRvYy0+cmVuZGVyVmlldygpKQorICAgICAgICByZXR1cm4gbmV3IChhcmVuYSkgUmVuZGVy UmVnaW9uKG5vZGUsIGRvYy0+cmVuZGVyVmlldygpLT5mbG93VGhyZWFkQ29udHJvbGxlcigpLT5l bnN1cmVSZW5kZXJGbG93VGhyZWFkV2l0aE5hbWUoc3R5bGUtPnJlZ2lvblRocmVhZCgpKSk7CiAg ICAgc3dpdGNoIChzdHlsZS0+ZGlzcGxheSgpKSB7CiAgICAgY2FzZSBOT05FOgogICAgICAgICBy ZXR1cm4gMDsKQEAgLTE2MCw5ICsxNjEsNiBAQCBSZW5kZXJPYmplY3QqIFJlbmRlck9iamVjdDo6 Y3JlYXRlT2JqZWN0KE5vZGUqIG5vZGUsIFJlbmRlclN0eWxlKiBzdHlsZSkKICAgICBjYXNlIElO TElORV9CTE9DSzoKICAgICBjYXNlIFJVTl9JTjoKICAgICBjYXNlIENPTVBBQ1Q6Ci0gICAgICAg IC8vIE9ubHkgbm9uLXJlcGxhY2VkIGJsb2NrIGVsZW1lbnRzIGNhbiBiZWNvbWUgYSByZWdpb24u Ci0gICAgICAgIGlmIChkb2MtPmNzc1JlZ2lvbnNFbmFibGVkKCkgJiYgIXN0eWxlLT5yZWdpb25U aHJlYWQoKS5pc0VtcHR5KCkgJiYgZG9jLT5yZW5kZXJWaWV3KCkpCi0gICAgICAgICAgICByZXR1 cm4gbmV3IChhcmVuYSkgUmVuZGVyUmVnaW9uKG5vZGUsIGRvYy0+cmVuZGVyVmlldygpLT5mbG93 VGhyZWFkQ29udHJvbGxlcigpLT5lbnN1cmVSZW5kZXJGbG93VGhyZWFkV2l0aE5hbWUoc3R5bGUt PnJlZ2lvblRocmVhZCgpKSk7CiAgICAgICAgIGlmICgoIXN0eWxlLT5oYXNBdXRvQ29sdW1uQ291 bnQoKSB8fCAhc3R5bGUtPmhhc0F1dG9Db2x1bW5XaWR0aCgpKSAmJiBkb2MtPnJlZ2lvbkJhc2Vk Q29sdW1uc0VuYWJsZWQoKSkKICAgICAgICAgICAgIHJldHVybiBuZXcgKGFyZW5hKSBSZW5kZXJN dWx0aUNvbHVtbkJsb2NrKG5vZGUpOwogICAgICAgICByZXR1cm4gbmV3IChhcmVuYSkgUmVuZGVy QmxvY2sobm9kZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHls ZS5oCmluZGV4IGQwNzAyNjkuLmNiNzk1MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdHlsZS9SZW5kZXJTdHlsZS5oCkBAIC0xNTA2LDYgKzE1MDYsMTMgQEAgcHVibGljOgogICAg ICAgICAgICAgfHwgb3JpZ2luYWxEaXNwbGF5KCkgPT0gSU5MSU5FX0JPWCB8fCBvcmlnaW5hbERp c3BsYXkoKSA9PSBJTkxJTkVfVEFCTEUgfHwgb3JpZ2luYWxEaXNwbGF5KCkgPT0gSU5MSU5FX0dS SUQ7CiAgICAgfQogCisgICAgYm9vbCBpc0Rpc3BsYXlSZWdpb25UeXBlKCkgY29uc3QKKyAgICB7 CisgICAgICAgIHJldHVybiBkaXNwbGF5KCkgPT0gQkxPQ0sgfHwgZGlzcGxheSgpID09IElOTElO RV9CTE9DSworICAgICAgICAgICAgfHwgZGlzcGxheSgpID09IFRBQkxFX0NFTEwgfHwgZGlzcGxh eSgpID09IFRBQkxFX0NBUFRJT04KKyAgICAgICAgICAgIHx8IGRpc3BsYXkoKSA9PSBMSVNUX0lU RU07CisgICAgfQorCiAgICAgdm9pZCBzZXRXcml0aW5nTW9kZShXcml0aW5nTW9kZSB2KSB7IGlu aGVyaXRlZF9mbGFncy5tX3dyaXRpbmdNb2RlID0gdjsgfQogCiAgICAgLy8gVG8gdGVsbCBpZiB0 aGlzIHN0eWxlIG1hdGNoZWQgYXR0cmlidXRlIHNlbGVjdG9ycy4gVGhpcyBtYWtlcyBpdCBpbXBv c3NpYmxlIHRvIHNoYXJlLgo=