Commit 1c757af5 authored by inferno@chromium.org's avatar inferno@chromium.org

2010-09-23 Abhishek Arya <inferno@chromium.org>

        Reviewed by Dave Hyatt.

        Fix the memory safety issue by checking containerObject is a RenderBox
        before doing the transforms.
        https://bugs.webkit.org/show_bug.cgi?id=46365

        Test: compositing/overflow/get-transform-from-non-box-container.html

        * rendering/RenderObject.cpp:
        (WebCore::RenderObject::getTransformFromContainer):
2010-09-23  Abhishek Arya  <inferno@chromium.org>

        Reviewed by Dave Hyatt.

        Tests that we donot assert on object->isBox.
        https://bugs.webkit.org/show_bug.cgi?id=46365

        * compositing/overflow/get-transform-from-non-box-container-expected.txt: Added.
        * compositing/overflow/get-transform-from-non-box-container.html: Added.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68158 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 4606a81e
2010-09-23 Abhishek Arya <inferno@chromium.org>
Reviewed by Dave Hyatt.
Tests that we donot assert on object->isBox.
https://bugs.webkit.org/show_bug.cgi?id=46365
* compositing/overflow/get-transform-from-non-box-container-expected.txt: Added.
* compositing/overflow/get-transform-from-non-box-container.html: Added.
2010-09-23 Dimitri Glazkov <dglazkov@chromium.org>
Remove passing tests. These were failing because the bot was missing QuickTime.
<html>
<head>
<style>
.container {
display: inline;
-webkit-perspective: 10px;
}
.intermediate {
-webkit-column-width: 100px;
}
</style>
</head>
<body>
<div class="container" style="position: relative">
<div class="intermediate" style="position: absolute">
PASS
</div>
</div>
<script>
if (window.layoutTestController)
layoutTestController.dumpAsText();
</script>
</body>
</html>
2010-09-23 Abhishek Arya <inferno@chromium.org>
Reviewed by Dave Hyatt.
Fix the memory safety issue by checking containerObject is a RenderBox
before doing the transforms.
https://bugs.webkit.org/show_bug.cgi?id=46365
Test: compositing/overflow/get-transform-from-non-box-container.html
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTransformFromContainer):
2010-09-23 David Hyatt <hyatt@apple.com>
Reviewed by Simon Fraser.
......@@ -1988,7 +1988,7 @@ void RenderObject::getTransformFromContainer(const RenderObject* containerObject
transform.multLeft(layer->currentTransform());
#if ENABLE(3D_RENDERING)
if (containerObject && containerObject->hasLayer() && containerObject->style()->hasPerspective()) {
if (containerObject && containerObject->isBox() && 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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment