96954 2012-09-17 14:39:58 -0700 [BlackBerry] Remove dysfunctional zoom blit in setViewportSize() 2012-09-17 15:50:43 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jpetsovits jpetsovits mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 722278 0 jpetsovits 2012-09-17 14:39:58 -0700 The blitContents() call removed by this patch used to be part of scheduleZoomAboutPoint(). Its goal was to display a preview of the zoomed contents, primarily when auto-zoomed after rotation. Nested inside a pair of screen suspend/resume calls, it has been a pointless no-op for a while. Antonio's recent change to remove scheduleZoomAboutPoint() and call zoomAboutPoint() from setViewportSize() directly (the only call site) obsoletes the call completely. The zoomAboutPoint() call itself will cause a re-render and blit right away, so we don't care about any preview. zoomAboutPoint() will also take care of the necessary screen/backingstore suspension. The result is a vastly simplified block of code. Further simplification seems feasible, but is not exactly logically equivalent so I have to check with other people on how exactly they are meant to function. In order to minimize the risk of unintended regressions, this patch leaves out those sensitive pieces. 722284 1 164454 jpetsovits 2012-09-17 14:44:40 -0700 Created attachment 164454 Patch 722338 2 164454 webkit.review.bot 2012-09-17 15:50:40 -0700 Comment on attachment 164454 Patch Clearing flags on attachment: 164454 Committed r128817: <http://trac.webkit.org/changeset/128817> 722339 3 webkit.review.bot 2012-09-17 15:50:43 -0700 All reviewed patches have been landed. Closing bug. 164454 2012-09-17 14:44:40 -0700 2012-09-17 15:50:40 -0700 Patch bug-96954-20120917174251.patch text/plain 5023 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0OTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA1MzdjNjVlMGM5YzQyOTRiODIzYzg1OWY2MmQyODRiMDljOGI2N2Y0Li45OWM2ZTE3Yzk3 NDZiNWU3YTljZWIxNGMyMjEzMTQ5NDA1ZTNlYmIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMSBAQAorMjAxMi0wOS0xNyAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBSZW1vdmUgZHlzZnVuY3Rp b25hbCB6b29tIGJsaXQgaW4gc2V0Vmlld3BvcnRTaXplKCkuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05Njk1NAorICAgICAgICBQUiAxNzg0MTEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYmxpdENv bnRlbnRzKCkgY2FsbCByZW1vdmVkIGJ5IHRoaXMgcGF0Y2ggdXNlZCB0bworICAgICAgICBiZSBw YXJ0IG9mIHNjaGVkdWxlWm9vbUFib3V0UG9pbnQoKS4gSXRzIGdvYWwgd2FzIHRvCisgICAgICAg IGRpc3BsYXkgYSBwcmV2aWV3IG9mIHRoZSB6b29tZWQgY29udGVudHMsIHByaW1hcmlseQorICAg ICAgICB3aGVuIGF1dG8tem9vbWVkIGFmdGVyIHJvdGF0aW9uLiBOZXN0ZWQgaW5zaWRlIGEgcGFp cgorICAgICAgICBvZiBzY3JlZW4gc3VzcGVuZC9yZXN1bWUgY2FsbHMsIGl0IGhhcyBiZWVuIGEg cG9pbnRsZXNzCisgICAgICAgIG5vLW9wIGZvciBhIHdoaWxlLgorCisgICAgICAgIEFudG9uaW8n cyByZWNlbnQgY2hhbmdlIHRvIHJlbW92ZSBzY2hlZHVsZVpvb21BYm91dFBvaW50KCkKKyAgICAg ICAgYW5kIGNhbGwgem9vbUFib3V0UG9pbnQoKSBmcm9tIHNldFZpZXdwb3J0U2l6ZSgpIGRpcmVj dGx5CisgICAgICAgICh0aGUgb25seSBjYWxsIHNpdGUpIG9ic29sZXRlcyB0aGUgY2FsbCBjb21w bGV0ZWx5LgorICAgICAgICBUaGUgem9vbUFib3V0UG9pbnQoKSBjYWxsIGl0c2VsZiB3aWxsIGNh dXNlIGEgcmUtcmVuZGVyCisgICAgICAgIGFuZCBibGl0IHJpZ2h0IGF3YXksIHNvIHdlIGRvbid0 IGNhcmUgYWJvdXQgYW55IHByZXZpZXcuCisgICAgICAgIHpvb21BYm91dFBvaW50KCkgd2lsbCBh bHNvIHRha2UgY2FyZSBvZiB0aGUgbmVjZXNzYXJ5CisgICAgICAgIHNjcmVlbi9iYWNraW5nc3Rv cmUgc3VzcGVuc2lvbi4KKworICAgICAgICBUaGUgcmVzdWx0IGlzIGEgdmFzdGx5IHNpbXBsaWZp ZWQgYmxvY2sgb2YgY29kZS4KKworICAgICAgICAqIEFwaS9XZWJQYWdlLmNwcDoKKyAgICAgICAg KEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OnNldFZpZXdwb3J0U2l6ZSk6CisK IDIwMTItMDktMTMgIEpha29iIFBldHNvdml0cyAgPGpwZXRzb3ZpdHNAcmltLmNvbT4KIAogICAg ICAgICBbQmxhY2tCZXJyeV0gU3VwcG9ydCBjb3B5aW5nIGltYWdlIGRhdGEgaW4gV2ViT3Zlcmxh eS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IGRhODMwZWY2 NWIzYzAyODMxM2RiZTcwYmEwZDE2ZmViOWVmMWM4MjEuLjMzMzFhMWIzNTQ3NGVhYzM2Njc0ZTkw ZjU0Y2EzZTAwN2RhMDkyZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdl LmNwcApAQCAtMzgzNyw1NCArMzgzNywyMSBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpzZXRWaWV3 cG9ydFNpemUoY29uc3QgSW50U2l6ZSYgdHJhbnNmb3JtZWRBY3R1YWxWaXNpYmxlU2l6ZQogICAg IGlmIChhdExlZnQpCiAgICAgICAgIGFuY2hvci5zZXRYKDApOwogCi0gICAgZG91YmxlIGNsYW1w ZWRTY2FsZTsKLQogICAgIC8vIFRyeSBhbmQgem9vbSBoZXJlIHdpdGggY2xhbXBpbmcgb24uCisg ICAgLy8gRklYTUU6IERldGVybWluZSB3aHkgdGhlIGFib3ZlIGNvbW1lbnQgc2F5cyAiY2xhbXBp bmcgb24iLCB5ZXQgd2UKKyAgICAvLyAgIGRvbid0IHNldCBlbmZvcmNlU2NhbGVDbGFtcGluZyB0 byB0cnVlLgorICAgIC8vIEZJWE1FOiBEZXRlcm1pbmUgd2h5IGVuc3VyZUNvbnRlbnRWaXNpYmxl KCkgaXMgb25seSBjYWxsZWQgZm9yICFzdWNjZXNzCisgICAgLy8gICBpbiB0aGUgZGlyZWN0LXJl bmRlcmluZyBjYXNlLCBidXQgaW4gYWxsIGNhc2VzIG90aGVyd2lzZS4gQ2hhbmNlcyBhcmUKKyAg ICAvLyAgIG9uZSBvZiB0aGVzZSBpcyBpbmNvcnJlY3QgYW5kIHdlIGNhbiB1bmlmeSB0d28gYnJh bmNoZXMgaW50byBvbmUuCiAgICAgaWYgKG1fYmFja2luZ1N0b3JlLT5kLT5zaG91bGREaXJlY3RS ZW5kZXJpbmdUb1dpbmRvdygpKSB7CiAgICAgICAgIGJvb2wgc3VjY2VzcyA9IHpvb21BYm91dFBv aW50KHNjYWxlLCBhbmNob3IsIGZhbHNlIC8qIGVuZm9yY2VTY2FsZUNsYW1waW5nICovLCB0cnVl IC8qIGZvcmNlUmVuZGVyaW5nICovKTsKICAgICAgICAgaWYgKCFzdWNjZXNzICYmIGVuc3VyZUZv Y3VzRWxlbWVudFZpc2libGUpCiAgICAgICAgICAgICBlbnN1cmVDb250ZW50VmlzaWJsZSghbmV3 VmlzaWJsZVJlY3RDb250YWluc09sZFZpc2libGVSZWN0KTsKIAotICAgIH0gZWxzZSBpZiAoc2hv dWxkWm9vbUFib3V0UG9pbnQoc2NhbGUsIGFuY2hvciwgZmFsc2UgLyogZW5mb3JjZVNjYWxlQ2xh bXBpbmcgKi8sICZjbGFtcGVkU2NhbGUpKSB7Ci0KLSAgICAgICAgLy8gRm9yIHNvbWUgcmVhc29u LCB0aGUgYml0bWFwIHpvb20gd2FudHMgYW4gYW5jaG9yIGluIGJhY2tpbmdzdG9yZSBjb29yZGlu YXRlcyEKLSAgICAgICAgLy8gdGhpcyBpcyBkaWZmZXJlbnQgZnJvbSB6b29tQWJvdXRQb2ludCwg d2hpY2ggd2FudHMgY29udGVudCBjb29yZGluYXRlcy4KLSAgICAgICAgLy8gU2VlIFJJTSBCdWcg IzY0MS4KLQotICAgICAgICBGbG9hdFBvaW50IHRyYW5zZm9ybWVkQW5jaG9yID0gbWFwVG9UcmFu c2Zvcm1lZEZsb2F0UG9pbnQoYW5jaG9yKTsKLSAgICAgICAgRmxvYXRQb2ludCB0cmFuc2Zvcm1l ZFNjcm9sbFBvc2l0aW9uID0gbWFwVG9UcmFuc2Zvcm1lZEZsb2F0UG9pbnQoc2Nyb2xsUG9zaXRp b24oKSk7Ci0KLSAgICAgICAgLy8gUHJvaGliaXQgYmFja2luZ3N0b3JlIGZyb20gdXBkYXRpbmcg dGhlIHdpbmRvdyBvdmVydG9wIG9mIHRoZSBiaXRtYXAuCi0gICAgICAgIG1fYmFja2luZ1N0b3Jl LT5kLT5zdXNwZW5kU2NyZWVuQW5kQmFja2luZ1N0b3JlVXBkYXRlcygpOwotCi0gICAgICAgIC8v IE5lZWQgdG8gaW52ZXJ0IHRoZSBwcmV2aW91cyB0cmFuc2Zvcm0gdG8gYW5jaG9yIHRoZSB2aWV3 cG9ydC4KLSAgICAgICAgZG91YmxlIHpvb21GcmFjdGlvbiA9IGNsYW1wZWRTY2FsZSAvIHRyYW5z Zm9ybWF0aW9uTWF0cml4KCktPm0xMSgpOwotCi0gICAgICAgIC8vIEFuY2hvciBvZmZzZXQgZnJv bSBzY3JvbGwgcG9zaXRpb24gaW4gZmxvYXQuCi0gICAgICAgIEZsb2F0UG9pbnQgYW5jaG9yT2Zm c2V0KHRyYW5zZm9ybWVkQW5jaG9yLngoKSAtIHRyYW5zZm9ybWVkU2Nyb2xsUG9zaXRpb24ueCgp LAotICAgICAgICAgICAgICAgIHRyYW5zZm9ybWVkQW5jaG9yLnkoKSAtIHRyYW5zZm9ybWVkU2Ny b2xsUG9zaXRpb24ueSgpKTsKLQotICAgICAgICBJbnRQb2ludCBzcmNQb2ludCgKLSAgICAgICAg ICAgICAgICBzdGF0aWNfY2FzdDxpbnQ+KHJvdW5kZih0cmFuc2Zvcm1lZEFuY2hvci54KCkgLSBh bmNob3JPZmZzZXQueCgpIC8gem9vbUZyYWN0aW9uKSksCi0gICAgICAgICAgICAgICAgc3RhdGlj X2Nhc3Q8aW50Pihyb3VuZGYodHJhbnNmb3JtZWRBbmNob3IueSgpIC0gYW5jaG9yT2Zmc2V0Lnko KSAvIHpvb21GcmFjdGlvbikpKTsKLQotICAgICAgICBjb25zdCBJbnRSZWN0IHZpZXdwb3J0UmVj dCA9IEludFJlY3QoSW50UG9pbnQ6Onplcm8oKSwgdHJhbnNmb3JtZWRWaWV3cG9ydFNpemUoKSk7 Ci0gICAgICAgIGNvbnN0IEludFJlY3QgZHN0UmVjdCA9IHZpZXdwb3J0UmVjdDsKLQotICAgICAg ICAvLyBUaGlzIGlzIHRoZSByZWN0IHRvIHBhc3MgYXMgdGhlIGFjdHVhbCBzb3VyY2UgcmVjdCBp biB0aGUgYmFja2luZ3N0b3JlCi0gICAgICAgIC8vIGZvciB0aGUgdHJhbnNmb3JtIGdpdmVuIGJ5 IHpvb20uCi0gICAgICAgIEludFJlY3Qgc3JjUmVjdChzcmNQb2ludC54KCksCi0gICAgICAgICAg ICAgICAgc3JjUG9pbnQueSgpLAotICAgICAgICAgICAgICAgIHZpZXdwb3J0UmVjdC53aWR0aCgp IC8gem9vbUZyYWN0aW9uLAotICAgICAgICAgICAgICAgIHZpZXdwb3J0UmVjdC5oZWlnaHQoKSAv IHpvb21GcmFjdGlvbik7Ci0gICAgICAgIG1fYmFja2luZ1N0b3JlLT5kLT5ibGl0Q29udGVudHMo ZHN0UmVjdCwgc3JjUmVjdCk7Ci0KLSAgICAgICAgem9vbUFib3V0UG9pbnQoY2xhbXBlZFNjYWxl LCBhbmNob3IsIGZhbHNlIC8qZW5mb3JjZVNjYWxlQ2xhbXBpbmcqLywgdHJ1ZSAvKmZvcmNlUmVu ZGVyaW5nKi8pOwotCi0gICAgICAgIG1fYmFja2luZ1N0b3JlLT5kLT5yZXN1bWVTY3JlZW5BbmRC YWNraW5nU3RvcmVVcGRhdGVzKEJhY2tpbmdTdG9yZTo6UmVuZGVyQW5kQmxpdCk7Ci0KKyAgICB9 IGVsc2UgaWYgKHpvb21BYm91dFBvaW50KHNjYWxlLCBhbmNob3IsIGZhbHNlIC8qZW5mb3JjZVNj YWxlQ2xhbXBpbmcqLywgdHJ1ZSAvKmZvcmNlUmVuZGVyaW5nKi8pKSB7CiAgICAgICAgIGlmIChl bnN1cmVGb2N1c0VsZW1lbnRWaXNpYmxlKQogICAgICAgICAgICAgZW5zdXJlQ29udGVudFZpc2li bGUoIW5ld1Zpc2libGVSZWN0Q29udGFpbnNPbGRWaXNpYmxlUmVjdCk7CisKICAgICB9IGVsc2Ug ewogCiAgICAgICAgIC8vIFN1c3BlbmQgYWxsIHNjcmVlbiB1cGRhdGVzIHRvIHRoZSBiYWNraW5n c3RvcmUuCg==