60671 2011-05-11 15:46:51 -0700 Switch calculateBackgroundImageGeometry to use IntRect 2011-05-12 11:06:12 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw darin eae eric simon.fraser oldest_to_newest 402362 0 leviw 2011-05-11 15:46:51 -0700 It currently takes four ints representing a rect. 402954 1 93303 leviw 2011-05-12 10:49:44 -0700 Created attachment 93303 Patch 402966 2 leviw 2011-05-12 11:03:51 -0700 Thanks for the review! 402969 3 93303 leviw 2011-05-12 11:06:09 -0700 Comment on attachment 93303 Patch Clearing flags on attachment: 93303 Committed r86359: <http://trac.webkit.org/changeset/86359> 402970 4 leviw 2011-05-12 11:06:12 -0700 All reviewed patches have been landed. Closing bug. 93303 2011-05-12 10:49:44 -0700 2011-05-12 11:06:08 -0700 Patch bug-60671-20110512104943.patch text/plain 5583 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2MzU3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDUtMTIgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBjYWxjdWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9t ZXRyeSB0byB1c2UgSW50UmVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjA2NzEKKworICAgICAgICBSZXBsYWNpbmcgdGhlIGZvdXIgaW50cyBwYXNz ZWQgaW50byBjYWxjdWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeSB3aXRoIGFuIEludFJlY3Qu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIHRoaXMgaXMganVzdCByZWZhY3RvcmluZy4K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyQm94OjptYXNrQ2xpcFJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpy ZXBhaW50TGF5ZXJSZWN0c0ZvckltYWdlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94 TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6 OnBhaW50RmlsbExheWVyRXh0ZW5kZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9k ZWxPYmplY3Q6OmNhbGN1bGF0ZUJhY2tncm91bmRJbWFnZUdlb21ldHJ5KToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaDoKKwogMjAxMS0wNS0xMiAgTHVrZSBNYWNw aGVyc29uICAgPG1hY3BoZXJzb25AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERpbWl0cmkgR2xhemtvdi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwCShyZXZpc2lvbiA4NjM1NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NzQsNyArOTc0LDcgQEAgSW50UmVjdCBSZW5kZXJC b3g6Om1hc2tDbGlwUmVjdCgpCiAgICAgICAgICAgICBJbnRSZWN0IG1hc2tSZWN0OwogICAgICAg ICAgICAgSW50UG9pbnQgcGhhc2U7CiAgICAgICAgICAgICBJbnRTaXplIHRpbGVTaXplOwotICAg ICAgICAgICAgY2FsY3VsYXRlQmFja2dyb3VuZEltYWdlR2VvbWV0cnkobWFza0xheWVyLCBiYm94 LngoKSwgYmJveC55KCksIGJib3gud2lkdGgoKSwgYmJveC5oZWlnaHQoKSwgbWFza1JlY3QsIHBo YXNlLCB0aWxlU2l6ZSk7CisgICAgICAgICAgICBjYWxjdWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9t ZXRyeShtYXNrTGF5ZXIsIGJib3gsIG1hc2tSZWN0LCBwaGFzZSwgdGlsZVNpemUpOwogICAgICAg ICAgICAgcmVzdWx0LnVuaXRlKG1hc2tSZWN0KTsKICAgICAgICAgfQogICAgIH0KQEAgLTEwNjgs NyArMTA2OCw3IEBAIGJvb2wgUmVuZGVyQm94OjpyZXBhaW50TGF5ZXJSZWN0c0ZvckltYWcKICAg ICAgICAgICAgIEludFJlY3QgcmVwYWludFJlY3Q7CiAgICAgICAgICAgICBJbnRQb2ludCBwaGFz ZTsKICAgICAgICAgICAgIEludFNpemUgdGlsZVNpemU7Ci0gICAgICAgICAgICBsYXllclJlbmRl cmVyLT5jYWxjdWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeShjdXJMYXllciwgcmVuZGVyZXJS ZWN0LngoKSwgcmVuZGVyZXJSZWN0LnkoKSwgcmVuZGVyZXJSZWN0LndpZHRoKCksIHJlbmRlcmVy UmVjdC5oZWlnaHQoKSwgcmVwYWludFJlY3QsIHBoYXNlLCB0aWxlU2l6ZSk7CisgICAgICAgICAg ICBsYXllclJlbmRlcmVyLT5jYWxjdWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeShjdXJMYXll ciwgcmVuZGVyZXJSZWN0LCByZXBhaW50UmVjdCwgcGhhc2UsIHRpbGVTaXplKTsKICAgICAgICAg ICAgIGxheWVyUmVuZGVyZXItPnJlcGFpbnRSZWN0YW5nbGUocmVwYWludFJlY3QpOwogICAgICAg ICAgICAgaWYgKHJlcGFpbnRSZWN0ID09IHJlbmRlcmVyUmVjdCkKICAgICAgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2Rl bE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveE1vZGVsT2JqZWN0LmNwcAkocmV2aXNpb24gODYzNTUpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NTks NyArNzU5LDcgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRGaWxsTGF5ZQogICAg ICAgICBJbnRQb2ludCBwaGFzZTsKICAgICAgICAgSW50U2l6ZSB0aWxlU2l6ZTsKIAotICAgICAg ICBjYWxjdWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeShiZ0xheWVyLCBzY3JvbGxlZFBhaW50 UmVjdC54KCksIHNjcm9sbGVkUGFpbnRSZWN0LnkoKSwgc2Nyb2xsZWRQYWludFJlY3Qud2lkdGgo KSwgc2Nyb2xsZWRQYWludFJlY3QuaGVpZ2h0KCksIGRlc3RSZWN0LCBwaGFzZSwgdGlsZVNpemUp OworICAgICAgICBjYWxjdWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeShiZ0xheWVyLCBzY3Jv bGxlZFBhaW50UmVjdCwgZGVzdFJlY3QsIHBoYXNlLCB0aWxlU2l6ZSk7CiAgICAgICAgIEludFBv aW50IGRlc3RPcmlnaW4gPSBkZXN0UmVjdC5sb2NhdGlvbigpOwogICAgICAgICBkZXN0UmVjdC5p bnRlcnNlY3QocGFpbnRJbmZvLnJlY3QpOwogICAgICAgICBpZiAoIWRlc3RSZWN0LmlzRW1wdHko KSkgewpAQCAtODM0LDcgKzgzNCw3IEBAIEludFNpemUgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmNh bGN1bGF0ZUYKICAgICByZXR1cm4gaW1hZ2UtPmltYWdlU2l6ZSh0aGlzLCBzdHlsZSgpLT5lZmZl Y3RpdmVab29tKCkpOwogfQogCi12b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpjYWxjdWxhdGVC YWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeShjb25zdCBGaWxsTGF5ZXIqIGZpbGxMYXllciwgaW50IHR4 LCBpbnQgdHksIGludCB3LCBpbnQgaCwgCit2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpjYWxj dWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeShjb25zdCBGaWxsTGF5ZXIqIGZpbGxMYXllciwg Y29uc3QgSW50UmVjdCYgcGFpbnRSZWN0LCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEludFJlY3QmIGRlc3RSZWN0LCBJbnRQb2lu dCYgcGhhc2UsIEludFNpemUmIHRpbGVTaXplKQogewogICAgIGludCBsZWZ0ID0gMDsKQEAgLTg1 Niw3ICs4NTYsNyBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpjYWxjdWxhdGVCYWNrCiAj ZW5kaWYKIAogICAgIGlmICghZml4ZWRBdHRhY2htZW50KSB7Ci0gICAgICAgIGRlc3RSZWN0ID0g SW50UmVjdCh0eCwgdHksIHcsIGgpOworICAgICAgICBkZXN0UmVjdCA9IHBhaW50UmVjdDsKIAog ICAgICAgICBpbnQgcmlnaHQgPSAwOwogICAgICAgICBpbnQgYm90dG9tID0gMDsKQEAgLTg4Miw3 ICs4ODIsNyBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpjYWxjdWxhdGVCYWNrCiAgICAg ICAgICAgICBsZWZ0ICs9IG1hcmdpbkxlZnQoKTsKICAgICAgICAgICAgIHRvcCArPSBtYXJnaW5U b3AoKTsKICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBwb3NpdGlvbmluZ0FyZWFTaXplID0g SW50U2l6ZSh3IC0gbGVmdCAtIHJpZ2h0LCBoIC0gdG9wIC0gYm90dG9tKTsKKyAgICAgICAgICAg IHBvc2l0aW9uaW5nQXJlYVNpemUgPSBJbnRTaXplKHBhaW50UmVjdC53aWR0aCgpIC0gbGVmdCAt IHJpZ2h0LCBwYWludFJlY3QuaGVpZ2h0KCkgLSB0b3AgLSBib3R0b20pOwogICAgIH0gZWxzZSB7 CiAgICAgICAgIGRlc3RSZWN0ID0gdmlld1JlY3QoKTsKICAgICAgICAgcG9zaXRpb25pbmdBcmVh U2l6ZSA9IGRlc3RSZWN0LnNpemUoKTsKQEAgLTkxMiw5ICs5MTIsOSBAQCB2b2lkIFJlbmRlckJv eE1vZGVsT2JqZWN0OjpjYWxjdWxhdGVCYWNrCiAgICAgfQogCiAgICAgaWYgKGZpeGVkQXR0YWNo bWVudCkKLSAgICAgICAgcGhhc2UubW92ZShtYXgodHggLSBkZXN0UmVjdC54KCksIDApLCBtYXgo dHkgLSBkZXN0UmVjdC55KCksIDApKTsKKyAgICAgICAgcGhhc2UubW92ZShtYXgocGFpbnRSZWN0 LngoKSAtIGRlc3RSZWN0LngoKSwgMCksIG1heChwYWludFJlY3QueSgpIC0gZGVzdFJlY3QueSgp LCAwKSk7CiAKLSAgICBkZXN0UmVjdC5pbnRlcnNlY3QoSW50UmVjdCh0eCwgdHksIHcsIGgpKTsK KyAgICBkZXN0UmVjdC5pbnRlcnNlY3QocGFpbnRSZWN0KTsKIH0KIAogYm9vbCBSZW5kZXJCb3hN b2RlbE9iamVjdDo6cGFpbnROaW5lUGllY2VJbWFnZShHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNz Q29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCwgY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlLApJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0 LmgJKHJldmlzaW9uIDg2MzU1KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eE1vZGVsT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTEzNCw3ICsxMzQsNyBAQCBwdWJsaWM6 CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2VsZWN0aW9uU3RhdGUoU2VsZWN0aW9uU3RhdGUgcyk7 CiBwcm90ZWN0ZWQ6Ci0gICAgdm9pZCBjYWxjdWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeShj b25zdCBGaWxsTGF5ZXIqLCBpbnQgdHgsIGludCB0eSwgaW50IHcsIGludCBoLCBJbnRSZWN0JiBk ZXN0UmVjdCwgSW50UG9pbnQmIHBoYXNlLCBJbnRTaXplJiB0aWxlU2l6ZSk7CisgICAgdm9pZCBj YWxjdWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeShjb25zdCBGaWxsTGF5ZXIqLCBjb25zdCBJ bnRSZWN0JiBwYWludFJlY3QsIEludFJlY3QmIGRlc3RSZWN0LCBJbnRQb2ludCYgcGhhc2UsIElu dFNpemUmIHRpbGVTaXplKTsKICAgICB2b2lkIGdldEJvcmRlckVkZ2VJbmZvKGNsYXNzIEJvcmRl ckVkZ2VbXSwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlID0gdHJ1ZSwgYm9vbCBpbmNsdWRl TG9naWNhbFJpZ2h0RWRnZSA9IHRydWUpIGNvbnN0OwogICAgIGJvb2wgYm9yZGVyT2JzY3VyZXNC YWNrZ3JvdW5kRWRnZShjb25zdCBGbG9hdFNpemUmIGNvbnRleHRTY2FsZSkgY29uc3Q7CiAK