34469 2010-02-02 03:15:43 -0800 Web Inspector: Separate OS type from OS version (WebInspector.platform) 2010-02-02 09:10:52 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov bweinstein joepeck keishi pfeldman pmuellr rik timothy oldest_to_newest 186890 0 apavlov 2010-02-02 03:15:43 -0800 Currently the WebInspector.platform value holds both the OS type (mac, windows, etc.) and the OS version (vista-or-later, leopard, etc.) This complicates the stylesheet rules and results in a lot of duplication. This should be split up into two properties, say, WebInspector.osType and WebInspector.osVersion. 186965 1 47931 apavlov 2010-02-02 08:05:58 -0800 Created attachment 47931 [PATCH] Suggested solution 186973 2 47931 pfeldman 2010-02-02 08:27:55 -0800 Comment on attachment 47931 [PATCH] Suggested solution > +body.detached.platform-snowleopard #toolbar { I'd suggest to rename "platform-snowleopard" to "platform-mac-snowleopard" or "mac-snowleopard" > + return WebInspector.PlatformFlavor.WindowsVistaOrLater; We don't seem to be consistent. We have vista or later, but don't have snow leopard or later. Should Vista imply newer platforms? 186982 3 47936 apavlov 2010-02-02 08:43:45 -0800 Created attachment 47936 [PATCH] Comments addressed 186984 4 47936 pfeldman 2010-02-02 08:48:14 -0800 Comment on attachment 47936 [PATCH] Comments addressed > + this._isMac = (WebInspector.platform === "mac"); No need for () here. 186996 5 apavlov 2010-02-02 09:10:52 -0800 "(...)" fixed. Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/InspectorBackendStub.js M WebCore/inspector/front-end/InspectorFrontendHostStub.js M WebCore/inspector/front-end/inspector.css M WebCore/inspector/front-end/inspector.js Committed r54240 47931 2010-02-02 08:05:58 -0800 2010-02-02 08:43:45 -0800 [PATCH] Suggested solution ostype.patch text/plain 7643 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg N2E1Yzc3Yi4uNTRiZjkyMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wMi0wMiAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEVsaW1pbmF0ZSBzb21lIG9mIHRo ZSBwbGF0Zm9ybSBmbGF2b3Itc3BlY2lmaWMgc3R5bGVzaGVldCBzZWxlY3RvcnMKKworICAgICAg ICBFeHRyYWN0IE9TIHZlcnNpb24gaW50byBXZWJJbnNwZWN0b3IucGxhdGZvcm1GbGF2b3IKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0NDY5CisKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvckZyb250ZW5kSG9zdFN0dWIuanM6 CisgICAgICAgICguV2ViSW5zcGVjdG9yLkluc3BlY3RvckZyb250ZW5kSG9zdFN0dWIucHJvdG90 eXBlLnBsYXRmb3JtKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5j c3M6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IucGVuZGluZ0Rpc3BhdGNoZXMuMC5VUkxSZWdFeHAuaS5nZXQgcGxhdGZv cm0pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmdldCBwbGF0Zm9ybUZsYXZvcik6CisgICAgICAg IChXZWJJbnNwZWN0b3IuX2RldGVjdFBsYXRmb3JtRmxhdm9yKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5sb2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnRvb2xiYXJEcmFnU3RhcnQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLmlzTWFjKToKKwogMjAxMC0wMi0wMiAgU2hpbmljaGlybyBI YW1hamkgIDxoYW1hamlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMg U2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3Rv ckZyb250ZW5kSG9zdFN0dWIuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVj dG9yRnJvbnRlbmRIb3N0U3R1Yi5qcwppbmRleCBkYzdkYTYxLi5mMWRlY2I2IDEwMDY0NAotLS0g YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5q cworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0 U3R1Yi5qcwpAQCAtMzUsMTAgKzM1LDEyIEBAIFdlYkluc3BlY3Rvci5JbnNwZWN0b3JGcm9udGVu ZEhvc3RTdHViID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX2F0dGFjaGVkV2luZG93SGVpZ2h0ID0g MDsKIH0KIAorV2ViSW5zcGVjdG9yLl9wbGF0Zm9ybUZsYXZvciA9IFdlYkluc3BlY3Rvci5QbGF0 Zm9ybUZsYXZvci5NYWNMZW9wYXJkOworCiBXZWJJbnNwZWN0b3IuSW5zcGVjdG9yRnJvbnRlbmRI b3N0U3R1Yi5wcm90b3R5cGUgPSB7CiAgICAgcGxhdGZvcm06IGZ1bmN0aW9uKCkKICAgICB7Ci0g ICAgICAgIHJldHVybiAibWFjLWxlb3BhcmQiOworICAgICAgICByZXR1cm4gIm1hYyI7CiAgICAg fSwKIAogICAgIHBvcnQ6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5jc3MKaW5kZXggNTU4MDRmMy4uZmJkNjE4NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKQEAgLTgzLDggKzgzLDggQEAgYm9keS5pbmFjdGl2ZSAj dG9vbGJhciB7CiAgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYig2NCUsIDY0JSwgNjQl KTsKIH0KIAotYm9keS5kZXRhY2hlZC5wbGF0Zm9ybS1tYWMtbGVvcGFyZCAjdG9vbGJhciwKLWJv ZHkuZGV0YWNoZWQucGxhdGZvcm0tbWFjLXNub3dsZW9wYXJkICN0b29sYmFyIHsKK2JvZHkuZGV0 YWNoZWQucGxhdGZvcm0tbGVvcGFyZCAjdG9vbGJhciwKK2JvZHkuZGV0YWNoZWQucGxhdGZvcm0t c25vd2xlb3BhcmQgI3Rvb2xiYXIgewogICAgIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50ICFpbXBv cnRhbnQ7CiB9CiAKQEAgLTI0NiwxMyArMjQ2LDExIEBAIGJvZHkuYXR0YWNoZWQucG9ydC1xdCAu dG9vbGJhci1pdGVtLmNsb3NlLWxlZnQsIGJvZHkuYXR0YWNoZWQucG9ydC1xdCAudG9vbGJhci1p CiAgICAgZGlzcGxheTogbm9uZTsKIH0KIAotYm9keS5wbGF0Zm9ybS1tYWMtdGlnZXIgLnRvb2xi YXItaXRlbS5jbG9zZS1yaWdodCwKLWJvZHkucGxhdGZvcm0tbWFjLWxlb3BhcmQgLnRvb2xiYXIt aXRlbS5jbG9zZS1yaWdodCwKLWJvZHkucGxhdGZvcm0tbWFjLXNub3dsZW9wYXJkIC50b29sYmFy LWl0ZW0uY2xvc2UtcmlnaHQgeworYm9keS5wbGF0Zm9ybS1tYWMgLnRvb2xiYXItaXRlbS5jbG9z ZS1yaWdodCB7CiAgICAgZGlzcGxheTogbm9uZTsKIH0KIAotYm9keTpub3QoLnBsYXRmb3JtLW1h Yy10aWdlcik6bm90KC5wbGF0Zm9ybS1tYWMtbGVvcGFyZCk6bm90KC5wbGF0Zm9ybS1tYWMtc25v d2xlb3BhcmQpIC50b29sYmFyLWl0ZW0uY2xvc2UtbGVmdCB7Citib2R5Om5vdCgucGxhdGZvcm0t bWFjKSAudG9vbGJhci1pdGVtLmNsb3NlLWxlZnQgewogICAgIGRpc3BsYXk6IG5vbmU7CiB9CiAK QEAgLTUwMywxOSArNTAxLDE4IEBAIGJvZHkuZHJhd2VyLXZpc2libGUgI2RyYXdlciB7CiAgICAg Zm9udC1mYW1pbHk6IG1vbm9zcGFjZTsKIH0KIAotYm9keS5wbGF0Zm9ybS1tYWMtdGlnZXIgLm1v bm9zcGFjZSwgYm9keS5wbGF0Zm9ybS1tYWMtbGVvcGFyZCAubW9ub3NwYWNlLAotYm9keS5wbGF0 Zm9ybS1tYWMtdGlnZXIgLnNvdXJjZS1jb2RlLCBib2R5LnBsYXRmb3JtLW1hYy1sZW9wYXJkIC5z b3VyY2UtY29kZSB7Citib2R5LnBsYXRmb3JtLW1hYyAubW9ub3NwYWNlLCBib2R5LnBsYXRmb3Jt LW1hYyAuc291cmNlLWNvZGUgewogICAgIGZvbnQtZmFtaWx5OiBNb25hY28sIG1vbm9zcGFjZTsK IH0KIAotYm9keS5wbGF0Zm9ybS1tYWMtc25vd2xlb3BhcmQgLm1vbm9zcGFjZSwKLWJvZHkucGxh dGZvcm0tbWFjLXNub3dsZW9wYXJkIC5zb3VyY2UtY29kZSB7CisvKiBLZWVwIC5wbGF0Zm9ybS1t YWMgdG8gbWFrZSB0aGUgcnVsZSBtb3JlIHNwZWNpZmljIHRoYW4gdGhlIGdlbmVyYWwgb25lIGFi b3ZlLiAqLworYm9keS5wbGF0Zm9ybS1tYWMucGxhdGZvcm0tc25vd2xlb3BhcmQgLm1vbm9zcGFj ZSwKK2JvZHkucGxhdGZvcm0tbWFjLnBsYXRmb3JtLXNub3dsZW9wYXJkIC5zb3VyY2UtY29kZSB7 CiAgICAgZm9udC1zaXplOiAxMXB4OwogICAgIGZvbnQtZmFtaWx5OiBNZW5sbywgbW9ub3NwYWNl OwogfQogCi1ib2R5LnBsYXRmb3JtLXdpbmRvd3MgLm1vbm9zcGFjZSwgYm9keS5wbGF0Zm9ybS13 aW5kb3dzLXZpc3RhLW9yLWxhdGVyIC5tb25vc3BhY2UsCi1ib2R5LnBsYXRmb3JtLXdpbmRvd3Mg LnNvdXJjZS1jb2RlLCBib2R5LnBsYXRmb3JtLXdpbmRvd3MtdmlzdGEtb3ItbGF0ZXIgLnNvdXJj ZS1jb2RlIHsKK2JvZHkucGxhdGZvcm0td2luZG93cyAubW9ub3NwYWNlLCBib2R5LnBsYXRmb3Jt LXdpbmRvd3MgLnNvdXJjZS1jb2RlIHsKICAgICBmb250LXNpemU6IDEycHg7CiAgICAgZm9udC1m YW1pbHk6IENvbnNvbGFzLCBMdWNpZGEgQ29uc29sZSwgbW9ub3NwYWNlOwogfQpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggYzYzN2YzNy4uM2E3YTQ3ZCAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC02NywzNyArNjcsNDQg QEAgdmFyIFdlYkluc3BlY3RvciA9IHsKICAgICBnZXQgcGxhdGZvcm0oKQogICAgIHsKICAgICAg ICAgaWYgKCEoIl9wbGF0Zm9ybSIgaW4gdGhpcykpCi0gICAgICAgICAgICB0aGlzLl9wbGF0Zm9y bSA9IHRoaXMuX2RldGVjdFBsYXRmb3JtKCk7CisgICAgICAgICAgICB0aGlzLl9wbGF0Zm9ybSA9 IEluc3BlY3RvckZyb250ZW5kSG9zdC5wbGF0Zm9ybSgpOwogCiAgICAgICAgIHJldHVybiB0aGlz Ll9wbGF0Zm9ybTsKICAgICB9LAogCi0gICAgX2RldGVjdFBsYXRmb3JtOiBmdW5jdGlvbigpCisg ICAgZ2V0IHBsYXRmb3JtRmxhdm9yKCkKKyAgICB7CisgICAgICAgIGlmICghKCJfcGxhdGZvcm1G bGF2b3IiIGluIHRoaXMpKQorICAgICAgICAgICAgdGhpcy5fcGxhdGZvcm1GbGF2b3IgPSB0aGlz Ll9kZXRlY3RQbGF0Zm9ybUZsYXZvcigpOworCisgICAgICAgIHJldHVybiB0aGlzLl9wbGF0Zm9y bUZsYXZvcjsKKyAgICB9LAorCisgICAgX2RldGVjdFBsYXRmb3JtRmxhdm9yOiBmdW5jdGlvbigp CiAgICAgewogICAgICAgICBjb25zdCB1c2VyQWdlbnQgPSBuYXZpZ2F0b3IudXNlckFnZW50Owot ICAgICAgICB2YXIgbmF0aXZlUGxhdGZvcm0gPSBJbnNwZWN0b3JGcm9udGVuZEhvc3QucGxhdGZv cm0oKTsKIAotICAgICAgICBpZiAobmF0aXZlUGxhdGZvcm0gPT09ICJ3aW5kb3dzIikgeworICAg ICAgICBpZiAodGhpcy5wbGF0Zm9ybSA9PT0gIndpbmRvd3MiKSB7CiAgICAgICAgICAgICB2YXIg bWF0Y2ggPSB1c2VyQWdlbnQubWF0Y2goL1dpbmRvd3MgTlQgKFxkKylcLig/OlxkKykvKTsKICAg ICAgICAgICAgIGlmIChtYXRjaCAmJiBtYXRjaFsxXSA+PSA2KQotICAgICAgICAgICAgICAgIHJl dHVybiBXZWJJbnNwZWN0b3IuT1MuV2luZG93c1Zpc3RhT3JMYXRlcjsKLSAgICAgICAgICAgIHJl dHVybiBXZWJJbnNwZWN0b3IuT1MuV2luZG93czsKLSAgICAgICAgfSBlbHNlIGlmIChuYXRpdmVQ bGF0Zm9ybSA9PT0gIm1hYyIpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9y LlBsYXRmb3JtRmxhdm9yLldpbmRvd3NWaXN0YU9yTGF0ZXI7CisgICAgICAgICAgICByZXR1cm4g bnVsbDsKKyAgICAgICAgfSBlbHNlIGlmICh0aGlzLnBsYXRmb3JtID09PSAibWFjIikgewogICAg ICAgICAgICAgdmFyIG1hdGNoID0gdXNlckFnZW50Lm1hdGNoKC9NYWMgT1MgWFxzKig/OihcZCsp XyhcZCspKT8vKTsKICAgICAgICAgICAgIGlmICghbWF0Y2ggfHwgbWF0Y2hbMV0gIT0gMTApCi0g ICAgICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5PUy5NYWNTbm93TGVvcGFyZDsKKyAg ICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlBsYXRmb3JtRmxhdm9yLk1hY1Nub3dM ZW9wYXJkOwogICAgICAgICAgICAgc3dpdGNoIChOdW1iZXIobWF0Y2hbMl0pKSB7CiAgICAgICAg ICAgICAgICAgY2FzZSA0OgotICAgICAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9y Lk9TLk1hY1RpZ2VyOworICAgICAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlBs YXRmb3JtRmxhdm9yLk1hY1RpZ2VyOwogICAgICAgICAgICAgICAgIGNhc2UgNToKLSAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5PUy5NYWNMZW9wYXJkOworICAgICAgICAg ICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlBsYXRmb3JtRmxhdm9yLk1hY0xlb3BhcmQ7 CiAgICAgICAgICAgICAgICAgY2FzZSA2OgogICAgICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAg ICAgICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuT1MuTWFjU25vd0xlb3BhcmQ7Cisg ICAgICAgICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuUGxhdGZvcm1GbGF2b3IuTWFj U25vd0xlb3BhcmQ7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICByZXR1cm4g bmF0aXZlUGxhdGZvcm07CisgICAgICAgIHJldHVybiBudWxsOwogICAgIH0sCiAKICAgICBnZXQg cG9ydCgpCkBAIC00MTUsMTIgKzQyMiwxMSBAQCB2YXIgV2ViSW5zcGVjdG9yID0gewogICAgIH0K IH0KIAotV2ViSW5zcGVjdG9yLk9TID0gewotICAgIFdpbmRvd3M6ICJ3aW5kb3dzIiwKLSAgICBX aW5kb3dzVmlzdGFPckxhdGVyOiAid2luZG93cy12aXN0YS1vci1sYXRlciIsCi0gICAgTWFjVGln ZXI6ICJtYWMtdGlnZXIiLAotICAgIE1hY0xlb3BhcmQ6ICJtYWMtbGVvcGFyZCIsCi0gICAgTWFj U25vd0xlb3BhcmQ6ICJtYWMtc25vd2xlb3BhcmQiCitXZWJJbnNwZWN0b3IuUGxhdGZvcm1GbGF2 b3IgPSB7CisgICAgV2luZG93c1Zpc3RhT3JMYXRlcjogInZpc3RhLW9yLWxhdGVyIiwKKyAgICBN YWNUaWdlcjogInRpZ2VyIiwKKyAgICBNYWNMZW9wYXJkOiAibGVvcGFyZCIsCisgICAgTWFjU25v d0xlb3BhcmQ6ICJzbm93bGVvcGFyZCIKIH0KIAogV2ViSW5zcGVjdG9yLmxvYWRlZCA9IGZ1bmN0 aW9uKCkKQEAgLTQyOSw2ICs0MzUsOSBAQCBXZWJJbnNwZWN0b3IubG9hZGVkID0gZnVuY3Rpb24o KQogCiAgICAgdmFyIHBsYXRmb3JtID0gV2ViSW5zcGVjdG9yLnBsYXRmb3JtOwogICAgIGRvY3Vt ZW50LmJvZHkuYWRkU3R5bGVDbGFzcygicGxhdGZvcm0tIiArIHBsYXRmb3JtKTsKKyAgICB2YXIg Zmxhdm9yID0gV2ViSW5zcGVjdG9yLnBsYXRmb3JtRmxhdm9yOworICAgIGlmIChmbGF2b3IpCisg ICAgICAgIGRvY3VtZW50LmJvZHkuYWRkU3R5bGVDbGFzcygicGxhdGZvcm0tIiArIGZsYXZvcik7 CiAgICAgdmFyIHBvcnQgPSBXZWJJbnNwZWN0b3IucG9ydDsKICAgICBkb2N1bWVudC5ib2R5LmFk ZFN0eWxlQ2xhc3MoInBvcnQtIiArIHBvcnQpOwogCkBAIC04NzEsNyArODgwLDcgQEAgV2ViSW5z cGVjdG9yLnRvZ2dsZUF0dGFjaCA9IGZ1bmN0aW9uKCkKIAogV2ViSW5zcGVjdG9yLnRvb2xiYXJE cmFnU3RhcnQgPSBmdW5jdGlvbihldmVudCkKIHsKLSAgICBpZiAoKCFXZWJJbnNwZWN0b3IuYXR0 YWNoZWQgJiYgV2ViSW5zcGVjdG9yLnBsYXRmb3JtICE9PSAibWFjLWxlb3BhcmQiKSB8fCBXZWJJ bnNwZWN0b3IucG9ydCA9PSAicXQiKQorICAgIGlmICgoIVdlYkluc3BlY3Rvci5hdHRhY2hlZCAm JiBXZWJJbnNwZWN0b3IucGxhdGZvcm1GbGF2b3IgIT09IFdlYkluc3BlY3Rvci5QbGF0Zm9ybUZs YXZvci5NYWNMZW9wYXJkICYmIFdlYkluc3BlY3Rvci5wbGF0Zm9ybUZsYXZvciAhPT0gV2ViSW5z cGVjdG9yLlBsYXRmb3JtRmxhdm9yLk1hY1Nub3dMZW9wYXJkKSB8fCBXZWJJbnNwZWN0b3IucG9y dCA9PSAicXQiKQogICAgICAgICByZXR1cm47CiAKICAgICB2YXIgdGFyZ2V0ID0gZXZlbnQudGFy Z2V0OwpAQCAtMTY4NSw3ICsxNjk0LDcgQEAgV2ViSW5zcGVjdG9yLlVJU3RyaW5nID0gZnVuY3Rp b24oc3RyaW5nKQogV2ViSW5zcGVjdG9yLmlzTWFjID0gZnVuY3Rpb24oKQogewogICAgIGlmICgh KCJfaXNNYWMiIGluIHRoaXMpKQotICAgICAgICB0aGlzLl9pc01hYyA9IFdlYkluc3BlY3Rvci5w bGF0Zm9ybS5pbmRleE9mKCJtYWMtIikgPT09IDA7CisgICAgICAgIHRoaXMuX2lzTWFjID0gKFdl Ykluc3BlY3Rvci5wbGF0Zm9ybSA9PT0gIm1hYyIpOwogCiAgICAgcmV0dXJuIHRoaXMuX2lzTWFj OwogfQo= 47936 2010-02-02 08:43:45 -0800 2010-02-02 08:48:14 -0800 [PATCH] Comments addressed ostype.patch text/plain 7814 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg N2E1Yzc3Yi4uMTAxMzdmMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMC0wMi0wMiAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEVsaW1pbmF0ZSBzb21lIG9mIHRo ZSBwbGF0Zm9ybSBmbGF2b3Itc3BlY2lmaWMgc3R5bGVzaGVldCBzZWxlY3RvcnMKKworICAgICAg ICBFeHRyYWN0IE9TIHZlcnNpb24gaW50byBXZWJJbnNwZWN0b3IucGxhdGZvcm1GbGF2b3IKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0NDY5CisKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvckJhY2tlbmRTdHViLmpzOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5qczoK KyAgICAgICAgKC5XZWJJbnNwZWN0b3IuSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5wcm90b3R5 cGUucGxhdGZvcm0pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNz czoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5wZW5kaW5nRGlzcGF0Y2hlcy4wLlVSTFJlZ0V4cC5pLmdldCBwbGF0Zm9y bSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZ2V0IHBsYXRmb3JtRmxhdm9yKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5fZGV0ZWN0UGxhdGZvcm1GbGF2b3IpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLmxvYWRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IudG9vbGJhckRyYWdTdGFydCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuaXNNYWMpOgorCiAyMDEwLTAyLTAyICBTaGluaWNoaXJvIEhh bWFqaSAgPGhhbWFqaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBT ZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9y QmFja2VuZFN0dWIuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yQmFj a2VuZFN0dWIuanMKaW5kZXggNWRkYjc0YS4uZWQwM2Y3MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvckJhY2tlbmRTdHViLmpzCisrKyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JCYWNrZW5kU3R1Yi5qcwpAQCAtNDYsMTcgKzQ2 LDYgQEAgV2ViSW5zcGVjdG9yLkluc3BlY3RvckJhY2tlbmRTdHViLnByb3RvdHlwZSA9IHsKICAg ICAgICAgcmV0dXJuIGZ1bmM7CiAgICAgfSwKIAotICAgIHBsYXRmb3JtOiBmdW5jdGlvbigpCi0g ICAgewotICAgICAgICByZXR1cm4gIm1hYy1sZW9wYXJkIjsKLSAgICB9LAotCi0gICAgcG9ydDog ZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgcmV0dXJuICJ1bmtub3duIjsKLSAgICB9LAotCi0K ICAgICBjbG9zZVdpbmRvdzogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5fd2luZG93 VmlzaWJsZSA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0luc3BlY3RvckZyb250ZW5kSG9zdFN0dWIuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5qcwppbmRleCBkYzdkYTYxLi5mMWRlY2I2IDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yRnJvbnRlbmRI b3N0U3R1Yi5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yRnJv bnRlbmRIb3N0U3R1Yi5qcwpAQCAtMzUsMTAgKzM1LDEyIEBAIFdlYkluc3BlY3Rvci5JbnNwZWN0 b3JGcm9udGVuZEhvc3RTdHViID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX2F0dGFjaGVkV2luZG93 SGVpZ2h0ID0gMDsKIH0KIAorV2ViSW5zcGVjdG9yLl9wbGF0Zm9ybUZsYXZvciA9IFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybUZsYXZvci5NYWNMZW9wYXJkOworCiBXZWJJbnNwZWN0b3IuSW5zcGVjdG9y RnJvbnRlbmRIb3N0U3R1Yi5wcm90b3R5cGUgPSB7CiAgICAgcGxhdGZvcm06IGZ1bmN0aW9uKCkK ICAgICB7Ci0gICAgICAgIHJldHVybiAibWFjLWxlb3BhcmQiOworICAgICAgICByZXR1cm4gIm1h YyI7CiAgICAgfSwKIAogICAgIHBvcnQ6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5jc3MKaW5kZXggNTU4MDRmMy4uYzNkZWQzNCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKKysrIGIvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKQEAgLTI0NiwxMyArMjQ2LDExIEBAIGJv ZHkuYXR0YWNoZWQucG9ydC1xdCAudG9vbGJhci1pdGVtLmNsb3NlLWxlZnQsIGJvZHkuYXR0YWNo ZWQucG9ydC1xdCAudG9vbGJhci1pCiAgICAgZGlzcGxheTogbm9uZTsKIH0KIAotYm9keS5wbGF0 Zm9ybS1tYWMtdGlnZXIgLnRvb2xiYXItaXRlbS5jbG9zZS1yaWdodCwKLWJvZHkucGxhdGZvcm0t bWFjLWxlb3BhcmQgLnRvb2xiYXItaXRlbS5jbG9zZS1yaWdodCwKLWJvZHkucGxhdGZvcm0tbWFj LXNub3dsZW9wYXJkIC50b29sYmFyLWl0ZW0uY2xvc2UtcmlnaHQgeworYm9keS5wbGF0Zm9ybS1t YWMgLnRvb2xiYXItaXRlbS5jbG9zZS1yaWdodCB7CiAgICAgZGlzcGxheTogbm9uZTsKIH0KIAot Ym9keTpub3QoLnBsYXRmb3JtLW1hYy10aWdlcik6bm90KC5wbGF0Zm9ybS1tYWMtbGVvcGFyZCk6 bm90KC5wbGF0Zm9ybS1tYWMtc25vd2xlb3BhcmQpIC50b29sYmFyLWl0ZW0uY2xvc2UtbGVmdCB7 Citib2R5Om5vdCgucGxhdGZvcm0tbWFjKSAudG9vbGJhci1pdGVtLmNsb3NlLWxlZnQgewogICAg IGRpc3BsYXk6IG5vbmU7CiB9CiAKQEAgLTUwMywxOSArNTAxLDE4IEBAIGJvZHkuZHJhd2VyLXZp c2libGUgI2RyYXdlciB7CiAgICAgZm9udC1mYW1pbHk6IG1vbm9zcGFjZTsKIH0KIAotYm9keS5w bGF0Zm9ybS1tYWMtdGlnZXIgLm1vbm9zcGFjZSwgYm9keS5wbGF0Zm9ybS1tYWMtbGVvcGFyZCAu bW9ub3NwYWNlLAotYm9keS5wbGF0Zm9ybS1tYWMtdGlnZXIgLnNvdXJjZS1jb2RlLCBib2R5LnBs YXRmb3JtLW1hYy1sZW9wYXJkIC5zb3VyY2UtY29kZSB7Citib2R5LnBsYXRmb3JtLW1hYyAubW9u b3NwYWNlLCBib2R5LnBsYXRmb3JtLW1hYyAuc291cmNlLWNvZGUgewogICAgIGZvbnQtZmFtaWx5 OiBNb25hY28sIG1vbm9zcGFjZTsKIH0KIAotYm9keS5wbGF0Zm9ybS1tYWMtc25vd2xlb3BhcmQg Lm1vbm9zcGFjZSwKLWJvZHkucGxhdGZvcm0tbWFjLXNub3dsZW9wYXJkIC5zb3VyY2UtY29kZSB7 CisvKiBLZWVwIC5wbGF0Zm9ybS1tYWMgdG8gbWFrZSB0aGUgcnVsZSBtb3JlIHNwZWNpZmljIHRo YW4gdGhlIGdlbmVyYWwgb25lIGFib3ZlLiAqLworYm9keS5wbGF0Zm9ybS1tYWMucGxhdGZvcm0t bWFjLXNub3dsZW9wYXJkIC5tb25vc3BhY2UsCitib2R5LnBsYXRmb3JtLW1hYy5wbGF0Zm9ybS1t YWMtc25vd2xlb3BhcmQgLnNvdXJjZS1jb2RlIHsKICAgICBmb250LXNpemU6IDExcHg7CiAgICAg Zm9udC1mYW1pbHk6IE1lbmxvLCBtb25vc3BhY2U7CiB9CiAKLWJvZHkucGxhdGZvcm0td2luZG93 cyAubW9ub3NwYWNlLCBib2R5LnBsYXRmb3JtLXdpbmRvd3MtdmlzdGEtb3ItbGF0ZXIgLm1vbm9z cGFjZSwKLWJvZHkucGxhdGZvcm0td2luZG93cyAuc291cmNlLWNvZGUsIGJvZHkucGxhdGZvcm0t d2luZG93cy12aXN0YS1vci1sYXRlciAuc291cmNlLWNvZGUgeworYm9keS5wbGF0Zm9ybS13aW5k b3dzIC5tb25vc3BhY2UsIGJvZHkucGxhdGZvcm0td2luZG93cyAuc291cmNlLWNvZGUgewogICAg IGZvbnQtc2l6ZTogMTJweDsKICAgICBmb250LWZhbWlseTogQ29uc29sYXMsIEx1Y2lkYSBDb25z b2xlLCBtb25vc3BhY2U7CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5q cwppbmRleCBjNjM3ZjM3Li5mOTlmM2E2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanMKQEAgLTY3LDM3ICs2Nyw0NCBAQCB2YXIgV2ViSW5zcGVjdG9yID0gewogICAg IGdldCBwbGF0Zm9ybSgpCiAgICAgewogICAgICAgICBpZiAoISgiX3BsYXRmb3JtIiBpbiB0aGlz KSkKLSAgICAgICAgICAgIHRoaXMuX3BsYXRmb3JtID0gdGhpcy5fZGV0ZWN0UGxhdGZvcm0oKTsK KyAgICAgICAgICAgIHRoaXMuX3BsYXRmb3JtID0gSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnBsYXRm b3JtKCk7CiAKICAgICAgICAgcmV0dXJuIHRoaXMuX3BsYXRmb3JtOwogICAgIH0sCiAKLSAgICBf ZGV0ZWN0UGxhdGZvcm06IGZ1bmN0aW9uKCkKKyAgICBnZXQgcGxhdGZvcm1GbGF2b3IoKQorICAg IHsKKyAgICAgICAgaWYgKCEoIl9wbGF0Zm9ybUZsYXZvciIgaW4gdGhpcykpCisgICAgICAgICAg ICB0aGlzLl9wbGF0Zm9ybUZsYXZvciA9IHRoaXMuX2RldGVjdFBsYXRmb3JtRmxhdm9yKCk7CisK KyAgICAgICAgcmV0dXJuIHRoaXMuX3BsYXRmb3JtRmxhdm9yOworICAgIH0sCisKKyAgICBfZGV0 ZWN0UGxhdGZvcm1GbGF2b3I6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGNvbnN0IHVzZXJB Z2VudCA9IG5hdmlnYXRvci51c2VyQWdlbnQ7Ci0gICAgICAgIHZhciBuYXRpdmVQbGF0Zm9ybSA9 IEluc3BlY3RvckZyb250ZW5kSG9zdC5wbGF0Zm9ybSgpOwogCi0gICAgICAgIGlmIChuYXRpdmVQ bGF0Zm9ybSA9PT0gIndpbmRvd3MiKSB7CisgICAgICAgIGlmICh0aGlzLnBsYXRmb3JtID09PSAi d2luZG93cyIpIHsKICAgICAgICAgICAgIHZhciBtYXRjaCA9IHVzZXJBZ2VudC5tYXRjaCgvV2lu ZG93cyBOVCAoXGQrKVwuKD86XGQrKS8pOwogICAgICAgICAgICAgaWYgKG1hdGNoICYmIG1hdGNo WzFdID49IDYpCi0gICAgICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5PUy5XaW5kb3dz VmlzdGFPckxhdGVyOwotICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5PUy5XaW5kb3dz OwotICAgICAgICB9IGVsc2UgaWYgKG5hdGl2ZVBsYXRmb3JtID09PSAibWFjIikgeworICAgICAg ICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuUGxhdGZvcm1GbGF2b3IuV2luZG93c1Zpc3Rh OworICAgICAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAgIH0gZWxzZSBpZiAodGhpcy5wbGF0 Zm9ybSA9PT0gIm1hYyIpIHsKICAgICAgICAgICAgIHZhciBtYXRjaCA9IHVzZXJBZ2VudC5tYXRj aCgvTWFjIE9TIFhccyooPzooXGQrKV8oXGQrKSk/Lyk7CiAgICAgICAgICAgICBpZiAoIW1hdGNo IHx8IG1hdGNoWzFdICE9IDEwKQotICAgICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3Iu T1MuTWFjU25vd0xlb3BhcmQ7CisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5Q bGF0Zm9ybUZsYXZvci5NYWNTbm93TGVvcGFyZDsKICAgICAgICAgICAgIHN3aXRjaCAoTnVtYmVy KG1hdGNoWzJdKSkgewogICAgICAgICAgICAgICAgIGNhc2UgNDoKLSAgICAgICAgICAgICAgICAg ICAgcmV0dXJuIFdlYkluc3BlY3Rvci5PUy5NYWNUaWdlcjsKKyAgICAgICAgICAgICAgICAgICAg cmV0dXJuIFdlYkluc3BlY3Rvci5QbGF0Zm9ybUZsYXZvci5NYWNUaWdlcjsKICAgICAgICAgICAg ICAgICBjYXNlIDU6Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuT1Mu TWFjTGVvcGFyZDsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5QbGF0 Zm9ybUZsYXZvci5NYWNMZW9wYXJkOwogICAgICAgICAgICAgICAgIGNhc2UgNjoKICAgICAgICAg ICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9y Lk9TLk1hY1Nub3dMZW9wYXJkOworICAgICAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVj dG9yLlBsYXRmb3JtRmxhdm9yLk1hY1Nub3dMZW9wYXJkOwogICAgICAgICAgICAgfQogICAgICAg ICB9CiAKLSAgICAgICAgcmV0dXJuIG5hdGl2ZVBsYXRmb3JtOworICAgICAgICByZXR1cm4gbnVs bDsKICAgICB9LAogCiAgICAgZ2V0IHBvcnQoKQpAQCAtNDE1LDkgKzQyMiw4IEBAIHZhciBXZWJJ bnNwZWN0b3IgPSB7CiAgICAgfQogfQogCi1XZWJJbnNwZWN0b3IuT1MgPSB7Ci0gICAgV2luZG93 czogIndpbmRvd3MiLAotICAgIFdpbmRvd3NWaXN0YU9yTGF0ZXI6ICJ3aW5kb3dzLXZpc3RhLW9y LWxhdGVyIiwKK1dlYkluc3BlY3Rvci5QbGF0Zm9ybUZsYXZvciA9IHsKKyAgICBXaW5kb3dzVmlz dGE6ICJ3aW5kb3dzLXZpc3RhIiwKICAgICBNYWNUaWdlcjogIm1hYy10aWdlciIsCiAgICAgTWFj TGVvcGFyZDogIm1hYy1sZW9wYXJkIiwKICAgICBNYWNTbm93TGVvcGFyZDogIm1hYy1zbm93bGVv cGFyZCIKQEAgLTQyOSw2ICs0MzUsOSBAQCBXZWJJbnNwZWN0b3IubG9hZGVkID0gZnVuY3Rpb24o KQogCiAgICAgdmFyIHBsYXRmb3JtID0gV2ViSW5zcGVjdG9yLnBsYXRmb3JtOwogICAgIGRvY3Vt ZW50LmJvZHkuYWRkU3R5bGVDbGFzcygicGxhdGZvcm0tIiArIHBsYXRmb3JtKTsKKyAgICB2YXIg Zmxhdm9yID0gV2ViSW5zcGVjdG9yLnBsYXRmb3JtRmxhdm9yOworICAgIGlmIChmbGF2b3IpCisg ICAgICAgIGRvY3VtZW50LmJvZHkuYWRkU3R5bGVDbGFzcygicGxhdGZvcm0tIiArIGZsYXZvcik7 CiAgICAgdmFyIHBvcnQgPSBXZWJJbnNwZWN0b3IucG9ydDsKICAgICBkb2N1bWVudC5ib2R5LmFk ZFN0eWxlQ2xhc3MoInBvcnQtIiArIHBvcnQpOwogCkBAIC04NzEsNyArODgwLDcgQEAgV2ViSW5z cGVjdG9yLnRvZ2dsZUF0dGFjaCA9IGZ1bmN0aW9uKCkKIAogV2ViSW5zcGVjdG9yLnRvb2xiYXJE cmFnU3RhcnQgPSBmdW5jdGlvbihldmVudCkKIHsKLSAgICBpZiAoKCFXZWJJbnNwZWN0b3IuYXR0 YWNoZWQgJiYgV2ViSW5zcGVjdG9yLnBsYXRmb3JtICE9PSAibWFjLWxlb3BhcmQiKSB8fCBXZWJJ bnNwZWN0b3IucG9ydCA9PSAicXQiKQorICAgIGlmICgoIVdlYkluc3BlY3Rvci5hdHRhY2hlZCAm JiBXZWJJbnNwZWN0b3IucGxhdGZvcm1GbGF2b3IgIT09IFdlYkluc3BlY3Rvci5QbGF0Zm9ybUZs YXZvci5NYWNMZW9wYXJkICYmIFdlYkluc3BlY3Rvci5wbGF0Zm9ybUZsYXZvciAhPT0gV2ViSW5z cGVjdG9yLlBsYXRmb3JtRmxhdm9yLk1hY1Nub3dMZW9wYXJkKSB8fCBXZWJJbnNwZWN0b3IucG9y dCA9PSAicXQiKQogICAgICAgICByZXR1cm47CiAKICAgICB2YXIgdGFyZ2V0ID0gZXZlbnQudGFy Z2V0OwpAQCAtMTY4NSw3ICsxNjk0LDcgQEAgV2ViSW5zcGVjdG9yLlVJU3RyaW5nID0gZnVuY3Rp b24oc3RyaW5nKQogV2ViSW5zcGVjdG9yLmlzTWFjID0gZnVuY3Rpb24oKQogewogICAgIGlmICgh KCJfaXNNYWMiIGluIHRoaXMpKQotICAgICAgICB0aGlzLl9pc01hYyA9IFdlYkluc3BlY3Rvci5w bGF0Zm9ybS5pbmRleE9mKCJtYWMtIikgPT09IDA7CisgICAgICAgIHRoaXMuX2lzTWFjID0gKFdl Ykluc3BlY3Rvci5wbGF0Zm9ybSA9PT0gIm1hYyIpOwogCiAgICAgcmV0dXJuIHRoaXMuX2lzTWFj OwogfQo=