97193 2012-09-20 04:26:35 -0700 Prepare CalendarPicker so we can add another picker, SuggetionPicker 2012-09-21 00:02:03 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 96085 1 keishi keishi tkent webkit.review.bot oldest_to_newest 724406 0 keishi 2012-09-20 04:26:35 -0700 Prepare CalendarPicker so we can add another picker, SuggetionPicker 724421 1 164892 keishi 2012-09-20 04:48:39 -0700 Created attachment 164892 Patch 724470 2 164892 tkent 2012-09-20 06:12:00 -0700 Comment on attachment 164892 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164892&action=review > Source/WebCore/Resources/pagepopups/calendarPicker.js:382 > - var elementHeight = this._element.offsetHeight; > this._element.style.width = "auto"; > daysAreaElement.style.width = "100%"; > daysAreaElement.style.tableLayout = "fixed"; > this._element.getElementsByClassName(ClassNames.YearMonthUpper)[0].style.display = "-webkit-box"; > this._element.getElementsByClassName(ClassNames.MonthSelectorBox)[0].style.display = "block"; > + var elementHeight = this._element.offsetHeight; Why do you move elementHeight? ChangeLog should explain such reasons of changes. 725155 3 165047 keishi 2012-09-20 22:27:30 -0700 Created attachment 165047 Patch 725157 4 keishi 2012-09-20 22:27:42 -0700 (In reply to comment #2) > (From update of attachment 164892 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=164892&action=review > > > Source/WebCore/Resources/pagepopups/calendarPicker.js:382 > > - var elementHeight = this._element.offsetHeight; > > this._element.style.width = "auto"; > > daysAreaElement.style.width = "100%"; > > daysAreaElement.style.tableLayout = "fixed"; > > this._element.getElementsByClassName(ClassNames.YearMonthUpper)[0].style.display = "-webkit-box"; > > this._element.getElementsByClassName(ClassNames.MonthSelectorBox)[0].style.display = "block"; > > + var elementHeight = this._element.offsetHeight; > > Why do you move elementHeight? > > ChangeLog should explain such reasons of changes. Removed this change. 725158 5 165047 tkent 2012-09-20 22:29:29 -0700 Comment on attachment 165047 Patch ok 725209 6 165047 webkit.review.bot 2012-09-21 00:01:59 -0700 Comment on attachment 165047 Patch Clearing flags on attachment: 165047 Committed r129198: <http://trac.webkit.org/changeset/129198> 725210 7 webkit.review.bot 2012-09-21 00:02:03 -0700 All reviewed patches have been landed. Closing bug. 164892 2012-09-20 04:48:39 -0700 2012-09-20 22:27:27 -0700 Patch bug-97193-20120920204804.patch text/plain 7798 keishi U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTk1NjhkMDc3YjFjODg4 MThjNTRmYmVkMmFjZWJhODg1ZjAyNTQyYi4uNWQxYjRhMGQ2MGE0ZTQ1OWE2M2I2OThjNTYwMDg1 MzM4NzRlNjcxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTA5LTIwICBLZWlz aGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgorCisgICAgICAgIFByZXBhcmUgQ2FsZW5k YXJQaWNrZXIgc28gd2UgY2FuIGFkZCBhbm90aGVyIHBpY2tlciwgU3VnZ2V0aW9uUGlja2VyCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzE5MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXBhcmF0aW9u IHNvIHdlIGNhbiBhZGQgYW5vdGhlciBwaWNrZXIgdG8gQ2FsZW5kYXJQaWNrZXIgYW5kIHN3aXRj aAorICAgICAgICBiZXR3ZWVuIHRoZW0uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBObyBiZWhh dmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBSZXNvdXJjZXMvcGFnZXBvcHVwcy9jYWxlbmRhclBp Y2tlci5jc3M6CisgICAgICAgICguY2FsZW5kYXItcGlja2VyKTogQWRkZWQgc28gd2UgY2FuIGFw cGx5IHRoZXNlIHN0eWxlcyBqdXN0IHRvIGNhbGVuZGFyIHBpY2tlci4KKyAgICAgICAgKiBSZXNv dXJjZXMvcGFnZXBvcHVwcy9jYWxlbmRhclBpY2tlci5qczoKKyAgICAgICAgKENhbGVuZGFyUGlj a2VyLnZhbGlkYXRlQ29uZmlnKTogUmVuYW1lZCBzbyBlYWNoIHBpY2tlciBjYW4gdmFsaWRhdGUg dGhlIGNvbmZpZyBvYmplY3QuCisgICAgICAgIChpbml0aWFsaXplKToKKyAgICAgICAgKGNsb3Nl UGlja2VyKTogQ2FsbCBQaWNrZXIuY2xlYW51cCgpLgorICAgICAgICAob3BlbkNhbGVuZGFyUGlj a2VyKToKKyAgICAgICAgKENhbGVuZGFyUGlja2VyKToKKyAgICAgICAgKENhbGVuZGFyUGlja2Vy LnByb3RvdHlwZS5jbGVhbnVwKTogQ2xlYW51cCBldmVudCBsaXN0ZW5lciBvbiBkb2N1bWVudC5i b2R5LgorICAgICAgICAoQ2FsZW5kYXJQaWNrZXIucHJvdG90eXBlLmZpeFdpbmRvd1NpemUpOgor ICAgICAgICAqIFJlc291cmNlcy9wYWdlcG9wdXBzL3BpY2tlckNvbW1vbi5qczoKKyAgICAgICAg KFBpY2tlci5wcm90b3R5cGUuY2xlYW51cCk6CisKIDIwMTItMDktMjAgIFlvc2hpZnVtaSBJbm91 ZSAgPHlvc2luQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbRm9ybXNdIEhUTUxTZWxlY3RFbGVt ZW50IHNob3VsZCBjYWxsIGZvcm1TdGF0ZURpZENoYW5nZSBvbiBib3RoIG1lbnVsaXN0IGFuZCBs aXNib3ggbW9kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL3BhZ2Vwb3B1 cHMvY2FsZW5kYXJQaWNrZXIuY3NzIGIvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL3BhZ2Vwb3B1 cHMvY2FsZW5kYXJQaWNrZXIuY3NzCmluZGV4IDUxOGEyNWFkMTgyMzFiNDk3MDg0ZTNhYmYxOTQ2 NTNhZTEwMDYzZGEuLjgxMzNkNzFiMDEyYmQyYWQ0ZDc0YWVlYTI2ZTAyNDZiYWE3YTZjZjQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9wYWdlcG9wdXBzL2NhbGVuZGFyUGlj a2VyLmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMvcGFnZXBvcHVwcy9jYWxlbmRh clBpY2tlci5jc3MKQEAgLTQwLDE0ICs0MCwxMyBAQCBib2R5IHsKICAgICBvdXRsaW5lOiBub25l OwogfQogCi0jbWFpbiB7CisuY2FsZW5kYXItcGlja2VyIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9y OiB3aGl0ZTsKICAgICBib3JkZXI6IHNvbGlkIDFweCAjODg5OWFhOwogICAgIGJveC1zaGFkb3c6 IGluc2V0IDJweCAycHggMnB4IHdoaXRlLAogICAgICAgICBpbnNldCAtMnB4IC0ycHggMXB4IHJn YmEoMCwwLDAsMC4xKTsKICAgICBwYWRkaW5nOiA2cHg7Ci0gICAgd2hpdGVzcGFjZTogbm93cmFw OwotICAgIC8qIHdpZHRoIGlzIHJlc2V0IGluIHRoZSBKUyBjb2RlLiAqLworICAgIHdoaXRlLXNw YWNlOiBub3dyYXA7CiAgICAgd2lkdGg6IDUwMHB4OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9SZXNvdXJjZXMvcGFnZXBvcHVwcy9jYWxlbmRhclBpY2tlci5qcyBiL1NvdXJjZS9X ZWJDb3JlL1Jlc291cmNlcy9wYWdlcG9wdXBzL2NhbGVuZGFyUGlja2VyLmpzCmluZGV4IDhhY2M0 MmIyOGY1MWU3Y2QzMDM4YzgwMzYzMTAyNjBkZmFjMWI4NzUuLmVjNTgyYmRmODIzMTIyOWJlYmY1 YzY3ZjhhMWQzNmZiZTAyZjg4NWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNl cy9wYWdlcG9wdXBzL2NhbGVuZGFyUGlja2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL1Jlc291 cmNlcy9wYWdlcG9wdXBzL2NhbGVuZGFyUGlja2VyLmpzCkBAIC03Miw3ICs3Miw4IEBAIHZhciBD bGFzc05hbWVzID0gewogICovCiB2YXIgZ2xvYmFsID0gewogICAgIGFyZ3VtZW50c1JlY2VpdmVk OiBmYWxzZSwKLSAgICBwYXJhbXM6IG51bGwKKyAgICBwYXJhbXM6IG51bGwsCisgICAgcGlja2Vy OiBudWxsCiB9OwogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkBAIC0yMzksMjUgKzI0MCwyNSBAQCBmdW5jdGlvbiBo YW5kbGVBcmd1bWVudHNUaW1lb3V0KCkgewogfQogCiAvKioKLSAqIEBwYXJhbSB7IU9iamVjdH0g YXJncworICogQHBhcmFtIHshT2JqZWN0fSBjb25maWcKICAqIEByZXR1cm4gez9zdHJpbmd9IEFu IGVycm9yIG1lc3NhZ2UsIG9yIG51bGwgaWYgdGhlIGFyZ3VtZW50IGhhcyBubyBlcnJvcnMuCiAg Ki8KLWZ1bmN0aW9uIHZhbGlkYXRlQXJndW1lbnRzKGFyZ3MpIHsKLSAgICBpZiAoIWFyZ3MubW9u dGhMYWJlbHMpCitDYWxlbmRhclBpY2tlci52YWxpZGF0ZUNvbmZpZyA9IGZ1bmN0aW9uKGNvbmZp ZykgeworICAgIGlmICghY29uZmlnLm1vbnRoTGFiZWxzKQogICAgICAgICByZXR1cm4gIk5vIG1v bnRoTGFiZWxzLiI7Ci0gICAgaWYgKGFyZ3MubW9udGhMYWJlbHMubGVuZ3RoICE9IDEyKQorICAg IGlmIChjb25maWcubW9udGhMYWJlbHMubGVuZ3RoICE9IDEyKQogICAgICAgICByZXR1cm4gIm1v bnRoTGFiZWxzIGlzIG5vdCBhbiBhcnJheSB3aXRoIDEyIGVsZW1lbnRzLiI7Ci0gICAgaWYgKCFh cmdzLmRheUxhYmVscykKKyAgICBpZiAoIWNvbmZpZy5kYXlMYWJlbHMpCiAgICAgICAgIHJldHVy biAiTm8gZGF5TGFiZWxzLiI7Ci0gICAgaWYgKGFyZ3MuZGF5TGFiZWxzLmxlbmd0aCAhPSA3KQor ICAgIGlmIChjb25maWcuZGF5TGFiZWxzLmxlbmd0aCAhPSA3KQogICAgICAgICByZXR1cm4gImRh eUxhYmVscyBpcyBub3QgYW4gYXJyYXkgd2l0aCA3IGVsZW1lbnRzLiI7Ci0gICAgaWYgKCFhcmdz LmNsZWFyTGFiZWwpCisgICAgaWYgKCFjb25maWcuY2xlYXJMYWJlbCkKICAgICAgICAgcmV0dXJu ICJObyBjbGVhckxhYmVsLiI7Ci0gICAgaWYgKCFhcmdzLnRvZGF5TGFiZWwpCisgICAgaWYgKCFj b25maWcudG9kYXlMYWJlbCkKICAgICAgICAgcmV0dXJuICJObyB0b2RheUxhYmVsLiI7Ci0gICAg aWYgKGFyZ3Mud2Vla1N0YXJ0RGF5KSB7Ci0gICAgICAgIGlmIChhcmdzLndlZWtTdGFydERheSA8 IDAgfHwgYXJncy53ZWVrU3RhcnREYXkgPiA2KQotICAgICAgICAgICAgcmV0dXJuICJJbnZhbGlk IHdlZWtTdGFydERheTogIiArIGFyZ3Mud2Vla1N0YXJ0RGF5OworICAgIGlmIChjb25maWcud2Vl a1N0YXJ0RGF5KSB7CisgICAgICAgIGlmIChjb25maWcud2Vla1N0YXJ0RGF5IDwgMCB8fCBjb25m aWcud2Vla1N0YXJ0RGF5ID4gNikKKyAgICAgICAgICAgIHJldHVybiAiSW52YWxpZCB3ZWVrU3Rh cnREYXk6ICIgKyBjb25maWcud2Vla1N0YXJ0RGF5OwogICAgIH0KICAgICByZXR1cm4gbnVsbDsK IH0KQEAgLTI2Niw3ICsyNjcsNyBAQCBmdW5jdGlvbiB2YWxpZGF0ZUFyZ3VtZW50cyhhcmdzKSB7 CiAgKiBAcGFyYW0geyFPYmplY3R9IGFyZ3MKICAqLwogZnVuY3Rpb24gaW5pdGlhbGl6ZShhcmdz KSB7Ci0gICAgdmFyIGVycm9yU3RyaW5nID0gdmFsaWRhdGVBcmd1bWVudHMoYXJncyk7CisgICAg dmFyIGVycm9yU3RyaW5nID0gQ2FsZW5kYXJQaWNrZXIudmFsaWRhdGVDb25maWcoYXJncyk7CiAg ICAgaWYgKGVycm9yU3RyaW5nKSB7CiAgICAgICAgIHZhciBtYWluID0gJCgibWFpbiIpOwogICAg ICAgICBtYWluLnRleHRDb250ZW50ID0gIkludGVybmFsIGVycm9yOiAiICsgZXJyb3JTdHJpbmc7 CkBAIC0yNzcsMTUgKzI3OCwxNyBAQCBmdW5jdGlvbiBpbml0aWFsaXplKGFyZ3MpIHsKICAgICB9 CiB9CiAKLWZ1bmN0aW9uIHJlc2V0TWFpbigpIHsKK2Z1bmN0aW9uIGNsb3NlUGlja2VyKCkgewor ICAgIGlmIChnbG9iYWwucGlja2VyKQorICAgICAgICBnbG9iYWwucGlja2VyLmNsZWFudXAoKTsK ICAgICB2YXIgbWFpbiA9ICQoIm1haW4iKTsKICAgICBtYWluLmlubmVySFRNTCA9ICIiOwogICAg IG1haW4uY2xhc3NOYW1lID0gIiI7CiB9OwogCiBmdW5jdGlvbiBvcGVuQ2FsZW5kYXJQaWNrZXIo KSB7Ci0gICAgcmVzZXRNYWluKCk7Ci0gICAgbmV3IENhbGVuZGFyUGlja2VyKCQoIm1haW4iKSwg Z2xvYmFsLnBhcmFtcyk7CisgICAgY2xvc2VQaWNrZXIoKTsKKyAgICBnbG9iYWwucGlja2VyID0g bmV3IENhbGVuZGFyUGlja2VyKCQoIm1haW4iKSwgZ2xvYmFsLnBhcmFtcyk7CiB9OwogCiAvKioK QEAgLTI5NSw2ICsyOTgsNyBAQCBmdW5jdGlvbiBvcGVuQ2FsZW5kYXJQaWNrZXIoKSB7CiAgKi8K IGZ1bmN0aW9uIENhbGVuZGFyUGlja2VyKGVsZW1lbnQsIGNvbmZpZykgewogICAgIFBpY2tlci5j YWxsKHRoaXMsIGVsZW1lbnQsIGNvbmZpZyk7CisgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3Qu YWRkKCJjYWxlbmRhci1waWNrZXIiKTsKICAgICAvLyBXZSBhc3N1bWUgdGhpcy5fY29uZmlnLm1p biBpcyBhIHZhbGlkIGRhdGUuCiAgICAgdGhpcy5taW5pbXVtRGF0ZSA9ICh0eXBlb2YgdGhpcy5f Y29uZmlnLm1pbiAhPT0gInVuZGVmaW5lZCIpID8gcGFyc2VEYXRlU3RyaW5nKHRoaXMuX2NvbmZp Zy5taW4pIDogQ2FsZW5kYXJQaWNrZXIuTWluaW11bVBvc3NpYmxlRGF0ZTsKICAgICAvLyBXZSBh c3N1bWUgdGhpcy5fY29uZmlnLm1heCBpcyBhIHZhbGlkIGRhdGUuCkBAIC0zMTEsNyArMzE1LDgg QEAgZnVuY3Rpb24gQ2FsZW5kYXJQaWNrZXIoZWxlbWVudCwgY29uZmlnKSB7CiAgICAgICAgIGlu aXRpYWxEYXRlID0gdGhpcy5tYXhpbXVtRGF0ZTsKICAgICB0aGlzLmRheXNUYWJsZS5zZWxlY3RE YXRlKGluaXRpYWxEYXRlKTsKICAgICB0aGlzLmZpeFdpbmRvd1NpemUoKTsKLSAgICBkb2N1bWVu dC5ib2R5LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0aGlzLl9oYW5kbGVCb2R5S2V5RG93 bi5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgdGhpcy5faGFuZGxlQm9keUtleURvd25Cb3VuZCA9 IHRoaXMuX2hhbmRsZUJvZHlLZXlEb3duLmJpbmQodGhpcyk7CisgICAgZG9jdW1lbnQuYm9keS5h ZGRFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgdGhpcy5faGFuZGxlQm9keUtleURvd25Cb3VuZCwg ZmFsc2UpOwogfQogQ2FsZW5kYXJQaWNrZXIucHJvdG90eXBlID0gT2JqZWN0LmNyZWF0ZShQaWNr ZXIucHJvdG90eXBlKTsKIApAQCAtMzIxLDYgKzMyNiwxMCBAQCBDYWxlbmRhclBpY2tlci5NYXhp bXVtUG9zc2libGVEYXRlID0gbmV3IERhdGUoODY0MDAwMDAwMDAwMDAwMC4wKTsKIC8vIFNlZSBX ZWJDb3JlL2h0bWwvRGF0ZUlucHV0VHlwZS5jcHAuCiBDYWxlbmRhclBpY2tlci5CYXNlU3RlcCA9 IDg2NDAwMDAwOwogCitDYWxlbmRhclBpY2tlci5wcm90b3R5cGUuY2xlYW51cCA9IGZ1bmN0aW9u KCkgeworICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlRXZlbnRMaXN0ZW5lcigia2V5ZG93biIsIHRo aXMuX2hhbmRsZUJvZHlLZXlEb3duQm91bmQsIGZhbHNlKTsKK307CisKIENhbGVuZGFyUGlja2Vy LnByb3RvdHlwZS5fbGF5b3V0ID0gZnVuY3Rpb24oKSB7CiAgICAgdGhpcy5fZWxlbWVudC5zdHls ZS5kaXJlY3Rpb24gPSBnbG9iYWwucGFyYW1zLmlzUlRMID8gInJ0bCIgOiAibHRyIjsKICAgICB0 aGlzLnllYXJNb250aENvbnRyb2xsZXIuYXR0YWNoVG8odGhpcy5fZWxlbWVudCk7CkBAIC0zNjUs MTIgKzM3NCwxMiBAQCBDYWxlbmRhclBpY2tlci5wcm90b3R5cGUuZml4V2luZG93U2l6ZSA9IGZ1 bmN0aW9uKCkgewogICAgIHZhciBNYWluQm9yZGVyID0gMTsKICAgICB2YXIgZGVzaXJlZEJvZHlX aWR0aCA9IG1heEVuZCArIE1haW5QYWRkaW5nICsgTWFpbkJvcmRlcjsKIAotICAgIHZhciBlbGVt ZW50SGVpZ2h0ID0gdGhpcy5fZWxlbWVudC5vZmZzZXRIZWlnaHQ7CiAgICAgdGhpcy5fZWxlbWVu dC5zdHlsZS53aWR0aCA9ICJhdXRvIjsKICAgICBkYXlzQXJlYUVsZW1lbnQuc3R5bGUud2lkdGgg PSAiMTAwJSI7CiAgICAgZGF5c0FyZWFFbGVtZW50LnN0eWxlLnRhYmxlTGF5b3V0ID0gImZpeGVk IjsKICAgICB0aGlzLl9lbGVtZW50LmdldEVsZW1lbnRzQnlDbGFzc05hbWUoQ2xhc3NOYW1lcy5Z ZWFyTW9udGhVcHBlcilbMF0uc3R5bGUuZGlzcGxheSA9ICItd2Via2l0LWJveCI7CiAgICAgdGhp cy5fZWxlbWVudC5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKENsYXNzTmFtZXMuTW9udGhTZWxlY3Rv ckJveClbMF0uc3R5bGUuZGlzcGxheSA9ICJibG9jayI7CisgICAgdmFyIGVsZW1lbnRIZWlnaHQg PSB0aGlzLl9lbGVtZW50Lm9mZnNldEhlaWdodDsKICAgICByZXNpemVXaW5kb3coZGVzaXJlZEJv ZHlXaWR0aCwgZWxlbWVudEhlaWdodCk7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9SZXNvdXJjZXMvcGFnZXBvcHVwcy9waWNrZXJDb21tb24uanMgYi9Tb3VyY2UvV2ViQ29yZS9S ZXNvdXJjZXMvcGFnZXBvcHVwcy9waWNrZXJDb21tb24uanMKaW5kZXggODUyMzMyMTYwNjE2YzEw ZjQwNGNmYmRjZWViMzJlNzI0M2NmMWMzMC4uYWQ5NTQyY2M0MDZjZWM5OWE3ZTQ2N2E0ZTUxMmQ5 ZmRmMjA3ZmVjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL3BhZ2Vwb3B1 cHMvcGlja2VyQ29tbW9uLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9wYWdlcG9w dXBzL3BpY2tlckNvbW1vbi5qcwpAQCAtMSwzICsxLDQgQEAKKyJ1c2Ugc3RyaWN0IjsKIC8qCiAg KiBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAq CkBAIC01Nyw2ICs1OCw5IEBAIGZ1bmN0aW9uIHJlc2l6ZVdpbmRvdyh3aWR0aCwgaGVpZ2h0KSB7 CiAgICAgfQogfQogCisvKioKKyAqIEByZXR1cm4geyFudW1iZXJ9CisgKi8KIGZ1bmN0aW9uIGdl dFNjcm9sbGJhcldpZHRoKCkgewogICAgIGlmICh0eXBlb2Ygd2luZG93LnNjcm9sbGJhcldpZHRo ID09PSAidW5kZWZpbmVkIikgewogICAgICAgICB2YXIgc2Nyb2xsRGl2ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7CkBAIC0xMDQsMyArMTA4LDUgQEAgUGlja2VyLnByb3RvdHlwZS5o YW5kbGVDYW5jZWwgPSBmdW5jdGlvbigpIHsKIFBpY2tlci5wcm90b3R5cGUuY2hvb3NlT3RoZXJD b2xvciA9IGZ1bmN0aW9uKCkgewogICAgIHdpbmRvdy5wYWdlUG9wdXBDb250cm9sbGVyLnNldFZh bHVlQW5kQ2xvc2VQb3B1cChQaWNrZXIuQWN0aW9ucy5DaG9vc2VPdGhlckNvbG9yLCAiIik7CiB9 CisKK1BpY2tlci5wcm90b3R5cGUuY2xlYW51cCA9IGZ1bmN0aW9uKCkge307Cg== 165047 2012-09-20 22:27:30 -0700 2012-09-21 00:01:59 -0700 Patch bug-97193-20120921142654.patch text/plain 7038 keishi U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTA3NDU3MzI5MGUxOTdk ZTczYWUxN2U1MGQxNjRkODBmMzFiYjQxNi4uMjEwNzE1YTdiODY2MjU1ODE2ZjMwODBhNzYxNGRj YjIwZGMyOTA2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA5LTIwICBLZWlz aGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgorCisgICAgICAgIFByZXBhcmUgQ2FsZW5k YXJQaWNrZXIgc28gd2UgY2FuIGFkZCBhbm90aGVyIHBpY2tlciwgU3VnZ2V0aW9uUGlja2VyCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzE5MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXBhcmF0aW9u IHNvIHdlIGNhbiBhZGQgYW5vdGhlciBwaWNrZXIgdG8gQ2FsZW5kYXJQaWNrZXIgYW5kIHN3aXRj aAorICAgICAgICBiZXR3ZWVuIHRoZW0uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBObyBiZWhh dmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBSZXNvdXJjZXMvcGFnZXBvcHVwcy9jYWxlbmRhclBp Y2tlci5jc3M6CisgICAgICAgICguY2FsZW5kYXItcGlja2VyKTogQWRkZWQgc28gd2UgY2FuIGFw cGx5IHRoZXNlIHN0eWxlcyBqdXN0IHRvIGNhbGVuZGFyIHBpY2tlci4KKyAgICAgICAgKiBSZXNv dXJjZXMvcGFnZXBvcHVwcy9jYWxlbmRhclBpY2tlci5qczoKKyAgICAgICAgKENhbGVuZGFyUGlj a2VyLnZhbGlkYXRlQ29uZmlnKTogUmVuYW1lZCBzbyBlYWNoIHBpY2tlciBjYW4gdmFsaWRhdGUg dGhlIGNvbmZpZyBvYmplY3QuCisgICAgICAgIChpbml0aWFsaXplKToKKyAgICAgICAgKGNsb3Nl UGlja2VyKTogQ2FsbCBQaWNrZXIuY2xlYW51cCgpLgorICAgICAgICAob3BlbkNhbGVuZGFyUGlj a2VyKToKKyAgICAgICAgKENhbGVuZGFyUGlja2VyKToKKyAgICAgICAgKENhbGVuZGFyUGlja2Vy LnByb3RvdHlwZS5jbGVhbnVwKTogQ2xlYW51cCBldmVudCBsaXN0ZW5lciBvbiBkb2N1bWVudC5i b2R5LgorICAgICAgICAqIFJlc291cmNlcy9wYWdlcG9wdXBzL3BpY2tlckNvbW1vbi5qczoKKyAg ICAgICAgKFBpY2tlci5wcm90b3R5cGUuY2xlYW51cCk6CisKIDIwMTItMDktMjAgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFByZXZlbnQgcmVhZGluZyBz dGFsZSBkYXRhIGZyb20gSW5saW5lVGV4dEJveGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9SZXNvdXJjZXMvcGFnZXBvcHVwcy9jYWxlbmRhclBpY2tlci5jc3MgYi9Tb3VyY2UvV2ViQ29y ZS9SZXNvdXJjZXMvcGFnZXBvcHVwcy9jYWxlbmRhclBpY2tlci5jc3MKaW5kZXggNTE4YTI1YWQx ODIzMWI0OTcwODRlM2FiZjE5NDY1M2FlMTAwNjNkYS4uODEzM2Q3MWIwMTJiZDJhZDRkNzRhZWVh MjZlMDI0NmJhYTdhNmNmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL3Bh Z2Vwb3B1cHMvY2FsZW5kYXJQaWNrZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNl cy9wYWdlcG9wdXBzL2NhbGVuZGFyUGlja2VyLmNzcwpAQCAtNDAsMTQgKzQwLDEzIEBAIGJvZHkg ewogICAgIG91dGxpbmU6IG5vbmU7CiB9CiAKLSNtYWluIHsKKy5jYWxlbmRhci1waWNrZXIgewog ICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOwogICAgIGJvcmRlcjogc29saWQgMXB4ICM4ODk5 YWE7CiAgICAgYm94LXNoYWRvdzogaW5zZXQgMnB4IDJweCAycHggd2hpdGUsCiAgICAgICAgIGlu c2V0IC0ycHggLTJweCAxcHggcmdiYSgwLDAsMCwwLjEpOwogICAgIHBhZGRpbmc6IDZweDsKLSAg ICB3aGl0ZXNwYWNlOiBub3dyYXA7Ci0gICAgLyogd2lkdGggaXMgcmVzZXQgaW4gdGhlIEpTIGNv ZGUuICovCisgICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKICAgICB3aWR0aDogNTAwcHg7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9wYWdlcG9wdXBzL2NhbGVuZGFy UGlja2VyLmpzIGIvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL3BhZ2Vwb3B1cHMvY2FsZW5kYXJQ aWNrZXIuanMKaW5kZXggOGFjYzQyYjI4ZjUxZTdjZDMwMzhjODAzNjMxMDI2MGRmYWMxYjg3NS4u MjBhODVmZDRhOGE1YTVkNTg0N2ZhODlhYzQ5MmY0ZDU0YTJjOGExOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvUmVzb3VyY2VzL3BhZ2Vwb3B1cHMvY2FsZW5kYXJQaWNrZXIuanMKKysrIGIv U291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL3BhZ2Vwb3B1cHMvY2FsZW5kYXJQaWNrZXIuanMKQEAg LTcyLDcgKzcyLDggQEAgdmFyIENsYXNzTmFtZXMgPSB7CiAgKi8KIHZhciBnbG9iYWwgPSB7CiAg ICAgYXJndW1lbnRzUmVjZWl2ZWQ6IGZhbHNlLAotICAgIHBhcmFtczogbnVsbAorICAgIHBhcmFt czogbnVsbCwKKyAgICBwaWNrZXI6IG51bGwKIH07CiAKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KQEAgLTIzOSwyNSAr MjQwLDI1IEBAIGZ1bmN0aW9uIGhhbmRsZUFyZ3VtZW50c1RpbWVvdXQoKSB7CiB9CiAKIC8qKgot ICogQHBhcmFtIHshT2JqZWN0fSBhcmdzCisgKiBAcGFyYW0geyFPYmplY3R9IGNvbmZpZwogICog QHJldHVybiB7P3N0cmluZ30gQW4gZXJyb3IgbWVzc2FnZSwgb3IgbnVsbCBpZiB0aGUgYXJndW1l bnQgaGFzIG5vIGVycm9ycy4KICAqLwotZnVuY3Rpb24gdmFsaWRhdGVBcmd1bWVudHMoYXJncykg ewotICAgIGlmICghYXJncy5tb250aExhYmVscykKK0NhbGVuZGFyUGlja2VyLnZhbGlkYXRlQ29u ZmlnID0gZnVuY3Rpb24oY29uZmlnKSB7CisgICAgaWYgKCFjb25maWcubW9udGhMYWJlbHMpCiAg ICAgICAgIHJldHVybiAiTm8gbW9udGhMYWJlbHMuIjsKLSAgICBpZiAoYXJncy5tb250aExhYmVs cy5sZW5ndGggIT0gMTIpCisgICAgaWYgKGNvbmZpZy5tb250aExhYmVscy5sZW5ndGggIT0gMTIp CiAgICAgICAgIHJldHVybiAibW9udGhMYWJlbHMgaXMgbm90IGFuIGFycmF5IHdpdGggMTIgZWxl bWVudHMuIjsKLSAgICBpZiAoIWFyZ3MuZGF5TGFiZWxzKQorICAgIGlmICghY29uZmlnLmRheUxh YmVscykKICAgICAgICAgcmV0dXJuICJObyBkYXlMYWJlbHMuIjsKLSAgICBpZiAoYXJncy5kYXlM YWJlbHMubGVuZ3RoICE9IDcpCisgICAgaWYgKGNvbmZpZy5kYXlMYWJlbHMubGVuZ3RoICE9IDcp CiAgICAgICAgIHJldHVybiAiZGF5TGFiZWxzIGlzIG5vdCBhbiBhcnJheSB3aXRoIDcgZWxlbWVu dHMuIjsKLSAgICBpZiAoIWFyZ3MuY2xlYXJMYWJlbCkKKyAgICBpZiAoIWNvbmZpZy5jbGVhckxh YmVsKQogICAgICAgICByZXR1cm4gIk5vIGNsZWFyTGFiZWwuIjsKLSAgICBpZiAoIWFyZ3MudG9k YXlMYWJlbCkKKyAgICBpZiAoIWNvbmZpZy50b2RheUxhYmVsKQogICAgICAgICByZXR1cm4gIk5v IHRvZGF5TGFiZWwuIjsKLSAgICBpZiAoYXJncy53ZWVrU3RhcnREYXkpIHsKLSAgICAgICAgaWYg KGFyZ3Mud2Vla1N0YXJ0RGF5IDwgMCB8fCBhcmdzLndlZWtTdGFydERheSA+IDYpCi0gICAgICAg ICAgICByZXR1cm4gIkludmFsaWQgd2Vla1N0YXJ0RGF5OiAiICsgYXJncy53ZWVrU3RhcnREYXk7 CisgICAgaWYgKGNvbmZpZy53ZWVrU3RhcnREYXkpIHsKKyAgICAgICAgaWYgKGNvbmZpZy53ZWVr U3RhcnREYXkgPCAwIHx8IGNvbmZpZy53ZWVrU3RhcnREYXkgPiA2KQorICAgICAgICAgICAgcmV0 dXJuICJJbnZhbGlkIHdlZWtTdGFydERheTogIiArIGNvbmZpZy53ZWVrU3RhcnREYXk7CiAgICAg fQogICAgIHJldHVybiBudWxsOwogfQpAQCAtMjY2LDcgKzI2Nyw3IEBAIGZ1bmN0aW9uIHZhbGlk YXRlQXJndW1lbnRzKGFyZ3MpIHsKICAqIEBwYXJhbSB7IU9iamVjdH0gYXJncwogICovCiBmdW5j dGlvbiBpbml0aWFsaXplKGFyZ3MpIHsKLSAgICB2YXIgZXJyb3JTdHJpbmcgPSB2YWxpZGF0ZUFy Z3VtZW50cyhhcmdzKTsKKyAgICB2YXIgZXJyb3JTdHJpbmcgPSBDYWxlbmRhclBpY2tlci52YWxp ZGF0ZUNvbmZpZyhhcmdzKTsKICAgICBpZiAoZXJyb3JTdHJpbmcpIHsKICAgICAgICAgdmFyIG1h aW4gPSAkKCJtYWluIik7CiAgICAgICAgIG1haW4udGV4dENvbnRlbnQgPSAiSW50ZXJuYWwgZXJy b3I6ICIgKyBlcnJvclN0cmluZzsKQEAgLTI3NywxNSArMjc4LDE3IEBAIGZ1bmN0aW9uIGluaXRp YWxpemUoYXJncykgewogICAgIH0KIH0KIAotZnVuY3Rpb24gcmVzZXRNYWluKCkgeworZnVuY3Rp b24gY2xvc2VQaWNrZXIoKSB7CisgICAgaWYgKGdsb2JhbC5waWNrZXIpCisgICAgICAgIGdsb2Jh bC5waWNrZXIuY2xlYW51cCgpOwogICAgIHZhciBtYWluID0gJCgibWFpbiIpOwogICAgIG1haW4u aW5uZXJIVE1MID0gIiI7CiAgICAgbWFpbi5jbGFzc05hbWUgPSAiIjsKIH07CiAKIGZ1bmN0aW9u IG9wZW5DYWxlbmRhclBpY2tlcigpIHsKLSAgICByZXNldE1haW4oKTsKLSAgICBuZXcgQ2FsZW5k YXJQaWNrZXIoJCgibWFpbiIpLCBnbG9iYWwucGFyYW1zKTsKKyAgICBjbG9zZVBpY2tlcigpOwor ICAgIGdsb2JhbC5waWNrZXIgPSBuZXcgQ2FsZW5kYXJQaWNrZXIoJCgibWFpbiIpLCBnbG9iYWwu cGFyYW1zKTsKIH07CiAKIC8qKgpAQCAtMjk1LDYgKzI5OCw3IEBAIGZ1bmN0aW9uIG9wZW5DYWxl bmRhclBpY2tlcigpIHsKICAqLwogZnVuY3Rpb24gQ2FsZW5kYXJQaWNrZXIoZWxlbWVudCwgY29u ZmlnKSB7CiAgICAgUGlja2VyLmNhbGwodGhpcywgZWxlbWVudCwgY29uZmlnKTsKKyAgICB0aGlz Ll9lbGVtZW50LmNsYXNzTGlzdC5hZGQoImNhbGVuZGFyLXBpY2tlciIpOwogICAgIC8vIFdlIGFz c3VtZSB0aGlzLl9jb25maWcubWluIGlzIGEgdmFsaWQgZGF0ZS4KICAgICB0aGlzLm1pbmltdW1E YXRlID0gKHR5cGVvZiB0aGlzLl9jb25maWcubWluICE9PSAidW5kZWZpbmVkIikgPyBwYXJzZURh dGVTdHJpbmcodGhpcy5fY29uZmlnLm1pbikgOiBDYWxlbmRhclBpY2tlci5NaW5pbXVtUG9zc2li bGVEYXRlOwogICAgIC8vIFdlIGFzc3VtZSB0aGlzLl9jb25maWcubWF4IGlzIGEgdmFsaWQgZGF0 ZS4KQEAgLTMxMSw3ICszMTUsOCBAQCBmdW5jdGlvbiBDYWxlbmRhclBpY2tlcihlbGVtZW50LCBj b25maWcpIHsKICAgICAgICAgaW5pdGlhbERhdGUgPSB0aGlzLm1heGltdW1EYXRlOwogICAgIHRo aXMuZGF5c1RhYmxlLnNlbGVjdERhdGUoaW5pdGlhbERhdGUpOwogICAgIHRoaXMuZml4V2luZG93 U2l6ZSgpOwotICAgIGRvY3VtZW50LmJvZHkuYWRkRXZlbnRMaXN0ZW5lcigia2V5ZG93biIsIHRo aXMuX2hhbmRsZUJvZHlLZXlEb3duLmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICB0aGlzLl9oYW5k bGVCb2R5S2V5RG93bkJvdW5kID0gdGhpcy5faGFuZGxlQm9keUtleURvd24uYmluZCh0aGlzKTsK KyAgICBkb2N1bWVudC5ib2R5LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0aGlzLl9oYW5k bGVCb2R5S2V5RG93bkJvdW5kLCBmYWxzZSk7CiB9CiBDYWxlbmRhclBpY2tlci5wcm90b3R5cGUg PSBPYmplY3QuY3JlYXRlKFBpY2tlci5wcm90b3R5cGUpOwogCkBAIC0zMjEsNiArMzI2LDEwIEBA IENhbGVuZGFyUGlja2VyLk1heGltdW1Qb3NzaWJsZURhdGUgPSBuZXcgRGF0ZSg4NjQwMDAwMDAw MDAwMDAwLjApOwogLy8gU2VlIFdlYkNvcmUvaHRtbC9EYXRlSW5wdXRUeXBlLmNwcC4KIENhbGVu ZGFyUGlja2VyLkJhc2VTdGVwID0gODY0MDAwMDA7CiAKK0NhbGVuZGFyUGlja2VyLnByb3RvdHlw ZS5jbGVhbnVwID0gZnVuY3Rpb24oKSB7CisgICAgZG9jdW1lbnQuYm9keS5yZW1vdmVFdmVudExp c3RlbmVyKCJrZXlkb3duIiwgdGhpcy5faGFuZGxlQm9keUtleURvd25Cb3VuZCwgZmFsc2UpOwor fTsKKwogQ2FsZW5kYXJQaWNrZXIucHJvdG90eXBlLl9sYXlvdXQgPSBmdW5jdGlvbigpIHsKICAg ICB0aGlzLl9lbGVtZW50LnN0eWxlLmRpcmVjdGlvbiA9IGdsb2JhbC5wYXJhbXMuaXNSVEwgPyAi cnRsIiA6ICJsdHIiOwogICAgIHRoaXMueWVhck1vbnRoQ29udHJvbGxlci5hdHRhY2hUbyh0aGlz Ll9lbGVtZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9wYWdlcG9w dXBzL3BpY2tlckNvbW1vbi5qcyBiL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9wYWdlcG9wdXBz L3BpY2tlckNvbW1vbi5qcwppbmRleCA4NTIzMzIxNjA2MTZjMTBmNDA0Y2ZiZGNlZWIzMmU3MjQz Y2YxYzMwLi5hZDk1NDJjYzQwNmNlYzk5YTdlNDY3YTRlNTEyZDlmZGYyMDdmZWNhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMvcGFnZXBvcHVwcy9waWNrZXJDb21tb24uanMK KysrIGIvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL3BhZ2Vwb3B1cHMvcGlja2VyQ29tbW9uLmpz CkBAIC0xLDMgKzEsNCBAQAorInVzZSBzdHJpY3QiOwogLyoKICAqIENvcHlyaWdodCAoQykgMjAx MiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKQEAgLTU3LDYgKzU4LDkgQEAg ZnVuY3Rpb24gcmVzaXplV2luZG93KHdpZHRoLCBoZWlnaHQpIHsKICAgICB9CiB9CiAKKy8qKgor ICogQHJldHVybiB7IW51bWJlcn0KKyAqLwogZnVuY3Rpb24gZ2V0U2Nyb2xsYmFyV2lkdGgoKSB7 CiAgICAgaWYgKHR5cGVvZiB3aW5kb3cuc2Nyb2xsYmFyV2lkdGggPT09ICJ1bmRlZmluZWQiKSB7 CiAgICAgICAgIHZhciBzY3JvbGxEaXYgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsK QEAgLTEwNCwzICsxMDgsNSBAQCBQaWNrZXIucHJvdG90eXBlLmhhbmRsZUNhbmNlbCA9IGZ1bmN0 aW9uKCkgewogUGlja2VyLnByb3RvdHlwZS5jaG9vc2VPdGhlckNvbG9yID0gZnVuY3Rpb24oKSB7 CiAgICAgd2luZG93LnBhZ2VQb3B1cENvbnRyb2xsZXIuc2V0VmFsdWVBbmRDbG9zZVBvcHVwKFBp Y2tlci5BY3Rpb25zLkNob29zZU90aGVyQ29sb3IsICIiKTsKIH0KKworUGlja2VyLnByb3RvdHlw ZS5jbGVhbnVwID0gZnVuY3Rpb24oKSB7fTsK