Changeset 18179 in webkit

Timestamp:

Dec 12, 2006 9:01:30 AM (17 years ago)

Author:

spadma

Message:

2006-12-11 sareen <​shyam.sareen@nokia.com>

Reviewed Sachin Padma.
DESC: Saved Pages: Some Images not saved with the page.
​http://bugzilla.opendarwin.org/show_bug.cgi?id=11721

• BrowserView/src/WebKitLoader.cpp: (CWebKitLoader::LoadPageL):
• ResourceLoader/inc/UrlRequestInfo.h: (CUrlRequestInfo::IsSavedPageRequest): (CUrlRequestInfo::SetSavedPageRequest):
• ResourceLoader/src/MultipartContentHandler.cpp: (CMultipartContentHandler::HandleMultipartMixedL):
• ResourceLoader/src/UrlRequestInfo.cpp: (CUrlRequestInfo::CUrlRequestInfo): (CUrlRequestInfo::~CUrlRequestInfo): (CUrlRequestInfo::SetPostDataL):

Location:

S60/branches/3.1m/WebKit

Files:

• BrowserView/src/WebKitLoader.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• ResourceLoader/inc/UrlRequestInfo.h (modified) (6 diffs)
• ResourceLoader/src/MultipartContentHandler.cpp (modified) (1 diff)
• ResourceLoader/src/UrlRequestInfo.cpp (modified) (6 diffs)

S60/branches/3.1m/WebKit/BrowserView/src/WebKitLoader.cpp

@@ -362 +362 @@
         }
     urlRequestInfo->SetClientSuppliesData( aDataLoadInfo );
+    urlRequestInfo->SetSavedPageRequest(iIsSavedPage);
 
     CleanupClosePushL( *urlRequestInfo );

S60/branches/3.1m/WebKit/ChangeLog

@@ +1 @@
+2006-12-11  sareen  <shyam.sareen@nokia.com>
+
+        Reviewed Sachin Padma.
+        DESC: Saved Pages: Some Images not saved with the page.
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=11721
+
+        * BrowserView/src/WebKitLoader.cpp:
+        (CWebKitLoader::LoadPageL):
+        * ResourceLoader/inc/UrlRequestInfo.h:
+        (CUrlRequestInfo::IsSavedPageRequest):
+        (CUrlRequestInfo::SetSavedPageRequest):
+        * ResourceLoader/src/MultipartContentHandler.cpp:
+        (CMultipartContentHandler::HandleMultipartMixedL):
+        * ResourceLoader/src/UrlRequestInfo.cpp:
+        (CUrlRequestInfo::CUrlRequestInfo):
+        (CUrlRequestInfo::~CUrlRequestInfo):
+        (CUrlRequestInfo::SetPostDataL):
+
 2006-12-11  w3liu  <wei.liu@nokia.com>
 

S60/branches/3.1m/WebKit/ResourceLoader/inc/UrlRequestInfo.h

@@ -10 +10 @@
 *    All rights reserved.
 *  
-*       Redistribution and use in source and binary forms, with or without
-*       modification, are permitted provided that the following conditions
-*       are met:
+*    Redistribution and use in source and binary forms, with or without
+*    modification, are permitted provided that the following conditions
+*    are met:
 *  
 *      * Redistributions of source code must retain the above copyright
@@ -24 +24 @@
 *        from this software without specific prior written permission.
 *  
-*       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*       A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*       OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*       SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*       DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*       THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*       USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*       DAMAGE.
+*    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+*    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+*    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+*    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+*    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+*    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+*    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+*    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+*    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+*    USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+*    DAMAGE.
 *  
 *    Please see file patentlicense.txt for further grants.
@@ -291 +291 @@
         void SetPostDataL( const RArray<TWebCoreFormDataItem>& aPostData );
 
-                /**
+        /**
         * Set the post body buffer
         * @since 3.1
@@ -437 +437 @@
         */
         inline TBool CookiesEnabled() const { return iCookiesEnabled; }
+
+        /**
+        * Indicates whether request is from a Saved Page
+        * @since 3.1
+        * @param
+        * @return
+        */
+        inline TBool IsSavedPageRequest() { return iSavedPageRequest; }
+        
+        
+        /**
+        * Sets the  request is from a Saved Page
+        * @since 3.1
+        * @param
+        * @return
+        */
+        
+        inline void SetSavedPageRequest( TBool aIsSavedPage ) { iSavedPageRequest = aIsSavedPage; }
 
     private:
@@ -479 +497 @@
         HBufC8*               iPostContentType;
         // Post body buffer
-        CPostDataParts*          iPostData;
+        CPostDataParts*       iPostData;
         // Boundary string on post body
         HBufC8*               iPostBoundary;
@@ -498 +516 @@
         //
         TInt                  iPriority;
+        //Is it save page request. 
+        TBool                 iSavedPageRequest;
     };
 

S60/branches/3.1m/WebKit/ResourceLoader/src/MultipartContentHandler.cpp

@@ -243 +243 @@
     
 
+    TInt  partCount( iBodyPartsArray.Count() );
         
+    if( !aResponseInfo.RequestInfo().IsSavedPageRequest() )
+        {
+        partCount = ValidateMultipartArrayL();  
+        }
     
-    if ( ValidateMultipartArrayL() > 0 )
-    {
-    
-    // handle valid multipart response
-    CUrlResponseHeaderInfo& headerInfo =
-      const_cast<CUrlResponseHeaderInfo&>( aResponseInfo.HeaderInfo() );
-
-      headerInfo.SetContentTypeL( iBodyPartsArray[ 0 ] ->ContentType() );
-      headerInfo.SetCharsetL( iBodyPartsArray[ 0 ] ->Charset() );        
-
-      // set main document as body of the CUrlResponseInfo object
-      // to be handled by renderer as the top-level document
-    const TDesC8& bodyPart = iBodyPartsArray[ 0 ] ->Body();
-    TPtr8 responseBody( (TUint8*)bodyPart.Ptr(), bodyPart.Length(), bodyPart.Length() );
-      aResponseInfo.SetBodyL( responseBody );
+    if ( partCount > 0 )
+        {
+        // handle valid multipart response
+        CUrlResponseHeaderInfo& headerInfo =
+        const_cast<CUrlResponseHeaderInfo&>( aResponseInfo.HeaderInfo() );
+
+        headerInfo.SetContentTypeL( iBodyPartsArray[ 0 ] ->ContentType() );
+        headerInfo.SetCharsetL( iBodyPartsArray[ 0 ] ->Charset() );
+        // set main document as body of the CUrlResponseInfo object
+        // to be handled by renderer as the top-level document
+        const TDesC8& bodyPart = iBodyPartsArray[ 0 ] ->Body();
+        TPtr8 responseBody( (TUint8*)bodyPart.Ptr(), bodyPart.Length(), bodyPart.Length() );
+        aResponseInfo.SetBodyL( responseBody );
           
-      // now push other parts to the two caches
-      for ( TInt n = 1; n < iBodyPartsArray.Count(); n++ )
-          {
-          PushToHttpCacheL( *iBodyPartsArray[ n ] );
-          delete iBodyPartsArray[ n ];
-          }
-
-      }
+        // now push other parts to the two caches
+        for ( TInt n = 1; n < iBodyPartsArray.Count(); n++ )
+              {
+              PushToHttpCacheL( *iBodyPartsArray[ n ] );
+              delete iBodyPartsArray[ n ];
+              }
+       }
     else
-      {
-
-    // handle invalid/empty multipart response
-    CUrlResponseHeaderInfo& headerInfo =
-      const_cast<CUrlResponseHeaderInfo&>( aResponseInfo.HeaderInfo() );
-
-      headerInfo.SetContentTypeL( KContentTypeTextHtml8 );
+        {
+        // handle invalid/empty multipart response
+        CUrlResponseHeaderInfo& headerInfo =
+        const_cast<CUrlResponseHeaderInfo&>( aResponseInfo.HeaderInfo() );
+        headerInfo.SetContentTypeL( KContentTypeTextHtml8 );
         aResponseInfo.ReplaceBodyL( KErrPage );
-        status = KErrGeneral;
-      
-      }
+        status = KErrGeneral;   
+        }
   
-  iContentDispatcher->HeadersL(aTransaction, aResponseInfo);
-  iContentDispatcher->ResponseL(aTransaction, aResponseInfo);
+    iContentDispatcher->HeadersL(aTransaction, aResponseInfo);
+    iContentDispatcher->ResponseL(aTransaction, aResponseInfo);
     
     return status;

S60/branches/3.1m/WebKit/ResourceLoader/src/UrlRequestInfo.cpp

@@ -10 +10 @@
 *    All rights reserved.
 *  
-*       Redistribution and use in source and binary forms, with or without
-*       modification, are permitted provided that the following conditions
-*       are met:
+*    Redistribution and use in source and binary forms, with or without
+*    modification, are permitted provided that the following conditions
+*    are met:
 *  
 *      * Redistributions of source code must retain the above copyright
@@ -24 +24 @@
 *        from this software without specific prior written permission.
 *  
-*       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*       A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*       OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*       SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*       DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*       THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*       USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*       DAMAGE.
+*    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+*    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+*    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+*    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+*    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+*    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+*    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+*    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+*    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+*    USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+*    DAMAGE.
 *  
 *    Please see file patentlicense.txt for further grants.
@@ -76 +76 @@
       iDefaultHeadersMask( EDefaultHeadersAll ),
       // no priority by default
-      iPriority( -1 )
+      iPriority( -1 ),
+      iSavedPageRequest ( EFalse )
     {
     }
@@ -118 +119 @@
     delete iRefererUrl;
     delete iPostContentType;
-        if(iPostData)
-                {
-                iPostData->Deref();
-                }
-    delete iPostBoundary;
-    delete iAcceptHeader;
+    if(iPostData)
+       {
+       iPostData->Deref();
+       }
+     delete iPostBoundary;
+     delete iAcceptHeader;
     }
 
@@ -181 +182 @@
     const RArray<TWebCoreFormDataItem>& aPostData )
     {
-        if(iPostData)
-                {
-                iPostData->Deref();
-                }
-    //
-        iPostData = CPostDataParts::NewL(aPostData ) ;
-        iPostData->Ref();
+    if(iPostData)
+       {
+       iPostData->Deref();
+       }
+    //
+    iPostData = CPostDataParts::NewL(aPostData ) ;
+    iPostData->Ref();
     }
 
@@ -198 +199 @@
 void CUrlRequestInfo::SetPostDataL( CPostDataParts* aPostData )
     {
-        if(iPostData)
-                {
-                iPostData->Deref();
-                }
-    //
-        iPostData = aPostData  ;
-        iPostData->Ref();
+    if(iPostData)
+       {
+       iPostData->Deref();
+       }
+    //
+    iPostData = aPostData  ;
+    iPostData->Ref();
     }