31116 2009-11-04 06:33:42 -0800 WebInspector: Corrects InspectorBackent::platform() on Windows. 2009-11-04 13:44:20 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) PC Windows 2000 RESOLVED FIXED Qt P3 Normal --- 1 jturcotte webkit-unassigned aroben commit-queue eric mark mjs pfeldman timothy oldest_to_newest 160425 0 jturcotte 2009-11-04 06:33:42 -0800 This allows Qt on Windows to use platform-qt in the inspector. 160427 1 42482 jturcotte 2009-11-04 06:38:08 -0800 Created attachment 42482 Patch 160429 2 jturcotte 2009-11-04 06:39:13 -0800 I suppose that Gtk and Wx would expect the same behavior. 160482 3 eric 2009-11-04 10:11:44 -0800 Looks OK, but I would think better would be to move the WIN_OS option to the end of the list, if it really should be a WIN_OS fallback for platforms based on WIN_OS. 160491 4 timothy 2009-11-04 10:17:48 -0800 I am not sure what the difference between WIN and WIN_OS is. 160496 5 aroben 2009-11-04 10:23:20 -0800 (In reply to comment #4) > I am not sure what the difference between WIN and WIN_OS is. WIN_OS is true for any platform building on the Windows operating system. WIN is mostly only true for Apple's Windows port, though it's possible Brent Fulgham's Cairo/libCurl-based Windows port also sets WIN to true. 160498 6 eric 2009-11-04 10:25:15 -0800 Oh, you're not alone. :) Sadly our PLATFORM macros are horribly confusing and you might get different answers from different people on different days. :) My understanding is that PLATFORM(WIN) is the Apple windows port, and PLATFORM(WIN_OS) is platforms which sit on top of the win32 api. The story is even more confusing on the mac. Maciej talked about a proposal to fix this long ago, I'm not sure what happened to that. 160583 7 42516 jturcotte 2009-11-04 13:23:35 -0800 Created attachment 42516 Alternate solution patch: webkit port identifier If we want to keep a WIN_OS wide platform identifier, I would rather use this solution instead. Unlike the PLATFORM macro on the C++ side, InspectorController.platform() returns a single value that must identify both the webkit flavor and the OS. Tell me if you prefer this solution or the first one, which should use identifers like qt-windows, qt-mac, gtk-linux if needed to switch different behavior/appearance of the inspector on different OS. 160586 8 jturcotte 2009-11-04 13:27:57 -0800 Details that might be usefull: currently, the only values returned by platform() that gets used in the code are "mac-*" and "qt" 160588 9 42516 commit-queue 2009-11-04 13:44:15 -0800 Comment on attachment 42516 Alternate solution patch: webkit port identifier Clearing flags on attachment: 42516 Committed r50528: <http://trac.webkit.org/changeset/50528> 160589 10 commit-queue 2009-11-04 13:44:20 -0800 All reviewed patches have been landed. Closing bug. 42482 2009-11-04 06:38:08 -0800 2009-11-04 13:34:47 -0800 Patch webinspector_patformwinos.patch text/plain 1165 jturcotte ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTg3MGY5YS4uM2M0NzU0OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAwOS0xMS0wNCAgSm9jZWx5biBUdXJj b3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvcnJlY3RzIEluc3BlY3RvckJhY2tlbnQ6OnBs YXRmb3JtKCkgb24gV2luZG93cy4KKyAgICAgICAgVGhpcyBhbGxvd3MgUXQgb24gV2luZG93cyB0 byB1c2UgcGxhdGZvcm0tcXQgaW4gdGhlIGluc3BlY3Rvci4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMTE2CisKKyAgICAgICAgKiBpbnNwZWN0b3Iv SW5zcGVjdG9yQmFja2VuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCYWNrZW5k OjpwbGF0Zm9ybSk6CisKIDIwMDktMTAtMjkgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KIAogICAgICAgICBObyByZXZpZXcsIHJvbGxpbmcgb3V0IHI1MDI5Ni4KZGlmZiAtLWdpdCBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuY3BwIGIvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQmFja2VuZC5jcHAKaW5kZXggMWZlYTI1Yi4uZmU1NTAzOSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5jcHAKKysrIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5jcHAKQEAgLTI0Myw3ICsyNDMsNyBAQCBjb25zdCBT dHJpbmcmIEluc3BlY3RvckJhY2tlbmQ6OnBsYXRmb3JtKCkgY29uc3QKICNlbHNlCiAgICAgREVG SU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIHBsYXRmb3JtLCAoIm1hYy1sZW9wYXJkIikp OwogI2VuZGlmCi0jZWxpZiBQTEFURk9STShXSU5fT1MpCisjZWxpZiBQTEFURk9STShXSU4pCiAg ICAgREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIHBsYXRmb3JtLCAoIndpbmRvd3Mi KSk7CiAjZWxpZiBQTEFURk9STShRVCkKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0 cmluZywgcGxhdGZvcm0sICgicXQiKSk7Cg== 42516 2009-11-04 13:23:35 -0800 2009-11-04 13:44:15 -0800 Alternate solution patch: webkit port identifier webinspector_portident.patch text/plain 5723 jturcotte ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTg3MGY5YS4uOGE0ZDA4MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAwOS0xMS0wNCAgSm9jZWx5biBUdXJj b3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYkluc3BlY3RvcjogVXNlIGEgZGlmZmVyZW50 IG1ldGhvZCB0byBpZGVudGlmeSB0aGUgd2Via2l0IHBvcnQgaW4KKyAgICAgICAgSW5zcGVjdG9y QmFja2VudDo6cGxhdGZvcm0oKS4KKyAgICAgICAgVGhpcyBjb3JyZWN0cyB0aGUgaW5zcGVjdG9y IGV4cGVjdGVkIGJlaGF2aW9yIHdpdGggUXQgb24gV2luZG93cy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMTE2CisKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yQmFja2VuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCYWNr ZW5kOjpwbGF0Zm9ybSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCYWNrZW5kOjpwb3J0 KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5oOgorICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmlkbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0luc3BlY3RvckNvbnRyb2xsZXJTdHViLmpzOgorICAgICAgICAoLldlYkluc3BlY3Rvci5J bnNwZWN0b3JDb250cm9sbGVyU3R1Yi5wcm90b3R5cGUucG9ydCk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmxvYWRlZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IudG9vbGJhckRyYWdTdGFydCk6CisKIDIwMDktMTAtMjkgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBObyByZXZpZXcsIHJvbGxpbmcgb3V0 IHI1MDI5Ni4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQu Y3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5jcHAKaW5kZXggMWZlYTI1 Yi4uODEzOTA3ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2Vu ZC5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5jcHAKQEAgLTI0 NSwxMiArMjQ1LDYgQEAgY29uc3QgU3RyaW5nJiBJbnNwZWN0b3JCYWNrZW5kOjpwbGF0Zm9ybSgp IGNvbnN0CiAjZW5kaWYKICNlbGlmIFBMQVRGT1JNKFdJTl9PUykKICAgICBERUZJTkVfU1RBVElD X0xPQ0FMKGNvbnN0IFN0cmluZywgcGxhdGZvcm0sICgid2luZG93cyIpKTsKLSNlbGlmIFBMQVRG T1JNKFFUKQotICAgIERFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5nLCBwbGF0Zm9ybSwg KCJxdCIpKTsKLSNlbGlmIFBMQVRGT1JNKEdUSykKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNv bnN0IFN0cmluZywgcGxhdGZvcm0sICgiZ3RrIikpOwotI2VsaWYgUExBVEZPUk0oV1gpCi0gICAg REVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIHBsYXRmb3JtLCAoInd4IikpOwogI2Vs c2UKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgcGxhdGZvcm0sICgidW5r bm93biIpKTsKICNlbmRpZgpAQCAtMjU4LDYgKzI1MiwyMiBAQCBjb25zdCBTdHJpbmcmIEluc3Bl Y3RvckJhY2tlbmQ6OnBsYXRmb3JtKCkgY29uc3QKICAgICByZXR1cm4gcGxhdGZvcm07CiB9CiAK KworY29uc3QgU3RyaW5nJiBJbnNwZWN0b3JCYWNrZW5kOjpwb3J0KCkgY29uc3QKK3sKKyNpZiBQ TEFURk9STShRVCkKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgcG9ydCwg KCJxdCIpKTsKKyNlbGlmIFBMQVRGT1JNKEdUSykKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNv bnN0IFN0cmluZywgcG9ydCwgKCJndGsiKSk7CisjZWxpZiBQTEFURk9STShXWCkKKyAgICBERUZJ TkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgcG9ydCwgKCJ3eCIpKTsKKyNlbHNlCisgICAg REVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIHBvcnQsICgidW5rbm93biIpKTsKKyNl bmRpZgorCisgICAgcmV0dXJuIHBvcnQ7Cit9CisKIHZvaWQgSW5zcGVjdG9yQmFja2VuZDo6c3Rh cnRUaW1lbGluZVByb2ZpbGVyKCkKIHsKICAgICBpZiAobV9pbnNwZWN0b3JDb250cm9sbGVyKQpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5oIGIvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5oCmluZGV4IDcxZjcxYWIuLmFlYTYzZTMgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuaAorKysgYi9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmgKQEAgLTk0LDYgKzk0LDcgQEAgcHVibGlj OgogICAgIHZvaWQgY2xvc2VXaW5kb3coKTsKIAogICAgIGNvbnN0IFN0cmluZyYgcGxhdGZvcm0o KSBjb25zdDsKKyAgICBjb25zdCBTdHJpbmcmIHBvcnQoKSBjb25zdDsKIAogICAgIHZvaWQgc3Rh cnRUaW1lbGluZVByb2ZpbGVyKCk7CiAgICAgdm9pZCBzdG9wVGltZWxpbmVQcm9maWxlcigpOwpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5pZGwgYi9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmlkbAppbmRleCA5NzgzNjk5Li5iYjM3ZTJi IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmlkbAorKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmlkbApAQCAtNjEsNiArNjEsNyBA QCBtb2R1bGUgY29yZSB7CiAgICAgICAgIERPTVN0cmluZyBsb2NhbGl6ZWRTdHJpbmdzVVJMKCk7 CiAgICAgICAgIERPTVN0cmluZyBoaWRkZW5QYW5lbHMoKTsKICAgICAgICAgRE9NU3RyaW5nIHBs YXRmb3JtKCk7CisgICAgICAgIERPTVN0cmluZyBwb3J0KCk7CiAgICAgICAgIHZvaWQgc3RhcnRU aW1lbGluZVByb2ZpbGVyKCk7CiAgICAgICAgIHZvaWQgc3RvcFRpbWVsaW5lUHJvZmlsZXIoKTsK ICAgICAgICAgW0ltcGxlbWVudGF0aW9uRnVuY3Rpb249bW92ZVdpbmRvd0J5XSB2b2lkIG1vdmVC eVVucmVzdHJpY3RlZChpbiBmbG9hdCB4LCBpbiBmbG9hdCB5KTsKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JDb250cm9sbGVyU3R1Yi5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JDb250cm9sbGVyU3R1Yi5qcwppbmRleCA2 ZmI1YTFiLi5mNzhjOWJkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SW5zcGVjdG9yQ29udHJvbGxlclN0dWIuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0luc3BlY3RvckNvbnRyb2xsZXJTdHViLmpzCkBAIC01OCw2ICs1OCwxMSBAQCBXZWJJbnNw ZWN0b3IuSW5zcGVjdG9yQ29udHJvbGxlclN0dWIucHJvdG90eXBlID0gewogICAgICAgICByZXR1 cm4gIm1hYy1sZW9wYXJkIjsKICAgICB9LAogCisgICAgcG9ydDogZnVuY3Rpb24oKQorICAgIHsK KyAgICAgICAgcmV0dXJuICJ1bmtub3duIjsKKyAgICB9LAorCiAKICAgICBjbG9zZVdpbmRvdzog ZnVuY3Rpb24oKQogICAgIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuY3NzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5j c3MKaW5kZXggNzhhYjIzZC4uYTgzZDM4YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5jc3MKQEAgLTk0LDcgKzk0LDcgQEAgYm9keS5hdHRhY2hlZCAjdG9vbGJhciB7 CiAgICAgcGFkZGluZy1sZWZ0OiAwOwogfQogCi1ib2R5LmF0dGFjaGVkLnBsYXRmb3JtLXF0ICN0 b29sYmFyIHsKK2JvZHkuYXR0YWNoZWQucG9ydC1xdCAjdG9vbGJhciB7CiAgICAgY3Vyc29yOiBh dXRvOwogfQogCkBAIC0yMzcsNyArMjM3LDcgQEAgYm9keS5kZXRhY2hlZCAudG9vbGJhci1pdGVt LmNsb3NlLWxlZnQsIGJvZHkuZGV0YWNoZWQgLnRvb2xiYXItaXRlbS5jbG9zZS1yaWdodAogICAg IGRpc3BsYXk6IG5vbmU7CiB9CiAKLWJvZHkuYXR0YWNoZWQucGxhdGZvcm0tcXQgLnRvb2xiYXIt aXRlbS5jbG9zZS1sZWZ0LCBib2R5LmF0dGFjaGVkLnBsYXRmb3JtLXF0IC50b29sYmFyLWl0ZW0u Y2xvc2UtcmlnaHQgeworYm9keS5hdHRhY2hlZC5wb3J0LXF0IC50b29sYmFyLWl0ZW0uY2xvc2Ut bGVmdCwgYm9keS5hdHRhY2hlZC5wb3J0LXF0IC50b29sYmFyLWl0ZW0uY2xvc2UtcmlnaHQgewog ICAgIGRpc3BsYXk6IG5vbmU7CiB9CiAKQEAgLTM5Miw3ICszOTIsNyBAQCBib2R5LmRldGFjaGVk ICNkb2NrLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggewogICAgIC13ZWJraXQtbWFzay1pbWFnZTog dXJsKEltYWdlcy9kb2NrQnV0dG9uR2x5cGgucG5nKTsKIH0KIAotYm9keS5wbGF0Zm9ybS1xdCAj ZG9jay1zdGF0dXMtYmFyLWl0ZW0geworYm9keS5wb3J0LXF0ICNkb2NrLXN0YXR1cy1iYXItaXRl bSB7CiAgICAgZGlzcGxheTogbm9uZQogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qcwppbmRleCA4OGE2NDM0Li4zMzA1YWNmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTM3MSw2ICszNzEsOCBAQCBXZWJJbnNwZWN0b3IubG9h ZGVkID0gZnVuY3Rpb24oKQogewogICAgIHZhciBwbGF0Zm9ybSA9IEluc3BlY3RvckNvbnRyb2xs ZXIucGxhdGZvcm0oKTsKICAgICBkb2N1bWVudC5ib2R5LmFkZFN0eWxlQ2xhc3MoInBsYXRmb3Jt LSIgKyBwbGF0Zm9ybSk7CisgICAgdmFyIHBvcnQgPSBJbnNwZWN0b3JDb250cm9sbGVyLnBvcnQo KTsKKyAgICBkb2N1bWVudC5ib2R5LmFkZFN0eWxlQ2xhc3MoInBvcnQtIiArIHBvcnQpOwogCiAg ICAgdGhpcy5fbG9hZFByZWZlcmVuY2VzKCk7CiAgICAgdGhpcy5wZW5kaW5nRGlzcGF0Y2hlcyA9 IDA7CkBAIC04MjIsNyArODI0LDcgQEAgV2ViSW5zcGVjdG9yLnRvZ2dsZUF0dGFjaCA9IGZ1bmN0 aW9uKCkKIAogV2ViSW5zcGVjdG9yLnRvb2xiYXJEcmFnU3RhcnQgPSBmdW5jdGlvbihldmVudCkK IHsKLSAgICBpZiAoKCFXZWJJbnNwZWN0b3IuYXR0YWNoZWQgJiYgSW5zcGVjdG9yQ29udHJvbGxl ci5wbGF0Zm9ybSgpICE9PSAibWFjLWxlb3BhcmQiKSB8fCBJbnNwZWN0b3JDb250cm9sbGVyLnBs YXRmb3JtKCkgPT0gInF0IikKKyAgICBpZiAoKCFXZWJJbnNwZWN0b3IuYXR0YWNoZWQgJiYgSW5z cGVjdG9yQ29udHJvbGxlci5wbGF0Zm9ybSgpICE9PSAibWFjLWxlb3BhcmQiKSB8fCBJbnNwZWN0 b3JDb250cm9sbGVyLnBvcnQoKSA9PSAicXQiKQogICAgICAgICByZXR1cm47CiAKICAgICB2YXIg dGFyZ2V0ID0gZXZlbnQudGFyZ2V0Owo=