Changeset 17941 in webkit

Timestamp:

Nov 30, 2006, 11:24:42 AM (20 years ago)

Author:

spadma

Message:

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

Reviewed by Sachin Padma.
DESC: [s60] Saved Pages: Some Images not saved with the page.
​http://bugs.webkit.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/trunk/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) (2 diffs)
• ResourceLoader/src/UrlRequestInfo.cpp (modified) (6 diffs)

S60/trunk/WebKit/BrowserView/src/WebKitLoader.cpp

@@ -364 +364 @@
         }
     urlRequestInfo->SetClientSuppliesData( aDataLoadInfo );
-
+    
+    
+    urlRequestInfo->SetSavedPageRequest(iIsSavedPage); 
+   
     CleanupClosePushL( *urlRequestInfo );
     // start loading

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+2006-11-30  sareen  <shyam.sareen@nokia.com>
+
+        Reviewed by Sachin Padma.
+        DESC: [s60] Saved Pages: Some Images not saved with the page.
+        http://bugs.webkit.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-11-28  yadavall  <sriram.yadavalli@nokia.com>
 

S60/trunk/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/trunk/WebKit/ResourceLoader/src/MultipartContentHandler.cpp

@@ -235 +235 @@
     {
     
-    TInt status( KErrNone );
+    TInt  status( KErrNone );
 
     // parse complete response
@@ -243 +243 @@
     
 
-        
-    
-    if ( ValidateMultipartArrayL() > 0 )
+    TInt  partCount( iBodyPartsArray.Count() );
+       
+    if( !aResponseInfo.RequestInfo().IsSavedPageRequest() )
+    {
+    partCount = ValidateMultipartArrayL();  
+    }
+    
+    if ( partCount > 0 )
     {
     

S60/trunk/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();
-                }
+  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();
     }