92990 2012-08-02 07:30:11 -0700 Web Inspector: Rename 'User agent' to 'Overrides' in settings screen 2012-08-02 12:42:22 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 addyo addyo apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 685358 0 addyo 2012-08-02 07:30:11 -0700 As the User agent tab in the settings screen has evolved over time to include override capabilities for more than just the user agent, I think we should rename this to 'Overrides', which better describes what the tab contains. 685408 1 156088 addyo 2012-08-02 08:11:54 -0700 Created attachment 156088 Patch 685583 2 156088 pfeldman 2012-08-02 10:59:02 -0700 Comment on attachment 156088 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156088&action=review > Source/WebCore/inspector/front-end/SettingsScreen.js:48 > + this._tabbedPane.appendTab(WebInspector.SettingsScreen.Tabs.UserAgent, WebInspector.UIString("Overrides"), new WebInspector.UserAgentSettingsTab()); You also need to chance these in the WebCore/English.lproj/localizedStrings.js 685617 3 156130 addyo 2012-08-02 11:30:58 -0700 Created attachment 156130 Patch 685619 4 addyo 2012-08-02 11:36:17 -0700 (In reply to comment #2) > (From update of attachment 156088 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=156088&action=review > > > Source/WebCore/inspector/front-end/SettingsScreen.js:48 > > + this._tabbedPane.appendTab(WebInspector.SettingsScreen.Tabs.UserAgent, WebInspector.UIString("Overrides"), new WebInspector.UserAgentSettingsTab()); > > You also need to chance these in the WebCore/English.lproj/localizedStrings.js Done! 685641 5 156132 addyo 2012-08-02 11:59:16 -0700 Created attachment 156132 Patch 685687 6 156132 webkit.review.bot 2012-08-02 12:42:18 -0700 Comment on attachment 156132 Patch Clearing flags on attachment: 156132 Committed r124486: <http://trac.webkit.org/changeset/124486> 685688 7 webkit.review.bot 2012-08-02 12:42:22 -0700 All reviewed patches have been landed. Closing bug. 156088 2012-08-02 08:11:54 -0700 2012-08-02 11:30:52 -0700 Patch bug-92990-20120802191134.patch text/plain 3386 addyo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0Mzc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2NlOGQ2ZWZhNTYzYjU4 M2Q1YmZjN2RmMDhmODEwOWQ0ZDE5NGE2Yi4uN2JkMTMyZTJkYjU4ZTIwNzZhYTFjNTdlOGJkYzQ1 MDNkOTMwYjMwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA4LTAyICBBZGR5 IE9zbWFuaSAgPGFkZHlvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBS ZW5hbWUgJ1VzZXIgYWdlbnQnIHRvICdPdmVycmlkZXMnIGluIHNldHRpbmdzIHNjcmVlbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI5OTAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW1wbGUgc2V0dGlu ZyByZW5hbWUgb2YgVXNlciBhZ2VudCAtPiBPdmVycmlkZXMsIHdpdGggbWlub3IgbmFtZSBjaGFu Z2VzIG1hZGUgdG8gb3RoZXIgaXRlbXMgaW4gdGhlIHBhbmVsLgorCisgICAgICAgICogRW5nbGlz aC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvU2V0dGluZ3NTY3JlZW4uanM6CisKIDIwMTItMDgtMDEgIEFudG9pbmUgTGFib3VyICA8cGlt YW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gcmVtb3ZlIHVudXNlZCBmaWVs ZHMgZnJvbSBMYXllclJlbmRlcmVyQ2FwYWJpbGl0aWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzU2NyZWVuLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5nc1NjcmVlbi5qcwppbmRleCBmZjZlMzEzZmUw ODkzZWYxODM5NGE0Y2VkYjk2YTU4ODU3NTdjYTI5Li5iMjY4YzAyZTY3NGY4MTNhNTk0NTIyNTUz MmQyNWRiZmJmNzRlNTFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NldHRpbmdzU2NyZWVuLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanMKQEAgLTQ1LDcgKzQ1LDcgQEAgV2ViSW5zcGVjdG9y LlNldHRpbmdzU2NyZWVuID0gZnVuY3Rpb24ob25IaWRlKQogICAgIHRoaXMuX3RhYmJlZFBhbmUu ZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoZWxwLXdpbmRvdy1tYWluIik7CiAgICAgdGhpcy5fdGFi YmVkUGFuZS5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2NyZWF0ZUNsb3NlQnV0dG9uKCkpOwog ICAgIHRoaXMuX3RhYmJlZFBhbmUuYXBwZW5kVGFiKFdlYkluc3BlY3Rvci5TZXR0aW5nc1NjcmVl bi5UYWJzLkdlbmVyYWwsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiR2VuZXJhbCIpLCBuZXcgV2Vi SW5zcGVjdG9yLkdlbmVyaWNTZXR0aW5nc1RhYigpKTsKLSAgICB0aGlzLl90YWJiZWRQYW5lLmFw cGVuZFRhYihXZWJJbnNwZWN0b3IuU2V0dGluZ3NTY3JlZW4uVGFicy5Vc2VyQWdlbnQsIFdlYklu c3BlY3Rvci5VSVN0cmluZygiVXNlciBhZ2VudCIpLCBuZXcgV2ViSW5zcGVjdG9yLlVzZXJBZ2Vu dFNldHRpbmdzVGFiKCkpOworICAgIHRoaXMuX3RhYmJlZFBhbmUuYXBwZW5kVGFiKFdlYkluc3Bl Y3Rvci5TZXR0aW5nc1NjcmVlbi5UYWJzLlVzZXJBZ2VudCwgV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJPdmVycmlkZXMiKSwgbmV3IFdlYkluc3BlY3Rvci5Vc2VyQWdlbnRTZXR0aW5nc1RhYigpKTsK ICAgICBpZiAoV2ViSW5zcGVjdG9yLmV4cGVyaW1lbnRzU2V0dGluZ3MuZXhwZXJpbWVudHNFbmFi bGVkKQogICAgICAgICB0aGlzLl90YWJiZWRQYW5lLmFwcGVuZFRhYihXZWJJbnNwZWN0b3IuU2V0 dGluZ3NTY3JlZW4uVGFicy5FeHBlcmltZW50cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFeHBl cmltZW50cyIpLCBuZXcgV2ViSW5zcGVjdG9yLkV4cGVyaW1lbnRzU2V0dGluZ3NUYWIoKSk7CiAg ICAgdGhpcy5fdGFiYmVkUGFuZS5hcHBlbmRUYWIoV2ViSW5zcGVjdG9yLlNldHRpbmdzU2NyZWVu LlRhYnMuU2hvcnRjdXRzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3J0Y3V0cyIpLCBXZWJJ bnNwZWN0b3Iuc2hvcnRjdXRzU2NyZWVuLmNyZWF0ZVNob3J0Y3V0c1RhYlZpZXcoKSk7CkBAIC0z NjQsNyArMzY0LDcgQEAgV2ViSW5zcGVjdG9yLlVzZXJBZ2VudFNldHRpbmdzVGFiLnByb3RvdHlw ZSA9IHsKICAgICAgICAgdmFyIGNoZWNrYm94RWxlbWVudCA9IGxhYmVsRWxlbWVudC5jcmVhdGVD aGlsZCgiaW5wdXQiKTsKICAgICAgICAgY2hlY2tib3hFbGVtZW50LnR5cGUgPSAiY2hlY2tib3gi OwogICAgICAgICBjaGVja2JveEVsZW1lbnQuY2hlY2tlZCA9ICEhdXNlckFnZW50OwotICAgICAg ICBsYWJlbEVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIk92ZXJy aWRlIFVzZXIgQWdlbnQiKSk7CisgICAgICAgIGxhYmVsRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1 bWVudC5jcmVhdGVUZXh0Tm9kZSgiVXNlciBBZ2VudCIpKTsKICAgICAgICAgcC5hcHBlbmRDaGls ZCh0aGlzLl9jcmVhdGVVc2VyQWdlbnRTZWxlY3RSb3dFbGVtZW50KGNoZWNrYm94RWxlbWVudCkp OwogICAgICAgICByZXR1cm4gcDsKICAgICB9LApAQCAtNTIwLDcgKzUyMCw3IEBAIFdlYkluc3Bl Y3Rvci5Vc2VyQWdlbnRTZXR0aW5nc1RhYi5wcm90b3R5cGUgPSB7CiAgICAgICAgIGNoZWNrYm94 RWxlbWVudC5jaGVja2VkID0gIW1ldHJpY3MgfHwgKG1ldHJpY3Mud2lkdGggJiYgbWV0cmljcy5o ZWlnaHQgJiYgbWV0cmljcy5mb250U2NhbGVGYWN0b3IpOwogICAgICAgICBjaGVja2JveEVsZW1l bnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9vbk1ldHJpY3NDaGVja2JveENsaWNr ZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgICAgICB0aGlzLl9tZXRyaWNzQ2hlY2tib3hFbGVt ZW50ID0gY2hlY2tib3hFbGVtZW50OwotICAgICAgICBsYWJlbEVsZW1lbnQuYXBwZW5kQ2hpbGQo ZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJPdmVycmlkZSBk ZXZpY2UgbWV0cmljcyIpKSk7CisgICAgICAgIGxhYmVsRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1 bWVudC5jcmVhdGVUZXh0Tm9kZShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRldmljZSBtZXRyaWNz IikpKTsKIAogICAgICAgICBjb25zdCBtZXRyaWNzU2VjdGlvbkVsZW1lbnQgPSB0aGlzLl9jcmVh dGVEZXZpY2VNZXRyaWNzRWxlbWVudChtZXRyaWNzKTsKICAgICAgICAgcC5hcHBlbmRDaGlsZCht ZXRyaWNzU2VjdGlvbkVsZW1lbnQpOwo= 156130 2012-08-02 11:30:58 -0700 2012-08-02 11:59:10 -0700 Patch bug-92990-20120802223038.patch text/plain 4726 addyo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0Mzc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2NlOGQ2ZWZhNTYzYjU4 M2Q1YmZjN2RmMDhmODEwOWQ0ZDE5NGE2Yi4uZGUxNWNmYTYyYzhhNmEyMTczNDViMjlmNDI0M2Rj MjNhMWVjYjM1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA4LTAyICBBZGR5 IE9zbWFuaSAgPGFkZHlvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBS ZW5hbWUgJ1VzZXIgYWdlbnQnIHRvICdPdmVycmlkZXMnIGluIHNldHRpbmdzIHNjcmVlbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI5OTAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW1wbGUgc2V0dGlu ZyByZW5hbWUgb2YgVXNlciBhZ2VudCAtPiBPdmVycmlkZXMKKworICAgICAgICAqIEVuZ2xpc2gu bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1NldHRpbmdzU2NyZWVuLmpzOgorCiAyMDEyLTA4LTAxICBBbnRvaW5lIExhYm91ciAgPHBpbWFu QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIHJlbW92ZSB1bnVzZWQgZmllbGRz IGZyb20gTGF5ZXJSZW5kZXJlckNhcGFiaWxpdGllcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUvRW5n bGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGE3OWRiY2RkOGJjYjA2ZTM3NTJi ZDRlNzA5ZGRhNjIzODZiNDllZTguLjQ1YTViYzM2NjRhNzI4NzExMTFmYmVmMmE4ZGZiZTQzYjA0 ZjcwN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0 cmluZ3MuanMKQEAgLTI5Miw3ICsyOTIsNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJPcGVuIGxpbmsg aW4gbmV3IHRhYiJdID0gIk9wZW4gbGluayBpbiBuZXcgdGFiIjsKIGxvY2FsaXplZFN0cmluZ3Nb Ik9wZW4gTGluayBpbiBSZXNvdXJjZXMgUGFuZWwiXSA9ICJPcGVuIExpbmsgaW4gUmVzb3VyY2Vz IFBhbmVsIjsKIGxvY2FsaXplZFN0cmluZ3NbIk9wZW4gbGluayBpbiBSZXNvdXJjZXMgcGFuZWwi XSA9ICJPcGVuIGxpbmsgaW4gUmVzb3VyY2VzIHBhbmVsIjsKIGxvY2FsaXplZFN0cmluZ3NbIk90 aGVyIl0gPSAiT3RoZXIiOwotbG9jYWxpemVkU3RyaW5nc1siT3ZlcnJpZGUgZGV2aWNlIG1ldHJp Y3MiXSA9ICJPdmVycmlkZSBkZXZpY2UgbWV0cmljcyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJEZXZp Y2UgbWV0cmljcyJdID0gIkRldmljZSBtZXRyaWNzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlBhaW50 Il0gPSAiUGFpbnQiOwogbG9jYWxpemVkU3RyaW5nc1siUGFyc2UiXSA9ICJQYXJzZSI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJQYXJzZXIiXSA9ICJQYXJzZXIiOwpAQCAtNjIyLDcgKzYyMiw3IEBAIGxv Y2FsaXplZFN0cmluZ3NbIjQgc3BhY2VzIl0gPSAiNCBzcGFjZXMiOwogbG9jYWxpemVkU3RyaW5n c1siOCBzcGFjZXMiXSA9ICI4IHNwYWNlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUYWIgY2hhcmFj dGVyIl0gPSAiVGFiIGNoYXJhY3RlciI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTZWFyY2ggaW4gY29u dGVudCBzY3JpcHRzIl0gPSAiU2VhcmNoIGluIGNvbnRlbnQgc2NyaXB0cyI7Ci1sb2NhbGl6ZWRT dHJpbmdzWyJPdmVycmlkZSBVc2VyIEFnZW50Il0gPSAiT3ZlcnJpZGUgVXNlciBBZ2VudCI7Cits b2NhbGl6ZWRTdHJpbmdzWyJVc2VyIEFnZW50Il0gPSAiVXNlciBBZ2VudCI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJPdGhlci4uLiJdID0gIk90aGVyLi4uIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNlYXJj aCBhY3Jvc3MgYWxsIHNvdXJjZXMiXSA9ICJTZWFyY2ggYWNyb3NzIGFsbCBzb3VyY2VzIjsKIGxv Y2FsaXplZFN0cmluZ3NbIkV2YWx1YXRlIGluIGNvbnNvbGUiXSA9ICJFdmFsdWF0ZSBpbiBjb25z b2xlIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0 dGluZ3NTY3JlZW4uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRp bmdzU2NyZWVuLmpzCmluZGV4IGZmNmUzMTNmZTA4OTNlZjE4Mzk0YTRjZWRiOTZhNTg4NTc1N2Nh MjkuLmIyNjhjMDJlNjc0ZjgxM2E1OTQ1MjI1NTMyZDI1ZGJmYmY3NGU1MWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5nc1NjcmVlbi5qcwpA QCAtNDUsNyArNDUsNyBAQCBXZWJJbnNwZWN0b3IuU2V0dGluZ3NTY3JlZW4gPSBmdW5jdGlvbihv bkhpZGUpCiAgICAgdGhpcy5fdGFiYmVkUGFuZS5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhlbHAt d2luZG93LW1haW4iKTsKICAgICB0aGlzLl90YWJiZWRQYW5lLmVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy5fY3JlYXRlQ2xvc2VCdXR0b24oKSk7CiAgICAgdGhpcy5fdGFiYmVkUGFuZS5hcHBlbmRU YWIoV2ViSW5zcGVjdG9yLlNldHRpbmdzU2NyZWVuLlRhYnMuR2VuZXJhbCwgV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJHZW5lcmFsIiksIG5ldyBXZWJJbnNwZWN0b3IuR2VuZXJpY1NldHRpbmdzVGFi KCkpOwotICAgIHRoaXMuX3RhYmJlZFBhbmUuYXBwZW5kVGFiKFdlYkluc3BlY3Rvci5TZXR0aW5n c1NjcmVlbi5UYWJzLlVzZXJBZ2VudCwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJVc2VyIGFnZW50 IiksIG5ldyBXZWJJbnNwZWN0b3IuVXNlckFnZW50U2V0dGluZ3NUYWIoKSk7CisgICAgdGhpcy5f dGFiYmVkUGFuZS5hcHBlbmRUYWIoV2ViSW5zcGVjdG9yLlNldHRpbmdzU2NyZWVuLlRhYnMuVXNl ckFnZW50LCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk92ZXJyaWRlcyIpLCBuZXcgV2ViSW5zcGVj dG9yLlVzZXJBZ2VudFNldHRpbmdzVGFiKCkpOwogICAgIGlmIChXZWJJbnNwZWN0b3IuZXhwZXJp bWVudHNTZXR0aW5ncy5leHBlcmltZW50c0VuYWJsZWQpCiAgICAgICAgIHRoaXMuX3RhYmJlZFBh bmUuYXBwZW5kVGFiKFdlYkluc3BlY3Rvci5TZXR0aW5nc1NjcmVlbi5UYWJzLkV4cGVyaW1lbnRz LCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkV4cGVyaW1lbnRzIiksIG5ldyBXZWJJbnNwZWN0b3Iu RXhwZXJpbWVudHNTZXR0aW5nc1RhYigpKTsKICAgICB0aGlzLl90YWJiZWRQYW5lLmFwcGVuZFRh YihXZWJJbnNwZWN0b3IuU2V0dGluZ3NTY3JlZW4uVGFicy5TaG9ydGN1dHMsIFdlYkluc3BlY3Rv ci5VSVN0cmluZygiU2hvcnRjdXRzIiksIFdlYkluc3BlY3Rvci5zaG9ydGN1dHNTY3JlZW4uY3Jl YXRlU2hvcnRjdXRzVGFiVmlldygpKTsKQEAgLTM2NCw3ICszNjQsNyBAQCBXZWJJbnNwZWN0b3Iu VXNlckFnZW50U2V0dGluZ3NUYWIucHJvdG90eXBlID0gewogICAgICAgICB2YXIgY2hlY2tib3hF bGVtZW50ID0gbGFiZWxFbGVtZW50LmNyZWF0ZUNoaWxkKCJpbnB1dCIpOwogICAgICAgICBjaGVj a2JveEVsZW1lbnQudHlwZSA9ICJjaGVja2JveCI7CiAgICAgICAgIGNoZWNrYm94RWxlbWVudC5j aGVja2VkID0gISF1c2VyQWdlbnQ7Ci0gICAgICAgIGxhYmVsRWxlbWVudC5hcHBlbmRDaGlsZChk b2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiT3ZlcnJpZGUgVXNlciBBZ2VudCIpKTsKKyAgICAgICAg bGFiZWxFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCJVc2VyIEFn ZW50IikpOwogICAgICAgICBwLmFwcGVuZENoaWxkKHRoaXMuX2NyZWF0ZVVzZXJBZ2VudFNlbGVj dFJvd0VsZW1lbnQoY2hlY2tib3hFbGVtZW50KSk7CiAgICAgICAgIHJldHVybiBwOwogICAgIH0s CkBAIC01MjAsNyArNTIwLDcgQEAgV2ViSW5zcGVjdG9yLlVzZXJBZ2VudFNldHRpbmdzVGFiLnBy b3RvdHlwZSA9IHsKICAgICAgICAgY2hlY2tib3hFbGVtZW50LmNoZWNrZWQgPSAhbWV0cmljcyB8 fCAobWV0cmljcy53aWR0aCAmJiBtZXRyaWNzLmhlaWdodCAmJiBtZXRyaWNzLmZvbnRTY2FsZUZh Y3Rvcik7CiAgICAgICAgIGNoZWNrYm94RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIs IHRoaXMuX29uTWV0cmljc0NoZWNrYm94Q2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAg ICAgIHRoaXMuX21ldHJpY3NDaGVja2JveEVsZW1lbnQgPSBjaGVja2JveEVsZW1lbnQ7Ci0gICAg ICAgIGxhYmVsRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIk92ZXJyaWRlIGRldmljZSBtZXRyaWNzIikpKTsKKyAgICAgICAg bGFiZWxFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiRGV2aWNlIG1ldHJpY3MiKSkpOwogCiAgICAgICAgIGNvbnN0IG1ldHJp Y3NTZWN0aW9uRWxlbWVudCA9IHRoaXMuX2NyZWF0ZURldmljZU1ldHJpY3NFbGVtZW50KG1ldHJp Y3MpOwogICAgICAgICBwLmFwcGVuZENoaWxkKG1ldHJpY3NTZWN0aW9uRWxlbWVudCk7Cg== 156132 2012-08-02 11:59:16 -0700 2012-08-02 12:42:17 -0700 Patch bug-92990-20120802225856.patch text/plain 5215 addyo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0Mzc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2NlOGQ2ZWZhNTYzYjU4 M2Q1YmZjN2RmMDhmODEwOWQ0ZDE5NGE2Yi4uZGUxNWNmYTYyYzhhNmEyMTczNDViMjlmNDI0M2Rj MjNhMWVjYjM1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA4LTAyICBBZGR5 IE9zbWFuaSAgPGFkZHlvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBS ZW5hbWUgJ1VzZXIgYWdlbnQnIHRvICdPdmVycmlkZXMnIGluIHNldHRpbmdzIHNjcmVlbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI5OTAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW1wbGUgc2V0dGlu ZyByZW5hbWUgb2YgVXNlciBhZ2VudCAtPiBPdmVycmlkZXMKKworICAgICAgICAqIEVuZ2xpc2gu bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1NldHRpbmdzU2NyZWVuLmpzOgorCiAyMDEyLTA4LTAxICBBbnRvaW5lIExhYm91ciAgPHBpbWFu QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIHJlbW92ZSB1bnVzZWQgZmllbGRz IGZyb20gTGF5ZXJSZW5kZXJlckNhcGFiaWxpdGllcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUvRW5n bGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGE3OWRiY2RkOGJjYjA2ZTM3NTJi ZDRlNzA5ZGRhNjIzODZiNDllZTguLjBiOWRiNDAxZTdiZWE5NDU2MWQ0NjRlOTc3OTQ2N2ZkNWY4 OGY0ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0 cmluZ3MuanMKQEAgLTI4NSw2ICsyODUsNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJPYmplY3RzIl0g PSAiT2JqZWN0cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJPZmZsaW5lIl0gPSAiT2ZmbGluZSI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJPbmxpbmUiXSA9ICJPbmxpbmUiOwogbG9jYWxpemVkU3RyaW5nc1si T25seSBlbmFibGUgZm9yIHRoaXMgc2Vzc2lvbiJdID0gIk9ubHkgZW5hYmxlIGZvciB0aGlzIHNl c3Npb24iOworbG9jYWxpemVkU3RyaW5nc1siT3ZlcnJpZGVzIl0gPSAiT3ZlcnJpZGVzIjsKIGxv Y2FsaXplZFN0cmluZ3NbIlJldmVhbCBpbiBOZXR3b3JrIFBhbmVsIl0gPSAiUmV2ZWFsIGluIE5l dHdvcmsgUGFuZWwiOwogbG9jYWxpemVkU3RyaW5nc1siUmV2ZWFsIGluIG5ldHdvcmsgcGFuZWwi XSA9ICJSZXZlYWwgaW4gbmV0d29yayBwYW5lbCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJPcGVuIExp bmsgaW4gTmV3IFRhYiJdID0gIk9wZW4gTGluayBpbiBOZXcgVGFiIjsKQEAgLTI5Miw3ICsyOTMs NyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJPcGVuIGxpbmsgaW4gbmV3IHRhYiJdID0gIk9wZW4gbGlu ayBpbiBuZXcgdGFiIjsKIGxvY2FsaXplZFN0cmluZ3NbIk9wZW4gTGluayBpbiBSZXNvdXJjZXMg UGFuZWwiXSA9ICJPcGVuIExpbmsgaW4gUmVzb3VyY2VzIFBhbmVsIjsKIGxvY2FsaXplZFN0cmlu Z3NbIk9wZW4gbGluayBpbiBSZXNvdXJjZXMgcGFuZWwiXSA9ICJPcGVuIGxpbmsgaW4gUmVzb3Vy Y2VzIHBhbmVsIjsKIGxvY2FsaXplZFN0cmluZ3NbIk90aGVyIl0gPSAiT3RoZXIiOwotbG9jYWxp emVkU3RyaW5nc1siT3ZlcnJpZGUgZGV2aWNlIG1ldHJpY3MiXSA9ICJPdmVycmlkZSBkZXZpY2Ug bWV0cmljcyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJEZXZpY2UgbWV0cmljcyJdID0gIkRldmljZSBt ZXRyaWNzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlBhaW50Il0gPSAiUGFpbnQiOwogbG9jYWxpemVk U3RyaW5nc1siUGFyc2UiXSA9ICJQYXJzZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQYXJzZXIiXSA9 ICJQYXJzZXIiOwpAQCAtNjIyLDcgKzYyMyw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIjQgc3BhY2Vz Il0gPSAiNCBzcGFjZXMiOwogbG9jYWxpemVkU3RyaW5nc1siOCBzcGFjZXMiXSA9ICI4IHNwYWNl cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUYWIgY2hhcmFjdGVyIl0gPSAiVGFiIGNoYXJhY3RlciI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJTZWFyY2ggaW4gY29udGVudCBzY3JpcHRzIl0gPSAiU2VhcmNo IGluIGNvbnRlbnQgc2NyaXB0cyI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJPdmVycmlkZSBVc2VyIEFn ZW50Il0gPSAiT3ZlcnJpZGUgVXNlciBBZ2VudCI7Citsb2NhbGl6ZWRTdHJpbmdzWyJVc2VyIEFn ZW50Il0gPSAiVXNlciBBZ2VudCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJPdGhlci4uLiJdID0gIk90 aGVyLi4uIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNlYXJjaCBhY3Jvc3MgYWxsIHNvdXJjZXMiXSA9 ICJTZWFyY2ggYWNyb3NzIGFsbCBzb3VyY2VzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkV2YWx1YXRl IGluIGNvbnNvbGUiXSA9ICJFdmFsdWF0ZSBpbiBjb25zb2xlIjsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzU2NyZWVuLmpzCmluZGV4IGZmNmUz MTNmZTA4OTNlZjE4Mzk0YTRjZWRiOTZhNTg4NTc1N2NhMjkuLmIyNjhjMDJlNjc0ZjgxM2E1OTQ1 MjI1NTMyZDI1ZGJmYmY3NGU1MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TZXR0aW5nc1NjcmVlbi5qcwpAQCAtNDUsNyArNDUsNyBAQCBXZWJJbnNw ZWN0b3IuU2V0dGluZ3NTY3JlZW4gPSBmdW5jdGlvbihvbkhpZGUpCiAgICAgdGhpcy5fdGFiYmVk UGFuZS5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhlbHAtd2luZG93LW1haW4iKTsKICAgICB0aGlz Ll90YWJiZWRQYW5lLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY3JlYXRlQ2xvc2VCdXR0b24o KSk7CiAgICAgdGhpcy5fdGFiYmVkUGFuZS5hcHBlbmRUYWIoV2ViSW5zcGVjdG9yLlNldHRpbmdz U2NyZWVuLlRhYnMuR2VuZXJhbCwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJHZW5lcmFsIiksIG5l dyBXZWJJbnNwZWN0b3IuR2VuZXJpY1NldHRpbmdzVGFiKCkpOwotICAgIHRoaXMuX3RhYmJlZFBh bmUuYXBwZW5kVGFiKFdlYkluc3BlY3Rvci5TZXR0aW5nc1NjcmVlbi5UYWJzLlVzZXJBZ2VudCwg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJVc2VyIGFnZW50IiksIG5ldyBXZWJJbnNwZWN0b3IuVXNl ckFnZW50U2V0dGluZ3NUYWIoKSk7CisgICAgdGhpcy5fdGFiYmVkUGFuZS5hcHBlbmRUYWIoV2Vi SW5zcGVjdG9yLlNldHRpbmdzU2NyZWVuLlRhYnMuVXNlckFnZW50LCBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIk92ZXJyaWRlcyIpLCBuZXcgV2ViSW5zcGVjdG9yLlVzZXJBZ2VudFNldHRpbmdzVGFi KCkpOwogICAgIGlmIChXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5leHBlcmltZW50 c0VuYWJsZWQpCiAgICAgICAgIHRoaXMuX3RhYmJlZFBhbmUuYXBwZW5kVGFiKFdlYkluc3BlY3Rv ci5TZXR0aW5nc1NjcmVlbi5UYWJzLkV4cGVyaW1lbnRzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IkV4cGVyaW1lbnRzIiksIG5ldyBXZWJJbnNwZWN0b3IuRXhwZXJpbWVudHNTZXR0aW5nc1RhYigp KTsKICAgICB0aGlzLl90YWJiZWRQYW5lLmFwcGVuZFRhYihXZWJJbnNwZWN0b3IuU2V0dGluZ3NT Y3JlZW4uVGFicy5TaG9ydGN1dHMsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hvcnRjdXRzIiks IFdlYkluc3BlY3Rvci5zaG9ydGN1dHNTY3JlZW4uY3JlYXRlU2hvcnRjdXRzVGFiVmlldygpKTsK QEAgLTM2NCw3ICszNjQsNyBAQCBXZWJJbnNwZWN0b3IuVXNlckFnZW50U2V0dGluZ3NUYWIucHJv dG90eXBlID0gewogICAgICAgICB2YXIgY2hlY2tib3hFbGVtZW50ID0gbGFiZWxFbGVtZW50LmNy ZWF0ZUNoaWxkKCJpbnB1dCIpOwogICAgICAgICBjaGVja2JveEVsZW1lbnQudHlwZSA9ICJjaGVj a2JveCI7CiAgICAgICAgIGNoZWNrYm94RWxlbWVudC5jaGVja2VkID0gISF1c2VyQWdlbnQ7Ci0g ICAgICAgIGxhYmVsRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgi T3ZlcnJpZGUgVXNlciBBZ2VudCIpKTsKKyAgICAgICAgbGFiZWxFbGVtZW50LmFwcGVuZENoaWxk KGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCJVc2VyIEFnZW50IikpOwogICAgICAgICBwLmFwcGVu ZENoaWxkKHRoaXMuX2NyZWF0ZVVzZXJBZ2VudFNlbGVjdFJvd0VsZW1lbnQoY2hlY2tib3hFbGVt ZW50KSk7CiAgICAgICAgIHJldHVybiBwOwogICAgIH0sCkBAIC01MjAsNyArNTIwLDcgQEAgV2Vi SW5zcGVjdG9yLlVzZXJBZ2VudFNldHRpbmdzVGFiLnByb3RvdHlwZSA9IHsKICAgICAgICAgY2hl Y2tib3hFbGVtZW50LmNoZWNrZWQgPSAhbWV0cmljcyB8fCAobWV0cmljcy53aWR0aCAmJiBtZXRy aWNzLmhlaWdodCAmJiBtZXRyaWNzLmZvbnRTY2FsZUZhY3Rvcik7CiAgICAgICAgIGNoZWNrYm94 RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX29uTWV0cmljc0NoZWNrYm94 Q2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgICAgIHRoaXMuX21ldHJpY3NDaGVja2Jv eEVsZW1lbnQgPSBjaGVja2JveEVsZW1lbnQ7Ci0gICAgICAgIGxhYmVsRWxlbWVudC5hcHBlbmRD aGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk92ZXJy aWRlIGRldmljZSBtZXRyaWNzIikpKTsKKyAgICAgICAgbGFiZWxFbGVtZW50LmFwcGVuZENoaWxk KGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGV2aWNlIG1l dHJpY3MiKSkpOwogCiAgICAgICAgIGNvbnN0IG1ldHJpY3NTZWN0aW9uRWxlbWVudCA9IHRoaXMu X2NyZWF0ZURldmljZU1ldHJpY3NFbGVtZW50KG1ldHJpY3MpOwogICAgICAgICBwLmFwcGVuZENo aWxkKG1ldHJpY3NTZWN0aW9uRWxlbWVudCk7Cg==