39645 2010-05-24 22:10:56 -0700 [chromium] Fix zoom tests after r60104 2010-05-24 23:55:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tony tony levin oldest_to_newest 230091 0 tony 2010-05-24 22:10:56 -0700 [chromium] Fix zoom tests after r60104d 230092 1 56971 tony 2010-05-24 22:11:19 -0700 Created attachment 56971 Patch 230093 2 tony 2010-05-24 22:12:28 -0700 In http://trac.webkit.org/changeset/60111 , I tried to fix the build break caused by http://trac.webkit.org/changeset/60104. The fix was wrong and causes some zoom related layout tests to fail. This should fix those tests. 230098 3 levin 2010-05-24 22:28:13 -0700 I'm sure you know what you are doing :) but there isn't enough in here to help me understand why this is correct. I started to try to figure it all out again but you probably already did this, so hopefully you can quickly explain, why did r60104 change things in a way that requires this change? 230111 4 56971 abarth 2010-05-24 23:38:43 -0700 Comment on attachment 56971 Patch I'm not an expert here, but this looks reasonable. 230113 5 56978 tony 2010-05-24 23:41:32 -0700 Created attachment 56978 Patch 230116 6 tony 2010-05-24 23:45:58 -0700 (In reply to comment #3) > I'm sure you know what you are doing :) but there isn't enough in here to help me understand why this is correct. > > I started to try to figure it all out again but you probably already did this, so hopefully you can quickly explain, why did r60104 change things in a way that requires this change? Sorry, I should have included an explanation. In writing it, I was able to make this a little simpler. m_zoomFactor moved from Frame to FrameView. FrameView has separate notions of page zoom and text zoom. In my hurried compile fix, I assumed that m_zoomFactor was for page zoom, but it's not always. I guess in tests, we default to text zoom factor, but the fix is to read the variable directly rather than checking to see if we're in text zoom or page zoom mode. 230119 7 56978 levin 2010-05-24 23:48:33 -0700 Comment on attachment 56978 Patch Would have been nice to have some of the explanation in the ChangeLog, but ok. :) 230122 8 tony 2010-05-24 23:54:56 -0700 Committed r60131: <http://trac.webkit.org/changeset/60131> 230123 9 tony 2010-05-24 23:55:46 -0700 (In reply to comment #7) > (From update of attachment 56978 [details]) > Would have been nice to have some of the explanation in the ChangeLog, but ok. :) I copied some of the explanation into the ChangeLog. Thanks for the fast review! 56971 2010-05-24 22:11:19 -0700 2010-05-24 23:41:26 -0700 Patch bug-39645-20100525141117.patch text/plain 1289 tony ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGUzZTc4MTFhZmFkYTFkYjY1ZTBmYTNlMTAyNzBjN2ZjYWE4YmM5YzQu LmY5ZjA1NjYwOWQ4YzQ3MzlhZTkyYjhmZDI1ZmNiODc2ZGZmMjQ1MTAgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDEzIEBACisyMDEwLTA1LTI0ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2No cm9taXVtXSBGaXggem9vbSB0ZXN0cyBhZnRlciByNjAxMDQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5NjQ1CisKKyAgICAgICAgKiBzcmMvV2ViVmll d0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0Wm9vbUxldmVsKToK KwogMjAxMC0wNS0yNCAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmNwcAppbmRleCA1MjY0NjlkOTVmOWVjZWNjNzAxMDVkMGZlMzk0OWMxNTMxNjZhYzU1Li4zYTUw ZjY0NTQzYmNjNDBmNjMyOGJmMmU5NzhmYWViZmM0MjI5ZTk0IDEwMDY0NAotLS0gYS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmNwcApAQCAtMTQ2NCw3ICsxNDY0LDcgQEAgaW50IFdlYlZpZXdJbXBsOjpzZXRa b29tTGV2ZWwoYm9vbCB0ZXh0T25seSwgaW50IHpvb21MZXZlbCkKICAgICBGcmFtZVZpZXcqIHZp ZXcgPSBmcmFtZS0+dmlldygpOwogICAgIGlmICghdmlldykKICAgICAgICAgcmV0dXJuIG1fem9v bUxldmVsOwotICAgIGlmICh6b29tRmFjdG9yICE9IHZpZXctPnBhZ2Vab29tRmFjdG9yKCkpIHsK KyAgICBpZiAoem9vbUZhY3RvciAhPSAodGV4dE9ubHkgPyB2aWV3LT50ZXh0Wm9vbUZhY3Rvcigp IDogdmlldy0+cGFnZVpvb21GYWN0b3IoKSkpIHsKICAgICAgICAgbV96b29tTGV2ZWwgPSB6b29t TGV2ZWw7CiAgICAgICAgIHZpZXctPnNldFpvb21GYWN0b3Ioem9vbUZhY3RvciwgdGV4dE9ubHkg PyBab29tVGV4dE9ubHkgOiBab29tUGFnZSk7CiAgICAgfQo= 56978 2010-05-24 23:41:32 -0700 2010-05-24 23:48:32 -0700 Patch bug-39645-20100525154130.patch text/plain 1247 tony ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGUzZTc4MTFhZmFkYTFkYjY1ZTBmYTNlMTAyNzBjN2ZjYWE4YmM5YzQu LmY5ZjA1NjYwOWQ4YzQ3MzlhZTkyYjhmZDI1ZmNiODc2ZGZmMjQ1MTAgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDEzIEBACisyMDEwLTA1LTI0ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2No cm9taXVtXSBGaXggem9vbSB0ZXN0cyBhZnRlciByNjAxMDQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5NjQ1CisKKyAgICAgICAgKiBzcmMvV2ViVmll d0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0Wm9vbUxldmVsKToK KwogMjAxMC0wNS0yNCAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmNwcAppbmRleCA1MjY0NjlkOTVmOWVjZWNjNzAxMDVkMGZlMzk0OWMxNTMxNjZhYzU1Li45YmMx ZWJhY2RjYzgzMzA2MzUxM2EyMDU2OTg0MTdmMjRkMDgzOTNkIDEwMDY0NAotLS0gYS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmNwcApAQCAtMTQ2NCw3ICsxNDY0LDcgQEAgaW50IFdlYlZpZXdJbXBsOjpzZXRa b29tTGV2ZWwoYm9vbCB0ZXh0T25seSwgaW50IHpvb21MZXZlbCkKICAgICBGcmFtZVZpZXcqIHZp ZXcgPSBmcmFtZS0+dmlldygpOwogICAgIGlmICghdmlldykKICAgICAgICAgcmV0dXJuIG1fem9v bUxldmVsOwotICAgIGlmICh6b29tRmFjdG9yICE9IHZpZXctPnBhZ2Vab29tRmFjdG9yKCkpIHsK KyAgICBpZiAoem9vbUZhY3RvciAhPSB2aWV3LT56b29tRmFjdG9yKCkpIHsKICAgICAgICAgbV96 b29tTGV2ZWwgPSB6b29tTGV2ZWw7CiAgICAgICAgIHZpZXctPnNldFpvb21GYWN0b3Ioem9vbUZh Y3RvciwgdGV4dE9ubHkgPyBab29tVGV4dE9ubHkgOiBab29tUGFnZSk7CiAgICAgfQo=