112423 2013-03-15 03:08:41 -0700 Web Inspector: Flame Chart. xOffset calculates incorrectly when chart width less that canvas.width 2013-03-15 03:48:33 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 loislo loislo apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 855843 0 loislo 2013-03-15 03:08:41 -0700 There were many places when we have to check the edge cases for xOffset. I've externalized the mechanics. patch to follow. 855852 1 193271 loislo 2013-03-15 03:20:06 -0700 Created attachment 193271 Patch 855868 2 loislo 2013-03-15 03:48:33 -0700 Committed r145894: <http://trac.webkit.org/changeset/145894> 193271 2013-03-15 03:20:06 -0700 2013-03-15 03:45:05 -0700 Patch bug-112423-20130315141601.patch text/plain 5470 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzhhMWQ5NDZkYzk1ZDU5 ZGJhZmZkNTU4OTQ0OWEyYTMxNDgyODMwYi4uOTA2NDk4ZjI2YzEyMjU5OWQ1YmNkOWY5ZDQxNTJj YzM5YTg1OTcwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDEzLTAzLTE1ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5zcGVj dG9yOiBGbGFtZSBDaGFydC4geE9mZnNldCBjYWxjdWxhdGVzIGluY29ycmVjdGx5IHdoZW4gY2hh cnQgd2lkdGggbGVzcyB0aGF0IGNhbnZhcy53aWR0aC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjQyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEkgZXh0cmFjdGVkIHhPZmZzZXQgYXNzaWdtZW50IHBy b2NlZHVyZSBpbnRvIGEgc2VwYXJhdGUgZnVuY3Rpb24uCisKKyAgICAgICAgRHJpdmUgYnkgZml4 OiBzaXplIGFuZCBwb3Npb24gb2YgYW5jaG9yIGVsZW1lbnQgd2FzIGFkanVzdGVkLgorICAgICAg ICBEcml2ZSBieSBmaXg6IHdlIHdpbGwgbm90IHBhaW50IGl0ZW0gaWYgaXQgaXMgbm90IHZpc2li bGUuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0ZsYW1lQ2hhcnQuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUuX21heFhPZmZzZXQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlLl9zZXRYT2Zmc2V0KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LnByb3RvdHlwZS5fY2FudmFzRHJhZ2dpbmcp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlLl9vbk1vdXNlTW92 ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUuX2FkanVzdFhP ZmZzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlLl9hZGp1 c3RYU2NhbGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlLmRy YXcpOgorCisyMDEzLTAzLTE1ICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9y Zz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBGbGFtZSBDaGFydC4gV2hlbiB1c2VyIHpvb21z IHRoZSBjaGFydCwgdGhlIHBvaW50IHVuZGVyIGN1cnNvciBoYXMgdG8gYmUgdGhlIHpvb21pbmcg Y2VudGVyLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTEyNDE3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RmxhbWVDaGFydC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmxhbWVD aGFydC5qcwppbmRleCBiZGQzZWUyNmQ4NzExNTIxOGQzZjRhNDNjMmYzOWUyMTk0NjllMjNhLi44 NmMyMWFkZDBlNWM1MTczZDE4NWEzMmUxZDZiOGNjMGUwOTNhZWFlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZsYW1lQ2hhcnQuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GbGFtZUNoYXJ0LmpzCkBAIC03NCwxOCArNzQs MjcgQEAgV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlID0gewogICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICB9LAogCi0gICAgX2NhbnZhc0RyYWdnaW5nOiBmdW5jdGlvbihldmVudCkK KyAgICBfbWF4WE9mZnNldDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl90 aW1lbGluZURhdGEpCisgICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgdmFyIG1heFhPZmZz ZXQgPSBNYXRoLmZsb29yKHRoaXMuX3RpbWVsaW5lRGF0YS50b3RhbFRpbWUgKiB0aGlzLl94U2Nh bGVGYWN0b3IgLSB0aGlzLl9jYW52YXMud2lkdGgpOworICAgICAgICByZXR1cm4gbWF4WE9mZnNl dCA+IDAgPyBtYXhYT2Zmc2V0IDogMDsKKyAgICB9LAorCisgICAgX3NldFhPZmZzZXQ6IGZ1bmN0 aW9uKHhPZmZzZXQpCiAgICAgewotICAgICAgICB0aGlzLl94T2Zmc2V0ID0gdGhpcy5fZHJhZ1N0 YXJ0WE9mZnNldCArIHRoaXMuX2RyYWdTdGFydFBvaW50IC0gZXZlbnQucGFnZVg7Ci0KLSAgICAg ICAgaWYgKHRoaXMuX3hPZmZzZXQgPCAwKQotICAgICAgICAgICAgdGhpcy5feE9mZnNldCA9IDA7 Ci0gICAgICAgIGVsc2UgewotICAgICAgICAgICAgdmFyIG1heFhPZmZzZXQgPSB0aGlzLl90aW1l bGluZURhdGEudG90YWxUaW1lICogdGhpcy5feFNjYWxlRmFjdG9yIC0gdGhpcy5fY2FudmFzLndp ZHRoOwotICAgICAgICAgICAgaWYgKHRoaXMuX3hPZmZzZXQgPiBtYXhYT2Zmc2V0KQotICAgICAg ICAgICAgICAgIHRoaXMuX3hPZmZzZXQgPSBtYXhYT2Zmc2V0OworICAgICAgICB4T2Zmc2V0ID0g TnVtYmVyLmNvbnN0cmFpbih4T2Zmc2V0LCAwLCB0aGlzLl9tYXhYT2Zmc2V0KCkpOworCisgICAg ICAgIGlmICh4T2Zmc2V0ICE9PSB0aGlzLl94T2Zmc2V0KSB7CisgICAgICAgICAgICB0aGlzLl94 T2Zmc2V0ID0geE9mZnNldDsKKyAgICAgICAgICAgIHRoaXMuX3NjaGVkdWxlVXBkYXRlKCk7CiAg ICAgICAgIH0KLSAgICAgICAgdGhpcy5fc2NoZWR1bGVVcGRhdGUoKTsKKyAgICB9LAorCisgICAg X2NhbnZhc0RyYWdnaW5nOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuX3Nl dFhPZmZzZXQodGhpcy5fZHJhZ1N0YXJ0WE9mZnNldCArIHRoaXMuX2RyYWdTdGFydFBvaW50IC0g ZXZlbnQucGFnZVgpOwogICAgIH0sCiAKICAgICBfZW5kQ2FudmFzRHJhZ2dpbmc6IGZ1bmN0aW9u KCkKQEAgLTI0MCwzOSArMjQ5LDM1IEBAIFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LnByb3RvdHlw ZSA9IHsKIAogICAgICAgICB2YXIgdGltZWxpbmVEYXRhID0gdGhpcy5fdGltZWxpbmVEYXRhOwog CisgICAgICAgIHZhciBhbmNob3JMZWZ0ID0gTWF0aC5mbG9vcih0aW1lbGluZURhdGEuc3RhcnRU aW1lc1tub2RlSW5kZXhdICogdGhpcy5feFNjYWxlRmFjdG9yIC0gdGhpcy5feE9mZnNldCk7Cisg ICAgICAgIGFuY2hvckxlZnQgPSBOdW1iZXIuY29uc3RyYWluKGFuY2hvckxlZnQsIDAsIHRoaXMu X2NhbnZhcy53aWR0aCk7CisKKyAgICAgICAgdmFyIGFuY2hvcldpZHRoID0gTWF0aC5mbG9vcih0 aW1lbGluZURhdGEuZHVyYXRpb25zW25vZGVJbmRleF0gKiB0aGlzLl94U2NhbGVGYWN0b3IpOwor ICAgICAgICBhbmNob3JXaWR0aCA9IE51bWJlci5jb25zdHJhaW4oYW5jaG9yV2lkdGgsIDAsIHRo aXMuX2NhbnZhcy53aWR0aCAtIGFuY2hvckxlZnQpOworCiAgICAgICAgIHZhciBzdHlsZSA9IHRo aXMuX2FuY2hvckVsZW1lbnQuc3R5bGU7Ci0gICAgICAgIHN0eWxlLndpZHRoID0gTWF0aC5mbG9v cih0aW1lbGluZURhdGEuZHVyYXRpb25zW25vZGVJbmRleF0gKiB0aGlzLl94U2NhbGVGYWN0b3Ip ICsgInB4IjsKKyAgICAgICAgc3R5bGUud2lkdGggPSBhbmNob3JXaWR0aCArICJweCI7CiAgICAg ICAgIHN0eWxlLmhlaWdodCA9IHRoaXMuX2JhckhlaWdodCArICJweCI7Ci0gICAgICAgIHN0eWxl LmxlZnQgPSBNYXRoLmZsb29yKHRpbWVsaW5lRGF0YS5zdGFydFRpbWVzW25vZGVJbmRleF0gKiB0 aGlzLl94U2NhbGVGYWN0b3IgLSB0aGlzLl94T2Zmc2V0KSArICJweCI7CisgICAgICAgIHN0eWxl LmxlZnQgPSBhbmNob3JMZWZ0ICsgInB4IjsKICAgICAgICAgc3R5bGUudG9wID0gTWF0aC5mbG9v cih0aGlzLl9jYW52YXMuaGVpZ2h0IC0gKHRpbWVsaW5lRGF0YS5kZXB0aHNbbm9kZUluZGV4XSAr IDEpICogdGhpcy5fYmFySGVpZ2h0KSArICJweCI7CiAgICAgfSwKIAogICAgIF9hZGp1c3RYT2Zm c2V0OiBmdW5jdGlvbihkaXJlY3Rpb24pCiAgICAgewogICAgICAgICB2YXIgc3RlcCA9IHRoaXMu X3hTY2FsZUZhY3RvciAqIDU7Ci0gICAgICAgIHRoaXMuX3hPZmZzZXQgKz0gZGlyZWN0aW9uID4g MCA/IHN0ZXAgOiAtc3RlcDsKLSAgICAgICAgaWYgKHRoaXMuX3hPZmZzZXQgPCAwKQotICAgICAg ICAgICAgdGhpcy5feE9mZnNldCA9IDA7CisgICAgICAgIHRoaXMuX3NldFhPZmZzZXQodGhpcy5f eE9mZnNldCArIChkaXJlY3Rpb24gPiAwID8gc3RlcCA6IC1zdGVwKSk7CiAgICAgfSwKIAogICAg IF9hZGp1c3RYU2NhbGU6IGZ1bmN0aW9uKGRpcmVjdGlvbiwgeCkKICAgICB7CiAgICAgICAgIHZh ciBjdXJzb3JUaW1lID0gKHggKyB0aGlzLl94T2Zmc2V0KSAvIHRoaXMuX3hTY2FsZUZhY3RvcjsK KwogICAgICAgICBpZiAoZGlyZWN0aW9uID4gMCkKICAgICAgICAgICAgIHRoaXMuX3hTY2FsZUZh Y3RvciAvPSAyOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB0aGlzLl94U2NhbGVGYWN0b3Ig Kj0gMjsKIAotICAgICAgICB2YXIgYWJzb2x1dGVYID0gTWF0aC5mbG9vcihjdXJzb3JUaW1lICog dGhpcy5feFNjYWxlRmFjdG9yKTsKLSAgICAgICAgdmFyIHJpZ2h0RW5kT2ZWaWV3UG9ydCA9IGFi c29sdXRlWCAtIHggKyB0aGlzLl9jYW52YXMud2lkdGg7Ci0KLSAgICAgICAgdmFyIHJpZ2h0RW5k T2ZHcmFwaCA9IE1hdGguZmxvb3IodGhpcy5fdGltZWxpbmVEYXRhLnRvdGFsVGltZSAqIHRoaXMu X3hTY2FsZUZhY3Rvcik7Ci0gICAgICAgIGlmIChyaWdodEVuZE9mVmlld1BvcnQgPiByaWdodEVu ZE9mR3JhcGgpCi0gICAgICAgICAgICByaWdodEVuZE9mVmlld1BvcnQgPSByaWdodEVuZE9mR3Jh cGg7Ci0KLSAgICAgICAgdGhpcy5feE9mZnNldCA9IHJpZ2h0RW5kT2ZWaWV3UG9ydCAtIHRoaXMu X2NhbnZhcy53aWR0aDsKLSAgICAgICAgaWYgKHRoaXMuX3hPZmZzZXQgPCAwKQotICAgICAgICAg ICAgdGhpcy5feE9mZnNldCA9IDA7CisgICAgICAgIHRoaXMuX3NldFhPZmZzZXQoTWF0aC5mbG9v cihjdXJzb3JUaW1lICogdGhpcy5feFNjYWxlRmFjdG9yIC0geCkpOwogICAgIH0sCiAKICAgICBf b25Nb3VzZVdoZWVsOiBmdW5jdGlvbihlKQpAQCAtMzM3LDYgKzM0Miw4IEBAIFdlYkluc3BlY3Rv ci5GbGFtZUNoYXJ0LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgICAgIHZhciB5ID0gaGVpZ2h0IC0gKHRpbWVsaW5lRGF0YS5kZXB0aHNbaV0gKyAxKSAqIGJh ckhlaWdodDsKICAgICAgICAgICAgIHZhciBiYXJXaWR0aCA9IE1hdGguZmxvb3IodGltZWxpbmVE YXRhLmR1cmF0aW9uc1tpXSAqIHhTY2FsZUZhY3Rvcik7CisgICAgICAgICAgICBpZiAoeCArIGJh cldpZHRoIDwgMCkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIGlmIChi YXJXaWR0aCA8IHRoaXMuX21pbldpZHRoKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCg==