57363 2011-03-29 11:10:46 -0700 Rename BidiResolver::current to BidiResolver::m_current to match modern style 2011-03-29 17:02:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 57367 1 eric eric abarth commit-queue eric rniwa webkit.review.bot oldest_to_newest 375552 0 eric 2011-03-29 11:10:46 -0700 Rename BidiResolver::current to BidiResolver::m_current to match modern style 375556 1 87370 eric 2011-03-29 11:12:15 -0700 Created attachment 87370 Patch 375560 2 87372 eric 2011-03-29 11:19:24 -0700 Created attachment 87372 Patch 375565 3 87372 dglazkov 2011-03-29 11:20:04 -0700 Comment on attachment 87372 Patch m_awesome. 375821 4 87372 commit-queue 2011-03-29 15:51:01 -0700 Comment on attachment 87372 Patch Clearing flags on attachment: 87372 Committed r82341: <http://trac.webkit.org/changeset/82341> 375822 5 commit-queue 2011-03-29 15:51:06 -0700 All reviewed patches have been landed. Closing bug. 375897 6 webkit.review.bot 2011-03-29 17:02:31 -0700 http://trac.webkit.org/changeset/82341 might have broken GTK Linux 32-bit Release The following tests are not passing: css1/basic/comments.html css1/basic/containment.html css1/basic/id_as_selector.html css1/basic/inheritance.html css1/box_properties/border.html css1/box_properties/border_bottom.html css1/box_properties/border_bottom_width.html css1/box_properties/border_left.html css1/box_properties/border_left_width.html css1/box_properties/border_right_inline.html css1/box_properties/border_right_width.html css1/box_properties/border_style.html css1/box_properties/border_top.html css1/box_properties/border_top_width.html css1/box_properties/border_width.html css1/box_properties/clear.html css1/box_properties/clear_float.html css1/box_properties/float_elements_in_series.html css1/box_properties/float_margin.html css1/box_properties/float_on_text_elements.html css1/box_properties/height.html css1/box_properties/margin.html css1/box_properties/margin_bottom.html css1/box_properties/margin_inline.html css1/box_properties/margin_left.html css1/box_properties/margin_right.html css1/box_properties/margin_top.html css1/box_properties/padding.html css1/box_properties/padding_bottom.html css1/box_properties/padding_inline.html css1/box_properties/padding_left.html css1/box_properties/padding_right.html css1/box_properties/padding_top.html css1/box_properties/width.html css1/cascade/cascade_order.html css1/classification/display.html css1/classification/list_style_type.html css1/classification/white_space.html css1/color_and_background/background.html css1/color_and_background/background_attachment.html css1/color_and_background/background_position.html css1/color_and_background/background_repeat.html css1/conformance/forward_compatible_parsing.html css1/font_properties/font.html css1/font_properties/font_family.html css1/font_properties/font_size.html css1/font_properties/font_weight.html css1/formatting_model/floating_elements.html css1/formatting_model/height_of_lines.html css1/formatting_model/horizontal_formatting.html css1/formatting_model/inline_elements.html css1/formatting_model/replaced_elements.html css1/formatting_model/vertical_formatting.html css1/pseudo/anchor.html css1/pseudo/firstletter.html css1/pseudo/firstline.html css1/pseudo/multiple_pseudo_elements.html css1/text_properties/letter_spacing.html css1/text_properties/line_height.html css1/text_properties/text_decoration.html css1/text_properties/text_indent.html css1/text_properties/text_transform.html css1/text_properties/vertical_align.html css1/text_properties/word_spacing.html css1/units/color_units.html css1/units/length_units.html css2.1/t0803-c5502-mrgn-r-02-c.html css2.1/t0803-c5505-mrgn-02-c.html css2.1/t080301-c411-vt-mrgn-00-b.html css2.1/t0905-c5525-fltclr-00-c-ag.html css2.1/t0905-c5525-fltmrgn-00-c-ag.html css2.1/t0905-c5525-fltwidth-00-c-g.html css2.1/t0905-c5526-fltclr-00-c-ag.html css2.1/t1002-c5523-width-02-b-g.html css2.1/t1202-counters-08-b.html css2.1/t1202-counters-09-b.html css2.1/t140201-c535-bg-fixd-00-b-g.html css2.1/t140201-c537-bgfxps-00-c-ag.html css2.1/t1508-c527-font-07-b.html editing/deleting/delete-after-span-ws-001.html editing/deleting/delete-after-span-ws-002.html editing/deleting/delete-after-span-ws-003.html editing/deleting/delete-line-end-ws-001.html editing/deleting/delete-line-end-ws-002.html editing/inserting/insert-div-023.html editing/selection/focus_editable_html.html editing/selection/select-all-001.html editing/selection/select-all-002.html editing/selection/select-all-003.html editing/selection/select-all-004.html editing/selection/unrendered-001.html editing/selection/unrendered-002.html editing/selection/unrendered-003.html editing/selection/unrendered-004.html editing/selection/unrendered-005.html fast/text/international/complex-character-based-fallback.html fast/text/international/thai-line-breaks.html fonts/cursive.html fonts/default.html fonts/fantasy.html fonts/monospace.html fonts/sans-serif.html fonts/serif.html http/tests/misc/link-rel-icon-beforeload.html media/video-controls-rendering.html media/video-zoom.html tables/mozilla/bugs/bug101674.html tables/mozilla/bugs/bug10269-2.html tables/mozilla/bugs/bug10296-1.html tables/mozilla/bugs/bug1055-1.html tables/mozilla/bugs/bug113235-1.html tables/mozilla/bugs/bug113235-3.html tables/mozilla/bugs/bug11944.html tables/mozilla/bugs/bug120364.html tables/mozilla/bugs/bug12384.html tables/mozilla/bugs/bug1302.html tables/mozilla/bugs/bug131020.html tables/mozilla/bugs/bug131020_iframe.html tables/mozilla/bugs/bug137388-2.html tables/mozilla/bugs/bug194024.html tables/mozilla/bugs/bug22019.html tables/mozilla/bugs/bug23151.html tables/mozilla/bugs/bug2479-1.html tables/mozilla/bugs/bug2479-3.html tables/mozilla/bugs/bug2479-4.html tables/mozilla/bugs/bug27038-2.html tables/mozilla/bugs/bug29314.html tables/mozilla/bugs/bug2947.html tables/mozilla/bugs/bug32205-2.html tables/mozilla/bugs/bug38916.html tables/mozilla/bugs/bug3977.html tables/mozilla/bugs/bug43039.html tables/mozilla/bugs/bug43854-1.html tables/mozilla/bugs/bug44505.html tables/mozilla/bugs/bug46480-1.html tables/mozilla/bugs/bug46480-2.html tables/mozilla/bugs/bug50695-1.html tables/mozilla/bugs/bug56405.html tables/mozilla/bugs/bug5797.html tables/mozilla/bugs/bug5835.html tables/mozilla/bugs/bug625.html tables/mozilla/bugs/bug650.html tables/mozilla/bugs/bug67915-1.html tables/mozilla/bugs/bug7112-1.html tables/mozilla/bugs/bug7112-2.html tables/mozilla/bugs/bug73321.html tables/mozilla/bugs/bug92143.html tables/mozilla/bugs/bug96334.html tables/mozilla/bugs/bug96343.html tables/mozilla/collapsing_borders/bug41262-3.html tables/mozilla/core/bloomberg.html tables/mozilla/core/captions.html tables/mozilla/core/cell_heights.html tables/mozilla/core/col_span.html tables/mozilla/core/col_widths_auto_fix.html tables/mozilla/core/col_widths_fix_fixPer.html tables/mozilla/core/nested1.html tables/mozilla/core/one_row.html tables/mozilla/core/row_span.html tables/mozilla/marvin/backgr_index.html tables/mozilla/marvin/backgr_layers-opacity.html tables/mozilla/marvin/backgr_position-table.html tables/mozilla/marvin/backgr_simple-table-cell.html tables/mozilla/marvin/backgr_simple-table-column-group.html tables/mozilla/marvin/backgr_simple-table-column.html tables/mozilla/marvin/backgr_simple-table-row-group.html tables/mozilla/marvin/backgr_simple-table-row.html tables/mozilla/marvin/backgr_simple-table.html tables/mozilla/marvin/x_table_bgcolor_name.xml tables/mozilla/marvin/x_table_bgcolor_rgb.xml tables/mozilla/marvin/x_td_bgcolor_name.xml tables/mozilla/marvin/x_td_bgcolor_rgb.xml tables/mozilla/marvin/x_td_height.xml tables/mozilla/marvin/x_td_nowrap.xml tables/mozilla/marvin/x_th_bgcolor_name.xml tables/mozilla/marvin/x_th_bgcolor_rgb.xml tables/mozilla/marvin/x_th_height.xml tables/mozilla/marvin/x_th_nowrap.xml tables/mozilla/marvin/x_tr_bgcolor_name.xml tables/mozilla/marvin/x_tr_bgcolor_rgb.xml tables/mozilla/other/cell_widths.html tables/mozilla/other/nestedTables.html tables/mozilla/other/test3.html tables/mozilla/other/test6.html tables/mozilla/other/wa_table_thtd_rowspan.html tables/mozilla/other/wa_table_tr_align.html tables/mozilla_expected_failures/bugs/bug10140.html tables/mozilla_expected_failures/bugs/bug101759.html tables/mozilla_expected_failures/bugs/bug10216.html tables/mozilla_expected_failures/bugs/bug1055-2.html tables/mozilla_expected_failures/bugs/bug106966.html tables/mozilla_expected_failures/bugs/bug131020-3.html tables/mozilla_expected_failures/bugs/bug14007-1.html tables/mozilla_expected_failures/bugs/bug14007-2.html tables/mozilla_expected_failures/bugs/bug19526.html tables/mozilla_expected_failures/bugs/bug220653.html tables/mozilla_expected_failures/bugs/bug22122.html tables/mozilla_expected_failures/bugs/bug2479-5.html tables/mozilla_expected_failures/bugs/bug32205-1.html tables/mozilla_expected_failures/bugs/bug67915-2.html tables/mozilla_expected_failures/bugs/bug7243.html tables/mozilla_expected_failures/bugs/bug80762-2.html tables/mozilla_expected_failures/bugs/bug85016.html tables/mozilla_expected_failures/bugs/bug89315.html tables/mozilla_expected_failures/bugs/bug91057.html tables/mozilla_expected_failures/core/backgrounds.html tables/mozilla_expected_failures/core/captions1.html tables/mozilla_expected_failures/core/captions2.html tables/mozilla_expected_failures/core/captions3.html tables/mozilla_expected_failures/core/col_span2.html tables/mozilla_expected_failures/core/columns.html tables/mozilla_expected_failures/core/conflicts.html tables/mozilla_expected_failures/core/standards1.html tables/mozilla_expected_failures/marvin/backgr_border-table-cell.html tables/mozilla_expected_failures/marvin/backgr_border-table-column-group.html tables/mozilla_expected_failures/marvin/backgr_border-table-column.html tables/mozilla_expected_failures/marvin/backgr_border-table-quirks.html tables/mozilla_expected_failures/marvin/backgr_border-table-row-group.html tables/mozilla_expected_failures/marvin/backgr_border-table-row.html tables/mozilla_expected_failures/marvin/backgr_border-table.html tables/mozilla_expected_failures/marvin/backgr_fixed-bg.html tables/mozilla_expected_failures/marvin/backgr_layers-hide.html tables/mozilla_expected_failures/marvin/backgr_layers-show.html tables/mozilla_expected_failures/marvin/backgr_position-table-cell.html tables/mozilla_expected_failures/marvin/backgr_position-table-column-group.html tables/mozilla_expected_failures/marvin/backgr_position-table-column.html tables/mozilla_expected_failures/marvin/backgr_position-table-row-group.html tables/mozilla_expected_failures/marvin/backgr_position-table-row.html tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row.html tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling.html tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling.html tables/mozilla_expected_failures/other/empty_cells.html tables/mozilla_expected_failures/other/test4.html transforms/2d/hindi-rotated.html transforms/2d/transform-fixed-container.html 87370 2011-03-29 11:12:15 -0700 2011-03-29 11:19:15 -0700 Patch bug-57363-20110329201209.patch text/plain 7728 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODIyNzcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxNjFmZjk2MThmZTc2YjM1 Y2E3ZWU0YmIyOGI5ZTQwOWZiNjNiYjNmLi5iZWRhZDEzMzU3MGMzZjJlM2VlMWFkZTNjODQ1ZWM5 ZTE0NzIxNTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjEgQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBSZW5hbWUgQmlkaVJlc29sdmVyOjpjdXJy ZW50IHRvIEJpZGlSZXNvbHZlcjo6bV9jdXJyZW50IHRvIG1hdGNoIG1vZGVybiBzdHlsZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTczNjMKKworICAg ICAgICBJIHdhcyB2ZXJ5IGNvbmZ1c2VkIGJ5IGN1cnJlbnQgdW50aWwgSSByZWFsaXplZCBpdCB3 YXMgYSBtZW1iZXIgdmFyaWFibGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L0JpZGlSZXNv bHZlci5oOgorICAgICAgICAoV2ViQ29yZTo6QmlkaVJlc29sdmVyOjpwb3NpdGlvbik6CisgICAg ICAgIChXZWJDb3JlOjpCaWRpUmVzb2x2ZXI6OnNldFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNv cmU6OkJpZGlSZXNvbHZlcjo6aW5jcmVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6Ojo6Y3JlYXRl QmlkaVJ1bnNGb3JMaW5lKToKKworMjAxMS0wMy0yOSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtp dC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAg U3RhcnQgdG8gY2xlYW4gdXAgQmlkaVJlc29sdmVyOjpjcmVhdGVCaWRpUnVuc0ZvckxpbmUgc28g dGhhdCBtZXJlIG1vcnRhbHMgY2FuIHVuZGVyc3RhbmQgaXQKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MzM4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3RleHQvQmlkaVJlc29sdmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS90ZXh0L0JpZGlSZXNvbHZlci5oCmluZGV4IDM0MDQ1MjIwMjcwZjVjMTA4NjcxMWE3NjJk NDFjZTEzMGQxN2ViOGUuLjhmYTg2MDQ2YjdlZmFiZTZlMjVjMGIwNTFjODJjMzk2YjA0NWY2NzMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvQmlkaVJlc29sdmVyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9CaWRpUmVzb2x2ZXIuaApAQCAtMTQ2 LDEwICsxNDYsMTAgQEAgcHVibGljIDoKICAgICB7CiAgICAgfQogCi0gICAgY29uc3QgSXRlcmF0 b3ImIHBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gY3VycmVudDsgfQotICAgIHZvaWQgc2V0UG9z aXRpb24oY29uc3QgSXRlcmF0b3ImIHBvc2l0aW9uKSB7IGN1cnJlbnQgPSBwb3NpdGlvbjsgfQor ICAgIGNvbnN0IEl0ZXJhdG9yJiBwb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fY3VycmVudDsg fQorICAgIHZvaWQgc2V0UG9zaXRpb24oY29uc3QgSXRlcmF0b3ImIHBvc2l0aW9uKSB7IG1fY3Vy cmVudCA9IHBvc2l0aW9uOyB9CiAKLSAgICB2b2lkIGluY3JlbWVudCgpIHsgY3VycmVudC5pbmNy ZW1lbnQoKTsgfQorICAgIHZvaWQgaW5jcmVtZW50KCkgeyBtX2N1cnJlbnQuaW5jcmVtZW50KCk7 IH0KIAogICAgIEJpZGlDb250ZXh0KiBjb250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9zdGF0dXMu Y29udGV4dC5nZXQoKTsgfQogICAgIHZvaWQgc2V0Q29udGV4dChQYXNzUmVmUHRyPEJpZGlDb250 ZXh0PiBjKSB7IG1fc3RhdHVzLmNvbnRleHQgPSBjOyB9CkBAIC0xODgsNyArMTg4LDcgQEAgcHJv dGVjdGVkOgogICAgIHZvaWQgYXBwZW5kUnVuKCk7CiAgICAgdm9pZCByZXZlcnNlUnVucyh1bnNp Z25lZCBzdGFydCwgdW5zaWduZWQgZW5kKTsKIAotICAgIEl0ZXJhdG9yIGN1cnJlbnQ7CisgICAg SXRlcmF0b3IgbV9jdXJyZW50OwogICAgIEl0ZXJhdG9yIHNvcjsKICAgICBJdGVyYXRvciBlb3I7 CiAgICAgSXRlcmF0b3IgbGFzdDsKQEAgLTU3MiwxMCArNTcyLDEwIEBAIHZvaWQgQmlkaVJlc29s dmVyPEl0ZXJhdG9yLCBSdW4+OjpjcmVhdGVCaWRpUnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0b3Im IGVuZCwgVmlzCiAKICAgICBpZiAob3ZlcnJpZGUgIT0gTm9WaXN1YWxPdmVycmlkZSkgewogICAg ICAgICBlbXB0eVJ1biA9IGZhbHNlOwotICAgICAgICBzb3IgPSBjdXJyZW50OworICAgICAgICBz b3IgPSBtX2N1cnJlbnQ7CiAgICAgICAgIGVvciA9IEl0ZXJhdG9yKCk7Ci0gICAgICAgIHdoaWxl IChjdXJyZW50ICE9IGVuZCAmJiAhY3VycmVudC5hdEVuZCgpKSB7Ci0gICAgICAgICAgICBlb3Ig PSBjdXJyZW50OworICAgICAgICB3aGlsZSAobV9jdXJyZW50ICE9IGVuZCAmJiAhbV9jdXJyZW50 LmF0RW5kKCkpIHsKKyAgICAgICAgICAgIGVvciA9IG1fY3VycmVudDsKICAgICAgICAgICAgIGlu Y3JlbWVudCgpOwogICAgICAgICB9CiAgICAgICAgIG1fZGlyZWN0aW9uID0gb3ZlcnJpZGUgPT0g VmlzdWFsTGVmdFRvUmlnaHRPdmVycmlkZSA/IExlZnRUb1JpZ2h0IDogUmlnaHRUb0xlZnQ7CkBA IC01OTAsMTMgKzU5MCwxMyBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6Y3Jl YXRlQmlkaVJ1bnNGb3JMaW5lKGNvbnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwogCiAgICAgZW9yID0g SXRlcmF0b3IoKTsKIAotICAgIGxhc3QgPSBjdXJyZW50OworICAgIGxhc3QgPSBtX2N1cnJlbnQ7 CiAgICAgYm9vbCBwYXN0RW5kID0gZmFsc2U7CiAgICAgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBS dW4+IHN0YXRlQXRFbmQ7CiAKICAgICB3aGlsZSAodHJ1ZSkgewogICAgICAgICBEaXJlY3Rpb24g ZGlyQ3VycmVudDsKLSAgICAgICAgaWYgKHBhc3RFbmQgJiYgKGhhcmRMaW5lQnJlYWsgfHwgY3Vy cmVudC5hdEVuZCgpKSkgeworICAgICAgICBpZiAocGFzdEVuZCAmJiAoaGFyZExpbmVCcmVhayB8 fCBtX2N1cnJlbnQuYXRFbmQoKSkpIHsKICAgICAgICAgICAgIEJpZGlDb250ZXh0KiBjID0gY29u dGV4dCgpOwogICAgICAgICAgICAgd2hpbGUgKGMtPnBhcmVudCgpKQogICAgICAgICAgICAgICAg IGMgPSBjLT5wYXJlbnQoKTsKQEAgLTYxMCw3ICs2MTAsNyBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJ dGVyYXRvciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGNvbnN0IEl0ZXJhdG9yJiBlbmQs IFZpcwogICAgICAgICAgICAgICAgIHN0YXRlQXRFbmQuc2V0TGFzdFN0cm9uZ0RpcihkaXJDdXJy ZW50KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGRpckN1 cnJlbnQgPSBjdXJyZW50LmRpcmVjdGlvbigpOworICAgICAgICAgICAgZGlyQ3VycmVudCA9IG1f Y3VycmVudC5kaXJlY3Rpb24oKTsKICAgICAgICAgICAgIGlmIChjb250ZXh0KCktPm92ZXJyaWRl KCkKICAgICAgICAgICAgICAgICAgICAgJiYgZGlyQ3VycmVudCAhPSBSaWdodFRvTGVmdEVtYmVk ZGluZwogICAgICAgICAgICAgICAgICAgICAmJiBkaXJDdXJyZW50ICE9IExlZnRUb1JpZ2h0RW1i ZWRkaW5nCkBAIC02ODgsNyArNjg4LDcgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1 bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJdGVyYXRvciYgZW5kLCBWaXMKICAgICAg ICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAg ICAgIH0KLSAgICAgICAgICAgIGVvciA9IGN1cnJlbnQ7CisgICAgICAgICAgICBlb3IgPSBtX2N1 cnJlbnQ7CiAgICAgICAgICAgICBtX3N0YXR1cy5lb3IgPSBMZWZ0VG9SaWdodDsKICAgICAgICAg ICAgIG1fc3RhdHVzLmxhc3RTdHJvbmcgPSBMZWZ0VG9SaWdodDsKICAgICAgICAgICAgIG1fZGly ZWN0aW9uID0gTGVmdFRvUmlnaHQ7CkBAIC03MjUsNyArNzI1LDcgQEAgdm9pZCBCaWRpUmVzb2x2 ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJdGVyYXRvciYg ZW5kLCBWaXMKICAgICAgICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGVvciA9IGN1cnJlbnQ7CisgICAgICAg ICAgICBlb3IgPSBtX2N1cnJlbnQ7CiAgICAgICAgICAgICBtX3N0YXR1cy5lb3IgPSBSaWdodFRv TGVmdDsKICAgICAgICAgICAgIG1fc3RhdHVzLmxhc3RTdHJvbmcgPSBkaXJDdXJyZW50OwogICAg ICAgICAgICAgbV9kaXJlY3Rpb24gPSBSaWdodFRvTGVmdDsKQEAgLTc5MSw3ICs3OTEsNyBAQCB2 b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGNv bnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwogICAgICAgICAgICAgICAgICAgICBkZWZhdWx0OgogICAg ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAg ICAgICAgIGVvciA9IGN1cnJlbnQ7CisgICAgICAgICAgICAgICAgZW9yID0gbV9jdXJyZW50Owog ICAgICAgICAgICAgICAgIG1fc3RhdHVzLmVvciA9IEV1cm9wZWFuTnVtYmVyOwogICAgICAgICAg ICAgICAgIGlmIChtX2RpcmVjdGlvbiA9PSBPdGhlck5ldXRyYWwpCiAgICAgICAgICAgICAgICAg ICAgIG1fZGlyZWN0aW9uID0gTGVmdFRvUmlnaHQ7CkBAIC04MzYsNyArODM2LDcgQEAgdm9pZCBC aWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJ dGVyYXRvciYgZW5kLCBWaXMKICAgICAgICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGVvciA9IGN1cnJlbnQ7 CisgICAgICAgICAgICBlb3IgPSBtX2N1cnJlbnQ7CiAgICAgICAgICAgICBtX3N0YXR1cy5lb3Ig PSBBcmFiaWNOdW1iZXI7CiAgICAgICAgICAgICBpZiAobV9kaXJlY3Rpb24gPT0gT3RoZXJOZXV0 cmFsKQogICAgICAgICAgICAgICAgIG1fZGlyZWN0aW9uID0gQXJhYmljTnVtYmVyOwpAQCAtODQ3 LDcgKzg0Nyw3IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+OjpjcmVhdGVCaWRp UnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0b3ImIGVuZCwgVmlzCiAgICAgICAgIGNhc2UgRXVyb3Bl YW5OdW1iZXJUZXJtaW5hdG9yOgogICAgICAgICAgICAgaWYgKG1fc3RhdHVzLmxhc3QgPT0gRXVy b3BlYW5OdW1iZXIpIHsKICAgICAgICAgICAgICAgICBkaXJDdXJyZW50ID0gRXVyb3BlYW5OdW1i ZXI7Ci0gICAgICAgICAgICAgICAgZW9yID0gY3VycmVudDsKKyAgICAgICAgICAgICAgICBlb3Ig PSBtX2N1cnJlbnQ7CiAgICAgICAgICAgICAgICAgbV9zdGF0dXMuZW9yID0gZGlyQ3VycmVudDsK ICAgICAgICAgICAgIH0gZWxzZSBpZiAobV9zdGF0dXMubGFzdCAhPSBFdXJvcGVhbk51bWJlclRl cm1pbmF0b3IpCiAgICAgICAgICAgICAgICAgbGFzdEJlZm9yZUVUID0gZW1wdHlSdW4gPyBlb3Ig OiBsYXN0OwpAQCAtODU2LDcgKzg1Niw3IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBS dW4+OjpjcmVhdGVCaWRpUnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0b3ImIGVuZCwgVmlzCiAgICAg ICAgIC8vIGJvdW5kYXJ5IG5ldXRyYWxzIHNob3VsZCBiZSBpZ25vcmVkCiAgICAgICAgIGNhc2Ug Qm91bmRhcnlOZXV0cmFsOgogICAgICAgICAgICAgaWYgKGVvciA9PSBsYXN0KQotICAgICAgICAg ICAgICAgIGVvciA9IGN1cnJlbnQ7CisgICAgICAgICAgICAgICAgZW9yID0gbV9jdXJyZW50Owog ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAvLyBuZXV0cmFscwogICAgICAgICBjYXNl IEJsb2NrU2VwYXJhdG9yOgpAQCAtODczLDcgKzg3Myw3IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0 ZXJhdG9yLCBSdW4+OjpjcmVhdGVCaWRpUnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0b3ImIGVuZCwg VmlzCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChwYXN0RW5k ICYmIGVvciA9PSBjdXJyZW50KSB7CisgICAgICAgIGlmIChwYXN0RW5kICYmIGVvciA9PSBtX2N1 cnJlbnQpIHsKICAgICAgICAgICAgIGlmICghcmVhY2hlZEVuZE9mTGluZSkgewogICAgICAgICAg ICAgICAgIGVvciA9IGVuZE9mTGluZTsKICAgICAgICAgICAgICAgICBzd2l0Y2ggKG1fc3RhdHVz LmVvcikgewpAQCAtODkwLDcgKzg5MCw3IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBS dW4+OjpjcmVhdGVCaWRpUnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0b3ImIGVuZCwgVmlzCiAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGFwcGVuZFJ1bigpOwogICAgICAgICAgICAg fQotICAgICAgICAgICAgY3VycmVudCA9IGVuZDsKKyAgICAgICAgICAgIG1fY3VycmVudCA9IGVu ZDsKICAgICAgICAgICAgIG1fc3RhdHVzID0gc3RhdGVBdEVuZC5tX3N0YXR1czsKICAgICAgICAg ICAgIHNvciA9IHN0YXRlQXRFbmQuc29yOyAKICAgICAgICAgICAgIGVvciA9IHN0YXRlQXRFbmQu ZW9yOwpAQCAtOTAzLDEwICs5MDMsMTAgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1 bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJdGVyYXRvciYgZW5kLCBWaXMKICAgICAg ICAgfQogCiAgICAgICAgIHVwZGF0ZVN0YXR1c0xhc3RGcm9tQ3VycmVudERpcmVjdGlvbihkaXJD dXJyZW50KTsKLSAgICAgICAgbGFzdCA9IGN1cnJlbnQ7CisgICAgICAgIGxhc3QgPSBtX2N1cnJl bnQ7CiAKICAgICAgICAgaWYgKGVtcHR5UnVuKSB7Ci0gICAgICAgICAgICBzb3IgPSBjdXJyZW50 OworICAgICAgICAgICAgc29yID0gbV9jdXJyZW50OwogICAgICAgICAgICAgZW1wdHlSdW4gPSBm YWxzZTsKICAgICAgICAgfQogCkBAIC05MTQsNyArOTE0LDcgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8 SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJdGVyYXRvciYgZW5k LCBWaXMKICAgICAgICAgaWYgKCFtX2N1cnJlbnRFeHBsaWNpdEVtYmVkZGluZ1NlcXVlbmNlLmlz RW1wdHkoKSkgewogICAgICAgICAgICAgYm9vbCBjb21taXR0ZWQgPSBjb21taXRFeHBsaWNpdEVt YmVkZGluZygpOwogICAgICAgICAgICAgaWYgKGNvbW1pdHRlZCAmJiBwYXN0RW5kKSB7Ci0gICAg ICAgICAgICAgICAgY3VycmVudCA9IGVuZDsKKyAgICAgICAgICAgICAgICBtX2N1cnJlbnQgPSBl bmQ7CiAgICAgICAgICAgICAgICAgbV9zdGF0dXMgPSBzdGF0ZUF0RW5kLm1fc3RhdHVzOwogICAg ICAgICAgICAgICAgIHNvciA9IHN0YXRlQXRFbmQuc29yOyAKICAgICAgICAgICAgICAgICBlb3Ig PSBzdGF0ZUF0RW5kLmVvcjsKQEAgLTkyNyw3ICs5MjcsNyBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJ dGVyYXRvciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGNvbnN0IEl0ZXJhdG9yJiBlbmQs IFZpcwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgaWYgKCFwYXN0RW5kICYm IChjdXJyZW50ID09IGVuZCB8fCBjdXJyZW50LmF0RW5kKCkpKSB7CisgICAgICAgIGlmICghcGFz dEVuZCAmJiAobV9jdXJyZW50ID09IGVuZCB8fCBtX2N1cnJlbnQuYXRFbmQoKSkpIHsKICAgICAg ICAgICAgIGlmIChlbXB0eVJ1bikKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAg IHN0YXRlQXRFbmQubV9zdGF0dXMgPSBtX3N0YXR1czsK 87372 2011-03-29 11:19:24 -0700 2011-03-29 15:51:00 -0700 Patch bug-57363-20110329201919.patch text/plain 10694 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODIyNzcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxNjFmZjk2MThmZTc2YjM1 Y2E3ZWU0YmIyOGI5ZTQwOWZiNjNiYjNmLi45NWFhZTA5MzgyODRmYWE0NzUyYmQyMWMwZmQ3Yzlh N2U3ZmRmZjg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjIgQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBSZW5hbWUgQmlkaVJlc29sdmVyOjpjdXJy ZW50IHRvIEJpZGlSZXNvbHZlcjo6bV9jdXJyZW50IHRvIG1hdGNoIG1vZGVybiBzdHlsZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTczNjMKKworICAg ICAgICBJIHdhcyB2ZXJ5IGNvbmZ1c2VkIGJ5IGN1cnJlbnQgdW50aWwgSSByZWFsaXplZCBpdCB3 YXMgYSBtZW1iZXIgdmFyaWFibGUuCisgICAgICAgIEkgYWxzbyBkaWQgbV9yZWFjaGVkRW5kT2ZM aW5lIHNpbmNlIHRoYXQgd2FzIHNtYWxsLgorCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9CaWRp UmVzb2x2ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkJpZGlSZXNvbHZlcjo6cG9zaXRpb24pOgor ICAgICAgICAoV2ViQ29yZTo6QmlkaVJlc29sdmVyOjpzZXRQb3NpdGlvbik6CisgICAgICAgIChX ZWJDb3JlOjpCaWRpUmVzb2x2ZXI6OmluY3JlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjo6OmNy ZWF0ZUJpZGlSdW5zRm9yTGluZSk6CisKKzIwMTEtMDMtMjkgIEVyaWMgU2VpZGVsICA8ZXJpY0B3 ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAg ICAgIFN0YXJ0IHRvIGNsZWFuIHVwIEJpZGlSZXNvbHZlcjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5l IHNvIHRoYXQgbWVyZSBtb3J0YWxzIGNhbiB1bmRlcnN0YW5kIGl0CiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzMzOAogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0JpZGlSZXNvbHZlci5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vdGV4dC9CaWRpUmVzb2x2ZXIuaAppbmRleCAzNDA0NTIyMDI3MGY1YzEwODY3MTFh NzYyZDQxY2UxMzBkMTdlYjhlLi40MzE2ZjM0ZjNhYmZlNzRjMWQ1YzRlMzVmYmE4NjEwNTdhNWJk MTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0JpZGlSZXNvbHZl ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvQmlkaVJlc29sdmVyLmgKQEAg LTEzNyw3ICsxMzcsNyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgSXRlcmF0b3IsIGNsYXNzIFJ1bj4gY2xh c3MgQmlkaVJlc29sdmVyIHsKIHB1YmxpYyA6CiAgICAgQmlkaVJlc29sdmVyKCkKICAgICAgICAg OiBtX2RpcmVjdGlvbihXVEY6OlVuaWNvZGU6Ok90aGVyTmV1dHJhbCkKLSAgICAgICAgLCByZWFj aGVkRW5kT2ZMaW5lKGZhbHNlKQorICAgICAgICAsIG1fcmVhY2hlZEVuZE9mTGluZShmYWxzZSkK ICAgICAgICAgLCBlbXB0eVJ1bih0cnVlKQogICAgICAgICAsIG1fZmlyc3RSdW4oMCkKICAgICAg ICAgLCBtX2xhc3RSdW4oMCkKQEAgLTE0NiwxMCArMTQ2LDEwIEBAIHB1YmxpYyA6CiAgICAgewog ICAgIH0KIAotICAgIGNvbnN0IEl0ZXJhdG9yJiBwb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIGN1 cnJlbnQ7IH0KLSAgICB2b2lkIHNldFBvc2l0aW9uKGNvbnN0IEl0ZXJhdG9yJiBwb3NpdGlvbikg eyBjdXJyZW50ID0gcG9zaXRpb247IH0KKyAgICBjb25zdCBJdGVyYXRvciYgcG9zaXRpb24oKSBj b25zdCB7IHJldHVybiBtX2N1cnJlbnQ7IH0KKyAgICB2b2lkIHNldFBvc2l0aW9uKGNvbnN0IEl0 ZXJhdG9yJiBwb3NpdGlvbikgeyBtX2N1cnJlbnQgPSBwb3NpdGlvbjsgfQogCi0gICAgdm9pZCBp bmNyZW1lbnQoKSB7IGN1cnJlbnQuaW5jcmVtZW50KCk7IH0KKyAgICB2b2lkIGluY3JlbWVudCgp IHsgbV9jdXJyZW50LmluY3JlbWVudCgpOyB9CiAKICAgICBCaWRpQ29udGV4dCogY29udGV4dCgp IGNvbnN0IHsgcmV0dXJuIG1fc3RhdHVzLmNvbnRleHQuZ2V0KCk7IH0KICAgICB2b2lkIHNldENv bnRleHQoUGFzc1JlZlB0cjxCaWRpQ29udGV4dD4gYykgeyBtX3N0YXR1cy5jb250ZXh0ID0gYzsg fQpAQCAtMTg4LDE0ICsxODgsMTQgQEAgcHJvdGVjdGVkOgogICAgIHZvaWQgYXBwZW5kUnVuKCk7 CiAgICAgdm9pZCByZXZlcnNlUnVucyh1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgZW5kKTsKIAot ICAgIEl0ZXJhdG9yIGN1cnJlbnQ7CisgICAgSXRlcmF0b3IgbV9jdXJyZW50OwogICAgIEl0ZXJh dG9yIHNvcjsKICAgICBJdGVyYXRvciBlb3I7CiAgICAgSXRlcmF0b3IgbGFzdDsKICAgICBCaWRp U3RhdHVzIG1fc3RhdHVzOwogICAgIFdURjo6VW5pY29kZTo6RGlyZWN0aW9uIG1fZGlyZWN0aW9u OwogICAgIEl0ZXJhdG9yIGVuZE9mTGluZTsKLSAgICBib29sIHJlYWNoZWRFbmRPZkxpbmU7Cisg ICAgYm9vbCBtX3JlYWNoZWRFbmRPZkxpbmU7CiAgICAgSXRlcmF0b3IgbGFzdEJlZm9yZUVUOwog ICAgIGJvb2wgZW1wdHlSdW47CiAKQEAgLTI5Myw3ICsyOTMsNyBAQCB2b2lkIEJpZGlSZXNvbHZl cjxJdGVyYXRvciwgUnVuPjo6YXBwZW5kUnVuKCkKICAgICAgICAgdW5zaWduZWQgZW5kT2Zmc2V0 ID0gZW9yLm9mZnNldCgpOwogCiAgICAgICAgIGlmICghZW5kT2ZMaW5lLmF0RW5kKCkgJiYgZW5k T2Zmc2V0ID49IGVuZE9mTGluZS5vZmZzZXQoKSkgewotICAgICAgICAgICAgcmVhY2hlZEVuZE9m TGluZSA9IHRydWU7CisgICAgICAgICAgICBtX3JlYWNoZWRFbmRPZkxpbmUgPSB0cnVlOwogICAg ICAgICAgICAgZW5kT2Zmc2V0ID0gZW5kT2ZMaW5lLm9mZnNldCgpOwogICAgICAgICB9CiAKQEAg LTU3MiwxMCArNTcyLDEwIEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+OjpjcmVh dGVCaWRpUnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0b3ImIGVuZCwgVmlzCiAKICAgICBpZiAob3Zl cnJpZGUgIT0gTm9WaXN1YWxPdmVycmlkZSkgewogICAgICAgICBlbXB0eVJ1biA9IGZhbHNlOwot ICAgICAgICBzb3IgPSBjdXJyZW50OworICAgICAgICBzb3IgPSBtX2N1cnJlbnQ7CiAgICAgICAg IGVvciA9IEl0ZXJhdG9yKCk7Ci0gICAgICAgIHdoaWxlIChjdXJyZW50ICE9IGVuZCAmJiAhY3Vy cmVudC5hdEVuZCgpKSB7Ci0gICAgICAgICAgICBlb3IgPSBjdXJyZW50OworICAgICAgICB3aGls ZSAobV9jdXJyZW50ICE9IGVuZCAmJiAhbV9jdXJyZW50LmF0RW5kKCkpIHsKKyAgICAgICAgICAg IGVvciA9IG1fY3VycmVudDsKICAgICAgICAgICAgIGluY3JlbWVudCgpOwogICAgICAgICB9CiAg ICAgICAgIG1fZGlyZWN0aW9uID0gb3ZlcnJpZGUgPT0gVmlzdWFsTGVmdFRvUmlnaHRPdmVycmlk ZSA/IExlZnRUb1JpZ2h0IDogUmlnaHRUb0xlZnQ7CkBAIC01OTAsMTMgKzU5MCwxMyBAQCB2b2lk IEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGNvbnN0 IEl0ZXJhdG9yJiBlbmQsIFZpcwogCiAgICAgZW9yID0gSXRlcmF0b3IoKTsKIAotICAgIGxhc3Qg PSBjdXJyZW50OworICAgIGxhc3QgPSBtX2N1cnJlbnQ7CiAgICAgYm9vbCBwYXN0RW5kID0gZmFs c2U7CiAgICAgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+IHN0YXRlQXRFbmQ7CiAKICAgICB3 aGlsZSAodHJ1ZSkgewogICAgICAgICBEaXJlY3Rpb24gZGlyQ3VycmVudDsKLSAgICAgICAgaWYg KHBhc3RFbmQgJiYgKGhhcmRMaW5lQnJlYWsgfHwgY3VycmVudC5hdEVuZCgpKSkgeworICAgICAg ICBpZiAocGFzdEVuZCAmJiAoaGFyZExpbmVCcmVhayB8fCBtX2N1cnJlbnQuYXRFbmQoKSkpIHsK ICAgICAgICAgICAgIEJpZGlDb250ZXh0KiBjID0gY29udGV4dCgpOwogICAgICAgICAgICAgd2hp bGUgKGMtPnBhcmVudCgpKQogICAgICAgICAgICAgICAgIGMgPSBjLT5wYXJlbnQoKTsKQEAgLTYx MCw3ICs2MTAsNyBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6Y3JlYXRlQmlk aVJ1bnNGb3JMaW5lKGNvbnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwogICAgICAgICAgICAgICAgIHN0 YXRlQXRFbmQuc2V0TGFzdFN0cm9uZ0RpcihkaXJDdXJyZW50KTsKICAgICAgICAgICAgIH0KICAg ICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGRpckN1cnJlbnQgPSBjdXJyZW50LmRpcmVjdGlv bigpOworICAgICAgICAgICAgZGlyQ3VycmVudCA9IG1fY3VycmVudC5kaXJlY3Rpb24oKTsKICAg ICAgICAgICAgIGlmIChjb250ZXh0KCktPm92ZXJyaWRlKCkKICAgICAgICAgICAgICAgICAgICAg JiYgZGlyQ3VycmVudCAhPSBSaWdodFRvTGVmdEVtYmVkZGluZwogICAgICAgICAgICAgICAgICAg ICAmJiBkaXJDdXJyZW50ICE9IExlZnRUb1JpZ2h0RW1iZWRkaW5nCkBAIC02ODgsNyArNjg4LDcg QEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGlu ZShjb25zdCBJdGVyYXRvciYgZW5kLCBWaXMKICAgICAgICAgICAgICAgICBkZWZhdWx0OgogICAg ICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGVvciA9 IGN1cnJlbnQ7CisgICAgICAgICAgICBlb3IgPSBtX2N1cnJlbnQ7CiAgICAgICAgICAgICBtX3N0 YXR1cy5lb3IgPSBMZWZ0VG9SaWdodDsKICAgICAgICAgICAgIG1fc3RhdHVzLmxhc3RTdHJvbmcg PSBMZWZ0VG9SaWdodDsKICAgICAgICAgICAgIG1fZGlyZWN0aW9uID0gTGVmdFRvUmlnaHQ7CkBA IC03MjUsNyArNzI1LDcgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0 ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJdGVyYXRvciYgZW5kLCBWaXMKICAgICAgICAgICAgICAg ICBkZWZhdWx0OgogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIGVvciA9IGN1cnJlbnQ7CisgICAgICAgICAgICBlb3IgPSBtX2N1cnJlbnQ7CiAg ICAgICAgICAgICBtX3N0YXR1cy5lb3IgPSBSaWdodFRvTGVmdDsKICAgICAgICAgICAgIG1fc3Rh dHVzLmxhc3RTdHJvbmcgPSBkaXJDdXJyZW50OwogICAgICAgICAgICAgbV9kaXJlY3Rpb24gPSBS aWdodFRvTGVmdDsKQEAgLTc5MSw3ICs3OTEsNyBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRv ciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGNvbnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwog ICAgICAgICAgICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIGVvciA9IGN1cnJlbnQ7Cisg ICAgICAgICAgICAgICAgZW9yID0gbV9jdXJyZW50OwogICAgICAgICAgICAgICAgIG1fc3RhdHVz LmVvciA9IEV1cm9wZWFuTnVtYmVyOwogICAgICAgICAgICAgICAgIGlmIChtX2RpcmVjdGlvbiA9 PSBPdGhlck5ldXRyYWwpCiAgICAgICAgICAgICAgICAgICAgIG1fZGlyZWN0aW9uID0gTGVmdFRv UmlnaHQ7CkBAIC04MzYsNyArODM2LDcgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1 bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJdGVyYXRvciYgZW5kLCBWaXMKICAgICAg ICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAg ICAgIH0KLSAgICAgICAgICAgIGVvciA9IGN1cnJlbnQ7CisgICAgICAgICAgICBlb3IgPSBtX2N1 cnJlbnQ7CiAgICAgICAgICAgICBtX3N0YXR1cy5lb3IgPSBBcmFiaWNOdW1iZXI7CiAgICAgICAg ICAgICBpZiAobV9kaXJlY3Rpb24gPT0gT3RoZXJOZXV0cmFsKQogICAgICAgICAgICAgICAgIG1f ZGlyZWN0aW9uID0gQXJhYmljTnVtYmVyOwpAQCAtODQ3LDcgKzg0Nyw3IEBAIHZvaWQgQmlkaVJl c29sdmVyPEl0ZXJhdG9yLCBSdW4+OjpjcmVhdGVCaWRpUnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0 b3ImIGVuZCwgVmlzCiAgICAgICAgIGNhc2UgRXVyb3BlYW5OdW1iZXJUZXJtaW5hdG9yOgogICAg ICAgICAgICAgaWYgKG1fc3RhdHVzLmxhc3QgPT0gRXVyb3BlYW5OdW1iZXIpIHsKICAgICAgICAg ICAgICAgICBkaXJDdXJyZW50ID0gRXVyb3BlYW5OdW1iZXI7Ci0gICAgICAgICAgICAgICAgZW9y ID0gY3VycmVudDsKKyAgICAgICAgICAgICAgICBlb3IgPSBtX2N1cnJlbnQ7CiAgICAgICAgICAg ICAgICAgbV9zdGF0dXMuZW9yID0gZGlyQ3VycmVudDsKICAgICAgICAgICAgIH0gZWxzZSBpZiAo bV9zdGF0dXMubGFzdCAhPSBFdXJvcGVhbk51bWJlclRlcm1pbmF0b3IpCiAgICAgICAgICAgICAg ICAgbGFzdEJlZm9yZUVUID0gZW1wdHlSdW4gPyBlb3IgOiBsYXN0OwpAQCAtODU2LDcgKzg1Niw3 IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+OjpjcmVhdGVCaWRpUnVuc0Zvckxp bmUoY29uc3QgSXRlcmF0b3ImIGVuZCwgVmlzCiAgICAgICAgIC8vIGJvdW5kYXJ5IG5ldXRyYWxz IHNob3VsZCBiZSBpZ25vcmVkCiAgICAgICAgIGNhc2UgQm91bmRhcnlOZXV0cmFsOgogICAgICAg ICAgICAgaWYgKGVvciA9PSBsYXN0KQotICAgICAgICAgICAgICAgIGVvciA9IGN1cnJlbnQ7Cisg ICAgICAgICAgICAgICAgZW9yID0gbV9jdXJyZW50OwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgICAgICAvLyBuZXV0cmFscwogICAgICAgICBjYXNlIEJsb2NrU2VwYXJhdG9yOgpAQCAtODcz LDggKzg3Myw4IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+OjpjcmVhdGVCaWRp UnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0b3ImIGVuZCwgVmlzCiAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgfQogCi0gICAgICAgIGlmIChwYXN0RW5kICYmIGVvciA9PSBjdXJyZW50KSB7Ci0g ICAgICAgICAgICBpZiAoIXJlYWNoZWRFbmRPZkxpbmUpIHsKKyAgICAgICAgaWYgKHBhc3RFbmQg JiYgZW9yID09IG1fY3VycmVudCkgeworICAgICAgICAgICAgaWYgKCFtX3JlYWNoZWRFbmRPZkxp bmUpIHsKICAgICAgICAgICAgICAgICBlb3IgPSBlbmRPZkxpbmU7CiAgICAgICAgICAgICAgICAg c3dpdGNoIChtX3N0YXR1cy5lb3IpIHsKICAgICAgICAgICAgICAgICAgICAgY2FzZSBMZWZ0VG9S aWdodDoKQEAgLTg5MCwxMiArODkwLDEyIEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBS dW4+OjpjcmVhdGVCaWRpUnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0b3ImIGVuZCwgVmlzCiAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGFwcGVuZFJ1bigpOwogICAgICAgICAgICAg fQotICAgICAgICAgICAgY3VycmVudCA9IGVuZDsKKyAgICAgICAgICAgIG1fY3VycmVudCA9IGVu ZDsKICAgICAgICAgICAgIG1fc3RhdHVzID0gc3RhdGVBdEVuZC5tX3N0YXR1czsKICAgICAgICAg ICAgIHNvciA9IHN0YXRlQXRFbmQuc29yOyAKICAgICAgICAgICAgIGVvciA9IHN0YXRlQXRFbmQu ZW9yOwogICAgICAgICAgICAgbGFzdCA9IHN0YXRlQXRFbmQubGFzdDsKLSAgICAgICAgICAgIHJl YWNoZWRFbmRPZkxpbmUgPSBzdGF0ZUF0RW5kLnJlYWNoZWRFbmRPZkxpbmU7CisgICAgICAgICAg ICBtX3JlYWNoZWRFbmRPZkxpbmUgPSBzdGF0ZUF0RW5kLm1fcmVhY2hlZEVuZE9mTGluZTsKICAg ICAgICAgICAgIGxhc3RCZWZvcmVFVCA9IHN0YXRlQXRFbmQubGFzdEJlZm9yZUVUOwogICAgICAg ICAgICAgZW1wdHlSdW4gPSBzdGF0ZUF0RW5kLmVtcHR5UnVuOwogICAgICAgICAgICAgbV9kaXJl Y3Rpb24gPSBPdGhlck5ldXRyYWw7CkBAIC05MDMsMTAgKzkwMywxMCBAQCB2b2lkIEJpZGlSZXNv bHZlcjxJdGVyYXRvciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGNvbnN0IEl0ZXJhdG9y JiBlbmQsIFZpcwogICAgICAgICB9CiAKICAgICAgICAgdXBkYXRlU3RhdHVzTGFzdEZyb21DdXJy ZW50RGlyZWN0aW9uKGRpckN1cnJlbnQpOwotICAgICAgICBsYXN0ID0gY3VycmVudDsKKyAgICAg ICAgbGFzdCA9IG1fY3VycmVudDsKIAogICAgICAgICBpZiAoZW1wdHlSdW4pIHsKLSAgICAgICAg ICAgIHNvciA9IGN1cnJlbnQ7CisgICAgICAgICAgICBzb3IgPSBtX2N1cnJlbnQ7CiAgICAgICAg ICAgICBlbXB0eVJ1biA9IGZhbHNlOwogICAgICAgICB9CiAKQEAgLTkxNCwxMiArOTE0LDEyIEBA IHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+OjpjcmVhdGVCaWRpUnVuc0ZvckxpbmUo Y29uc3QgSXRlcmF0b3ImIGVuZCwgVmlzCiAgICAgICAgIGlmICghbV9jdXJyZW50RXhwbGljaXRF bWJlZGRpbmdTZXF1ZW5jZS5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIGJvb2wgY29tbWl0dGVk ID0gY29tbWl0RXhwbGljaXRFbWJlZGRpbmcoKTsKICAgICAgICAgICAgIGlmIChjb21taXR0ZWQg JiYgcGFzdEVuZCkgewotICAgICAgICAgICAgICAgIGN1cnJlbnQgPSBlbmQ7CisgICAgICAgICAg ICAgICAgbV9jdXJyZW50ID0gZW5kOwogICAgICAgICAgICAgICAgIG1fc3RhdHVzID0gc3RhdGVB dEVuZC5tX3N0YXR1czsKICAgICAgICAgICAgICAgICBzb3IgPSBzdGF0ZUF0RW5kLnNvcjsgCiAg ICAgICAgICAgICAgICAgZW9yID0gc3RhdGVBdEVuZC5lb3I7CiAgICAgICAgICAgICAgICAgbGFz dCA9IHN0YXRlQXRFbmQubGFzdDsKLSAgICAgICAgICAgICAgICByZWFjaGVkRW5kT2ZMaW5lID0g c3RhdGVBdEVuZC5yZWFjaGVkRW5kT2ZMaW5lOworICAgICAgICAgICAgICAgIG1fcmVhY2hlZEVu ZE9mTGluZSA9IHN0YXRlQXRFbmQubV9yZWFjaGVkRW5kT2ZMaW5lOwogICAgICAgICAgICAgICAg IGxhc3RCZWZvcmVFVCA9IHN0YXRlQXRFbmQubGFzdEJlZm9yZUVUOwogICAgICAgICAgICAgICAg IGVtcHR5UnVuID0gc3RhdGVBdEVuZC5lbXB0eVJ1bjsKICAgICAgICAgICAgICAgICBtX2RpcmVj dGlvbiA9IE90aGVyTmV1dHJhbDsKQEAgLTkyNywxNCArOTI3LDE0IEBAIHZvaWQgQmlkaVJlc29s dmVyPEl0ZXJhdG9yLCBSdW4+OjpjcmVhdGVCaWRpUnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0b3Im IGVuZCwgVmlzCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIXBhc3RF bmQgJiYgKGN1cnJlbnQgPT0gZW5kIHx8IGN1cnJlbnQuYXRFbmQoKSkpIHsKKyAgICAgICAgaWYg KCFwYXN0RW5kICYmIChtX2N1cnJlbnQgPT0gZW5kIHx8IG1fY3VycmVudC5hdEVuZCgpKSkgewog ICAgICAgICAgICAgaWYgKGVtcHR5UnVuKQogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICAgICAgc3RhdGVBdEVuZC5tX3N0YXR1cyA9IG1fc3RhdHVzOwogICAgICAgICAgICAgc3RhdGVB dEVuZC5zb3IgPSBzb3I7IAogICAgICAgICAgICAgc3RhdGVBdEVuZC5lb3IgPSBlb3I7CiAgICAg ICAgICAgICBzdGF0ZUF0RW5kLmxhc3QgPSBsYXN0OwotICAgICAgICAgICAgc3RhdGVBdEVuZC5y ZWFjaGVkRW5kT2ZMaW5lID0gcmVhY2hlZEVuZE9mTGluZTsKKyAgICAgICAgICAgIHN0YXRlQXRF bmQubV9yZWFjaGVkRW5kT2ZMaW5lID0gbV9yZWFjaGVkRW5kT2ZMaW5lOwogICAgICAgICAgICAg c3RhdGVBdEVuZC5sYXN0QmVmb3JlRVQgPSBsYXN0QmVmb3JlRVQ7CiAgICAgICAgICAgICBzdGF0 ZUF0RW5kLmVtcHR5UnVuID0gZW1wdHlSdW47CiAgICAgICAgICAgICBlbmRPZkxpbmUgPSBsYXN0 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaAppbmRleCAwNGYwNWQy MDE3ZGFjMjcwMWFkNzQ2MDMwMDFiYjlkOWRjOWY5NzRkLi42ODA1ZjczMmI0OTk2NDM3NjAwNTVl MjRkOGNlNmY4ZWIzMGZkM2QyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv SW5saW5lSXRlcmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lSXRl cmF0b3IuaApAQCAtMjQyLDcgKzI0Miw3IEBAIEFMV0FZU19JTkxJTkUgV1RGOjpVbmljb2RlOjpE aXJlY3Rpb24gSW5saW5lSXRlcmF0b3I6OmRpcmVjdGlvbigpIGNvbnN0CiB0ZW1wbGF0ZTw+CiBp bmxpbmUgdm9pZCBJbmxpbmVCaWRpUmVzb2x2ZXI6OmluY3JlbWVudCgpCiB7Ci0gICAgY3VycmVu dC5pbmNyZW1lbnQodGhpcyk7CisgICAgbV9jdXJyZW50LmluY3JlbWVudCh0aGlzKTsKIH0KIAog dGVtcGxhdGUgPD4KQEAgLTI1OSw3ICsyNTksNyBAQCBpbmxpbmUgdm9pZCBJbmxpbmVCaWRpUmVz b2x2ZXI6OmFwcGVuZFJ1bigpCiAgICAgICAgIGlmIChvYmopIHsKICAgICAgICAgICAgIHVuc2ln bmVkIHBvcyA9IG9iaiA9PSBlb3IubV9vYmogPyBlb3IubV9wb3MgOiBVSU5UX01BWDsKICAgICAg ICAgICAgIGlmIChvYmogPT0gZW5kT2ZMaW5lLm1fb2JqICYmIGVuZE9mTGluZS5tX3BvcyA8PSBw b3MpIHsKLSAgICAgICAgICAgICAgICByZWFjaGVkRW5kT2ZMaW5lID0gdHJ1ZTsKKyAgICAgICAg ICAgICAgICBtX3JlYWNoZWRFbmRPZkxpbmUgPSB0cnVlOwogICAgICAgICAgICAgICAgIHBvcyA9 IGVuZE9mTGluZS5tX3BvczsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIC8vIEl0J3MgT0sg dG8gYWRkIHJ1bnMgZm9yIHplcm8tbGVuZ3RoIFJlbmRlck9iamVjdHMsIGp1c3QgZG9uJ3QgbWFr ZSB0aGUgcnVuIGxhcmdlciB0aGFuIGl0IHNob3VsZCBiZQo=