<!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>[20721] S60/trunk/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20721">20721</a></dd>
<dt>Author</dt> <dd>yongjzha</dd>
<dt>Date</dt> <dd>2007-04-05 08:24:50 -0700 (Thu, 05 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>hongzhao, reviewed by yongjun.zhang@nokia.com
DESC: [S60]Animated images with DRM content won't be displayed in Browser in 3.2
Fix: Handle DRM image content during construct the content.
http://bugs.webkit.org/show_bug.cgi?id=13258
* BrowserCore/Renderers/inc/AnimationDecoder.h:
* BrowserCore/Renderers/inc/StaticImageDecoder.h:
* BrowserCore/Renderers/src/StaticImageDecoder.cpp:
(CRawData::ConstructL):
(CRawData::DecodeDRMImageContentL):
(CStaticImageDecoder::LoadNextImage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#S60trunkWebKitBrowserCoreRenderersincAnimationDecoderh">S60/trunk/WebKit/BrowserCore/Renderers/inc/AnimationDecoder.h</a></li>
<li><a href="#S60trunkWebKitBrowserCoreRenderersincStaticImageDecoderh">S60/trunk/WebKit/BrowserCore/Renderers/inc/StaticImageDecoder.h</a></li>
<li><a href="#S60trunkWebKitBrowserCoreRendererssrcStaticImageDecodercpp">S60/trunk/WebKit/BrowserCore/Renderers/src/StaticImageDecoder.cpp</a></li>
<li><a href="#S60trunkWebKitChangeLog">S60/trunk/WebKit/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="S60trunkWebKitBrowserCoreRenderersincAnimationDecoderh"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/BrowserCore/Renderers/inc/AnimationDecoder.h (20720 => 20721)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/BrowserCore/Renderers/inc/AnimationDecoder.h 2007-04-05 10:20:22 UTC (rev 20720)
+++ S60/trunk/WebKit/BrowserCore/Renderers/inc/AnimationDecoder.h 2007-04-05 15:24:50 UTC (rev 20721)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> _LIT(KMimeMBM, "image/x-epoc-mbm");
</span><span class="cx"> _LIT(KMimeOTA, "image/vnd.nokia.ota-bitmap");
</span><span class="cx"> _LIT(KMimeICO, "image/x-icon");
</span><ins>+_LIT(KMimeDRM, "application/vnd.oma.drm.content"); //DRM content
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> // CLASS DECLARATION
</span></span></pre></div>
<a id="S60trunkWebKitBrowserCoreRenderersincStaticImageDecoderh"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/BrowserCore/Renderers/inc/StaticImageDecoder.h (20720 => 20721)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/BrowserCore/Renderers/inc/StaticImageDecoder.h 2007-04-05 10:20:22 UTC (rev 20720)
+++ S60/trunk/WebKit/BrowserCore/Renderers/inc/StaticImageDecoder.h 2007-04-05 15:24:50 UTC (rev 20721)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> CRawData() : iData(0), iDataPtr(0,0), iMime(0), iTarget(0), iObserver(0) {}
</span><span class="cx"> void ConstructL(const TDesC8& aData, TDesC* aMime,
</span><span class="cx"> CMaskedBitmap* aTarget, CImageRenderer* aObserv );
</span><ins>+ HBufC8* DecodeDRMImageContentL(const TDesC8& aData);
</ins><span class="cx">
</span><span class="cx"> TAny* iData;
</span><span class="cx"> TPtr8 iDataPtr;
</span><span class="lines">@@ -82,7 +83,6 @@
</span><span class="cx"> TBool LoadNextImage();
</span><span class="cx"> void LoadOneFrame();
</span><span class="cx"> void StartLoading();
</span><del>- void DecodeDRMImageL();
</del><span class="cx"> TDisplayMode GetBestDisplayMode(TDisplayMode) const;
</span><span class="cx"> TBool CheckBitmapMemoryConsumption( const TFrameInfo& aFrameInfo ) const;
</span><span class="cx">
</span></span></pre></div>
<a id="S60trunkWebKitBrowserCoreRendererssrcStaticImageDecodercpp"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/BrowserCore/Renderers/src/StaticImageDecoder.cpp (20720 => 20721)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/BrowserCore/Renderers/src/StaticImageDecoder.cpp 2007-04-05 10:20:22 UTC (rev 20720)
+++ S60/trunk/WebKit/BrowserCore/Renderers/src/StaticImageDecoder.cpp 2007-04-05 15:24:50 UTC (rev 20721)
</span><span class="lines">@@ -38,8 +38,6 @@
</span><span class="cx"> // block all images that would take more than this percentage of available free ram
</span><span class="cx"> const TInt KMaxBitmapRamPercent = 25;
</span><span class="cx">
</span><del>-_LIT(KMimeDRM, "application/vnd.oma.drm.content"); //DRM content
-_LIT8(KMimeDRMImage, "application/vnd.oma.drm.content"); //DRM content
</del><span class="cx"> //=============================================================================
</span><span class="cx"> // CRawData
</span><span class="cx"> //=============================================================================
</span><span class="lines">@@ -59,7 +57,7 @@
</span><span class="cx"> {
</span><span class="cx"> // it is safer to ignore the server supplied mime type and just recognize
</span><span class="cx"> // the image type from the data headers. this does not work for all formats though
</span><del>- if ( *aMIMEType==KMimeWBMP || *aMIMEType==KMimeOTA || *aMIMEType==KMimeWMF || *aMIMEType==KMimeDRM)
</del><ins>+ if ( *aMIMEType==KMimeWBMP || *aMIMEType==KMimeOTA || *aMIMEType==KMimeWMF)
</ins><span class="cx"> {
</span><span class="cx"> // convert to 8 bit
</span><span class="cx"> iMime = HBufC8::NewL(aMIMEType->Length());
</span><span class="lines">@@ -67,11 +65,24 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( *aMIMEType==KMimeDRM )
+ {
+ HBufC8* drmContent = DecodeDRMImageContentL(aData);
+ TInt drmContentLength = drmContent->Des().Length();
+ const TUint8* src = drmContent->Des().Ptr();
+ iData = MemoryManager::Alloc( drmContentLength );
+ Mem::Copy( iData, src, drmContentLength );
+ iDataPtr.Set((TUint8*)iData, drmContentLength, drmContentLength );
+ delete drmContent;
+ }
+ else
+ {
</ins><span class="cx"> // data
</span><span class="cx"> const TUint8* src = aData.Ptr();
</span><span class="cx"> iData = MemoryManager::Alloc( aData.Length() );
</span><span class="cx"> Mem::Copy( iData, src, aData.Length() );
</span><span class="cx"> iDataPtr.Set((TUint8*)iData, aData.Length(), aData.Length() );
</span><ins>+ }
</ins><span class="cx"> iObserver = aObserv;
</span><span class="cx"> iTarget = aTarget;
</span><span class="cx"> }
</span><span class="lines">@@ -81,7 +92,48 @@
</span><span class="cx"> MemoryManager::Free( iData );
</span><span class="cx"> delete iMime;
</span><span class="cx"> }
</span><ins>+//=============================================================================
+// DecodeDRMImageContentL : Function for handling the DRM image content
+//=============================================================================
+HBufC8* CRawData::DecodeDRMImageContentL(const TDesC8& aData)
+{
+ // input buffers for image conversion
+ HBufC8* bufInput = HBufC8::NewLC( aData.Length() + 1 );
+ TPtr8 ptrInput = bufInput->Des();
+ //Reader intends to view content
+ ptrInput.Append( EView );
+ ptrInput.Append( aData );
</ins><span class="cx">
</span><ins>+ // output buffer for image conversion
+ HBufC8* animatedDRMdata = HBufC8::NewLC( aData.Length() + 256 );
+ TPtr8 ptrOutput = animatedDRMdata->Des();
+
+ //Find DRM agent
+ TAgent agentDRM;
+ RArray<ContentAccess::TAgent> agents;
+ ContentAccess::CManager* manager = CManager::NewLC();
+ manager->ListAgentsL( agents );
+ for ( TInt i = 0; i < agents.Count(); i++ )
+ {
+ if ( agents[i].Name().Compare( KOmaDrm2AgentName ) == 0)
+ {
+ agentDRM = agents[i];
+ break;
+ }
+ }
+
+ // convert the DRM image
+ manager->AgentSpecificCommand( agentDRM, EDecryptOma1DcfBuffer, ptrInput,
+ ptrOutput);
+
+ CleanupStack::PopAndDestroy(manager);
+ //keep animatedDRMdata to return
+ CleanupStack::Pop(animatedDRMdata);
+ CleanupStack::PopAndDestroy(bufInput);
+
+ return animatedDRMdata;
+ }
+
</ins><span class="cx"> //=============================================================================
</span><span class="cx"> // CStaticImageDecoder
</span><span class="cx"> //=============================================================================
</span><span class="lines">@@ -122,14 +174,7 @@
</span><span class="cx">
</span><span class="cx"> if( data->iMime )
</span><span class="cx"> {
</span><del>- if (data->iMime->Des().Compare(KMimeDRMImage) == 0) //DRM content
- {
- TRAP_IGNORE( DecodeDRMImageL() );
- }
- else
- {
</del><span class="cx"> TRAP_IGNORE(iDecoder->OpenL( data->iDataPtr, *(data->iMime), CImageDecoder::EOptionNone));
</span><del>- }
</del><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><span class="lines">@@ -182,60 +227,6 @@
</span><span class="cx"> StartLoading();
</span><span class="cx">
</span><span class="cx"> return ETrue;
</span><del>- }
-
-//=============================================================================
-// DecodeDRMImageL : Function for handling the DRM images.
-//=============================================================================
-void CStaticImageDecoder::DecodeDRMImageL()
-{
- TInt error(KErrNone);
- CRawData* data = iQueue[0];
-
- // Input buffer length
- TInt inputBufLen = data->iDataPtr.Size() + 1;
- // input buffers for image conversion
- HBufC8* bufInput = HBufC8::NewLC( inputBufLen + 1 );
- TPtr8 ptrInput = bufInput->Des();
- //Reader intends to view content
- ptrInput.Append( EView );
- ptrInput.Append( data->iDataPtr );
-
- // Output buffer length
- TInt outputBufLen = data->iDataPtr.Size() + 256;
- // output buffer for image conversion
- HBufC8* bufOutput = HBufC8::NewLC( outputBufLen );
- TPtr8 ptrOutput = bufOutput->Des();
-
- // Do we have a DRM image?
- TAgent agentDRM;
- RArray<ContentAccess::TAgent> agents;
- ContentAccess::CManager* manager = CManager::NewLC();
- manager->ListAgentsL( agents );
- for ( TInt i = 0; i < agents.Count(); i++ )
- {
- if ( agents[i].Name().Compare( KOmaDrm2AgentName ) == 0)
- {
- agentDRM = agents[i];
- break;
- }
- }
-
- // convert the DRM image
- error = manager->AgentSpecificCommand(
- agentDRM,
- EDecryptOma1DcfBuffer,
- ptrInput,
- ptrOutput);
-
- if ( error == KErrNone)
- {
- Reset();
- // Decrypted ok (if not image is skipped)
- iDecoder->OpenL( ptrOutput, CImageDecoder::EOptionNone );
- }
-
- CleanupStack::Pop(3); // manager, bufOutput,bufInput
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CStaticImageDecoder::LoadOneFrame()
</span></span></pre></div>
<a id="S60trunkWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/ChangeLog (20720 => 20721)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/ChangeLog 2007-04-05 10:20:22 UTC (rev 20720)
+++ S60/trunk/WebKit/ChangeLog 2007-04-05 15:24:50 UTC (rev 20721)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+hongzhao, reviewed by yongjun.zhang@nokia.com
+ DESC: [S60]Animated images with DRM content won't be displayed in Browser in 3.2
+ Fix: Handle DRM image content during construct the content.
+ http://bugs.webkit.org/show_bug.cgi?id=13258
+
+ * BrowserCore/Renderers/inc/AnimationDecoder.h:
+ * BrowserCore/Renderers/inc/StaticImageDecoder.h:
+ * BrowserCore/Renderers/src/StaticImageDecoder.cpp:
+ (CRawData::ConstructL):
+ (CRawData::DecodeDRMImageContentL):
+ (CStaticImageDecoder::LoadNextImage):
+
</ins><span class="cx"> 2007-03-30 ligman <joseph.ligman@nokia.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Sachin.
</span></span></pre>
</div>
</div>
</body>
</html>