34754 2010-02-09 07:47:56 -0800 [GTK] Set GtkAdjustments on our FrameView when loading a page in the PageCache 2010-02-09 10:23:43 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 xan.lopez webkit-unassigned webkit.review.bot oldest_to_newest 189009 0 xan.lopez 2010-02-09 07:47:56 -0800 Right now we only do this in FrameLoaderClient::transitionToCommittedForNewPage, which is only called when we load uncached pages. If the page we are about to load is in the cache rameLoaderClient::transitionToCommittedFromCachedFrame is called instead, and we never set the adjustments. This results in the scrollbars for the main frame being mispositioned and nonfunctional in some cases. 189011 1 48414 xan.lopez 2010-02-09 07:52:59 -0800 Created attachment 48414 setadjforframeview.diff 189018 2 webkit.review.bot 2010-02-09 07:55:58 -0800 Attachment 48414 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp:1131: Use 0 instead of NULL. [readability/null] [5] WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp:1142: Declaration has space between type name and * in Frame *frame [whitespace/declaration] [3] Total errors found: 2 If any of these errors are false positives, please file a bug against check-webkit-style. 189062 3 48414 gustavo 2010-02-09 10:18:59 -0800 Comment on attachment 48414 setadjforframeview.diff r=me with the style issues reported by the bot fixed! =) 189065 4 xan.lopez 2010-02-09 10:23:43 -0800 All done in r54559. 48414 2010-02-09 07:52:59 -0800 2010-02-09 10:18:58 -0800 setadjforframeview.diff setadjforframeview.diff text/plain 4222 xan.lopez RnJvbSA0ZGY5OTA5NjA4MGQyZjkyZTcwNTUwODM4ZTJjMTUyMGRhNzJjZmY5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBU dWUsIDkgRmViIDIwMTAgMTc6NTI6MDAgKzAyMDAKU3ViamVjdDogW1BBVENIXSAyMDEwLTAyLTA5 ICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCgogICAgICAgIFtHVEtdIFNldCBHdGtBZGp1c3RtZW50cyBvbiBvdXIgRnJh bWVWaWV3IHdoZW4gbG9hZGluZyBhIHBhZ2UgaW4gdGhlIFBhZ2VDYWNoZQogICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDc1NAoKICAgICAgICBTZXQgdGhl IEd0ayBBZGp1c3RtZW50cyBvZiB0aGUgRnJhbWVWaWV3cyB3aGVuIHRoZXkgYXJlIHJlc3RvcmVk CiAgICAgICAgZnJvbSB0aGUgUGFnZUNhY2hlIHRvby4gUmlnaHQgd2Ugb25seSBkbyBpdCBmb3Ig dGhlIG5ld2x5IGNyZWF0ZWQKICAgICAgICBGcmFtZVZpZXdzIGluIHRyYW5zaXRpb25Ub0NvbW1p dHRlZEZvck5ld1BhZ2UsIGJ1dCB3ZSBpdCBhbHNvCiAgICAgICAgbmVlZHMgdG8gYmUgZG9uZSBp biB0aGUgZXF1aWxhdmVudCB0cmFuc2l0aW9uIG1ldGhvZCBmb3IgY2FjaGVkCiAgICAgICAgcGFn ZXMuCgogICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwOgog ICAgICAgIChXZWJLaXQ6OnBvc3RDb21taXRGcmFtZVZpZXdTZXR1cCk6CiAgICAgICAgKFdlYktp dDo6RnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZyb21DYWNoZWRGcmFt ZSk6CiAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1p dHRlZEZvck5ld1BhZ2UpOgotLS0KIFdlYktpdC9ndGsvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAxOCArKysrKysrKysrCiBXZWJLaXQvZ3RrL1dlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCB8ICAgMzYgKysrKysrKysrKysrKystLS0tLS0K IDIgZmlsZXMgY2hhbmdlZCwgNDMgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRl eCBiY2E0ZjY5Li5iMWQ0Zjg0IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysg Yi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEwLTAyLTA5ICBYYW4g TG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbR1RLXSBTZXQgR3RrQWRqdXN0bWVudHMgb24gb3VyIEZyYW1l VmlldyB3aGVuIGxvYWRpbmcgYSBwYWdlIGluIHRoZSBQYWdlQ2FjaGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0NzU0CisKKyAgICAgICAgU2V0IHRo ZSBHdGsgQWRqdXN0bWVudHMgb2YgdGhlIEZyYW1lVmlld3Mgd2hlbiB0aGV5IGFyZSByZXN0b3Jl ZAorICAgICAgICBmcm9tIHRoZSBQYWdlQ2FjaGUgdG9vLiBSaWdodCB3ZSBvbmx5IGRvIGl0IGZv ciB0aGUgbmV3bHkgY3JlYXRlZAorICAgICAgICBGcmFtZVZpZXdzIGluIHRyYW5zaXRpb25Ub0Nv bW1pdHRlZEZvck5ld1BhZ2UsIGJ1dCB3ZSBpdCBhbHNvCisgICAgICAgIG5lZWRzIHRvIGJlIGRv bmUgaW4gdGhlIGVxdWlsYXZlbnQgdHJhbnNpdGlvbiBtZXRob2QgZm9yIGNhY2hlZAorICAgICAg ICBwYWdlcy4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3Rr LmNwcDoKKyAgICAgICAgKFdlYktpdDo6cG9zdENvbW1pdEZyYW1lVmlld1NldHVwKToKKyAgICAg ICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZyb21D YWNoZWRGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0 aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKToKKwogMjAxMC0wMi0wOCAgWGFuIExvcGV6ICA8eGxv cGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR3VzdGF2byBOb3JvbmhhLgpk aWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0 ay5jcHAgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNw cAppbmRleCAxZTBkNTcyLi4xNTc1ZjkyIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL1dlYkNvcmVT dXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVT dXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcApAQCAtMjUsNiArMjUsNyBAQAogI2luY2x1 ZGUgIkZyYW1lTG9hZGVyQ2xpZW50R3RrLmgiCiAKICNpbmNsdWRlICJBcmNoaXZlUmVzb3VyY2Uu aCIKKyNpbmNsdWRlICJDYWNoZWRGcmFtZS5oIgogI2luY2x1ZGUgIkNvbG9yLmgiCiAjaW5jbHVk ZSAiRG9jdW1lbnRMb2FkZXIuaCIKICNpbmNsdWRlICJEb2N1bWVudExvYWRlckd0ay5oIgpAQCAt MTExOSw4ICsxMTIwLDMwIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OnNhdmVQbGF0Zm9ybURh dGFUb0NhY2hlZEZyYW1lKENhY2hlZEZyYW1lKikKIHsKIH0KIAotdm9pZCBGcmFtZUxvYWRlckNs aWVudDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRnJvbUNhY2hlZEZyYW1lKENhY2hlZEZyYW1lKikK K3N0YXRpYyB2b2lkIHBvc3RDb21taXRGcmFtZVZpZXdTZXR1cChXZWJLaXRXZWJGcmFtZSAqZnJh bWUsIEZyYW1lVmlldyAqdmlldykKIHsKKyAgICBXZWJLaXRXZWJWaWV3KiBjb250YWluaW5nV2lu ZG93ID0gZ2V0Vmlld0Zyb21GcmFtZShmcmFtZSk7CisgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUq IHByaXYgPSBXRUJLSVRfV0VCX1ZJRVdfR0VUX1BSSVZBVEUoY29udGFpbmluZ1dpbmRvdyk7Cisg ICAgdmlldy0+c2V0R3RrQWRqdXN0bWVudHMocHJpdi0+aG9yaXpvbnRhbEFkanVzdG1lbnQsIHBy aXYtPnZlcnRpY2FsQWRqdXN0bWVudCk7CisKKyAgICBpZiAocHJpdi0+Y3VycmVudE1lbnUpIHsK KyAgICAgICAgR3RrTWVudSogbWVudSA9IHByaXYtPmN1cnJlbnRNZW51OworICAgICAgICBwcml2 LT5jdXJyZW50TWVudSA9IE5VTEw7CisKKyAgICAgICAgZ3RrX21lbnVfcG9wZG93bihtZW51KTsK KyAgICAgICAgZ19vYmplY3RfdW5yZWYobWVudSk7CisgICAgfQorfQorCit2b2lkIEZyYW1lTG9h ZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGcm9tQ2FjaGVkRnJhbWUoQ2FjaGVkRnJh bWUqIGNhY2hlZEZyYW1lKQoreworICAgIEFTU0VSVChjYWNoZWRGcmFtZS0+dmlldygpKTsKKwor ICAgIEZyYW1lICpmcmFtZSA9IGNvcmUobV9mcmFtZSk7CisgICAgaWYgKGZyYW1lICE9IGZyYW1l LT5wYWdlKCktPm1haW5GcmFtZSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBwb3N0Q29tbWl0 RnJhbWVWaWV3U2V0dXAobV9mcmFtZSwgY2FjaGVkRnJhbWUtPnZpZXcoKSk7CiB9CiAKIHZvaWQg RnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UoKQpAQCAt MTEzOSwxNiArMTE2Miw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0Nv bW1pdHRlZEZvck5ld1BhZ2UoKQogICAgIGlmIChmcmFtZSAhPSBmcmFtZS0+cGFnZSgpLT5tYWlu RnJhbWUoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHBy aXYgPSBXRUJLSVRfV0VCX1ZJRVdfR0VUX1BSSVZBVEUoY29udGFpbmluZ1dpbmRvdyk7Ci0gICAg ZnJhbWUtPnZpZXcoKS0+c2V0R3RrQWRqdXN0bWVudHMocHJpdi0+aG9yaXpvbnRhbEFkanVzdG1l bnQsIHByaXYtPnZlcnRpY2FsQWRqdXN0bWVudCk7Ci0KLSAgICBpZiAocHJpdi0+Y3VycmVudE1l bnUpIHsKLSAgICAgICAgR3RrTWVudSogbWVudSA9IHByaXYtPmN1cnJlbnRNZW51OwotICAgICAg ICBwcml2LT5jdXJyZW50TWVudSA9IE5VTEw7Ci0KLSAgICAgICAgZ3RrX21lbnVfcG9wZG93biht ZW51KTsKLSAgICAgICAgZ19vYmplY3RfdW5yZWYobWVudSk7Ci0gICAgfQorICAgIHBvc3RDb21t aXRGcmFtZVZpZXdTZXR1cChtX2ZyYW1lLCBmcmFtZS0+dmlldygpKTsKIH0KIAogfQotLSAKMS42 LjYKCg==