75381 2011-12-30 01:57:52 -0800 Web Inspector: migrate from "attached" to "compact" styles. 2011-12-30 02:17:40 -0800 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 528104 0 pfeldman 2011-12-30 01:57:52 -0800 When front-end is docked to right, it should look like "detached", but is still "attached". Use "compact" mode instead of "attached" mode in the styles to mitigate it. 528105 1 120788 pfeldman 2011-12-30 02:00:15 -0800 Created attachment 120788 Patch 528107 2 pfeldman 2011-12-30 02:17:40 -0800 Committed r103839: <http://trac.webkit.org/changeset/103839> 120788 2011-12-30 02:00:15 -0800 2011-12-30 02:13:26 -0800 Patch bug-75381-20111230140013.patch text/plain 14042 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzODM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDRkMDQ3ZTZjODdmMjBh YTFhYjQxY2JjZTc3ZDFhNjQ5MjkxN2U0ZS4uMmFjMzg1MTAzOTJkYjgyNWU3NmQyNTQ3MmQ4YTJk ZmI0MWUwMTNmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDExLTEyLTMwICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBtaWdyYXRlIGZyb20gImF0dGFjaGVkIiB0byAiY29tcGFjdCIgc3R5bGVzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzUzODEKKworICAgICAgICBX aGVuIGZyb250LWVuZCBpcyBkb2NrZWQgdG8gcmlnaHQsIGl0IHNob3VsZCBsb29rIGxpa2UgImRl dGFjaGVkIiwgYnV0IGlzIHN0aWxsICJhdHRhY2hlZCIuCisgICAgICAgIFVzZSAiY29tcGFjdCIg bW9kZSBpbnN0ZWFkIG9mICJhdHRhY2hlZCIgbW9kZSBpbiB0aGUgc3R5bGVzIHRvIG1pdGlnYXRl IGl0LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9TZWFyY2hDb250cm9sbGVyLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNlYXJjaENvbnRyb2xsZXIucHJvdG90eXBlLnVwZGF0ZVNlYXJjaExhYmVsKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Rvb2xiYXIuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVG9vbGJhci5wcm90b3R5cGUuc2V0IGNvbXBhY3QpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRvb2xiYXIucHJvdG90eXBlLl90b29sYmFyRHJhZ1N0YXJ0KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Ub29sYmFyLnByb3RvdHlwZS5fdG9vbGJhckRyYWcpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvaGVscFNjcmVlbi5jc3M6CisgICAgICAgIChib2R5LmNvbXBhY3QgLmhl bHAtd2luZG93LW91dGVyKToKKyAgICAgICAgKGJvZHkuY29tcGFjdCAuaGVscC13aW5kb3ctbWFp bik6CisgICAgICAgIChib2R5LmNvbXBhY3QgLmhlbHAtd2luZG93LWNhcHRpb24pOgorICAgICAg ICAoYm9keS5jb21wYWN0IC5oZWxwLWNsb3NlLWJ1dHRvbik6CisgICAgICAgIChib2R5LmNvbXBh Y3QgLmhlbHAtY29udGVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuY3NzOgorICAgICAgICAoYm9keS5jb21wYWN0ICN0b29sYmFyKToKKyAgICAgICAgKGJvZHku Y29tcGFjdC5wb3J0LXF0ICN0b29sYmFyKToKKyAgICAgICAgKGJvZHkuY29tcGFjdC5pbmFjdGl2 ZSAjdG9vbGJhcik6CisgICAgICAgIChib2R5LmNvbXBhY3QgI3NlYXJjaC10b29sYmFyLWxhYmVs KToKKyAgICAgICAgKGJvZHkuY29tcGFjdCAjdG9vbGJhci1kcm9wZG93bi1hcnJvdyk6CisgICAg ICAgIChib2R5LmNvbXBhY3QgI3NlYXJjaCk6CisgICAgICAgIChib2R5LmNvbXBhY3QucG9ydC1x dCAudG9vbGJhci1pdGVtLmNsb3NlLWxlZnQsIGJvZHkuY29tcGFjdC5wb3J0LXF0IC50b29sYmFy LWl0ZW0uY2xvc2UtcmlnaHQpOgorICAgICAgICAoYm9keS5jb21wYWN0ICNtYWluKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5zZXQgYXR0YWNoZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmdldCBpc0NvbXBhY3RN b2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5nZXQgX3NldENvbXBhY3RNb2RlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5faW5zdGFsbERvY2tUb1JpZ2h0Lmxpc3RlbmVyLmdldCBpZik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuX2luc3RhbGxEb2NrVG9SaWdodC5saXN0ZW5lcik6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3JDb21tb24uY3NzOgorICAgICAgICAo Ym9keS5kb2NrLXRvLXJpZ2h0KToKKyAgICAgICAgKGJvZHkuZG9jay10by1yaWdodC5pbmFjdGl2 ZSk6CisKIDIwMTEtMTItMjkgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGVuYWJsZSBkb2NrLXRvLXJpZ2h0IHZpZXcgKHN0aWxs IG5lZWQgZW1iZWRkZXJzIHRvIHN1cHBvcnQgaXQpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpp bmRleCAxOGEwY2U2ZmFiNDk1NjMyMjExZWIxYjgwZDI3NmQ3Y2JhZTVmYzg5Li5jNWU4OThkMWUz YWI3ZmJkNmFhZjdhNTAzYjU3MmM2YjE2OTMzNDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDExLTEyLTMwICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5A Z29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBtaWdyYXRlIGZyb20gImF0dGFj aGVkIiB0byAiY29tcGFjdCIgc3R5bGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzUzODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBXaGVuIGZyb250LWVuZCBpcyBkb2NrZWQgdG8gcmlnaHQsIGl0IHNo b3VsZCBsb29rIGxpa2UgImRldGFjaGVkIiwgYnV0IGlzIHN0aWxsICJhdHRhY2hlZCIuCisgICAg ICAgIFVzZSAiY29tcGFjdCIgbW9kZSBpbnN0ZWFkIG9mICJhdHRhY2hlZCIgbW9kZSBpbiB0aGUg c3R5bGVzIHRvIG1pdGlnYXRlIGl0LgorCisgICAgICAgICogc3JjL2pzL2RldlRvb2xzLmNzczoK KyAgICAgICAgKGJvZHkuY29tcGFjdCAjdG9vbGJhcik6CisKIDIwMTEtMTItMjkgIFNoZXJpZmYg Qm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHIxMDM4MzEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NlYXJjaENvbnRyb2xsZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NlYXJjaENvbnRyb2xsZXIuanMKaW5kZXggMDM5MzYzOWRjYmQ5OTNlZmZh ZTZjYjliZDlkNGQ4MjBlNjFhMTgyMC4uNjY2MDhjYzAxNjJiNzEyYmQ2NjRlNTAyNDA5NWEwZjRj YTQ4ZWRiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T ZWFyY2hDb250cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2VhcmNoQ29udHJvbGxlci5qcwpAQCAtNjcsNyArNjcsNyBAQCBXZWJJbnNwZWN0b3IuU2Vh cmNoQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghcGFuZWxOYW1lKQogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB2YXIgbmV3TGFiZWwgPSBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlNlYXJjaCAlcyIsIHBhbmVsTmFtZSk7Ci0gICAgICAgIGlmIChXZWJJbnNwZWN0b3Iu YXR0YWNoZWQpCisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuaXNDb21wYWN0TW9kZSgpKQogICAg ICAgICAgICAgdGhpcy5lbGVtZW50LnNldEF0dHJpYnV0ZSgicGxhY2Vob2xkZXIiLCBuZXdMYWJl bCk7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZUF0dHJp YnV0ZSgicGxhY2Vob2xkZXIiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVG9vbGJhci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVG9vbGJhci5qcwppbmRleCA5MDFmMzFjYzA5OTYyMDg1NDFlYTZkYTI0NWNiNDUyYmE5YzVk NWQ5Li4xYmVhMzBkMWMxMTgwMGJiMjZjYjY4OWI4MTk2ODI2NDk2NjRiYTYzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Rvb2xiYXIuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Ub29sYmFyLmpzCkBAIC00NSw5ICs0NSw5 IEBAIFdlYkluc3BlY3Rvci5Ub29sYmFyID0gZnVuY3Rpb24oKQogfQogCiBXZWJJbnNwZWN0b3Iu VG9vbGJhci5wcm90b3R5cGUgPSB7Ci0gICAgc2V0IGF0dGFjaGVkKGF0dGFjaGVkKQorICAgIHNl dCBjb21wYWN0KGNvbXBhY3QpCiAgICAgewotICAgICAgICBpZiAoYXR0YWNoZWQpCisgICAgICAg IGlmIChjb21wYWN0KQogICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoInRv b2xiYXItc21hbGwiKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5lbGVtZW50LnJl bW92ZVN0eWxlQ2xhc3MoInRvb2xiYXItc21hbGwiKTsKQEAgLTY3LDcgKzY3LDcgQEAgV2ViSW5z cGVjdG9yLlRvb2xiYXIucHJvdG90eXBlID0gewogCiAgICAgX3Rvb2xiYXJEcmFnU3RhcnQ6IGZ1 bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgaWYgKCghV2ViSW5zcGVjdG9yLmF0dGFjaGVk ICYmIFdlYkluc3BlY3Rvci5wbGF0Zm9ybUZsYXZvcigpICE9PSBXZWJJbnNwZWN0b3IuUGxhdGZv cm1GbGF2b3IuTWFjTGVvcGFyZCAmJiBXZWJJbnNwZWN0b3IucGxhdGZvcm1GbGF2b3IoKSAhPT0g V2ViSW5zcGVjdG9yLlBsYXRmb3JtRmxhdm9yLk1hY1Nub3dMZW9wYXJkKSB8fCBXZWJJbnNwZWN0 b3IucG9ydCgpID09ICJxdCIpCisgICAgICAgIGlmICgoIVdlYkluc3BlY3Rvci5pc0NvbXBhY3RN b2RlKCkgJiYgV2ViSW5zcGVjdG9yLnBsYXRmb3JtRmxhdm9yKCkgIT09IFdlYkluc3BlY3Rvci5Q bGF0Zm9ybUZsYXZvci5NYWNMZW9wYXJkICYmIFdlYkluc3BlY3Rvci5wbGF0Zm9ybUZsYXZvcigp ICE9PSBXZWJJbnNwZWN0b3IuUGxhdGZvcm1GbGF2b3IuTWFjU25vd0xlb3BhcmQpIHx8IFdlYklu c3BlY3Rvci5wb3J0KCkgPT0gInF0IikKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB2 YXIgdGFyZ2V0ID0gZXZlbnQudGFyZ2V0OwpAQCAtODAsNyArODAsNyBAQCBXZWJJbnNwZWN0b3Iu VG9vbGJhci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuZWxlbWVudC5sYXN0U2NyZWVuWCA9 IGV2ZW50LnNjcmVlblg7CiAgICAgICAgIHRoaXMuZWxlbWVudC5sYXN0U2NyZWVuWSA9IGV2ZW50 LnNjcmVlblk7CiAKLSAgICAgICAgV2ViSW5zcGVjdG9yLmVsZW1lbnREcmFnU3RhcnQodGhpcy5l bGVtZW50LCB0aGlzLl90b29sYmFyRHJhZy5iaW5kKHRoaXMpLCB0aGlzLl90b29sYmFyRHJhZ0Vu ZC5iaW5kKHRoaXMpLCBldmVudCwgKFdlYkluc3BlY3Rvci5hdHRhY2hlZCA/ICJyb3ctcmVzaXpl IiA6ICJkZWZhdWx0IikpOworICAgICAgICBXZWJJbnNwZWN0b3IuZWxlbWVudERyYWdTdGFydCh0 aGlzLmVsZW1lbnQsIHRoaXMuX3Rvb2xiYXJEcmFnLmJpbmQodGhpcyksIHRoaXMuX3Rvb2xiYXJE cmFnRW5kLmJpbmQodGhpcyksIGV2ZW50LCAoV2ViSW5zcGVjdG9yLmlzQ29tcGFjdE1vZGUoKSA/ ICJyb3ctcmVzaXplIiA6ICJkZWZhdWx0IikpOwogICAgIH0sCiAKICAgICBfdG9vbGJhckRyYWdF bmQ6IGZ1bmN0aW9uKGV2ZW50KQpAQCAtOTMsNyArOTMsNyBAQCBXZWJJbnNwZWN0b3IuVG9vbGJh ci5wcm90b3R5cGUgPSB7CiAKICAgICBfdG9vbGJhckRyYWc6IGZ1bmN0aW9uKGV2ZW50KQogICAg IHsKLSAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5hdHRhY2hlZCkgeworICAgICAgICBpZiAoV2Vi SW5zcGVjdG9yLmlzQ29tcGFjdE1vZGUoKSkgewogICAgICAgICAgICAgdmFyIGhlaWdodCA9IHdp bmRvdy5pbm5lckhlaWdodCAtIChldmVudC5zY3JlZW5ZIC0gdGhpcy5lbGVtZW50Lmxhc3RTY3Jl ZW5ZKTsKIAogICAgICAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnNldEF0dGFjaGVkV2lu ZG93SGVpZ2h0KGhlaWdodCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2hlbHBTY3JlZW4uY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9oZWxwU2NyZWVuLmNzcwppbmRleCBlZTU1YTk2MTYzM2U2Y2Y1MGM2OGYxYjZmNGU0MGE4 ZDZkYjEyMTBmLi43ODE2Njk2ODA4Yjk4NTczZDgyNDdmNWIzYmU2ZmQ5NTQ0OGNmMDg5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2hlbHBTY3JlZW4uY3Nz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaGVscFNjcmVlbi5jc3MK QEAgLTcsNyArNyw3IEBACiAgICAgei1pbmRleDogMjAwMDsKIH0KIAotYm9keS5hdHRhY2hlZCAu aGVscC13aW5kb3ctb3V0ZXIgeworYm9keS5jb21wYWN0IC5oZWxwLXdpbmRvdy1vdXRlciB7CiAg ICAgdG9wOiAzMnB4OwogICAgIGxlZnQ6IDA7CiAgICAgd2lkdGg6IDEwMCU7CkBAIC0yNSwxMiAr MjUsMTIgQEAgYm9keS5hdHRhY2hlZCAuaGVscC13aW5kb3ctb3V0ZXIgewogICAgIC13ZWJraXQt Ym94LXNoYWRvdzogMTBweCAxMHB4IDhweCByZ2JhKDQwLCA0MCwgNDAsIDAuNDApOwogfQogCi1i b2R5LmF0dGFjaGVkIC5oZWxwLXdpbmRvdy1tYWluIHsKK2JvZHkuY29tcGFjdCAuaGVscC13aW5k b3ctbWFpbiB7CiAgICAgaGVpZ2h0OiAxMDAlOwogICAgIHBhZGRpbmc6IDEwcHg7CiB9CiAKLWJv ZHkuYXR0YWNoZWQgLmhlbHAtd2luZG93LW1haW4geworYm9keS5jb21wYWN0IC5oZWxwLXdpbmRv dy1tYWluIHsKICAgICBib3JkZXItcmFkaXVzOiAwOwogICAgIC13ZWJraXQtYm94LXNoYWRvdzog MCAwIDA7CiB9CkBAIC0zOSw3ICszOSw3IEBAIGJvZHkuYXR0YWNoZWQgLmhlbHAtd2luZG93LW1h aW4gewogICAgIG1hcmdpbjogOHB4IDhweCAwIDhweDsKIH0KIAotYm9keS5hdHRhY2hlZCAuaGVs cC13aW5kb3ctY2FwdGlvbiB7Citib2R5LmNvbXBhY3QgLmhlbHAtd2luZG93LWNhcHRpb24gewog ICAgIG1hcmdpbjogMDsKIH0KIApAQCAtOTQsMTEgKzk0LDExIEBAIGJvZHkuYXR0YWNoZWQgLmhl bHAtd2luZG93LWNhcHRpb24gewogICAgIHdpZHRoOiAxNnB4OwogfQogCi1ib2R5LmF0dGFjaGVk IC5oZWxwLWNsb3NlLWJ1dHRvbiB7Citib2R5LmNvbXBhY3QgLmhlbHAtY2xvc2UtYnV0dG9uIHsK ICAgICBtYXJnaW46IDA7CiB9CiAKLWJvZHkuYXR0YWNoZWQgLmhlbHAtY29udGVudCB7Citib2R5 LmNvbXBhY3QgLmhlbHAtY29udGVudCB7CiAgICAgbWFyZ2luOiA4cHggMCAwIDhweDsKIH0KIApA QCAtMTk2LDcgKzE5Niw2IEBAIGJvZHkucGxhdGZvcm0tbWFjIC5oZWxwLWtleSB7CiAgICAgY29s b3I6IHJnYigxNTAsIDE1MCwgMTUwKTsKIH0KIAotCiAuaGVscC1jb250ZW50IGlucHV0W3R5cGU9 Y2hlY2tib3hdIHsKICAgICBoZWlnaHQ6IDEzcHg7CiAgICAgd2lkdGg6IDEzcHg7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKaW5kZXggYjU1 YjM5NDZmNDU1MzQxY2JmZmExODE2YjMyMTQwYWYzZGZkMGYzMi4uZTA1ZjA2NTllMGUxOWViZDdh ZmMyMzVkYWQ1OTRhMTdhNzIzOTQ3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwpAQCAtNjMsMTggKzYzLDE4IEBAIGJvZHkuZGV0YWNo ZWQucGxhdGZvcm0tbWFjLXNub3dsZW9wYXJkICN0b29sYmFyIHsKICAgICBiYWNrZ3JvdW5kOiB0 cmFuc3BhcmVudDsKIH0KIAotYm9keS5hdHRhY2hlZCAjdG9vbGJhciB7Citib2R5LmNvbXBhY3Qg I3Rvb2xiYXIgewogICAgIGhlaWdodDogMzRweDsKICAgICBib3JkZXItdG9wOiAxcHggc29saWQg cmdiKDEwMCwgMTAwLCAxMDApOwogICAgIGN1cnNvcjogbnMtcmVzaXplOwogICAgIHBhZGRpbmct bGVmdDogMDsKIH0KIAotYm9keS5hdHRhY2hlZC5wb3J0LXF0ICN0b29sYmFyIHsKK2JvZHkuY29t cGFjdC5wb3J0LXF0ICN0b29sYmFyIHsKICAgICBjdXJzb3I6IGF1dG87CiB9CiAKLWJvZHkuYXR0 YWNoZWQuaW5hY3RpdmUgI3Rvb2xiYXIgeworYm9keS5jb21wYWN0LmluYWN0aXZlICN0b29sYmFy IHsKICAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdiKDY0JSwgNjQlLCA2NCUpOwogfQogCkBA IC0xMzUsNyArMTM1LDcgQEAgYm9keS5hdHRhY2hlZC5pbmFjdGl2ZSAjdG9vbGJhciB7CiAgICAg dG9wOiAycHg7CiB9CiAKLWJvZHkuYXR0YWNoZWQgI3NlYXJjaC10b29sYmFyLWxhYmVsIHsKK2Jv ZHkuY29tcGFjdCAjc2VhcmNoLXRvb2xiYXItbGFiZWwgewogICAgIGRpc3BsYXk6IG5vbmU7CiB9 CiAKQEAgLTE1NSw3ICsxNTUsNyBAQCBib2R5LmF0dGFjaGVkICNzZWFyY2gtdG9vbGJhci1sYWJl bCB7CiAgICAgdGV4dC1zaGFkb3c6IG5vbmU7CiB9CiAKLWJvZHkuYXR0YWNoZWQgI3Rvb2xiYXIt ZHJvcGRvd24tYXJyb3cgeworYm9keS5jb21wYWN0ICN0b29sYmFyLWRyb3Bkb3duLWFycm93IHsK ICAgICBmb250LXNpemU6IDE0cHg7CiAgICAgcGFkZGluZy1ib3R0b206IDRweDsKIH0KQEAgLTI2 Nyw3ICsyNjcsNyBAQCBib2R5LmRldGFjaGVkLnBsYXRmb3JtLW1hYy1zbm93bGVvcGFyZCAjdG9v bGJhci1kcm9wZG93biB7CiAgICAgZm9udC1zaXplOiAxNnB4OwogfQogCi1ib2R5LmF0dGFjaGVk ICNzZWFyY2ggeworYm9keS5jb21wYWN0ICNzZWFyY2ggewogICAgIGZvbnQtc2l6ZTogMTFweDsK IH0KIApAQCAtMzYyLDcgKzM2Miw3IEBAIGJvZHkuZGV0YWNoZWQgLnRvb2xiYXItaXRlbS5jbG9z ZS1sZWZ0LCBib2R5LmRldGFjaGVkIC50b29sYmFyLWl0ZW0uY2xvc2UtcmlnaHQKICAgICBkaXNw bGF5OiBub25lOwogfQogCi1ib2R5LmF0dGFjaGVkLnBvcnQtcXQgLnRvb2xiYXItaXRlbS5jbG9z ZS1sZWZ0LCBib2R5LmF0dGFjaGVkLnBvcnQtcXQgLnRvb2xiYXItaXRlbS5jbG9zZS1yaWdodCB7 Citib2R5LmNvbXBhY3QucG9ydC1xdCAudG9vbGJhci1pdGVtLmNsb3NlLWxlZnQsIGJvZHkuY29t cGFjdC5wb3J0LXF0IC50b29sYmFyLWl0ZW0uY2xvc2UtcmlnaHQgewogICAgIGRpc3BsYXk6IG5v bmU7CiB9CiAKQEAgLTM4OSw3ICszODksNyBAQCBib2R5Om5vdCgucGxhdGZvcm0tbWFjKSAudG9v bGJhci1pdGVtLmNsb3NlLWxlZnQgewogICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOwogfQog Ci1ib2R5LmF0dGFjaGVkICNtYWluIHsKK2JvZHkuY29tcGFjdCAjbWFpbiB7CiAgICAgdG9wOiAz NHB4OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVj dG9yLmpzCmluZGV4IGFlZTM0ZDZmZGJjMTZlNGI2ZjQ0ODc5Y2U0NmY3MjQ5OTVmNmRkMzEuLjQ3 NTg3MmRmOTFlNTJmMjRjZTBlMDY0NTIzZGZiYTE5ZTNkMWNmNjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC0xODcsMjQgKzE4Nywy OSBAQCB2YXIgV2ViSW5zcGVjdG9yID0gewogICAgICAgICAgICAgdGhpcy5fZG9ja1RvZ2dsZUJ1 dHRvbi50b2dnbGVkID0gIXg7CiAgICAgICAgIH0KIAotICAgICAgICB0aGlzLl9yZW5kZXJBc0F0 dGFjaGVkKHggJiYgIVdlYkluc3BlY3Rvci5zZXR0aW5ncy5kb2NrVG9SaWdodC5nZXQoKSk7Cisg ICAgICAgIHRoaXMuX3NldENvbXBhY3RNb2RlKHggJiYgIVdlYkluc3BlY3Rvci5zZXR0aW5ncy5k b2NrVG9SaWdodC5nZXQoKSk7CiAgICAgfSwKIAotICAgIF9yZW5kZXJBc0F0dGFjaGVkOiBmdW5j dGlvbih4KQorICAgIGlzQ29tcGFjdE1vZGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJl dHVybiB0aGlzLmF0dGFjaGVkICYmICFXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuZG9ja1RvUmlnaHQu Z2V0KCk7CisgICAgfSwKKworICAgIF9zZXRDb21wYWN0TW9kZTogZnVuY3Rpb24oeCkKICAgICB7 CiAgICAgICAgIHZhciBib2R5ID0gZG9jdW1lbnQuYm9keTsKICAgICAgICAgaWYgKHgpIHsKICAg ICAgICAgICAgIGJvZHkucmVtb3ZlU3R5bGVDbGFzcygiZGV0YWNoZWQiKTsKLSAgICAgICAgICAg IGJvZHkuYWRkU3R5bGVDbGFzcygiYXR0YWNoZWQiKTsKKyAgICAgICAgICAgIGJvZHkuYWRkU3R5 bGVDbGFzcygiY29tcGFjdCIpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgYm9keS5y ZW1vdmVTdHlsZUNsYXNzKCJhdHRhY2hlZCIpOworICAgICAgICAgICAgYm9keS5yZW1vdmVTdHls ZUNsYXNzKCJjb21wYWN0Iik7CiAgICAgICAgICAgICBib2R5LmFkZFN0eWxlQ2xhc3MoImRldGFj aGVkIik7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBUaGlzIG1heSBiZSBjYWxsZWQgYmVmb3Jl IGRvTG9hZGVkRG9uZSwgaGVuY2UgdGhlIGJ1bGsgb2YgaW5zcGVjdG9yIG9iamVjdHMgbWF5CiAg ICAgICAgIC8vIG5vdCBiZSBjcmVhdGVkIHlldC4KICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci50 b29sYmFyKQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnRvb2xiYXIuYXR0YWNoZWQgPSB4Owor ICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnRvb2xiYXIuY29tcGFjdCA9IHg7CiAKICAgICAgICAg aWYgKFdlYkluc3BlY3Rvci5zZWFyY2hDb250cm9sbGVyKQogICAgICAgICAgICAgV2ViSW5zcGVj dG9yLnNlYXJjaENvbnRyb2xsZXIudXBkYXRlU2VhcmNoTGFiZWwoKTsKQEAgLTM4OSw4ICszOTQs OSBAQCBXZWJJbnNwZWN0b3IuX2RvTG9hZGVkRG9uZVdpdGhDYXBhYmlsaXRpZXMgPSBmdW5jdGlv bigpCiAgICAgdGhpcy5fY3JlYXRlUGFuZWxzKCk7CiAgICAgdGhpcy5fY3JlYXRlR2xvYmFsU3Rh dHVzQmFySXRlbXMoKTsKIAorCiAgICAgdGhpcy50b29sYmFyID0gbmV3IFdlYkluc3BlY3Rvci5U b29sYmFyKCk7Ci0gICAgdGhpcy50b29sYmFyLmF0dGFjaGVkID0gV2ViSW5zcGVjdG9yLmF0dGFj aGVkOworICAgIFdlYkluc3BlY3Rvci5faW5zdGFsbERvY2tUb1JpZ2h0KCk7CiAKICAgICBmb3Ig KHZhciBwYW5lbE5hbWUgaW4gdGhpcy5wYW5lbHMpCiAgICAgICAgIHRoaXMuYWRkUGFuZWwodGhp cy5wYW5lbHNbcGFuZWxOYW1lXSk7CkBAIC00MTgsOCArNDI0LDYgQEAgV2ViSW5zcGVjdG9yLl9k b0xvYWRlZERvbmVXaXRoQ2FwYWJpbGl0aWVzID0gZnVuY3Rpb24oKQogICAgICAgICAgICAgV2Vi SW5zcGVjdG9yLnNob3dQYW5lbChXZWJJbnNwZWN0b3Iuc2V0dGluZ3MubGFzdEFjdGl2ZVBhbmVs LmdldCgpKTsKICAgICB9CiAKLSAgICBXZWJJbnNwZWN0b3IuX2luc3RhbGxEb2NrVG9SaWdodCgp OwotCiAgICAgSW5zcGVjdG9yQWdlbnQuZW5hYmxlKHNob3dJbml0aWFsUGFuZWwpOwogICAgIERh dGFiYXNlQWdlbnQuZW5hYmxlKCk7CiAgICAgRE9NU3RvcmFnZUFnZW50LmVuYWJsZSgpOwpAQCAt NDMzLDIzICs0MzcsMjcgQEAgV2ViSW5zcGVjdG9yLl9pbnN0YWxsRG9ja1RvUmlnaHQgPSBmdW5j dGlvbigpCiB7CiAgICAgLy8gUmUtdXNlIFNldHRpbmdzIGluZnJhc3RydWN0dXJlIGZvciB0aGUg ZG9jay10by1yaWdodCBzZXR0aW5ncyBVSQogICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5kb2Nr VG9SaWdodC5zZXQoV2ViSW5zcGVjdG9yLnF1ZXJ5UGFyYW1zT2JqZWN0LmRvY2tTaWRlID09PSAi cmlnaHQiKTsKLSAgICBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuZG9ja1RvUmlnaHQuYWRkQ2hhbmdl TGlzdGVuZXIobGlzdGVuZXIuYmluZCh0aGlzKSk7Ci0gICAgdXBkYXRlVG9vbGJhcigpOwogCi0g ICAgZnVuY3Rpb24gdXBkYXRlVG9vbGJhcigpCi0gICAgewotICAgICAgICBpZiAoV2ViSW5zcGVj dG9yLmF0dGFjaGVkKQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLl9yZW5kZXJBc0F0dGFjaGVk KCFXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuZG9ja1RvUmlnaHQuZ2V0KCkpOwotICAgIH0KKyAgICBp ZiAoV2ViSW5zcGVjdG9yLnNldHRpbmdzLmRvY2tUb1JpZ2h0LmdldCgpKQorICAgICAgICBkb2N1 bWVudC5ib2R5LmFkZFN0eWxlQ2xhc3MoImRvY2stdG8tcmlnaHQiKTsKKworICAgIGlmIChXZWJJ bnNwZWN0b3IuYXR0YWNoZWQpCisgICAgICAgIFdlYkluc3BlY3Rvci5fc2V0Q29tcGFjdE1vZGUo IVdlYkluc3BlY3Rvci5zZXR0aW5ncy5kb2NrVG9SaWdodC5nZXQoKSk7CisKKyAgICBXZWJJbnNw ZWN0b3Iuc2V0dGluZ3MuZG9ja1RvUmlnaHQuYWRkQ2hhbmdlTGlzdGVuZXIobGlzdGVuZXIuYmlu ZCh0aGlzKSk7CiAKICAgICBmdW5jdGlvbiBsaXN0ZW5lcihldmVudCkKICAgICB7CiAgICAgICAg IHZhciB2YWx1ZSA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5kb2NrVG9SaWdodC5nZXQoKTsKLSAg ICAgICAgaWYgKHZhbHVlKQorICAgICAgICBpZiAodmFsdWUpIHsKICAgICAgICAgICAgIEluc3Bl Y3RvckZyb250ZW5kSG9zdC5yZXF1ZXN0U2V0RG9ja1NpZGUoInJpZ2h0Iik7Ci0gICAgICAgIGVs c2UKKyAgICAgICAgICAgIGRvY3VtZW50LmJvZHkuYWRkU3R5bGVDbGFzcygiZG9jay10by1yaWdo dCIpOworICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0 LnJlcXVlc3RTZXREb2NrU2lkZSgiYm90dG9tIik7Ci0gICAgICAgIHVwZGF0ZVRvb2xiYXIoKTsK KyAgICAgICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlU3R5bGVDbGFzcygiZG9jay10by1yaWdo dCIpOworICAgICAgICB9CisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuYXR0YWNoZWQpCisgICAg ICAgICAgICBXZWJJbnNwZWN0b3IuX3NldENvbXBhY3RNb2RlKCF2YWx1ZSk7CiAgICAgfQogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ckNvbW1vbi5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ckNvbW1vbi5jc3MKaW5kZXggZmVjMzk2OWUxZTg3NGJkODQwYTc1NzA2ZTQ0OGE3NTJiNTMwY2Fl OC4uODJkYzViODY1NmJkYjIxZjk0YmY4N2U2YWIwZmRmZGRiNWE1MmJkYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3JDb21tb24uY3NzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yQ29tbW9uLmNz cwpAQCAtMTcsNiArMTcsMTQgQEAgYm9keSB7CiAgICAgLXdlYmtpdC11c2VyLXNlbGVjdDogbm9u ZTsKIH0KIAorYm9keS5kb2NrLXRvLXJpZ2h0IHsKKyAgICBib3JkZXItbGVmdDogMXB4IHNvbGlk IHJnYig4MCwgODAsIDgwKTsKK30KKworYm9keS5kb2NrLXRvLXJpZ2h0LmluYWN0aXZlIHsKKyAg ICBib3JkZXItbGVmdDogMXB4IHNvbGlkIHJnYig2NCUsIDY0JSwgNjQlKTsKK30KKwogKiB7CiAg ICAgLXdlYmtpdC1ib3gtc2l6aW5nOiBib3JkZXItYm94OwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvanMvZGV2VG9vbHMuY3NzIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvanMvZGV2VG9vbHMuY3NzCmluZGV4IDYxMThiNWQxMDliMTM4Zjk3ODc1Mzk3Njk2 ZjNlYWFlZTI0NWE2OTcuLjNkMTE4MzQwNDQ5ZjNkNGFhZjgwYjI0NWU1N2I5OTdmN2Y4NzA0NmQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL2RldlRvb2xzLmNzcwor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9kZXZUb29scy5jc3MKQEAgLTIsNyAr Miw3IEBACiAgICAgbGluZS1oZWlnaHQ6IDEyMCU7CiB9CiAKLWJvZHkuYXR0YWNoZWQgI3Rvb2xi YXIgeworYm9keS5jb21wYWN0ICN0b29sYmFyIHsKICAgICBoZWlnaHQ6IDM0cHg7CiAgICAgYm9y ZGVyLXRvcDogMXB4IHNvbGlkIHJnYigxMDAsIDEwMCwgMTAwKTsKICAgICBjdXJzb3I6IGRlZmF1 bHQ7IC8qIG92ZXJyaWRlbiAqLwo=