46485 2010-09-24 10:52:18 -0700 Generalize from RenderBox to RenderBoxModelObject for getTransformFromContainer 2010-09-24 11:22:21 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Minor --- 1 inferno inferno simon.fraser oldest_to_newest 284534 0 inferno 2010-09-24 10:52:18 -0700 Fixing as per Simon's comments: Comment #5 From Simon Fraser (smfr) 2010-09-24 10:38:50 PST (-) [reply] I think a better fix would be: diff --git a/WebCore/rendering/RenderObject.cpp b/WebCore/rendering/RenderObject.cpp index 39ee309..346cd8b 100644 --- a/WebCore/rendering/RenderObject.cpp +++ b/WebCore/rendering/RenderObject.cpp @@ -1988,10 +1988,10 @@ void RenderObject::getTransformFromContainer(const RenderObject* containerObject transform.multLeft(layer->currentTransform()); #if ENABLE(3D_RENDERING) - if (containerObject && containerObject->isBox() && containerObject->hasLayer() && containerObject->style()->hasPerspective()) { + if (containerObject && containerObject->hasLayer() && containerObject->style()->hasPerspective()) { // Perpsective on the container affects us, so we have to factor it in here. ASSERT(containerObject->hasLayer()); - FloatPoint perspectiveOrigin = toRenderBox(containerObject)->layer()->perspectiveOrigin(); + FloatPoint perspectiveOrigin = toRenderBoxModelObject(containerObject)->layer()->perspectiveOrigin(); TransformationMatrix perspectiveMatrix; perspectiveMatrix.applyPerspective(containerObject->style()->perspective()); Nowhere do we state that something has to be a box to have perspective. 284536 1 inferno 2010-09-24 10:52:49 -0700 This fix is so as to comply with the spec, although the current code does not work on things other than RenderBox. 284553 2 68716 inferno 2010-09-24 11:14:39 -0700 Created attachment 68716 Patch 284561 3 inferno 2010-09-24 11:22:21 -0700 Committed r68278: <http://trac.webkit.org/changeset/68278> 68716 2010-09-24 11:14:39 -0700 2010-09-24 11:18:08 -0700 Patch bug-46485-20100924111438.patch text/plain 1741 inferno SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODI3MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMDktMjQgIEFiaGlzaGVrIEFyeWEgIDxpbmZlcm5vQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBDb21wbHkgd2l0aCBzcGVjIGJ5IGdlbmVyYWxpemluZyBjb250YWluZXIgb24gd2hpY2ggdHJh bnNmb3JtcyBjYW4gYmUgYXBwbGllZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ2NDg1CisKKyAgICAgICAgQWxyZWFkeSBjb3ZlcmVkIGJ5IGV4aXN0 aW5nIHRlc3RzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmdldFRyYW5zZm9ybUZyb21Db250YWluZXIpOgor CiAyMDEwLTA5LTI0ICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3Bw CShyZXZpc2lvbiA2ODE1OCkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTE5ODgsMTAgKzE5ODgsMTAgQEAgdm9pZCBSZW5kZXJPYmplY3Q6 OmdldFRyYW5zZm9ybUZyb21Db250YQogICAgICAgICB0cmFuc2Zvcm0ubXVsdExlZnQobGF5ZXIt PmN1cnJlbnRUcmFuc2Zvcm0oKSk7CiAgICAgCiAjaWYgRU5BQkxFKDNEX1JFTkRFUklORykKLSAg ICBpZiAoY29udGFpbmVyT2JqZWN0ICYmIGNvbnRhaW5lck9iamVjdC0+aXNCb3goKSAmJiBjb250 YWluZXJPYmplY3QtPmhhc0xheWVyKCkgJiYgY29udGFpbmVyT2JqZWN0LT5zdHlsZSgpLT5oYXNQ ZXJzcGVjdGl2ZSgpKSB7CisgICAgaWYgKGNvbnRhaW5lck9iamVjdCAmJiBjb250YWluZXJPYmpl Y3QtPmhhc0xheWVyKCkgJiYgY29udGFpbmVyT2JqZWN0LT5zdHlsZSgpLT5oYXNQZXJzcGVjdGl2 ZSgpKSB7CiAgICAgICAgIC8vIFBlcnBzZWN0aXZlIG9uIHRoZSBjb250YWluZXIgYWZmZWN0cyB1 cywgc28gd2UgaGF2ZSB0byBmYWN0b3IgaXQgaW4gaGVyZS4KICAgICAgICAgQVNTRVJUKGNvbnRh aW5lck9iamVjdC0+aGFzTGF5ZXIoKSk7Ci0gICAgICAgIEZsb2F0UG9pbnQgcGVyc3BlY3RpdmVP cmlnaW4gPSB0b1JlbmRlckJveChjb250YWluZXJPYmplY3QpLT5sYXllcigpLT5wZXJzcGVjdGl2 ZU9yaWdpbigpOworICAgICAgICBGbG9hdFBvaW50IHBlcnNwZWN0aXZlT3JpZ2luID0gdG9SZW5k ZXJCb3hNb2RlbE9iamVjdChjb250YWluZXJPYmplY3QpLT5sYXllcigpLT5wZXJzcGVjdGl2ZU9y aWdpbigpOwogCiAgICAgICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IHBlcnNwZWN0aXZlTWF0cml4 OwogICAgICAgICBwZXJzcGVjdGl2ZU1hdHJpeC5hcHBseVBlcnNwZWN0aXZlKGNvbnRhaW5lck9i amVjdC0+c3R5bGUoKS0+cGVyc3BlY3RpdmUoKSk7Cg==