Attachment 32015 Details for Bug 26706 – Patch with updated test

[patch] Patch with updated test

26706.patch (text/plain), 4.54 KB, created by Chris Marrin on 2009-06-29 11:51:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Marrin

Created: 2009-06-29 11:51:52 PDT

Size: 4.54 KB

patch

obsolete

>Index: WebCore/ChangeLog
>===================================================================
>--- WebCore/ChangeLog	(revision 45341)
>+++ WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2009-06-29  Chris Marrin  <cmarrin@apple.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        https://bugs.webkit.org/show_bug.cgi?id=26706
>+
>+        Fixed crash due to dereference of m_toStyle
>+
>+        * page/animation/ImplicitAnimation.cpp:
>+        (WebCore::ImplicitAnimation::isTargetPropertyEqual):
>+
> 2009-06-29  David Hyatt  <hyatt@apple.com>
> 
>         Reviewed by Adam Roben.
>Index: WebCore/page/animation/ImplicitAnimation.cpp
>===================================================================
>--- WebCore/page/animation/ImplicitAnimation.cpp	(revision 45288)
>+++ WebCore/page/animation/ImplicitAnimation.cpp	(working copy)
>@@ -212,6 +212,10 @@ bool ImplicitAnimation::affectsProperty(
> 
> bool ImplicitAnimation::isTargetPropertyEqual(int prop, const RenderStyle* targetStyle)
> {
>+    // We can get here for a transition that has not started yet. This would make m_toStyle unset and null. 
>+    // So we check that here (see <https://bugs.webkit.org/show_bug.cgi?id=26706>)
>+    if (!m_toStyle)
>+        return false;
>     return propertiesEqual(prop, m_toStyle.get(), targetStyle);
> }
> 
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 45341)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2009-06-29  Chris Marrin  <cmarrin@apple.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        https://bugs.webkit.org/show_bug.cgi?id=26706
>+
>+        Added tests for -webkit-text-fill-color and
>+        text-shadow, since these go through different
>+        paths.
>+
>+        * transitions/override-transition-crash-expected.txt:
>+        * transitions/override-transition-crash.html:
>+
> 2009-06-28  Dan Bernstein  <mitz@apple.com>
> 
>         Reviewed by Simon Fraser.
>Index: LayoutTests/transitions/override-transition-crash-expected.txt
>===================================================================
>--- LayoutTests/transitions/override-transition-crash-expected.txt	(revision 45288)
>+++ LayoutTests/transitions/override-transition-crash-expected.txt	(working copy)
>@@ -1,3 +1,3 @@
>-This tests a crash that was occuring when you have both an explicit property and 'all' in the -webkit-transition-property CSS property. The crash would occur when you start the transition of the explicit property. This test should not crash.
>-
>+This tests a crash that was occuring when you have both an explicit property and 'all' in the -webkit-transition-property CSS property. The crash would occur when you start the transition of the explicit property. Transitions of 3 sample properties are used (top, -webkit-text-fill-color, and text-shadow), to test 3 separate code paths for property animation. This test should not crash.
> 
>+Text With a Shadow
>Index: LayoutTests/transitions/override-transition-crash.html
>===================================================================
>--- LayoutTests/transitions/override-transition-crash.html	(revision 45288)
>+++ LayoutTests/transitions/override-transition-crash.html	(working copy)
>@@ -12,7 +12,12 @@
>       width: 100px;
>       background-color: blue;
>       -webkit-transition-duration: 1s;
>-      -webkit-transition-property: top, all;
>+      -webkit-transition-property: top, -webkit-text-fill-color, text-shadow, all;
>+    }
>+    #box.change {
>+      -webkit-text-fill-color: white;
>+      top: 100px;
>+      text-shadow: 1px 1px 1px rgba(0,0,0, .8);
>     }
>   </style>
>   <script type="text/javascript" charset="utf-8">
>@@ -23,7 +28,7 @@
>     function start()
>     {
>         var box = document.getElementById('box');
>-        box.style.top = '100px';
>+        box.className = "change";
>     }
>     
>     window.addEventListener('load', start, false);
>@@ -33,11 +38,14 @@
> <body>
> 
> <p>
>-This tests a crash that was occuring when you have both an explicit property and 'all' in the -webkit-transition-property
>-CSS property. The crash would occur when you start the transition of the explicit property. This test should not
>-crash.
>+This tests a crash that was occuring when you have both an explicit property and 'all' in the -webkit-transition-property CSS property. The crash would occur when you start the transition 
>+of the explicit property. Transitions of 3 sample properties are used (top, -webkit-text-fill-color, 
>+and text-shadow), to test 3 separate code paths for property animation.
>+
>+This test should not crash.
> </p>
> <div id="box">
>+    Text With a Shadow
> </div>
> </body>
> </html>

Flags:

simon.fraser: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 26706: 31830 | 32015