87015 2012-05-21 06:34:48 -0700 [Qt] Make the resizing code more straight forward 2012-05-22 03:48:42 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth hausmann menard webkit.review.bot zoltan oldest_to_newest 629037 0 kenneth 2012-05-21 06:34:48 -0700 SSIA 629038 1 143020 kenneth 2012-05-21 06:36:27 -0700 Created attachment 143020 Patch 630184 2 143020 webkit.review.bot 2012-05-22 03:48:37 -0700 Comment on attachment 143020 Patch Clearing flags on attachment: 143020 Committed r117943: <http://trac.webkit.org/changeset/117943> 630185 3 webkit.review.bot 2012-05-22 03:48:42 -0700 All reviewed patches have been landed. Closing bug. 143020 2012-05-21 06:36:27 -0700 2012-05-22 03:48:37 -0700 Patch bug-87015-20120521153553.patch text/plain 7434 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjIxNmY0ZTY4Mzk1NGYy YmFkYTBkMGMzNmYwZTljMDAxZDUwNzRlYi4uNWQyYWEzNTBiNGUyYTczYTkyMTc0ZTBlZjM0MzU4 MDIwNjMxODQwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDEyLTA1LTIxICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBb UXRdIE1ha2UgdGhlIHJlc2l6aW5nIGNvZGUgbW9yZSBzdHJhaWdodCBmb3J3YXJkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzAxNQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9x dC9xcXVpY2t3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFRdWlja1dlYlBhZ2U6OnRyYW5zZm9ybVRv SXRlbSk6CisgICAgICAgIChRUXVpY2tXZWJQYWdlUHJpdmF0ZTo6dXBkYXRlU2l6ZSk6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv cXQvcXF1aWNrd2Vidmlld19wX3AuaDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXdGbGlja2FibGVQ cml2YXRlKToKKworMjAxMi0wNS0yMSAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5u ZXRoQHdlYmtpdC5vcmc+CisKICAgICAgICAgW1F0XSBNaW5pIGNsZWFuIHVwcyBpbiB0aGUgaW50 ZXJhY3Rpb24gZW5naW5lCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04NzAxMwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3FxdWlja3dlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x cXVpY2t3ZWJwYWdlLmNwcAppbmRleCBlMDJjY2M5YjJmNGRhNTA5MmQ5MmEyNzAzYjNjMWQ4OGYx ZGQ1YTlhLi41YjRlYTJiZjY1OGU5M2VmODAxMzY4NmU1YjI3YzVjNGU5ZGQ5YzQ1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHAKQEAg LTE0MCwxOCArMTQwLDQxIEBAIFFUcmFuc2Zvcm0gUVF1aWNrV2ViUGFnZTo6dHJhbnNmb3JtRnJv bUl0ZW0oKSBjb25zdAogCiBRVHJhbnNmb3JtIFFRdWlja1dlYlBhZ2U6OnRyYW5zZm9ybVRvSXRl bSgpIGNvbnN0CiB7Ci0gICAgUVBvaW50RiBwb3MgPSBkLT52aWV3cG9ydEl0ZW0tPnBhZ2VJdGVt UG9zKCk7Ci0gICAgcmV0dXJuIFFUcmFuc2Zvcm0oZC0+Y29udGVudHNTY2FsZSwgMCwgMCwgMCwg ZC0+Y29udGVudHNTY2FsZSwgMCwgcG9zLngoKSwgcG9zLnkoKSwgMSk7CisgICAgcXJlYWwgeFBv cyA9IHgoKTsKKyAgICBxcmVhbCB5UG9zID0geSgpOworCisgICAgaWYgKGQtPnZpZXdwb3J0SXRl bS0+ZXhwZXJpbWVudGFsKCktPmZsaWNrYWJsZVZpZXdwb3J0RW5hYmxlZCgpKSB7CisgICAgICAg IC8vIEZsaWNrYWJsZSBtb3ZlcyBpdHMgY29udGVudEl0ZW0gc28gd2UgbmVlZCB0byB0YWtlIHRo YXQgcG9zaXRpb24gaW50bworICAgICAgICAvLyBhY2NvdW50LCBhcyB3ZWxsIGFzIHRoZSBwb3Rl bnRpYWwgZGlzcGxhY2VtZW50IG9mIHRoZSBwYWdlIG9uIHRoZQorICAgICAgICAvLyBjb250ZW50 SXRlbSBiZWNhdXNlIG9mIGFkZGl0aW9uYWwgUU1MIGl0ZW1zLgorICAgICAgICB4UG9zICs9IGQt PnZpZXdwb3J0SXRlbS0+Y29udGVudEl0ZW0oKS0+eCgpOworICAgICAgICB5UG9zICs9IGQtPnZp ZXdwb3J0SXRlbS0+Y29udGVudEl0ZW0oKS0+eSgpOworICAgIH0KKworICAgIHJldHVybiBRVHJh bnNmb3JtKGQtPmNvbnRlbnRzU2NhbGUsIDAsIDAsIDAsIGQtPmNvbnRlbnRzU2NhbGUsIDAsIHhQ b3MsIHlQb3MsIDEpOwogfQogCiB2b2lkIFFRdWlja1dlYlBhZ2VQcml2YXRlOjp1cGRhdGVTaXpl KCkKIHsKICAgICBRU2l6ZUYgc2NhbGVkU2l6ZSA9IGNvbnRlbnRzU2l6ZSAqIGNvbnRlbnRzU2Nh bGU7Ci0gICAgcS0+c2V0U2l6ZShzY2FsZWRTaXplKTsKLSAgICB2aWV3cG9ydEl0ZW0tPnVwZGF0 ZUNvbnRlbnRzU2l6ZShzY2FsZWRTaXplKTsKKwogICAgIERyYXdpbmdBcmVhUHJveHkqIGRyYXdp bmdBcmVhID0gd2ViUGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpOwogICAgIGlmIChkcmF3aW5nQXJl YSAmJiBkcmF3aW5nQXJlYS0+bGF5ZXJUcmVlSG9zdFByb3h5KCkpCiAgICAgICAgIGRyYXdpbmdB cmVhLT5sYXllclRyZWVIb3N0UHJveHkoKS0+c2V0Q29udGVudHNTaXplKFdlYkNvcmU6OkZsb2F0 U2l6ZShjb250ZW50c1NpemUud2lkdGgoKSwgY29udGVudHNTaXplLmhlaWdodCgpKSk7CisKKyAg ICBxLT5zZXRTaXplKHNjYWxlZFNpemUpOworCisgICAgaWYgKHZpZXdwb3J0SXRlbS0+ZXhwZXJp bWVudGFsKCktPmZsaWNrYWJsZVZpZXdwb3J0RW5hYmxlZCgpKSB7CisgICAgICAgIC8vIE1ha2Ug c3VyZSB0aGF0IHRoZSBjb250ZW50IGlzIHNpemVkIHRvIHRoZSBwYWdlIGlmIHRoZSB1c2VyIGRp ZCBub3QKKyAgICAgICAgLy8gYWRkIG90aGVyIGZsaWNrYWJsZSBpdGVtcy4gSWYgdGhhdCBpcyBu b3QgdGhlIGNhc2UsIHRoZSB1c2VyIG5lZWRzIHRvCisgICAgICAgIC8vIGRpc2FibGUgdGhlIGRl ZmF1bHQgY29udGVudCBpdGVtIHNpemUgcHJvcGVydHkgb24gdGhlIFdlYlZpZXcgYW5kCisgICAg ICAgIC8vIGJpbmQgdGhlIGNvbnRlbnRXaWR0aCBhbmQgY29udGVudEhlaWdodCBhY2NvcmRpbmds eSwgaW4gYWNjb3JkYW5jZQorICAgICAgICAvLyBhY2NvcmRhbmNlIHdpdGggbm9ybWFsIEZsaWNr YWJsZSBiZWhhdmlvdXIuCisgICAgICAgIGlmICh2aWV3cG9ydEl0ZW0tPmV4cGVyaW1lbnRhbCgp LT51c2VEZWZhdWx0Q29udGVudEl0ZW1TaXplKCkpIHsKKyAgICAgICAgICAgIHZpZXdwb3J0SXRl bS0+c2V0Q29udGVudFdpZHRoKHNjYWxlZFNpemUud2lkdGgoKSk7CisgICAgICAgICAgICB2aWV3 cG9ydEl0ZW0tPnNldENvbnRlbnRIZWlnaHQoc2NhbGVkU2l6ZS5oZWlnaHQoKSk7CisgICAgICAg IH0KKyAgICB9CiB9CiAKIFFRdWlja1dlYlBhZ2VQcml2YXRlOjp+UVF1aWNrV2ViUGFnZVByaXZh dGUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3 ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmll dy5jcHAKaW5kZXggOTM1ODQyMTQ2NDA2ZTM0ZTM5ZWNhNDgyNTVjYWIyOTZmNzViN2M0NS4uZTVi NTU0Y2U2NjhlZTlhZTE4M2UxNDUwZmIzNTE0MWZlN2VhYjczYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCkBAIC0zMjQsMTIgKzMy NCw2IEBAIGJvb2wgUVF1aWNrV2ViVmlld1ByaXZhdGU6OnRyYW5zcGFyZW50QmFja2dyb3VuZCgp IGNvbnN0CiAgICAgcmV0dXJuIHdlYlBhZ2VQcm94eS0+ZHJhd3NUcmFuc3BhcmVudEJhY2tncm91 bmQoKTsKIH0KIAotUVBvaW50RiBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6cGFnZUl0ZW1Qb3MoKQot ewotICAgIEFTU0VSVChwYWdlVmlldyk7Ci0gICAgcmV0dXJuIHBhZ2VWaWV3LT5wb3MoKTsKLX0K LQogLyohCiAgICAgXHFtbHNpZ25hbCBXZWJWaWV3Ojpsb2FkaW5nQ2hhbmdlZChXZWJMb2FkUmVx dWVzdCByZXF1ZXN0KQogKi8KQEAgLTc5OCwzNCArNzkyLDYgQEAgdm9pZCBRUXVpY2tXZWJWaWV3 RmxpY2thYmxlUHJpdmF0ZTo6aW5pdGlhbGl6ZShXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQ YWdlR3IKICAgICB3ZWJQYWdlUHJveHktPnNldFVzZUZpeGVkTGF5b3V0KHRydWUpOwogfQogCi1R UG9pbnRGIFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2YXRlOjpwYWdlSXRlbVBvcygpCi17Ci0g ICAgUV9RKFFRdWlja1dlYlZpZXcpOwotICAgIC8vIEZsaWNrYWJsZSBtb3ZlcyBpdHMgY29udGVu dEl0ZW0gc28gd2UgbmVlZCB0byB0YWtlIHRoYXQgcG9zaXRpb24gaW50byBhY2NvdW50LAotICAg IC8vIGFzIHdlbGwgYXMgdGhlIHBvdGVudGlhbCBkaXNwbGFjZW1lbnQgb2YgdGhlIHBhZ2Ugb24g dGhlIGNvbnRlbnRJdGVtIGJlY2F1c2UKLSAgICAvLyBvZiBhZGRpdGlvbmFsIFFNTCBpdGVtcy4K LSAgICBxcmVhbCB4UG9zID0gcS0+Y29udGVudEl0ZW0oKS0+eCgpICsgcGFnZVZpZXctPngoKTsK LSAgICBxcmVhbCB5UG9zID0gcS0+Y29udGVudEl0ZW0oKS0+eSgpICsgcGFnZVZpZXctPnkoKTsK LSAgICByZXR1cm4gUVBvaW50Rih4UG9zLCB5UG9zKTsKLX0KLQotdm9pZCBRUXVpY2tXZWJWaWV3 RmxpY2thYmxlUHJpdmF0ZTo6dXBkYXRlQ29udGVudHNTaXplKGNvbnN0IFFTaXplRiYgc2l6ZSkK LXsKLSAgICBRX1EoUVF1aWNrV2ViVmlldyk7Ci0KLSAgICAvLyBNYWtlIHN1cmUgdGhhdCB0aGUg Y29udGVudEl0ZW0gaXMgc2l6ZWQgdG8gdGhlIHBhZ2UKLSAgICAvLyBpZiB0aGUgdXNlciBkaWQg bm90IGFkZCBvdGhlciBmbGlja2FibGUgaXRlbXMgaW4gUU1MLgotICAgIC8vIElmIHRoZSB1c2Vy IGFkZHMgaXRlbXMgaW4gUU1MIGhlIGhhcyB0byBtYWtlIHN1cmUgdG8KLSAgICAvLyBkaXNhYmxl IHRoZSBkZWZhdWx0IGNvbnRlbnQgaXRlbSBzaXplIHByb3BlcnR5IG9uIHRoZSBXZWJWaWV3Ci0g ICAgLy8gYW5kIGJpbmQgdGhlIGNvbnRlbnRXaWR0aCBhbmQgY29udGVudEhlaWdodCBhY2NvcmRp bmdseS4KLSAgICAvLyBUaGlzIGlzIGluIGFjY29yZGFuY2Ugd2l0aCBub3JtYWwgUU1MIEZsaWNr YWJsZSBiZWhhdmlvdXIuCi0gICAgaWYgKCFtX3VzZURlZmF1bHRDb250ZW50SXRlbVNpemUpCi0g ICAgICAgIHJldHVybjsKLQotICAgIHEtPnNldENvbnRlbnRXaWR0aChzaXplLndpZHRoKCkpOwot ICAgIHEtPnNldENvbnRlbnRIZWlnaHQoc2l6ZS5oZWlnaHQoKSk7Ci19Ci0KIHZvaWQgUVF1aWNr V2ViVmlld0ZsaWNrYWJsZVByaXZhdGU6Om9uQ29tcG9uZW50Q29tcGxldGUoKQogewogICAgIFFf UShRUXVpY2tXZWJWaWV3KTsKQEAgLTE4MjcsMTggKzE3OTMsNiBAQCB2b2lkIFFRdWlja1dlYlZp ZXc6OmxvYWRIdG1sKGNvbnN0IFFTdHJpbmcmIGh0bWwsIGNvbnN0IFFVcmwmIGJhc2VVcmwpCiAg ICAgZC0+d2ViUGFnZVByb3h5LT5sb2FkSFRNTFN0cmluZyhodG1sLCBiYXNlVXJsLnRvU3RyaW5n KCkpOwogfQogCi1RUG9pbnRGIFFRdWlja1dlYlZpZXc6OnBhZ2VJdGVtUG9zKCkKLXsKLSAgICBR X0QoUVF1aWNrV2ViVmlldyk7Ci0gICAgcmV0dXJuIGQtPnBhZ2VJdGVtUG9zKCk7Ci19Ci0KLXZv aWQgUVF1aWNrV2ViVmlldzo6dXBkYXRlQ29udGVudHNTaXplKGNvbnN0IFFTaXplRiYgc2l6ZSkK LXsKLSAgICBRX0QoUVF1aWNrV2ViVmlldyk7Ci0gICAgZC0+dXBkYXRlQ29udGVudHNTaXplKHNp emUpOwotfQotCiBxcmVhbCBRUXVpY2tXZWJWaWV3Ojp6b29tRmFjdG9yKCkgY29uc3QKIHsKICAg ICBRX0QoY29uc3QgUVF1aWNrV2ViVmlldyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3AuaAppbmRleCA3NzNmNzM1YTljYzkyMDAyYzYyNmM2 NjI2YzRkYzAxOWFmOWUxZGVhLi40NTBlYTFkN2M3OTI1ZTg0OTg4ZDYwM2JkMDE0OGY1YzNmY2Iw M2Y3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dl YnZpZXdfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vi dmlld19wLmgKQEAgLTE0MSwxMCArMTQxLDYgQEAgcHVibGljOgogCiAgICAgc3RhdGljIHZvaWQg cGxhdGZvcm1Jbml0aWFsaXplKCk7IC8vIE9ubHkgbmVlZGVkIGJ5IFdUUi4KIAotICAgIC8vIElu dGVybmFsIEFQSSB1c2VkIGJ5IFdlYlBhZ2UuCi0gICAgdm9pZCB1cGRhdGVDb250ZW50c1NpemUo Y29uc3QgUVNpemVGJik7Ci0gICAgUVBvaW50RiBwYWdlSXRlbVBvcygpOwotCiAgICAgLy8gUHJp dmF0ZSBDKystb25seSBBUEkuCiAgICAgcXJlYWwgem9vbUZhY3RvcigpIGNvbnN0OwogICAgIHZv aWQgc2V0Wm9vbUZhY3RvcihxcmVhbCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmgKaW5kZXggZWJkMDZlM2VhNDc2NzQzNjIxYTI2 Y2EwNDQ2NjZkOGFiZjQ4OGMzZS4uMzA2OWYwZGZmOTMxMDNhNjAwZDdhY2VkNWZhZWM3NjllZDRm M2I0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3 ZWJ2aWV3X3BfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNr d2Vidmlld19wX3AuaApAQCAtNzQsOSArNzQsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lk IGVuYWJsZU1vdXNlRXZlbnRzKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIGRpc2FibGVNb3VzZUV2 ZW50cygpIHsgfQogCi0gICAgdmlydHVhbCBRUG9pbnRGIHBhZ2VJdGVtUG9zKCk7Ci0gICAgdmly dHVhbCB2b2lkIHVwZGF0ZUNvbnRlbnRzU2l6ZShjb25zdCBRU2l6ZUYmKSB7IH0KLQogICAgIHZp cnR1YWwgdm9pZCBwcm92aXNpb25hbExvYWREaWRTdGFydChjb25zdCBRVXJsJiB1cmwpOwogICAg IHZpcnR1YWwgdm9pZCBsb2FkRGlkQ29tbWl0KCk7CiAgICAgdmlydHVhbCB2b2lkIGRpZFNhbWVE b2N1bWVudE5hdmlnYXRpb24oKTsKQEAgLTIyNiw5ICsyMjMsNiBAQCBwdWJsaWM6CiAKICAgICB2 aXJ0dWFsIHZvaWQgb25Db21wb25lbnRDb21wbGV0ZSgpOwogCi0gICAgdmlydHVhbCBRUG9pbnRG IHBhZ2VJdGVtUG9zKCk7Ci0gICAgdmlydHVhbCB2b2lkIHVwZGF0ZUNvbnRlbnRzU2l6ZShjb25z dCBRU2l6ZUYmKTsKLQogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VWaWV3cG9ydFByb3BlcnRp ZXMoY29uc3QgV2ViQ29yZTo6Vmlld3BvcnRBdHRyaWJ1dGVzJik7CiAgICAgdmlydHVhbCBXZWJL aXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSogdmlld3BvcnRJbnRlcmFjdGlvbkVuZ2lu ZSgpIHsgcmV0dXJuIGludGVyYWN0aW9uRW5naW5lLmRhdGEoKTsgfQogICAgIHZpcnR1YWwgdm9p ZCB1cGRhdGVWaWV3cG9ydFNpemUoKTsK