35829 2010-03-06 09:36:33 -0800 Web Inspector: switching to/from Timeline Panel moves scrolled region. 2010-03-06 11:51:23 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein joepeck loislo rik timothy oldest_to_newest 196918 0 pfeldman 2010-03-06 09:36:33 -0800 The reason is that when switching back, sidebar tree is the default focus target, but has random scroll offset. The only solution i've found is to 1) prevent scroller from being default focus target 2) manually restore scroll offset upon show. Only (1) or only (2) does not work for the reason above. 196919 1 50153 pfeldman 2010-03-06 09:39:39 -0800 Created attachment 50153 [PATCH] Proposed fix. 196922 2 pfeldman 2010-03-06 10:02:34 -0800 I'd like to land this soon for the nightly / dev channel. So I am asking for formal reviewer from somebody. I'll make sure this is fine with Tim (xenon) who was reviewing my timeline code. This change was tested well and is safe. Brings only good :) 196923 3 50153 jorlow 2010-03-06 10:02:37 -0800 Comment on attachment 50153 [PATCH] Proposed fix. Seems reasonable. r=me 196924 4 pfeldman 2010-03-06 10:15:09 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/English.lproj/localizedStrings.js M WebCore/inspector/front-end/TimelinePanel.js Committed r55627 196927 5 timothy 2010-03-06 11:51:23 -0800 Looks fine. 50153 2010-03-06 09:39:39 -0800 2010-03-06 10:02:37 -0800 [PATCH] Proposed fix. timeline_scroller text/plain 5722 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWZlZTlhMi4uZDI3OWEwMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wMy0wNiAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBzd2l0Y2hpbmcgdG8vZnJvbSBUaW1l bGluZSBQYW5lbCBtb3ZlcyBzY3JvbGxlci4KKyAgICAgICAgKEFsc28gYWRkZWQgY291cGxlIG9m IHJlY29yZCBkZXRhaWxzIGl0ZW1zIGFzIEkgd2FzIGZpeGluZyBpdCkuCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1ODI5CisKKyAgICAgICAgKiBF bmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9UaW1lbGluZVBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l UGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLmdl dCBkZWZhdWx0Rm9jdXNlZEVsZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l UGFuZWwucHJvdG90eXBlLnNob3cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFu ZWwucHJvdG90eXBlLl9yZWZyZXNoUmVjb3Jkcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQucHJvdG90eXBlLl9nZW5lcmF0ZVBvcHVwQ29udGVu dCk6CisKIDIwMTAtMDMtMDYgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHBhcm9nYS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJDb3Jl L0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1dlYkNvcmUvRW5nbGlzaC5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDI4MWQ4NDUuLjYwNTU4OTYgMTAwNjQ0CkJpbmFy eSBmaWxlcyBhL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGFuZCBi L1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGRpZmZlcgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcwppbmRleCBkOWY2NjE1Li43 MDMzMDEyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQ YW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5q cwpAQCAtMzcsNiArMzcsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbCA9IGZ1bmN0aW9u KCkKICAgICB0aGlzLl9vdmVydmlld1BhbmUuYWRkRXZlbnRMaXN0ZW5lcigid2luZG93IGNoYW5n ZWQiLCB0aGlzLl93aW5kb3dDaGFuZ2VkLCB0aGlzKTsKICAgICB0aGlzLl9vdmVydmlld1BhbmUu YWRkRXZlbnRMaXN0ZW5lcigiZmlsdGVyIGNoYW5nZWQiLCB0aGlzLl9yZWZyZXNoLCB0aGlzKTsK ICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fb3ZlcnZpZXdQYW5lLmVsZW1lbnQp OworICAgIHRoaXMuZWxlbWVudC50YWJJbmRleCA9IDA7CiAKICAgICB0aGlzLl9zaWRlYmFyQmFj a2dyb3VuZEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlz Ll9zaWRlYmFyQmFja2dyb3VuZEVsZW1lbnQuY2xhc3NOYW1lID0gInNpZGViYXIgdGltZWxpbmUt c2lkZWJhci1iYWNrZ3JvdW5kIjsKQEAgLTExMyw2ICsxMTQsMTEgQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5fY2F0ZWdvcmll czsKICAgICB9LAogCisgICAgZ2V0IGRlZmF1bHRGb2N1c2VkRWxlbWVudCgpCisgICAgeworICAg ICAgICByZXR1cm4gdGhpcy5lbGVtZW50OworICAgIH0sCisKICAgICBnZXQgX3JlY29yZFN0eWxl cygpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX3JlY29yZFN0eWxlc0FycmF5KSB7CkBAIC0y MzQsOCArMjQwLDkgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0gewog ICAgIHNob3c6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5QYW5lbC5w cm90b3R5cGUuc2hvdy5jYWxsKHRoaXMpOwotCi0gICAgICAgIGlmICh0aGlzLl9uZWVkc1JlZnJl c2gpCisgICAgICAgIGlmICh0eXBlb2YgdGhpcy5fc2Nyb2xsVG9wID09PSAibnVtYmVyIikKKyAg ICAgICAgICAgIHRoaXMuX2NvbnRhaW5lckVsZW1lbnQuc2Nyb2xsVG9wID0gdGhpcy5fc2Nyb2xs VG9wOworICAgICAgICBlbHNlIGlmICh0aGlzLl9uZWVkc1JlZnJlc2gpCiAgICAgICAgICAgICB0 aGlzLl9yZWZyZXNoKCk7CiAgICAgfSwKIApAQCAtMzEzLDcgKzMyMCw4IEBAIFdlYkluc3BlY3Rv ci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIC8vIENh bGN1bGF0ZSB0aGUgdmlzaWJsZSBhcmVhLgotICAgICAgICB2YXIgdmlzaWJsZVRvcCA9IHRoaXMu X2NvbnRhaW5lckVsZW1lbnQuc2Nyb2xsVG9wOworICAgICAgICB0aGlzLl9zY3JvbGxUb3AgPSB0 aGlzLl9jb250YWluZXJFbGVtZW50LnNjcm9sbFRvcDsKKyAgICAgICAgdmFyIHZpc2libGVUb3Ag PSB0aGlzLl9zY3JvbGxUb3A7CiAgICAgICAgIHZhciB2aXNpYmxlQm90dG9tID0gdmlzaWJsZVRv cCArIHRoaXMuX2NvbnRhaW5lckVsZW1lbnQuY2xpZW50SGVpZ2h0OwogCiAgICAgICAgIC8vIERl ZmluZSByb3cgaGVpZ2h0LCBzaG91bGQgYmUgaW4gc3luYyB3aXRoIHN0eWxlcyBmb3IgdGltZWxp bmUgZ3JhcGhzLgpAQCAtNjk5LDkgKzcwNyw5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVs LkZvcm1hdHRlZFJlY29yZC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgY29uc3QgcmVjb3JkVHlw ZXMgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlOwogICAgICAgICBpZiAo dGhpcy5kZXRhaWxzKSB7Ci0gICAgICAgICAgICBpZiAodGhpcy50eXBlID09IHJlY29yZFR5cGVz LlRpbWVySW5zdGFsbCB8fAotICAgICAgICAgICAgICAgIHRoaXMudHlwZSA9PSByZWNvcmRUeXBl cy5UaW1lckZpcmUgfHwKLSAgICAgICAgICAgICAgICB0aGlzLnR5cGUgPT0gcmVjb3JkVHlwZXMu VGltZXJSZW1vdmUpIHsKKyAgICAgICAgICAgIGlmICh0aGlzLnR5cGUgPT09IHJlY29yZFR5cGVz LlRpbWVySW5zdGFsbCB8fAorICAgICAgICAgICAgICAgIHRoaXMudHlwZSA9PT0gcmVjb3JkVHlw ZXMuVGltZXJGaXJlIHx8CisgICAgICAgICAgICAgICAgdGhpcy50eXBlID09PSByZWNvcmRUeXBl cy5UaW1lclJlbW92ZSkgewogICAgICAgICAgICAgICAgIHJlY29yZENvbnRlbnRUYWJsZS5hcHBl bmRDaGlsZCh0aGlzLl9jcmVhdGVSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1lciBJZCIp LCB0aGlzLmRhdGEudGltZXJJZCkpOwogICAgICAgICAgICAgICAgIGlmICh0aGlzLnRpbWVvdXQp IHsKICAgICAgICAgICAgICAgICAgICAgcmVjb3JkQ29udGVudFRhYmxlLmFwcGVuZENoaWxkKHRo aXMuX2NyZWF0ZVJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRpbWVvdXQiKSwgdGhpcy50aW1l b3V0KSk7CkBAIC03MTEsMTIgKzcxOSwxOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5G b3JtYXR0ZWRSZWNvcmQucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICB2YXIgbGlu ayA9IFdlYkluc3BlY3Rvci5saW5raWZ5UmVzb3VyY2VBc05vZGUodGhpcy5jYWxsU2l0ZVNjcmlw dE5hbWUsICJzY3JpcHRzIiwgdGhpcy5jYWxsU2l0ZVNjcmlwdExpbmUsICJ0aW1lbGluZS1kZXRh aWxzIik7CiAgICAgICAgICAgICAgICAgICAgIHJlY29yZENvbnRlbnRUYWJsZS5hcHBlbmRDaGls ZCh0aGlzLl9jcmVhdGVMaW5rUm93KFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2FsbCBTaXRlIiks IGxpbmspKTsKICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKHRoaXMu dHlwZSA9PSByZWNvcmRUeXBlcy5GdW5jdGlvbkNhbGwpIHsKKyAgICAgICAgICAgIH0gZWxzZSBp ZiAodGhpcy50eXBlID09PSByZWNvcmRUeXBlcy5GdW5jdGlvbkNhbGwpIHsKICAgICAgICAgICAg ICAgICB2YXIgbGluayA9IFdlYkluc3BlY3Rvci5saW5raWZ5UmVzb3VyY2VBc05vZGUodGhpcy5k YXRhLnNjcmlwdE5hbWUsICJzY3JpcHRzIiwgdGhpcy5kYXRhLnNjcmlwdExpbmUsICJ0aW1lbGlu ZS1kZXRhaWxzIik7CiAgICAgICAgICAgICAgICAgcmVjb3JkQ29udGVudFRhYmxlLmFwcGVuZENo aWxkKHRoaXMuX2NyZWF0ZUxpbmtSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMb2NhdGlvbiIp LCBsaW5rKSk7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKHRoaXMudHlwZSA9PT0gcmVjb3JkVHlw ZXMuUmVzb3VyY2VTZW5kUmVxdWVzdCB8fCB0aGlzLnR5cGUgPT09IHJlY29yZFR5cGVzLlJlc291 cmNlUmVjZWl2ZVJlc3BvbnNlIHx8IHRoaXMudHlwZSA9PT0gcmVjb3JkVHlwZXMuUmVzb3VyY2VG aW5pc2gpIHsKICAgICAgICAgICAgICAgICB2YXIgbGluayA9IFdlYkluc3BlY3Rvci5saW5raWZ5 UmVzb3VyY2VBc05vZGUodGhpcy5kYXRhLnVybCwgInJlc291cmNlcyIsIG51bGwsICJ0aW1lbGlu ZS1kZXRhaWxzIik7CiAgICAgICAgICAgICAgICAgcmVjb3JkQ29udGVudFRhYmxlLmFwcGVuZENo aWxkKHRoaXMuX2NyZWF0ZUxpbmtSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXNvdXJjZSIp LCBsaW5rKSk7CisgICAgICAgICAgICB9IGVsc2UgaWYgKHRoaXMudHlwZSA9PT0gcmVjb3JkVHlw ZXMuRXZhbHVhdGVTY3JpcHQpIHsKKyAgICAgICAgICAgICAgICB2YXIgbGluayA9IFdlYkluc3Bl Y3Rvci5saW5raWZ5UmVzb3VyY2VBc05vZGUodGhpcy5kYXRhLnVybCwgInNjcmlwdHMiLCBudWxs LCAidGltZWxpbmUtZGV0YWlscyIpOworICAgICAgICAgICAgICAgIHJlY29yZENvbnRlbnRUYWJs ZS5hcHBlbmRDaGlsZCh0aGlzLl9jcmVhdGVMaW5rUm93KFdlYkluc3BlY3Rvci5VSVN0cmluZygi U2NyaXB0IiksIGxpbmspKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAodGhpcy50eXBlID09PSBy ZWNvcmRUeXBlcy5QYWludCkgeworICAgICAgICAgICAgICAgIHJlY29yZENvbnRlbnRUYWJsZS5h cHBlbmRDaGlsZCh0aGlzLl9jcmVhdGVSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMb2NhdGlv biIpLCB0aGlzLmRhdGEueCArICJcdTIwMDlcdTAwZDdcdTIwMDkiICsgdGhpcy5kYXRhLnkpKTsK KyAgICAgICAgICAgICAgICByZWNvcmRDb250ZW50VGFibGUuYXBwZW5kQ2hpbGQodGhpcy5fY3Jl YXRlUm93KFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGltZW5zaW9ucyIpLCB0aGlzLmRhdGEud2lk dGggKyAiXHUyMDA5XHUwMGQ3XHUyMDA5IiArIHRoaXMuZGF0YS5oZWlnaHQpKTsKICAgICAgICAg ICAgIH0gZWxzZQogICAgICAgICAgICAgICAgIHJlY29yZENvbnRlbnRUYWJsZS5hcHBlbmRDaGls ZCh0aGlzLl9jcmVhdGVSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEZXRhaWxzIiksIHRoaXMu ZGV0YWlscykpOwogICAgICAgICB9Cg==