118439 2013-07-05 17:30:19 -0700 Fix r152265: FrameView's pagination mode is only one of two, and the logic was totally wrong 2013-07-05 19:20:39 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca bdakin simon.fraser webkit-bug-importer oldest_to_newest 906513 0 thorton 2013-07-05 17:30:19 -0700 The test was only passing by sheer happenstance (FrameView's pagination is the CSS one, so it was set to Unpaginated, so the totally-broken logic happened to cause the clamping not to happen). So, use both FrameView's and Page's. And fix the logic (we wanted to NOT clamp in the pagination case). Also, I found ways (with RTL text) that even left-to-right and top-to-bottom pagination can be broken here, so expand to all "pagination enabled" non-0-scrollOrigin states. Also, the test was broken because DrawingAreaImpl doesn't know what to do with a 40000 px wide view (and just asserts in SharedMemory code and thus makes the test time out). And DidFirstPaintAfterSuppressedIncrementalRendering doesn't fire if the window is offscreen. And EXPECT_JS_EQ is pretty cool. Basically, rewrite the patch. It deserves it. 906514 1 webkit-bug-importer 2013-07-05 17:30:42 -0700 <rdar://problem/14366120> 906516 2 206179 thorton 2013-07-05 17:48:53 -0700 Created attachment 206179 patch 906523 3 thorton 2013-07-05 19:20:39 -0700 http://trac.webkit.org/changeset/152433 206179 2013-07-05 17:48:53 -0700 2013-07-05 18:05:44 -0700 patch fix-test.diff text/plain 5835 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhOGMyMmQzLi4xYTkxOTY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTMtMDctMDUgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgRml4IHIxNTIyNjU6IEZyYW1lVmlldydzIHBhZ2luYXRpb24gbW9kZSBpcyBvbmx5 IG9uZSBvZiB0d28sIGFuZCB0aGUgbG9naWMgd2FzIHRvdGFsbHkgd3JvbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExODQzOQorICAgICAgICA8cmRh cjovL3Byb2JsZW0vMTQzNjYxMjA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZVZpZXc6Om1heGltdW1TY3JvbGxQb3NpdGlvbik6CisgICAgICAgIC0gVGVzdCBib3RoIFBh Z2UgYW5kIEZyYW1lVmlldydzIHBhZ2luYXRpb24gbW9kZXMuCisgICAgICAgIC0gKkRvbid0KiBj bGFtcCBuZWdhdGl2ZXMgdG8gemVybyBpZiB3ZSBhcmUgcGFnaW5hdGVkIHdpdGggc2Nyb2xsIG9m ZnNldCBzZXQsCisgICAgICAgICAgICBsaWtlIHRoZSBvcmlnaW5hbCBjaGFuZ2Vsb2cgY2xhaW1l ZCwgYnV0IHRoZSBjb2RlIGRpZCB0aGUgb3Bwb3NpdGUuCisgICAgICAgIC0gRG9uJ3QgY2xhbXAg aW4gKmFsbCogcGFnaW5hdGlvbiBtb2Rlczsgd2l0aCAnZGlyZWN0aW9uOiBSVEwnIGl0J3Mgc3Rp bGwgcG9zc2libGUKKyAgICAgICAgICAgIHRvIGhhdmUgYSBuZWdhdGl2ZSBtYXhpbXVtIHBvc2l0 aW9uIGluIExUUi9UQiBwYWdpbmF0aW9uIG1vZGVzLgorCiAyMDEzLTA3LTA1ICBCcmVudCBGdWxn aGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5kb3dzXSBJZGVudGlmeSBP Uy1sZXZlbCBhdCBidWlsZC10aW1lLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDAw MTAyYjkuLmMzNjBiZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTE2NTMsOSAr MTY1Myw4IEBAIEludFBvaW50IEZyYW1lVmlldzo6bWF4aW11bVNjcm9sbFBvc2l0aW9uKCkgY29u c3QKIHsKICAgICBJbnRQb2ludCBtYXhpbXVtT2Zmc2V0KGNvbnRlbnRzV2lkdGgoKSAtIHZpc2li bGVXaWR0aCgpIC0gc2Nyb2xsT3JpZ2luKCkueCgpLCB0b3RhbENvbnRlbnRzU2l6ZSgpLmhlaWdo dCgpIC0gdmlzaWJsZUhlaWdodCgpIC0gc2Nyb2xsT3JpZ2luKCkueSgpKTsKIAotICAgIC8vIFdp dGggcmV2ZXJzZSBwYWdpbmF0aW9uIG1vZGVzLCB3ZSBjYW4gaGF2ZSBhIG5lZ2F0aXZlIG1heGlt dW0gc2Nyb2xsIHBvc2l0aW9uLgotICAgIGlmIChtX3BhZ2luYXRpb24ubW9kZSA9PSBQYWdpbmF0 aW9uOjpCb3R0b21Ub1RvcFBhZ2luYXRlZAotICAgICAgICB8fCBtX3BhZ2luYXRpb24ubW9kZSA9 PSBQYWdpbmF0aW9uOjpSaWdodFRvTGVmdFBhZ2luYXRlZAorICAgIC8vIFdpdGggcGFnaW5hdGlv biBlbmFibGVkLCB3ZSBjYW4gaGF2ZSBhIG5lZ2F0aXZlIG1heGltdW0gc2Nyb2xsIHBvc2l0aW9u LgorICAgIGlmICgobV9mcmFtZS0+cGFnZSgpLT5wYWdpbmF0aW9uKCkubW9kZSA9PSBQYWdpbmF0 aW9uOjpVbnBhZ2luYXRlZCAmJiBtX3BhZ2luYXRpb24ubW9kZSA9PSBQYWdpbmF0aW9uOjpVbnBh Z2luYXRlZCkKICAgICAgICAgfHwgc2Nyb2xsT3JpZ2luKCkgPT0gSW50UG9pbnQ6Onplcm8oKSkK ICAgICAgICAgbWF4aW11bU9mZnNldC5jbGFtcE5lZ2F0aXZlVG9aZXJvKCk7CiAgICAgCmRpZmYg LS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDc0ZjRmZS4u OTcxMDA1NiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSw1ICsxLDIzIEBACiAyMDEzLTA3LTA1ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0 b25AYXBwbGUuY29tPgogCisgICAgICAgIEZpeCByMTUyMjY1OiBGcmFtZVZpZXcncyBwYWdpbmF0 aW9uIG1vZGUgaXMgb25seSBvbmUgb2YgdHdvLCBhbmQgdGhlIGxvZ2ljIHdhcyB0b3RhbGx5IHdy b25nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTg0 MzkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE0MzY2MTIwPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXQyL1Jlc2l6ZVJldmVyc2VQYWdpbmF0ZWRXZWJWaWV3LmNwcDoKKyAgICAgICAgKFRlc3RXZWJL aXRBUEk6OmRpZExheW91dCk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKyAgICAg ICAgLSBNYWtlIHVzZSBvZiBFWFBFQ1RfSlNfRVEgaW5zdGVhZCBvZiBtYW51YWxseSBkb2luZyBK YXZhU2NyaXB0IHN0dWZmLgorICAgICAgICAtIEFzc2VydCB0aGF0IHdlIGdvdCB0aGUgcmlnaHQg bnVtYmVyIG9mIHBhZ2VzIGZvciBzYW5pdHkuCisgICAgICAgIC0gUmVkdWNlIHRoZSBwYWdlIGdh cCBzaXplIHNvIHRoYXQgRHJhd2luZ0FyZWFJbXBsIGRvZXNuJ3QgdHJ5IHRvIGFsbG9jYXRlCisg ICAgICAgICAgICBzbyBtdWNoIG1lbW9yeSB0aGF0IFNoYXJlZE1lbW9yeSBhc3NlcnRzIGFuZCBt YWtlcyB0aGUgdGVzdCB0aW1lIG91dC4KKyAgICAgICAgLSBVc2UgZGlkRmlyc3RMYXlvdXRBZnRl clN1cHByZXNzZWRJbmNyZW1lbnRhbFJlbmRlcmluZyBpbnN0ZWFkIG9mIFBhaW50CisgICAgICAg ICAgICBiZWNhdXNlIHBhaW50IGRvZXNuJ3QgZmlyZSBpZiB0aGUgd2luZG93IGlzIG9mZnNjcmVl bi4KKworMjAxMy0wNy0wNSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4K KwogICAgICAgICBbd2syXSBBZGQgQVBJIHRvIGxvY2sgdGhlIHNjcm9sbCBwb3NpdGlvbiBhdCB0 aGUgdG9wIG9yIGJvdHRvbSBvZiB0aGUgcGFnZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4NDI5CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNDEy MDMyMz4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9SZXNp emVSZXZlcnNlUGFnaW5hdGVkV2ViVmlldy5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdDIvUmVzaXplUmV2ZXJzZVBhZ2luYXRlZFdlYlZpZXcuY3BwCmluZGV4IGI5NWIzYTMu LjFkODRjOTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9S ZXNpemVSZXZlcnNlUGFnaW5hdGVkV2ViVmlldy5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQyL1Jlc2l6ZVJldmVyc2VQYWdpbmF0ZWRXZWJWaWV3LmNwcApAQCAtMjQs NiArMjQsNyBAQAogICovCiAKICNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJKYXZhU2Ny aXB0VGVzdC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSAiUGxh dGZvcm1XZWJWaWV3LmgiCiAjaW5jbHVkZSAiVGVzdC5oIgpAQCAtMzcsMzEgKzM4LDIxIEBAIG5h bWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsKIHN0YXRpYyBib29sIHRlc3REb25lOwogCiBzdGF0aWMg Y29uc3QgdW5zaWduZWQgcGFnZUxlbmd0aCA9IDEwMDsKLXN0YXRpYyBjb25zdCB1bnNpZ25lZCBw YWdlR2FwID0gMTAwMDsKLQotc3RhdGljIHZvaWQgZGlkUnVuSmF2YVNjcmlwdChXS1NlcmlhbGl6 ZWRTY3JpcHRWYWx1ZVJlZiByZXN1bHRTZXJpYWxpemVkU2NyaXB0VmFsdWUsIFdLRXJyb3JSZWYg ZXJyb3IsIHZvaWQqIGNvbnRleHQpCi17Ci0gICAgSlNHbG9iYWxDb250ZXh0UmVmIHNjcmlwdENv bnRleHQgPSBKU0dsb2JhbENvbnRleHRDcmVhdGUoMCk7Ci0gICAgQVNTRVJUX05PVF9OVUxMKHNj cmlwdENvbnRleHQpOwotCi0gICAgQVNTRVJUX05PVF9OVUxMKHJlc3VsdFNlcmlhbGl6ZWRTY3Jp cHRWYWx1ZSk7Ci0gICAgSlNWYWx1ZVJlZiByZXR1cm5WYWx1ZSA9IFdLU2VyaWFsaXplZFNjcmlw dFZhbHVlRGVzZXJpYWxpemUocmVzdWx0U2VyaWFsaXplZFNjcmlwdFZhbHVlLCBzY3JpcHRDb250 ZXh0LCAwKTsKLSAgICBkb3VibGUgc2Nyb2xsUG9zaXRpb24gPSBKU1ZhbHVlVG9OdW1iZXIoc2Ny aXB0Q29udGV4dCwgcmV0dXJuVmFsdWUsIDApOwotCi0gICAgQVNTRVJUX0VRKC0yMDkwMC4wLCBz Y3JvbGxQb3NpdGlvbik7Ci0KLSAgICB0ZXN0RG9uZSA9IHRydWU7Ci19CitzdGF0aWMgY29uc3Qg dW5zaWduZWQgcGFnZUdhcCA9IDEwMDsKK3N0YXRpYyBjb25zdCB1bnNpZ25lZCBleHBlY3RlZFBh Z2VDb3VudCA9IDIwOwogCiBzdGF0aWMgdm9pZCBkaWRMYXlvdXQoV0tQYWdlUmVmIHBhZ2UsIFdL TGF5b3V0TWlsZXN0b25lcyBtaWxlc3RvbmVzLCBXS1R5cGVSZWYsIGNvbnN0IHZvaWQqIGNsaWVu dEluZm8pCiB7Ci0gICAgaWYgKG1pbGVzdG9uZXMgJiBrV0tEaWRGaXJzdFBhaW50QWZ0ZXJTdXBw cmVzc2VkSW5jcmVtZW50YWxSZW5kZXJpbmcpIHsKKyAgICBpZiAobWlsZXN0b25lcyAmIGtXS0Rp ZEZpcnN0TGF5b3V0QWZ0ZXJTdXBwcmVzc2VkSW5jcmVtZW50YWxSZW5kZXJpbmcpIHsKICAgICAg ICAgUGxhdGZvcm1XZWJWaWV3KiB3ZWJWaWV3ID0gKFBsYXRmb3JtV2ViVmlldyopY2xpZW50SW5m bzsKKwogICAgICAgICB1bnNpZ25lZCBwYWdlQ291bnQgPSBXS1BhZ2VHZXRQYWdlQ291bnQocGFn ZSk7CisgICAgICAgIEVYUEVDVF9FUShleHBlY3RlZFBhZ2VDb3VudCwgcGFnZUNvdW50KTsKKwog ICAgICAgICB3ZWJWaWV3LT5yZXNpemVUbygocGFnZUxlbmd0aCAqIHBhZ2VDb3VudCkgKyAocGFn ZUdhcCAqIChwYWdlQ291bnQgLSAxKSksIDUwMCk7CisgICAgICAgIEVYUEVDVF9KU19FUShwYWdl LCAid2luZG93LnNjcm9sbFgiLCAiLTM4MDAiKTsKIAotICAgICAgICBXS1JldGFpblB0cjxXS1N0 cmluZ1JlZj4gamF2YVNjcmlwdFN0cmluZyhBZG9wdFdLLCBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4 Q1N0cmluZygid2luZG93LnNjcm9sbFgiKSk7Ci0gICAgICAgIFdLUGFnZVJ1bkphdmFTY3JpcHRJ bk1haW5GcmFtZShwYWdlLCBqYXZhU2NyaXB0U3RyaW5nLmdldCgpLCAwLCBkaWRSdW5KYXZhU2Ny aXB0KTsKKyAgICAgICAgdGVzdERvbmUgPSB0cnVlOwogICAgIH0KIH0KIApAQCAtNzgsNyArNjks NyBAQCBURVNUKFdlYktpdDIsIFJlc2l6ZVJldmVyc2VQYWdpbmF0ZWRXZWJWaWV3KQogCiAgICAg V0tQYWdlU2V0UGFnZUxvYWRlckNsaWVudCh3ZWJWaWV3LnBhZ2UoKSwgJmxvYWRlckNsaWVudCk7 CiAKLSAgICBXS1BhZ2VMaXN0ZW5Gb3JMYXlvdXRNaWxlc3RvbmVzKHdlYlZpZXcucGFnZSgpLCBr V0tEaWRGaXJzdFBhaW50QWZ0ZXJTdXBwcmVzc2VkSW5jcmVtZW50YWxSZW5kZXJpbmcpOworICAg IFdLUGFnZUxpc3RlbkZvckxheW91dE1pbGVzdG9uZXMod2ViVmlldy5wYWdlKCksIGtXS0RpZEZp cnN0TGF5b3V0QWZ0ZXJTdXBwcmVzc2VkSW5jcmVtZW50YWxSZW5kZXJpbmcpOwogCiAgICAgV0tQ YWdlR3JvdXBSZWYgcGFnZUdyb3VwID0gIFdLUGFnZUdldFBhZ2VHcm91cCh3ZWJWaWV3LnBhZ2Uo KSk7CiAgICAgV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlcyA9IFdLUGFnZUdyb3VwR2V0UHJl ZmVyZW5jZXMocGFnZUdyb3VwKTsK