64357 2011-07-12 07:07:33 -0700 [Qt] Forward the touch view scale changes to the tiled drawing area. 2011-07-13 02:50:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 jturcotte jturcotte benjamin kenneth oldest_to_newest 435626 0 jturcotte 2011-07-12 07:07:33 -0700 [Qt] Forward the touch view scale changes to the tiled drawing area. 435628 1 100480 jturcotte 2011-07-12 07:10:30 -0700 Created attachment 100480 Patch 435632 2 100480 kenneth 2011-07-12 07:15:51 -0700 Comment on attachment 100480 Patch This looks good 435633 3 100480 benjamin 2011-07-12 07:17:16 -0700 Comment on attachment 100480 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100480&action=review > Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp:104 > +void QTouchWebPageProxy::setContentsScale(float scale) should be qreal. 435635 4 100480 benjamin 2011-07-12 07:26:57 -0700 Comment on attachment 100480 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100480&action=review > Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp:182 > + page->setContentsScale(q->scale()); I would prefer you stop the m_scaleCommitTimer here instead of in QTouchWebPage::timerEvent(). Otherwise it might timeout after the commitScaleChange and you get a second call commitScaleChange, and the assertion would fail. 435642 5 kenneth 2011-07-12 07:37:10 -0700 (In reply to comment #3) > (From update of attachment 100480 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=100480&action=review > > > Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp:104 > > +void QTouchWebPageProxy::setContentsScale(float scale) > > should be qreal. Tis is why I found it confusing with mixing webcore and qt types :-( 435646 6 jturcotte 2011-07-12 07:45:00 -0700 Committed r90817: <http://trac.webkit.org/changeset/90817> 435647 7 jturcotte 2011-07-12 07:47:50 -0700 Reopening to address comment #4. 435654 8 100486 jturcotte 2011-07-12 08:05:18 -0700 Created attachment 100486 Patch (for comment #4) Patch that addresses comment #4 since I already pushed the fixed that was momentarily r+ed. (The qreal fix was done before pushing) 436324 9 jturcotte 2011-07-13 02:50:39 -0700 Committed r90899: <http://trac.webkit.org/changeset/90899> 100480 2011-07-12 07:10:30 -0700 2011-07-12 08:05:32 -0700 Patch bug-64357-20110712161029.patch text/plain 3800 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogOTA3NDMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBkN2M3NGRkYWMyMjgyZDA4 NWY4ODRhNDQ3ZTNhMjlkZjJiMjVhMWQ1Li5lNjJmMWFkY2Q1ZmRiODVjOGZkNDYxYmJkMjBiNWQ0 MzIxNGZkNjU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDctMTIgIEpvY2Vs eW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KKworICAgICAgICBbUXRd IEZvcndhcmQgdGhlIHRvdWNoIHZpZXcgc2NhbGUgY2hhbmdlcyB0byB0aGUgdGlsZWQgZHJhd2lu ZyBhcmVhLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjQzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGUgZHJhd2luZyBhcmVhIG5lZWRzIHRvIGtub3cgdGhlIG5ldyBzY2FsZSB0byByZW5kZXIgdGls ZXMgYWNjb3JkaW5nbHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnBh Z2UuY3BwOgorICAgICAgICAoUVRvdWNoV2ViUGFnZVByaXZhdGU6OmNvbW1pdFNjYWxlQ2hhbmdl KToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvcXRvdWNod2VicGFnZXByb3h5LmNwcDoKKyAgICAg ICAgKFFUb3VjaFdlYlBhZ2VQcm94eTo6c2V0Q29udGVudHNTY2FsZSk6CisgICAgICAgICogVUlQ cm9jZXNzL3F0L3F0b3VjaHdlYnBhZ2Vwcm94eS5oOgorICAgICAgICAoUVRvdWNoV2ViUGFnZVBy b3h5OjpkcmF3aW5nQXJlYSk6CisKIDIwMTEtMDctMTEgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3 ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF1bV0syXSBNb3ZlIHpvb21hYmxlLWFyZWEtZm9yLXBv aW50IGZ1bmN0aW9uYWxpdHkgdG8gUVRvdWNoV2ViUGFnZVByb3h5CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnBhZ2UuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJwYWdlLmNwcAppbmRleCA1NTEwOTJmNmZh ZWU3ZmEzYzQ5ZGE5NDAzMjQ4M2NhZjEwNWE0ZTJiLi4xOTI3NWUwMjBkMzI3MTc2NzY1OTQ0OGQw NzkxODE4OGI3MGRlYWU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3F0b3VjaHdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvcXRvdWNod2VicGFnZS5jcHAKQEAgLTE3OSw3ICsxNzksNyBAQCB2b2lkIFFUb3VjaFdlYlBh Z2VQcml2YXRlOjpjb21taXRTY2FsZUNoYW5nZSgpCiB7CiAgICAgQVNTRVJUKG1faXNDaGFuZ2lu Z1NjYWxlKTsKICAgICBtX2lzQ2hhbmdpbmdTY2FsZSA9IGZhbHNlOwotICAgIC8vIEZJWE1FOiBh ZGQgd2VicGFnZSBzdXBwb3J0IHdoZW4gdGhlIHZpZXcgaGFzIGl0cyBwcm9wZXIgV0tQYWdlIHN1 YmNsYXNzLgorICAgIHBhZ2UtPnNldENvbnRlbnRzU2NhbGUocS0+c2NhbGUoKSk7CiB9CiAKIHZv aWQgUVRvdWNoV2ViUGFnZVByaXZhdGU6Om9uU2NhbGVDaGFuZ2VkKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9xdG91Y2h3ZWJwYWdlcHJveHkuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L3F0b3VjaHdlYnBhZ2Vwcm94eS5jcHAKaW5kZXggOWFiY2Jk YTdkYzJmNDU3MzIzNGRjNmMyYzQ0OWQ2Njk0NDY4ZmE5OS4uYTMxZjI1YjAzYTcwOTE2ZjgzNTE4 YzIzODgzZTYzNjk5MmNkMDJmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L3F0b3VjaHdlYnBhZ2Vwcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L3F0b3VjaHdlYnBhZ2Vwcm94eS5jcHAKQEAgLTIxLDcgKzIxLDYgQEAKICNpbmNsdWRlICJj b25maWcuaCIKICNpbmNsdWRlICJxdG91Y2h3ZWJwYWdlcHJveHkuaCIKIAotI2luY2x1ZGUgPFRp bGVkRHJhd2luZ0FyZWFQcm94eS5oPgogI2luY2x1ZGUgPEludFJlY3QuaD4KICNpbmNsdWRlIDxO YXRpdmVXZWJUb3VjaEV2ZW50Lmg+CiAjaW5jbHVkZSA8V2ViRXZlbnRGYWN0b3J5UXQuaD4KQEAg LTEwMiw2ICsxMDEsMTEgQEAgdm9pZCBRVG91Y2hXZWJQYWdlUHJveHk6OmZpbmRab29tYWJsZUFy ZWFGb3JQb2ludChjb25zdCBRUG9pbnQmIHBvaW50KQogICAgIG1fd2ViUGFnZVByb3h5LT5maW5k Wm9vbWFibGVBcmVhRm9yUG9pbnQocG9pbnQpOwogfQogCit2b2lkIFFUb3VjaFdlYlBhZ2VQcm94 eTo6c2V0Q29udGVudHNTY2FsZShmbG9hdCBzY2FsZSkKK3sKKyAgICBkcmF3aW5nQXJlYSgpLT5z ZXRDb250ZW50c1NjYWxlKHNjYWxlKTsKK30KKwogdm9pZCBRVG91Y2hXZWJQYWdlUHJveHk6OmRp ZEZpbmRab29tYWJsZUFyZWEoY29uc3QgSW50UmVjdCYgYXJlYSkKIHsKICAgICBlbWl0IHpvb21h YmxlQXJlYUZvdW5kKFFSZWN0KGFyZWEpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9xdG91Y2h3ZWJwYWdlcHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9xdG91Y2h3ZWJwYWdlcHJveHkuaAppbmRleCA0NTY4ZjI3YzBhMWQ0NTk2ZGI5ZmMwMmI1 M2M3NWM0ZWIyNGFkNDBkLi5jNTIxMTg4OThlODAxZDEyZGI4YzZmZDRiMTFjM2RhYzcxZmI3MmQ4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvcXRvdWNod2VicGFnZXBy b3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L3F0b3VjaHdlYnBhZ2Vwcm94 eS5oCkBAIC0yNSw2ICsyNSw3IEBACiAjaW5jbHVkZSAiRHJhd2luZ0FyZWFQcm94eS5oIgogI2lu Y2x1ZGUgIlF0UGFuR2VzdHVyZVJlY29nbml6ZXIuaCIKICNpbmNsdWRlICJRdFdlYlBhZ2VQcm94 eS5oIgorI2luY2x1ZGUgIlRpbGVkRHJhd2luZ0FyZWFQcm94eS5oIgogI2luY2x1ZGUgIlRvdWNo Vmlld0ludGVyZmFjZS5oIgogI2luY2x1ZGUgInF0b3VjaHdlYnBhZ2UuaCIKICNpbmNsdWRlIDx3 dGYvUGFzc093blB0ci5oPgpAQCAtNDAsNiArNDEsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNl dFJlc2l6ZXNUb0NvbnRlbnRzVXNpbmdMYXlvdXRTaXplKGNvbnN0IFFTaXplJiB0YXJnZXRMYXlv dXRTaXplKTsKICAgICB2b2lkIGZpbmRab29tYWJsZUFyZWFGb3JQb2ludChjb25zdCBRUG9pbnQm KTsKKyAgICB2b2lkIHNldENvbnRlbnRzU2NhbGUoZmxvYXQpOwogCiBwcm90ZWN0ZWQ6CiAgICAg dmlydHVhbCB2b2lkIHBhaW50Q29udGVudChRUGFpbnRlciogcGFpbnRlciwgY29uc3QgUVJlY3Qm IGFyZWEpOwpAQCAtNTUsNiArNTcsNyBAQCBwcml2YXRlOgogCiAgICAgVG91Y2hWaWV3SW50ZXJm YWNlKiB0b3VjaFZpZXdJbnRlcmZhY2UoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxUb3Vj aFZpZXdJbnRlcmZhY2UqPihtX3ZpZXdJbnRlcmZhY2UpOyB9CiAgICAgUVRvdWNoV2ViUGFnZSog cGFnZVZpZXcoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxRVG91Y2hXZWJQYWdlKj4odG91 Y2hWaWV3SW50ZXJmYWNlKCktPnBhZ2VWaWV3KCkpOyB9CisgICAgVGlsZWREcmF3aW5nQXJlYVBy b3h5KiBkcmF3aW5nQXJlYSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PFdlYktpdDo6VGls ZWREcmF3aW5nQXJlYVByb3h5Kj4obV93ZWJQYWdlUHJveHktPmRyYXdpbmdBcmVhKCkpOyB9CiAK ICAgICB2b2lkIHRvdWNoRXZlbnQoUVRvdWNoRXZlbnQqKTsKIAo= 100486 2011-07-12 08:05:18 -0700 2011-07-12 08:19:08 -0700 Patch (for comment #4) CommentNo4.patch text/plain 1608 jturcotte ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2MmU0Y2Q3Li45MDg2N2EyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYg QEAKIDIwMTEtMDctMTIgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lh LmNvbT4KIAorICAgICAgICBbUXRdIEFsc28gc3RvcCB0aGUgc2NhbGUgY29tbWl0IHRpbWVyIHdo ZW4gY29tbWl0U2NhbGVDaGFuZ2UgaXMgY2FsbGVkIGV4cGxpY2l0bHkuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDM1NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xdG91 Y2h3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFUb3VjaFdlYlBhZ2U6OnRpbWVyRXZlbnQpOgorICAg ICAgICAoUVRvdWNoV2ViUGFnZVByaXZhdGU6OmNvbW1pdFNjYWxlQ2hhbmdlKToKKworMjAxMS0w Ny0xMiAgSm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgorCiAg ICAgICAgIFtRdF0gRm9yd2FyZCB0aGUgdG91Y2ggdmlldyBzY2FsZSBjaGFuZ2VzIHRvIHRoZSB0 aWxlZCBkcmF3aW5nIGFyZWEuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02NDM1NwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3F0b3VjaHdlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xdG91Y2h3ZWJwYWdlLmNwcAppbmRleCAzMzViYzI2Li5mZGY5MDk3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnBhZ2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2VicGFnZS5jcHAKQEAgLTg5LDEw ICs4OSw4IEBAIGJvb2wgUVRvdWNoV2ViUGFnZTo6ZXZlbnQoUUV2ZW50KiBldikKIAogdm9pZCBR VG91Y2hXZWJQYWdlOjp0aW1lckV2ZW50KFFUaW1lckV2ZW50KiBldikKIHsKLSAgICBpZiAoZXYt PnRpbWVySWQoKSA9PSBkLT5tX3NjYWxlQ29tbWl0VGltZXIudGltZXJJZCgpKSB7CisgICAgaWYg KGV2LT50aW1lcklkKCkgPT0gZC0+bV9zY2FsZUNvbW1pdFRpbWVyLnRpbWVySWQoKSkKICAgICAg ICAgZC0+Y29tbWl0U2NhbGVDaGFuZ2UoKTsKLSAgICAgICAgZC0+bV9zY2FsZUNvbW1pdFRpbWVy LnN0b3AoKTsKLSAgICB9CiB9CiAKIHZvaWQgUVRvdWNoV2ViUGFnZTo6cmVzaXplRXZlbnQoUUdy YXBoaWNzU2NlbmVSZXNpemVFdmVudCogZXYpCkBAIC0xMjQsNiArMTIyLDcgQEAgdm9pZCBRVG91 Y2hXZWJQYWdlUHJpdmF0ZTo6Y29tbWl0U2NhbGVDaGFuZ2UoKQogewogICAgIEFTU0VSVChtX2lz Q2hhbmdpbmdTY2FsZSk7CiAgICAgbV9pc0NoYW5naW5nU2NhbGUgPSBmYWxzZTsKKyAgICBtX3Nj YWxlQ29tbWl0VGltZXIuc3RvcCgpOwogICAgIHBhZ2UtPnNldENvbnRlbnRzU2NhbGUocS0+c2Nh bGUoKSk7CiB9CiAK