<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[20680] S60/branches/3.1m/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20680">20680</a></dd>
<dt>Author</dt> <dd>yongjzha</dd>
<dt>Date</dt> <dd>2007-04-03 07:29:51 -0700 (Tue, 03 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>2007-04-02 ligman <joseph.ligman@nokia.com>
Reviewed by yongjun.zhang@nokia.com
DESC: Animated gif in xhtml fails. Start the animation timer for single scaled animated bitmaps.
http://bugs.webkit.org/show_bug.cgi?id=13254
* BrowserCore/Renderers/inc/ImageRenderer.h:
(CImageRenderer::GetParent):
* BrowserCore/Renderers/src/ImageRenderer.cpp:
(CImageRenderer::DrawImageInRect):
(NextFrameCb):
(CImageRenderer::NextFrame):
(CImageRenderer::InitAnimationCallback):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#S60branches31mWebKitBrowserCoreRenderersincImageRendererh">S60/branches/3.1m/WebKit/BrowserCore/Renderers/inc/ImageRenderer.h</a></li>
<li><a href="#S60branches31mWebKitBrowserCoreRendererssrcImageRenderercpp">S60/branches/3.1m/WebKit/BrowserCore/Renderers/src/ImageRenderer.cpp</a></li>
<li><a href="#S60branches31mWebKitChangeLog">S60/branches/3.1m/WebKit/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="S60branches31mWebKitBrowserCoreRenderersincImageRendererh"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebKit/BrowserCore/Renderers/inc/ImageRenderer.h (20679 => 20680)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebKit/BrowserCore/Renderers/inc/ImageRenderer.h 2007-04-03 14:26:12 UTC (rev 20679)
+++ S60/branches/3.1m/WebKit/BrowserCore/Renderers/inc/ImageRenderer.h 2007-04-03 14:29:51 UTC (rev 20680)
</span><span class="lines">@@ -236,7 +236,9 @@
</span><span class="cx"> void ScalingCompletedL(CMaskedBitmap*& aResultBitmap, const TRect& aTargetRect);
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- void NextFrame();
</del><ins>+ CImageRenderer* GetParent() { return iParent; }
+ void InitAnimationCallback(CImageRenderer* aImageRenderer);
+ void NextFrame(CImageRenderer* aImageRenderer);
</ins><span class="cx">
</span><span class="cx"> void LoadCannedImageL(TInt aImageId);
</span><span class="cx">
</span></span></pre></div>
<a id="S60branches31mWebKitBrowserCoreRendererssrcImageRenderercpp"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebKit/BrowserCore/Renderers/src/ImageRenderer.cpp (20679 => 20680)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebKit/BrowserCore/Renderers/src/ImageRenderer.cpp 2007-04-03 14:26:12 UTC (rev 20679)
+++ S60/branches/3.1m/WebKit/BrowserCore/Renderers/src/ImageRenderer.cpp 2007-04-03 14:29:51 UTC (rev 20680)
</span><span class="lines">@@ -310,6 +310,13 @@
</span><span class="cx"> {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
+
+ if (iParent->iDecoder && iParent->iDecoder->IsAnimation())
+ {
+ InitAnimationCallback(iParent);
+ }
+
</ins><span class="cx"> // draw the parent bitmap
</span><span class="cx"> iParent->iBitmap->DrawBitmap(bitgc,aInRect);
</span><span class="cx"> }
</span><span class="lines">@@ -326,33 +333,10 @@
</span><span class="cx"> //check if zoom level has changes
</span><span class="cx"> CheckStartScaling();
</span><span class="cx">
</span><del>- if (iDecoder && iDecoder->IsAnimation() && !iDecoder->IsBusy())
- {
- //If we are at last loop, let stop by destroying the timer and stay at the last frame of last loop
- TInt16 loopCount = iDecoder->getLoopCount();
- if((loopCount == -1) || (loopCount > 0)) // -1 means looping forever
</del><ins>+ if (iDecoder && iDecoder->IsAnimation())
</ins><span class="cx"> {
</span><del>- if (!iAnimationTimer)
- {
- TRAP_IGNORE(iAnimationTimer = CPeriodic::NewL(CActive::EPriorityLow));
- }
- // need to restart animation
- if (iAnimationTimer && !iAnimationTimer->IsActive())
- {
- iAnimationTimer->Start(iBitmap->FrameDelay(), 0, TCallBack(&NextFrameCb,this));
- }
</del><ins>+ InitAnimationCallback(this);
</ins><span class="cx"> }
</span><del>- else
- {
- //Looping is completed and destroy the timer and return
- //Don't draw to keep the screen with the last frame of last loop
- if(iAnimationTimer)
- {
- delete iAnimationTimer;
- iAnimationTimer = NULL;
- }
- }
- }
</del><span class="cx">
</span><span class="cx"> bitgc.SetBrushStyle(CGraphicsContext::ENullBrush);
</span><span class="cx">
</span><span class="lines">@@ -628,7 +612,14 @@
</span><span class="cx"> //
</span><span class="cx"> TInt NextFrameCb(TAny* aAny)
</span><span class="cx"> {
</span><del>- static_cast<CImageRenderer*>(aAny)->NextFrame();
</del><ins>+ if (static_cast<CImageRenderer*>(aAny)->GetParent())
+ {
+ static_cast<CImageRenderer*>(aAny)->NextFrame(static_cast<CImageRenderer*>(aAny)->GetParent());
+ }
+ else
+ {
+ static_cast<CImageRenderer*>(aAny)->NextFrame(static_cast<CImageRenderer*>(aAny));
+ }
</ins><span class="cx"> return EFalse;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -637,35 +628,35 @@
</span><span class="cx"> //
</span><span class="cx"> // -----------------------------------------------------------------------------
</span><span class="cx"> //
</span><del>-void CImageRenderer::NextFrame()
- {
- if (iAnimationTimer)
</del><ins>+void CImageRenderer::NextFrame(CImageRenderer* aImage)
+ {
+ if (aImage->iAnimationTimer)
</ins><span class="cx"> {
</span><del>- iAnimationTimer->Cancel();
</del><ins>+ aImage->iAnimationTimer->Cancel();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (iAnimationEnabled)
</del><ins>+ if (aImage->iAnimationEnabled)
</ins><span class="cx"> {
</span><span class="cx"> // Check if animation is in last frame
</span><del>- if( iCurrentAnimationFrame == iDecoder->AnimationFrameCount() - 1 )
</del><ins>+ if( aImage->iCurrentAnimationFrame == aImage->iDecoder->AnimationFrameCount() - 1 )
</ins><span class="cx"> {
</span><del>- iCurrentAnimationFrame = 0;
- if(iDecoder->getLoopCount() != -1) //For infinite loop, don't change the loop count
- iDecoder->decreamentLoopCount();
</del><ins>+ aImage->iCurrentAnimationFrame = 0;
+ if(aImage->iDecoder->getLoopCount() != -1) //For infinite loop, don't change the loop count
+ aImage->iDecoder->decreamentLoopCount();
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><span class="cx"> // Not in last frame; move to next frame
</span><del>- iCurrentAnimationFrame++;
</del><ins>+ aImage->iCurrentAnimationFrame++;
</ins><span class="cx"> }
</span><span class="cx"> //If we are at last loop, don't load the frame and stay at the last frame of last loop
</span><del>- TInt16 loopCount = iDecoder->getLoopCount();
</del><ins>+ TInt16 loopCount = aImage->iDecoder->getLoopCount();
</ins><span class="cx"> if((loopCount == -1) || (loopCount > 0))
</span><span class="cx"> {
</span><span class="cx"> //load the frame
</span><del>- iDecoder->LoadFrame(iCurrentAnimationFrame);
</del><ins>+ aImage->iDecoder->LoadFrame(iCurrentAnimationFrame);
</ins><span class="cx"> }
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -899,6 +890,46 @@
</span><span class="cx"> return iDecoderCB;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+// -----------------------------------------------------------------------------
+// void CImageRenderer::InitAnimationCallback
+//
+// -----------------------------------------------------------------------------
+//
+void CImageRenderer::InitAnimationCallback(CImageRenderer* aImageRenderer)
+{
+
+ if (!aImageRenderer->iDecoder->IsBusy())
+ {
+ //If we are at last loop, let stop by destroying the timer and stay at the last frame of last loop
+ TInt16 loopCount = aImageRenderer->iDecoder->getLoopCount();
+ if((loopCount == -1) || (loopCount > 0)) // -1 means looping forever
+ {
+ if (!aImageRenderer->iAnimationTimer)
+ {
+ TRAP_IGNORE(aImageRenderer->iAnimationTimer = CPeriodic::NewL(CActive::EPriorityLow));
+ }
+ // need to restart animation
+ if (aImageRenderer->iAnimationTimer && !aImageRenderer->iAnimationTimer->IsActive())
+ {
+ aImageRenderer->iAnimationTimer->Start(aImageRenderer->iBitmap->FrameDelay(), 0, TCallBack(&NextFrameCb,this));
+ }
+ }
+ else
+ {
+ //Looping is completed and destroy the timer and return
+ //Don't draw to keep the screen with the last frame of last loop
+ if(aImageRenderer->iAnimationTimer)
+ {
+ delete aImageRenderer->iAnimationTimer;
+ aImageRenderer->iAnimationTimer = NULL;
+ }
+ }
+ }
+
+}
+
+
</ins><span class="cx"> #ifdef __OOM__
</span><span class="cx"> void CImageRenderer::DeleteBitmap()
</span><span class="cx"> {
</span></span></pre></div>
<a id="S60branches31mWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebKit/ChangeLog (20679 => 20680)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebKit/ChangeLog 2007-04-03 14:26:12 UTC (rev 20679)
+++ S60/branches/3.1m/WebKit/ChangeLog 2007-04-03 14:29:51 UTC (rev 20680)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2007-04-02 ligman <joseph.ligman@nokia.com>
+
+ Reviewed by yongjun.zhang@nokia.com
+ DESC: Animated gif in xhtml fails. Start the animation timer for single scaled animated bitmaps.
+ http://bugs.webkit.org/show_bug.cgi?id=13254
+
+ * BrowserCore/Renderers/inc/ImageRenderer.h:
+ (CImageRenderer::GetParent):
+ * BrowserCore/Renderers/src/ImageRenderer.cpp:
+ (CImageRenderer::DrawImageInRect):
+ (NextFrameCb):
+ (CImageRenderer::NextFrame):
+ (CImageRenderer::InitAnimationCallback):
+
</ins><span class="cx"> 2007-04-02 bujtas <zbujtas@gmail.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Sachin.
</span><span class="lines">@@ -27,6 +41,7 @@
</span><span class="cx"> (CLoaderContainer::~CLoaderContainer):
</span><span class="cx"> (CLoaderContainer::SetClientAcceptHeadersL):
</span><span class="cx">
</span><ins>+>>>>>>> .r20679
</ins><span class="cx"> 2007-03-29 vbradley <vincent.bradley@nokia.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Yongjan.
</span></span></pre>
</div>
</div>
</body>
</html>