86359 2012-05-14 04:43:15 -0700 Web Inspector: preserve tab index while widening / shrinking tabbed pane area. 2012-05-14 08:52:21 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 622833 0 pfeldman 2012-05-14 04:43:15 -0700 After the drag'n'drop reorder, we should preserve tab index while widening / shrinking the tabbed pane area. 622840 1 141694 pfeldman 2012-05-14 04:50:47 -0700 Created attachment 141694 Patch 622857 2 141698 pfeldman 2012-05-14 05:12:10 -0700 Created attachment 141698 Patch 622958 3 141724 pfeldman 2012-05-14 07:31:44 -0700 Created attachment 141724 Patch 623023 4 pfeldman 2012-05-14 08:52:21 -0700 Committed r116954: <http://trac.webkit.org/changeset/116954> 141694 2012-05-14 04:50:47 -0700 2012-05-14 05:12:03 -0700 Patch bug-86359-20120514155045.patch text/plain 6128 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2OTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDM5YjQ4YzQ4NWI4N2Nk MmIyNDQxMDU0NDAwY2Y0M2ZmZWFkNDVjZi4uNTUxNDcxZWJhY2U0ZjMxYWJhNTg4YTBjZjZhYTAw NzliNzkzOWNiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA1LTE0ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHByZXNlcnZlIHRhYiBpbmRleCB3aGlsZSB3aWRlbmluZyAvIHNocmlua2luZyB0YWJiZWQg cGFuZSBhcmVhLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODYzNTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZnRlciB0aGUgZHJhZyduJ2Ryb3AgcmVvcmRlciwgd2Ugc2hvdWxkIHByZXNlcnZlIHRhYiBp bmRleCB3aGlsZSB3aWRlbmluZyAvCisgICAgICAgIHNocmlua2luZyB0aGUgdGFiYmVkIHBhbmUg YXJlYS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZS5faW5uZXJDbG9zZVRhYik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZS5wcm90b3R5cGUuX3Nob3dUYWJFbGVt ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZS5faGlkZVRh YkVsZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJvdG90eXBlLl91 cGRhdGVUYWJzRHJvcERvd24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJv dG90eXBlLmVsZW1lbnRzVG9SZXN0b3JlU2Nyb2xsUG9zaXRpb25zRm9yKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZS5faW5zZXJ0QmVmb3JlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJi ZWRQYW5lVGFiLnByb3RvdHlwZS5fY3JlYXRlVGFiRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGFiYmVkUGFuZVRhYi5wcm90b3R5cGUuX3RhYkRyYWdnaW5nKToKKwogMjAxMi0wNS0x MiAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIg SW5zcGVjdG9yOiBpbXBsZW1lbnQgdGFicyByZW9yZGVyaW5nIHZpYSBkcmFnJ24nZHJvcC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qcwppbmRl eCBmOWIxNzI4NTYwNDI0ZTFlZWFlMzUyYmVhOWY2YTg4NjY4NGViOWFiLi5mZjAwOTQ4ODEzYzM2 ZWY1N2VlMDc2NmZjNTIwYjM5YWRkMmJhOGVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZFBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5lLmpzCkBAIC0xMzksNyArMTM5LDcgQEAgV2ViSW5z cGVjdG9yLlRhYmJlZFBhbmUucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX3RhYnNIaXN0 b3J5LnNwbGljZSh0aGlzLl90YWJzSGlzdG9yeS5pbmRleE9mKHRhYiksIDEpOwogICAgICAgICB0 aGlzLl90YWJzLnNwbGljZSh0aGlzLl90YWJzLmluZGV4T2YodGFiKSwgMSk7Ci0gICAgICAgIGlm ICh0YWIuc2hvd24pCisgICAgICAgIGlmICh0YWIuX3Nob3duKQogICAgICAgICAgICAgdGhpcy5f aGlkZVRhYkVsZW1lbnQodGFiKTsKIAogICAgICAgICB2YXIgZXZlbnREYXRhID0geyB0YWJJZDog aWQsIHZpZXc6IHRhYi52aWV3LCBpc1VzZXJHZXN0dXJlOiB1c2VyR2VzdHVyZSB9OwpAQCAtMjgx LDcgKzI4MSw3IEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIHRoaXMuX3RhYnNFbGVtZW50LmFwcGVuZENoaWxkKHRhYi50YWJFbGVtZW50KTsKICAg ICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5fdGFic0VsZW1lbnQuaW5zZXJ0QmVmb3JlKHRh Yi50YWJFbGVtZW50LCB0aGlzLl90YWJzRWxlbWVudC5jaGlsZHJlbltpbmRleF0pOwotICAgICAg ICB0YWIuc2hvd24gPSB0cnVlOworICAgICAgICB0YWIuX3Nob3duID0gdHJ1ZTsKICAgICB9LAog CiAgICAgLyoqCkBAIC0yOTAsNyArMjkwLDcgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJv dG90eXBlID0gewogICAgIF9oaWRlVGFiRWxlbWVudDogZnVuY3Rpb24odGFiKQogICAgIHsKICAg ICAgICAgdGhpcy5fdGFic0VsZW1lbnQucmVtb3ZlQ2hpbGQodGFiLnRhYkVsZW1lbnQpOwotICAg ICAgICB0YWIuc2hvd24gPSBmYWxzZTsKKyAgICAgICAgdGFiLl9zaG93biA9IGZhbHNlOwogICAg IH0sCiAKICAgICBfY3JlYXRlRHJvcERvd25CdXR0b246IGZ1bmN0aW9uKCkKQEAgLTMwOSwxMiAr MzA5LDEyIEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAg dmFyIHRhYnNUb1Nob3dJbmRleGVzID0gdGhpcy5fdGFic1RvU2hvd0luZGV4ZXModGhpcy5fdGFi cywgdGhpcy5fdGFic0hpc3RvcnksIHRoaXMuX2hlYWRlckNvbnRlbnRzRWxlbWVudC5vZmZzZXRX aWR0aCwgdGhpcy5fbWVhc3VyZWREcm9wRG93bkJ1dHRvbldpZHRoKTsKIAogICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IHRoaXMuX3RhYnMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIGlm ICh0aGlzLl90YWJzW2ldLnNob3duICYmIHRhYnNUb1Nob3dJbmRleGVzLmluZGV4T2YoaSkgPT09 IC0xKQorICAgICAgICAgICAgaWYgKHRoaXMuX3RhYnNbaV0uX3Nob3duICYmIHRhYnNUb1Nob3dJ bmRleGVzLmluZGV4T2YoaSkgPT09IC0xKQogICAgICAgICAgICAgICAgIHRoaXMuX2hpZGVUYWJF bGVtZW50KHRoaXMuX3RhYnNbaV0pOwogICAgICAgICB9CiAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgdGFic1RvU2hvd0luZGV4ZXMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciB0 YWIgPSB0aGlzLl90YWJzW3RhYnNUb1Nob3dJbmRleGVzW2ldXTsKLSAgICAgICAgICAgIGlmICgh dGFiLnNob3duKQorICAgICAgICAgICAgaWYgKCF0YWIuX3Nob3duKQogICAgICAgICAgICAgICAg IHRoaXMuX3Nob3dUYWJFbGVtZW50KGksIHRhYik7CiAgICAgICAgIH0KICAgICAgICAgCkBAIC0z MjksNyArMzI5LDcgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJvdG90eXBlID0gewogICAg ICAgICB0aGlzLl90YWJzU2VsZWN0LnJlbW92ZUNoaWxkcmVuKCk7CiAgICAgICAgIHZhciB0YWJz VG9TaG93ID0gW107CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fdGFicy5sZW5n dGg7ICsraSkgewotICAgICAgICAgICAgaWYgKCF0aGlzLl90YWJzW2ldLnNob3duKQorICAgICAg ICAgICAgaWYgKCF0aGlzLl90YWJzW2ldLl9zaG93bikKICAgICAgICAgICAgICAgICB0YWJzVG9T aG93LnB1c2godGhpcy5fdGFic1tpXSk7CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAg ICAgIH0KQEAgLTQ4Miw2ICs0ODIsMjAgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJvdG90 eXBlID0gewogICAgIGVsZW1lbnRzVG9SZXN0b3JlU2Nyb2xsUG9zaXRpb25zRm9yOiBmdW5jdGlv bigpCiAgICAgewogICAgICAgICByZXR1cm4gWyB0aGlzLl9jb250ZW50RWxlbWVudCBdOworICAg IH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFi fSB0YWIKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gaW5kZXgKKyAgICAgKi8KKyAgICBfaW5zZXJ0 QmVmb3JlOiBmdW5jdGlvbih0YWIsIGluZGV4KQorICAgIHsKKyAgICAgICAgdGhpcy5fdGFic0Vs ZW1lbnQuaW5zZXJ0QmVmb3JlKHRhYi5fdGFiRWxlbWVudCwgdGhpcy5fdGFic0VsZW1lbnQuY2hp bGROb2Rlc1tpbmRleF0pOworICAgICAgICB2YXIgb2xkSW5kZXggPSB0aGlzLl90YWJzLmluZGV4 T2YodGFiKTsKKyAgICAgICAgdGhpcy5fdGFicy5zcGxpY2Uob2xkSW5kZXgsIDEpOworICAgICAg ICBpZiAob2xkSW5kZXggPCBpbmRleCkKKyAgICAgICAgICAgIC0taW5kZXg7CisgICAgICAgIHRo aXMuX3RhYnMuc3BsaWNlKGluZGV4LCAwLCB0YWIpOwogICAgIH0KIH0KIApAQCAtNTA3LDcgKzUy MSw3IEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiID0gZnVuY3Rpb24odGFiYmVkUGFuZSwg bWVhc3VyZUVsZW1lbnQsIGlkLCB0aXRsZSwgY2xvCiAgICAgdGhpcy5fdGl0bGUgPSB0aXRsZTsK ICAgICB0aGlzLl90b29sdGlwID0gdG9vbHRpcDsKICAgICB0aGlzLl92aWV3ID0gdmlldzsKLSAg ICB0aGlzLnNob3duID0gZmFsc2U7CisgICAgdGhpcy5fc2hvd24gPSBmYWxzZTsKICAgICAvKiog QHR5cGUge251bWJlcn0gKi8gdGhpcy5fbWVhc3VyZWRXaWR0aDsKICAgICAvKiogQHR5cGUge0Vs ZW1lbnR9ICovIHRoaXMuX3RhYkVsZW1lbnQ7CiB9CkBAIC02MjgsOSArNjQyLDkgQEAgV2ViSW5z cGVjdG9yLlRhYmJlZFBhbmVUYWIucHJvdG90eXBlID0gewogICAgICAgICBlbHNlIHsKICAgICAg ICAgICAgIHRoaXMuX3RhYkVsZW1lbnQgPSB0YWJFbGVtZW50OwogICAgICAgICAgICAgdGFiRWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3RhYkNsaWNrZWQuYmluZCh0aGlz KSwgZmFsc2UpOworICAgICAgICAgICAgdGFiRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3Vz ZWRvd24iLCB0aGlzLl90YWJNb3VzZURvd24uYmluZCh0aGlzKSwgZmFsc2UpOwogICAgICAgICAg ICAgaWYgKHRoaXMuX2Nsb3NlYWJsZSkgewogICAgICAgICAgICAgICAgIHRhYkVsZW1lbnQuYWRk RXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl90YWJDb250ZXh0TWVudS5iaW5kKHRo aXMpLCBmYWxzZSk7Ci0gICAgICAgICAgICAgICAgdGFiRWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJtb3VzZWRvd24iLCB0aGlzLl90YWJNb3VzZURvd24uYmluZCh0aGlzKSwgZmFsc2UpOwogICAg ICAgICAgICAgICAgIHRhYkVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vtb3ZlIiwgdGhp cy5fdGFiTW91c2VNb3ZlLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQpAQCAtNzEyLDExICs3MjYsMTQgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmVUYWIucHJv dG90eXBlID0gewogICAgICAgICAgICAgaWYgKGV2ZW50Lm9mZnNldFggPCBvZmZzZXQgfHwgZXZl bnQub2Zmc2V0WCA+IG9mZnNldCArIHRhYkVsZW1lbnQuY2xpZW50V2lkdGgpCiAgICAgICAgICAg ICAgICAgY29udGludWU7CiAgIAotICAgICAgICAgICAgaWYgKHRhYkVsZW1lbnQub2Zmc2V0TGVm dCA+IHRoaXMuX3RhYkVsZW1lbnQub2Zmc2V0TGVmdCkKKyAgICAgICAgICAgIGlmICh0YWJFbGVt ZW50Lm9mZnNldExlZnQgPiB0aGlzLl90YWJFbGVtZW50Lm9mZnNldExlZnQpIHsKICAgICAgICAg ICAgICAgICB0YWJFbGVtZW50ID0gdGFiRWxlbWVudC5uZXh0U2libGluZzsKKyAgICAgICAgICAg ICAgICArK2k7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICB2YXIgb2xkT2Zmc2V0TGVmdCA9 IHRoaXMuX3RhYkVsZW1lbnQub2Zmc2V0TGVmdDsKLSAgICAgICAgICAgIHRoaXMuX3RhYkVsZW1l bnQucGFyZW50RWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5fdGFiRWxlbWVudCwgdGFiRWxlbWVu dCk7CisgICAgICAgICAgICB0aGlzLl90YWJiZWRQYW5lLl9pbnNlcnRCZWZvcmUodGhpcywgaSk7 CiAgICAgICAgICAgICB0aGlzLl9kcmFnU3RhcnRYICs9IHRoaXMuX3RhYkVsZW1lbnQub2Zmc2V0 TGVmdCAtIG9sZE9mZnNldExlZnQ7CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCiAg ICAgICAgIGlmICghdGhpcy5fdGFiRWxlbWVudC5wcmV2aW91c1NpYmxpbmcgJiYgZXZlbnQucGFn ZVggLSB0aGlzLl9kcmFnU3RhcnRYIDwgMCkgewo= 141698 2012-05-14 05:12:10 -0700 2012-05-14 07:31:37 -0700 Patch bug-86359-20120514161208.patch text/plain 7984 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2OTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDM5YjQ4YzQ4NWI4N2Nk MmIyNDQxMDU0NDAwY2Y0M2ZmZWFkNDVjZi4uNTUxNDcxZWJhY2U0ZjMxYWJhNTg4YTBjZjZhYTAw NzliNzkzOWNiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA1LTE0ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHByZXNlcnZlIHRhYiBpbmRleCB3aGlsZSB3aWRlbmluZyAvIHNocmlua2luZyB0YWJiZWQg cGFuZSBhcmVhLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODYzNTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZnRlciB0aGUgZHJhZyduJ2Ryb3AgcmVvcmRlciwgd2Ugc2hvdWxkIHByZXNlcnZlIHRhYiBp bmRleCB3aGlsZSB3aWRlbmluZyAvCisgICAgICAgIHNocmlua2luZyB0aGUgdGFiYmVkIHBhbmUg YXJlYS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZS5faW5uZXJDbG9zZVRhYik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZS5wcm90b3R5cGUuX3Nob3dUYWJFbGVt ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZS5faGlkZVRh YkVsZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJvdG90eXBlLl91 cGRhdGVUYWJzRHJvcERvd24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJv dG90eXBlLmVsZW1lbnRzVG9SZXN0b3JlU2Nyb2xsUG9zaXRpb25zRm9yKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZS5faW5zZXJ0QmVmb3JlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJi ZWRQYW5lVGFiLnByb3RvdHlwZS5fY3JlYXRlVGFiRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGFiYmVkUGFuZVRhYi5wcm90b3R5cGUuX3RhYkRyYWdnaW5nKToKKwogMjAxMi0wNS0x MiAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIg SW5zcGVjdG9yOiBpbXBsZW1lbnQgdGFicyByZW9yZGVyaW5nIHZpYSBkcmFnJ24nZHJvcC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qcwppbmRl eCBmOWIxNzI4NTYwNDI0ZTFlZWFlMzUyYmVhOWY2YTg4NjY4NGViOWFiLi5jODcwMjEyOThkZmM4 ZTdjN2NiMGY2MzgxNzFhOGI3NjQ1MjEwZmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZFBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5lLmpzCkBAIC0xMzksNyArMTM5LDcgQEAgV2ViSW5z cGVjdG9yLlRhYmJlZFBhbmUucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX3RhYnNIaXN0 b3J5LnNwbGljZSh0aGlzLl90YWJzSGlzdG9yeS5pbmRleE9mKHRhYiksIDEpOwogICAgICAgICB0 aGlzLl90YWJzLnNwbGljZSh0aGlzLl90YWJzLmluZGV4T2YodGFiKSwgMSk7Ci0gICAgICAgIGlm ICh0YWIuc2hvd24pCisgICAgICAgIGlmICh0YWIuX3Nob3duKQogICAgICAgICAgICAgdGhpcy5f aGlkZVRhYkVsZW1lbnQodGFiKTsKIAogICAgICAgICB2YXIgZXZlbnREYXRhID0geyB0YWJJZDog aWQsIHZpZXc6IHRhYi52aWV3LCBpc1VzZXJHZXN0dXJlOiB1c2VyR2VzdHVyZSB9OwpAQCAtMjgx LDcgKzI4MSw3IEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIHRoaXMuX3RhYnNFbGVtZW50LmFwcGVuZENoaWxkKHRhYi50YWJFbGVtZW50KTsKICAg ICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5fdGFic0VsZW1lbnQuaW5zZXJ0QmVmb3JlKHRh Yi50YWJFbGVtZW50LCB0aGlzLl90YWJzRWxlbWVudC5jaGlsZHJlbltpbmRleF0pOwotICAgICAg ICB0YWIuc2hvd24gPSB0cnVlOworICAgICAgICB0YWIuX3Nob3duID0gdHJ1ZTsKICAgICB9LAog CiAgICAgLyoqCkBAIC0yOTAsNyArMjkwLDcgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJv dG90eXBlID0gewogICAgIF9oaWRlVGFiRWxlbWVudDogZnVuY3Rpb24odGFiKQogICAgIHsKICAg ICAgICAgdGhpcy5fdGFic0VsZW1lbnQucmVtb3ZlQ2hpbGQodGFiLnRhYkVsZW1lbnQpOwotICAg ICAgICB0YWIuc2hvd24gPSBmYWxzZTsKKyAgICAgICAgdGFiLl9zaG93biA9IGZhbHNlOwogICAg IH0sCiAKICAgICBfY3JlYXRlRHJvcERvd25CdXR0b246IGZ1bmN0aW9uKCkKQEAgLTMwOSwxMiAr MzA5LDEyIEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAg dmFyIHRhYnNUb1Nob3dJbmRleGVzID0gdGhpcy5fdGFic1RvU2hvd0luZGV4ZXModGhpcy5fdGFi cywgdGhpcy5fdGFic0hpc3RvcnksIHRoaXMuX2hlYWRlckNvbnRlbnRzRWxlbWVudC5vZmZzZXRX aWR0aCwgdGhpcy5fbWVhc3VyZWREcm9wRG93bkJ1dHRvbldpZHRoKTsKIAogICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IHRoaXMuX3RhYnMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIGlm ICh0aGlzLl90YWJzW2ldLnNob3duICYmIHRhYnNUb1Nob3dJbmRleGVzLmluZGV4T2YoaSkgPT09 IC0xKQorICAgICAgICAgICAgaWYgKHRoaXMuX3RhYnNbaV0uX3Nob3duICYmIHRhYnNUb1Nob3dJ bmRleGVzLmluZGV4T2YoaSkgPT09IC0xKQogICAgICAgICAgICAgICAgIHRoaXMuX2hpZGVUYWJF bGVtZW50KHRoaXMuX3RhYnNbaV0pOwogICAgICAgICB9CiAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgdGFic1RvU2hvd0luZGV4ZXMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciB0 YWIgPSB0aGlzLl90YWJzW3RhYnNUb1Nob3dJbmRleGVzW2ldXTsKLSAgICAgICAgICAgIGlmICgh dGFiLnNob3duKQorICAgICAgICAgICAgaWYgKCF0YWIuX3Nob3duKQogICAgICAgICAgICAgICAg IHRoaXMuX3Nob3dUYWJFbGVtZW50KGksIHRhYik7CiAgICAgICAgIH0KICAgICAgICAgCkBAIC0z MjksNyArMzI5LDcgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJvdG90eXBlID0gewogICAg ICAgICB0aGlzLl90YWJzU2VsZWN0LnJlbW92ZUNoaWxkcmVuKCk7CiAgICAgICAgIHZhciB0YWJz VG9TaG93ID0gW107CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fdGFicy5sZW5n dGg7ICsraSkgewotICAgICAgICAgICAgaWYgKCF0aGlzLl90YWJzW2ldLnNob3duKQorICAgICAg ICAgICAgaWYgKCF0aGlzLl90YWJzW2ldLl9zaG93bikKICAgICAgICAgICAgICAgICB0YWJzVG9T aG93LnB1c2godGhpcy5fdGFic1tpXSk7CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAg ICAgIH0KQEAgLTQ4Miw2ICs0ODIsMjAgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJvdG90 eXBlID0gewogICAgIGVsZW1lbnRzVG9SZXN0b3JlU2Nyb2xsUG9zaXRpb25zRm9yOiBmdW5jdGlv bigpCiAgICAgewogICAgICAgICByZXR1cm4gWyB0aGlzLl9jb250ZW50RWxlbWVudCBdOworICAg IH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFi fSB0YWIKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gaW5kZXgKKyAgICAgKi8KKyAgICBfaW5zZXJ0 QmVmb3JlOiBmdW5jdGlvbih0YWIsIGluZGV4KQorICAgIHsKKyAgICAgICAgdGhpcy5fdGFic0Vs ZW1lbnQuaW5zZXJ0QmVmb3JlKHRhYi5fdGFiRWxlbWVudCwgdGhpcy5fdGFic0VsZW1lbnQuY2hp bGROb2Rlc1tpbmRleF0pOworICAgICAgICB2YXIgb2xkSW5kZXggPSB0aGlzLl90YWJzLmluZGV4 T2YodGFiKTsKKyAgICAgICAgdGhpcy5fdGFicy5zcGxpY2Uob2xkSW5kZXgsIDEpOworICAgICAg ICBpZiAob2xkSW5kZXggPCBpbmRleCkKKyAgICAgICAgICAgIC0taW5kZXg7CisgICAgICAgIHRo aXMuX3RhYnMuc3BsaWNlKGluZGV4LCAwLCB0YWIpOwogICAgIH0KIH0KIApAQCAtNTA3LDcgKzUy MSw3IEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiID0gZnVuY3Rpb24odGFiYmVkUGFuZSwg bWVhc3VyZUVsZW1lbnQsIGlkLCB0aXRsZSwgY2xvCiAgICAgdGhpcy5fdGl0bGUgPSB0aXRsZTsK ICAgICB0aGlzLl90b29sdGlwID0gdG9vbHRpcDsKICAgICB0aGlzLl92aWV3ID0gdmlldzsKLSAg ICB0aGlzLnNob3duID0gZmFsc2U7CisgICAgdGhpcy5fc2hvd24gPSBmYWxzZTsKICAgICAvKiog QHR5cGUge251bWJlcn0gKi8gdGhpcy5fbWVhc3VyZWRXaWR0aDsKICAgICAvKiogQHR5cGUge0Vs ZW1lbnR9ICovIHRoaXMuX3RhYkVsZW1lbnQ7CiB9CkBAIC02MjgsOSArNjQyLDkgQEAgV2ViSW5z cGVjdG9yLlRhYmJlZFBhbmVUYWIucHJvdG90eXBlID0gewogICAgICAgICBlbHNlIHsKICAgICAg ICAgICAgIHRoaXMuX3RhYkVsZW1lbnQgPSB0YWJFbGVtZW50OwogICAgICAgICAgICAgdGFiRWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3RhYkNsaWNrZWQuYmluZCh0aGlz KSwgZmFsc2UpOworICAgICAgICAgICAgdGFiRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3Vz ZWRvd24iLCB0aGlzLl90YWJNb3VzZURvd24uYmluZCh0aGlzKSwgZmFsc2UpOwogICAgICAgICAg ICAgaWYgKHRoaXMuX2Nsb3NlYWJsZSkgewogICAgICAgICAgICAgICAgIHRhYkVsZW1lbnQuYWRk RXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl90YWJDb250ZXh0TWVudS5iaW5kKHRo aXMpLCBmYWxzZSk7Ci0gICAgICAgICAgICAgICAgdGFiRWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJtb3VzZWRvd24iLCB0aGlzLl90YWJNb3VzZURvd24uYmluZCh0aGlzKSwgZmFsc2UpOwogICAg ICAgICAgICAgICAgIHRhYkVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vtb3ZlIiwgdGhp cy5fdGFiTW91c2VNb3ZlLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQpAQCAtNjYzLDYgKzY3Nyw3IEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiLnByb3Rv dHlwZSA9IHsKICAgICAgICAgaWYgKGV2ZW50LnRhcmdldC5oYXNTdHlsZUNsYXNzKCJ0YWJiZWQt cGFuZS1oZWFkZXItdGFiLWNsb3NlLWJ1dHRvbiIpIHx8IGV2ZW50LmJ1dHRvbiA9PT0gMSkKICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5fdGFiYmVkUGFuZS5zZWxlY3RUYWIodGhp cy5pZCwgdHJ1ZSk7CisgICAgICAgIHRoaXMuX2RyYWdTdGFydFggPSBldmVudC5wYWdlWDsKICAg ICB9LAogCiAgICAgX3RhYkNvbnRleHRNZW51OiBmdW5jdGlvbihldmVudCkKQEAgLTY5MSwxMSAr NzA2LDEyIEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiLnByb3RvdHlwZSA9IHsKIAogICAg IF90YWJNb3VzZU1vdmU6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKKyAgICAgICAgaWYgKGlzTmFO KHRoaXMuX2RyYWdTdGFydFgpKQorICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBpZiAoZXZl bnQud2hpY2ggIT09IDEpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHRoaXMuX3RhYmJl ZFBhbmUuc2VsZWN0VGFiKHRoaXMuaWQsIHRydWUpOwogICAgICAgICBXZWJJbnNwZWN0b3IuZWxl bWVudERyYWdTdGFydCh0aGlzLl90YWJFbGVtZW50LCB0aGlzLl90YWJEcmFnZ2luZy5iaW5kKHRo aXMpLCB0aGlzLl9lbmRUYWJEcmFnZ2luZy5iaW5kKHRoaXMpLCBldmVudCwgInBvaW50ZXIiKTsK LSAgICAgICAgdGhpcy5fZHJhZ1N0YXJ0WCA9IGV2ZW50LnBhZ2VYOwogICAgIH0sCiAKICAgICAv KioKQEAgLTcxMiwxMSArNzI4LDE0IEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiLnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgIGlmIChldmVudC5vZmZzZXRYIDwgb2Zmc2V0IHx8IGV2ZW50 Lm9mZnNldFggPiBvZmZzZXQgKyB0YWJFbGVtZW50LmNsaWVudFdpZHRoKQogICAgICAgICAgICAg ICAgIGNvbnRpbnVlOwogICAKLSAgICAgICAgICAgIGlmICh0YWJFbGVtZW50Lm9mZnNldExlZnQg PiB0aGlzLl90YWJFbGVtZW50Lm9mZnNldExlZnQpCisgICAgICAgICAgICBpZiAodGFiRWxlbWVu dC5vZmZzZXRMZWZ0ID4gdGhpcy5fdGFiRWxlbWVudC5vZmZzZXRMZWZ0KSB7CiAgICAgICAgICAg ICAgICAgdGFiRWxlbWVudCA9IHRhYkVsZW1lbnQubmV4dFNpYmxpbmc7CisgICAgICAgICAgICAg ICAgKytpOworICAgICAgICAgICAgfQogICAgICAgICAgICAgdmFyIG9sZE9mZnNldExlZnQgPSB0 aGlzLl90YWJFbGVtZW50Lm9mZnNldExlZnQ7Ci0gICAgICAgICAgICB0aGlzLl90YWJFbGVtZW50 LnBhcmVudEVsZW1lbnQuaW5zZXJ0QmVmb3JlKHRoaXMuX3RhYkVsZW1lbnQsIHRhYkVsZW1lbnQp OworICAgICAgICAgICAgdGhpcy5fdGFiYmVkUGFuZS5faW5zZXJ0QmVmb3JlKHRoaXMsIGkpOwog ICAgICAgICAgICAgdGhpcy5fZHJhZ1N0YXJ0WCArPSB0aGlzLl90YWJFbGVtZW50Lm9mZnNldExl ZnQgLSBvbGRPZmZzZXRMZWZ0OworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAogICAg ICAgICBpZiAoIXRoaXMuX3RhYkVsZW1lbnQucHJldmlvdXNTaWJsaW5nICYmIGV2ZW50LnBhZ2VY IC0gdGhpcy5fZHJhZ1N0YXJ0WCA8IDApIHsKQEAgLTczOSw2ICs3NTgsNyBAQCBXZWJJbnNwZWN0 b3IuVGFiYmVkUGFuZVRhYi5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB0aGlzLl90YWJF bGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJwb3NpdGlvbiIpOwogICAgICAgICB0aGlzLl90 YWJFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJsZWZ0Iik7CisgICAgICAgIGRlbGV0ZSB0 aGlzLl9kcmFnU3RhcnRYOwogICAgICAgICBXZWJJbnNwZWN0b3IuZWxlbWVudERyYWdFbmQoZXZl bnQpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBw ZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDFjZDIyYjBmN2NlNzI1 NzcwZGVjMTAzNmM3NTliNzQ2Mzc2MTJjZjEuLmZjMjQ5ZTE3ODdiNDFiZTlkNzg5YTQ0YjExYmUz YmVlMGYzZmI1MmEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQK KysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZApAQCAtMjU2MSwxMCArMjU2MSwz IEBAIGZhc3QvY3NzL3RhYi1zaXplLmh0bWwKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg2MTgyCiBmYXN0L2ZyYW1lcy9zZWFtbGVzcy9zZWFtbGVzcy1pbmhlcml0 ZWQtZG9jdW1lbnQtc3R5bGUuaHRtbAogCi0jIFtRdF0gUkVHUkVTU0lPTiAocjExNjc4OSk6IGlu c3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHQtZm9ybWF0dGVyLWNvbnNvbGUuaHRtbCBmYWlscwotIyBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODYzMzYKLWluc3BlY3Rvci9k ZWJ1Z2dlci9zY3JpcHQtZm9ybWF0dGVyLWNvbnNvbGUuaHRtbAotCi0jIFtRdF0gUkVHUkVTU0lP TiAocjExNjc3NSk6IGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHQtZm9ybWF0dGVyLWJyZWFrcG9p bnRzLmh0bWwgZmFpbHMKLSMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTg2MzM3Ci1pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci1icmVha3BvaW50cy5o dG1sCg== 141724 2012-05-14 07:31:44 -0700 2012-05-14 08:40:34 -0700 Patch bug-86359-20120514183142.patch text/plain 7805 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2OTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2NmMDQxOTE1ZTQwOGZj ZDcwOWUzOTBiOGNlMWM3N2UyZWRlMTk4Ni4uMjNkMTc0NzdiMTVlZjJmYTlkOWNkMDRlYTRlMGYw OTNjZjA1ODkzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDEyLTA1LTE0ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHByZXNlcnZlIHRhYiBpbmRleCB3aGlsZSB3aWRlbmluZyAvIHNocmlua2luZyB0YWJiZWQg cGFuZSBhcmVhLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODYzNTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZnRlciB0aGUgZHJhZyduJ2Ryb3AgcmVvcmRlciwgd2Ugc2hvdWxkIHByZXNlcnZlIHRhYiBp bmRleCB3aGlsZSB3aWRlbmluZyAvCisgICAgICAgIHNocmlua2luZyB0aGUgdGFiYmVkIHBhbmUg YXJlYS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZS5faW5uZXJDbG9zZVRhYik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZS5wcm90b3R5cGUuX3Nob3dUYWJFbGVt ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZS5faGlkZVRh YkVsZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJvdG90eXBlLl91 cGRhdGVUYWJzRHJvcERvd24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJv dG90eXBlLmVsZW1lbnRzVG9SZXN0b3JlU2Nyb2xsUG9zaXRpb25zRm9yKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZS5faW5zZXJ0QmVmb3JlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJi ZWRQYW5lVGFiLnByb3RvdHlwZS5fY3JlYXRlVGFiRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGFiYmVkUGFuZVRhYi5wcm90b3R5cGUuX3RhYkRyYWdnaW5nKToKKworMjAxMi0wNS0x NCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKwogICAgICAgICBbUXRd IFJFR1JFU1NJT04gKHIxMTY3ODkpOiBpbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRl ci1jb25zb2xlLmh0bWwgZmFpbHMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg2MzM2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVGFiYmVkUGFuZS5qcwppbmRleCBmOWIxNzI4NTYwNDI0ZTFlZWFlMzUyYmVhOWY2YTg4 NjY4NGViOWFiLi4wOWRjMjIwNTlkM2ZhMThjNGY1MWNkZDVjZDdlYmUxOTcwZmJlN2U2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZFBhbmUuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5lLmpzCkBA IC0xMzksNyArMTM5LDcgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJvdG90eXBlID0gewog CiAgICAgICAgIHRoaXMuX3RhYnNIaXN0b3J5LnNwbGljZSh0aGlzLl90YWJzSGlzdG9yeS5pbmRl eE9mKHRhYiksIDEpOwogICAgICAgICB0aGlzLl90YWJzLnNwbGljZSh0aGlzLl90YWJzLmluZGV4 T2YodGFiKSwgMSk7Ci0gICAgICAgIGlmICh0YWIuc2hvd24pCisgICAgICAgIGlmICh0YWIuX3No b3duKQogICAgICAgICAgICAgdGhpcy5faGlkZVRhYkVsZW1lbnQodGFiKTsKIAogICAgICAgICB2 YXIgZXZlbnREYXRhID0geyB0YWJJZDogaWQsIHZpZXc6IHRhYi52aWV3LCBpc1VzZXJHZXN0dXJl OiB1c2VyR2VzdHVyZSB9OwpAQCAtMjgxLDcgKzI4MSw3IEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQ YW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX3RhYnNFbGVtZW50LmFwcGVuZENo aWxkKHRhYi50YWJFbGVtZW50KTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5fdGFi c0VsZW1lbnQuaW5zZXJ0QmVmb3JlKHRhYi50YWJFbGVtZW50LCB0aGlzLl90YWJzRWxlbWVudC5j aGlsZHJlbltpbmRleF0pOwotICAgICAgICB0YWIuc2hvd24gPSB0cnVlOworICAgICAgICB0YWIu X3Nob3duID0gdHJ1ZTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0yOTAsNyArMjkwLDcgQEAgV2Vi SW5zcGVjdG9yLlRhYmJlZFBhbmUucHJvdG90eXBlID0gewogICAgIF9oaWRlVGFiRWxlbWVudDog ZnVuY3Rpb24odGFiKQogICAgIHsKICAgICAgICAgdGhpcy5fdGFic0VsZW1lbnQucmVtb3ZlQ2hp bGQodGFiLnRhYkVsZW1lbnQpOwotICAgICAgICB0YWIuc2hvd24gPSBmYWxzZTsKKyAgICAgICAg dGFiLl9zaG93biA9IGZhbHNlOwogICAgIH0sCiAKICAgICBfY3JlYXRlRHJvcERvd25CdXR0b246 IGZ1bmN0aW9uKCkKQEAgLTMwOSwxMiArMzA5LDEyIEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5l LnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHRhYnNUb1Nob3dJbmRleGVzID0gdGhpcy5fdGFi c1RvU2hvd0luZGV4ZXModGhpcy5fdGFicywgdGhpcy5fdGFic0hpc3RvcnksIHRoaXMuX2hlYWRl ckNvbnRlbnRzRWxlbWVudC5vZmZzZXRXaWR0aCwgdGhpcy5fbWVhc3VyZWREcm9wRG93bkJ1dHRv bldpZHRoKTsKIAogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3RhYnMubGVuZ3Ro OyArK2kpIHsKLSAgICAgICAgICAgIGlmICh0aGlzLl90YWJzW2ldLnNob3duICYmIHRhYnNUb1No b3dJbmRleGVzLmluZGV4T2YoaSkgPT09IC0xKQorICAgICAgICAgICAgaWYgKHRoaXMuX3RhYnNb aV0uX3Nob3duICYmIHRhYnNUb1Nob3dJbmRleGVzLmluZGV4T2YoaSkgPT09IC0xKQogICAgICAg ICAgICAgICAgIHRoaXMuX2hpZGVUYWJFbGVtZW50KHRoaXMuX3RhYnNbaV0pOwogICAgICAgICB9 CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGFic1RvU2hvd0luZGV4ZXMubGVuZ3RoOyAr K2kpIHsKICAgICAgICAgICAgIHZhciB0YWIgPSB0aGlzLl90YWJzW3RhYnNUb1Nob3dJbmRleGVz W2ldXTsKLSAgICAgICAgICAgIGlmICghdGFiLnNob3duKQorICAgICAgICAgICAgaWYgKCF0YWIu X3Nob3duKQogICAgICAgICAgICAgICAgIHRoaXMuX3Nob3dUYWJFbGVtZW50KGksIHRhYik7CiAg ICAgICAgIH0KICAgICAgICAgCkBAIC0zMjksNyArMzI5LDcgQEAgV2ViSW5zcGVjdG9yLlRhYmJl ZFBhbmUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl90YWJzU2VsZWN0LnJlbW92ZUNoaWxk cmVuKCk7CiAgICAgICAgIHZhciB0YWJzVG9TaG93ID0gW107CiAgICAgICAgIGZvciAodmFyIGkg PSAwOyBpIDwgdGhpcy5fdGFicy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgaWYgKCF0aGlz Ll90YWJzW2ldLnNob3duKQorICAgICAgICAgICAgaWYgKCF0aGlzLl90YWJzW2ldLl9zaG93bikK ICAgICAgICAgICAgICAgICB0YWJzVG9TaG93LnB1c2godGhpcy5fdGFic1tpXSk7CiAgICAgICAg ICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KQEAgLTQ4Miw2ICs0ODIsMjAgQEAgV2ViSW5z cGVjdG9yLlRhYmJlZFBhbmUucHJvdG90eXBlID0gewogICAgIGVsZW1lbnRzVG9SZXN0b3JlU2Ny b2xsUG9zaXRpb25zRm9yOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4gWyB0aGlz Ll9jb250ZW50RWxlbWVudCBdOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dl Ykluc3BlY3Rvci5UYWJiZWRQYW5lVGFifSB0YWIKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gaW5k ZXgKKyAgICAgKi8KKyAgICBfaW5zZXJ0QmVmb3JlOiBmdW5jdGlvbih0YWIsIGluZGV4KQorICAg IHsKKyAgICAgICAgdGhpcy5fdGFic0VsZW1lbnQuaW5zZXJ0QmVmb3JlKHRhYi5fdGFiRWxlbWVu dCwgdGhpcy5fdGFic0VsZW1lbnQuY2hpbGROb2Rlc1tpbmRleF0pOworICAgICAgICB2YXIgb2xk SW5kZXggPSB0aGlzLl90YWJzLmluZGV4T2YodGFiKTsKKyAgICAgICAgdGhpcy5fdGFicy5zcGxp Y2Uob2xkSW5kZXgsIDEpOworICAgICAgICBpZiAob2xkSW5kZXggPCBpbmRleCkKKyAgICAgICAg ICAgIC0taW5kZXg7CisgICAgICAgIHRoaXMuX3RhYnMuc3BsaWNlKGluZGV4LCAwLCB0YWIpOwog ICAgIH0KIH0KIApAQCAtNTA3LDcgKzUyMSw3IEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFi ID0gZnVuY3Rpb24odGFiYmVkUGFuZSwgbWVhc3VyZUVsZW1lbnQsIGlkLCB0aXRsZSwgY2xvCiAg ICAgdGhpcy5fdGl0bGUgPSB0aXRsZTsKICAgICB0aGlzLl90b29sdGlwID0gdG9vbHRpcDsKICAg ICB0aGlzLl92aWV3ID0gdmlldzsKLSAgICB0aGlzLnNob3duID0gZmFsc2U7CisgICAgdGhpcy5f c2hvd24gPSBmYWxzZTsKICAgICAvKiogQHR5cGUge251bWJlcn0gKi8gdGhpcy5fbWVhc3VyZWRX aWR0aDsKICAgICAvKiogQHR5cGUge0VsZW1lbnR9ICovIHRoaXMuX3RhYkVsZW1lbnQ7CiB9CkBA IC02MjgsOSArNjQyLDkgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmVUYWIucHJvdG90eXBlID0g ewogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIHRoaXMuX3RhYkVsZW1lbnQgPSB0YWJFbGVt ZW50OwogICAgICAgICAgICAgdGFiRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRo aXMuX3RhYkNsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOworICAgICAgICAgICAgdGFiRWxlbWVu dC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl90YWJNb3VzZURvd24uYmluZCh0 aGlzKSwgZmFsc2UpOwogICAgICAgICAgICAgaWYgKHRoaXMuX2Nsb3NlYWJsZSkgewogICAgICAg ICAgICAgICAgIHRhYkVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlz Ll90YWJDb250ZXh0TWVudS5iaW5kKHRoaXMpLCBmYWxzZSk7Ci0gICAgICAgICAgICAgICAgdGFi RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl90YWJNb3VzZURvd24u YmluZCh0aGlzKSwgZmFsc2UpOwogICAgICAgICAgICAgICAgIHRhYkVsZW1lbnQuYWRkRXZlbnRM aXN0ZW5lcigibW91c2Vtb3ZlIiwgdGhpcy5fdGFiTW91c2VNb3ZlLmJpbmQodGhpcyksIGZhbHNl KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtNjYzLDYgKzY3Nyw3IEBAIFdlYkluc3Bl Y3Rvci5UYWJiZWRQYW5lVGFiLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKGV2ZW50LnRhcmdl dC5oYXNTdHlsZUNsYXNzKCJ0YWJiZWQtcGFuZS1oZWFkZXItdGFiLWNsb3NlLWJ1dHRvbiIpIHx8 IGV2ZW50LmJ1dHRvbiA9PT0gMSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5f dGFiYmVkUGFuZS5zZWxlY3RUYWIodGhpcy5pZCwgdHJ1ZSk7CisgICAgICAgIHRoaXMuX2RyYWdT dGFydFggPSBldmVudC5wYWdlWDsKICAgICB9LAogCiAgICAgX3RhYkNvbnRleHRNZW51OiBmdW5j dGlvbihldmVudCkKQEAgLTY5MSwxMSArNzA2LDEyIEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5l VGFiLnByb3RvdHlwZSA9IHsKIAogICAgIF90YWJNb3VzZU1vdmU6IGZ1bmN0aW9uKGV2ZW50KQog ICAgIHsKKyAgICAgICAgaWYgKGlzTmFOKHRoaXMuX2RyYWdTdGFydFgpKQorICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICBpZiAoZXZlbnQud2hpY2ggIT09IDEpCiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIHRoaXMuX3RhYmJlZFBhbmUuc2VsZWN0VGFiKHRoaXMuaWQsIHRydWUpOwog ICAgICAgICBXZWJJbnNwZWN0b3IuZWxlbWVudERyYWdTdGFydCh0aGlzLl90YWJFbGVtZW50LCB0 aGlzLl90YWJEcmFnZ2luZy5iaW5kKHRoaXMpLCB0aGlzLl9lbmRUYWJEcmFnZ2luZy5iaW5kKHRo aXMpLCBldmVudCwgInBvaW50ZXIiKTsKLSAgICAgICAgdGhpcy5fZHJhZ1N0YXJ0WCA9IGV2ZW50 LnBhZ2VYOwogICAgIH0sCiAKICAgICAvKioKQEAgLTcwOCwxNSArNzI0LDI0IEBAIFdlYkluc3Bl Y3Rvci5UYWJiZWRQYW5lVGFiLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHZhciB0YWJFbGVt ZW50ID0gdGFiRWxlbWVudHNbaV07CiAgICAgICAgICAgICBpZiAodGFiRWxlbWVudCA9PT0gdGhp cy5fdGFiRWxlbWVudCkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIHZh ciBvZmZzZXQgPSB0YWJFbGVtZW50LnRvdGFsT2Zmc2V0TGVmdCgpOwotICAgICAgICAgICAgaWYg KGV2ZW50Lm9mZnNldFggPCBvZmZzZXQgfHwgZXZlbnQub2Zmc2V0WCA+IG9mZnNldCArIHRhYkVs ZW1lbnQuY2xpZW50V2lkdGgpCisKKyAgICAgICAgICAgIHZhciBpbnRlcnNlY3RzID0gdGFiRWxl bWVudC5vZmZzZXRMZWZ0ICsgdGFiRWxlbWVudC5jbGllbnRXaWR0aCA+IHRoaXMuX3RhYkVsZW1l bnQub2Zmc2V0TGVmdCAmJgorICAgICAgICAgICAgICAgIHRoaXMuX3RhYkVsZW1lbnQub2Zmc2V0 TGVmdCArIHRoaXMuX3RhYkVsZW1lbnQuY2xpZW50V2lkdGggPiB0YWJFbGVtZW50Lm9mZnNldExl ZnQ7CisgICAgICAgICAgICBpZiAoIWludGVyc2VjdHMpCiAgICAgICAgICAgICAgICAgY29udGlu dWU7Ci0gIAotICAgICAgICAgICAgaWYgKHRhYkVsZW1lbnQub2Zmc2V0TGVmdCA+IHRoaXMuX3Rh YkVsZW1lbnQub2Zmc2V0TGVmdCkKKworICAgICAgICAgICAgaWYgKE1hdGguYWJzKGV2ZW50LnBh Z2VYIC0gdGhpcy5fZHJhZ1N0YXJ0WCkgPCB0YWJFbGVtZW50LmNsaWVudFdpZHRoIC8gMiArIDUp CisgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgIGlmIChldmVudC5wYWdlWCAt IHRoaXMuX2RyYWdTdGFydFggPiAwKSB7CiAgICAgICAgICAgICAgICAgdGFiRWxlbWVudCA9IHRh YkVsZW1lbnQubmV4dFNpYmxpbmc7CisgICAgICAgICAgICAgICAgKytpOworICAgICAgICAgICAg fQorCiAgICAgICAgICAgICB2YXIgb2xkT2Zmc2V0TGVmdCA9IHRoaXMuX3RhYkVsZW1lbnQub2Zm c2V0TGVmdDsKLSAgICAgICAgICAgIHRoaXMuX3RhYkVsZW1lbnQucGFyZW50RWxlbWVudC5pbnNl cnRCZWZvcmUodGhpcy5fdGFiRWxlbWVudCwgdGFiRWxlbWVudCk7CisgICAgICAgICAgICB0aGlz Ll90YWJiZWRQYW5lLl9pbnNlcnRCZWZvcmUodGhpcywgaSk7CiAgICAgICAgICAgICB0aGlzLl9k cmFnU3RhcnRYICs9IHRoaXMuX3RhYkVsZW1lbnQub2Zmc2V0TGVmdCAtIG9sZE9mZnNldExlZnQ7 CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCiAgICAgICAgIGlmICghdGhpcy5fdGFi RWxlbWVudC5wcmV2aW91c1NpYmxpbmcgJiYgZXZlbnQucGFnZVggLSB0aGlzLl9kcmFnU3RhcnRY IDwgMCkgewpAQCAtNzM5LDYgKzc2NCw3IEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiLnBy b3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHRoaXMuX3RhYkVsZW1lbnQuc3R5bGUucmVtb3Zl UHJvcGVydHkoInBvc2l0aW9uIik7CiAgICAgICAgIHRoaXMuX3RhYkVsZW1lbnQuc3R5bGUucmVt b3ZlUHJvcGVydHkoImxlZnQiKTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX2RyYWdTdGFydFg7CiAg ICAgICAgIFdlYkluc3BlY3Rvci5lbGVtZW50RHJhZ0VuZChldmVudCk7CiAgICAgfQogfQo=