Changeset 19432 in webkit

Timestamp:

Feb 6, 2007 8:50:29 AM (17 years ago)

Author:

brmorris

Message:

yaharon, Reviewed by Yongjun.

DESC: [S60] OSS Browser crashes when accessing cnn.com, yahoo.com with Load images & sounds turned off.(SLON-6XY8JM )
​http://bugs.webkit.org/show_bug.cgi?id=12622

Location:

S60/branches/3.1m/WebKit

Files:

• BrowserView/src/LoadListeners.cpp (modified) (4 diffs)
• BrowserView/src/WcSettingsController.cpp (modified) (7 diffs)
• BrowserView/src/webkitbridge.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)

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

@@ -333 +333 @@
     CWebKitLoader* webKitLoader = iWebKitLoader;
     // lock
+    CWebKitFrame* frame = &(webKitLoader->WebKitBridge().Frame());
+    // Quick fix around a WebCore bug that detaches the parent frame and then detaches the child frame again,
+    // in cases where we have 3 levels of nested iframes, created by javascript 
+    webKitLoader->WebKitBridge().Frame().Ref();
     webKitLoader->WebKitBridge().Frame().Ref();
 
@@ -338 +342 @@
     webKitLoader->IncomingContentInfo( aTransactionId, ELoadComplete, ETrue, aResponse );
     // unlock
-    webKitLoader->WebKitBridge().Frame().Deref();
+    frame->Deref();
+    frame->Deref();
     // reset errors
     iIgnoreContent = EFalse;
@@ -457 +462 @@
 
     // lock
+    CWebKitFrame* frame = &(webKitLoader->WebKitBridge().Frame());
+    // Quick fix around a WebCore bug that detaches the parent frame and then detaches the child frame again,
+    // in cases where we have 3 levels of nested iframes, created by javascript 
+    webKitLoader->WebKitBridge().Frame().Ref();
     webKitLoader->WebKitBridge().Frame().Ref();
     if( aError == KErrNone && iError == KErrNone )
@@ -472 +481 @@
     webKitLoader->IncomingContentInfo( aTransactionId, ELoadComplete, EFalse, aResponse );
     // unlock
-    webKitLoader->WebKitBridge().Frame().Deref();
+    frame->Deref();
+    frame->Deref();
     }
 

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

@@ -11 +11 @@
 *    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
@@ -25 +25 @@
 *        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.
@@ -48 +48 @@
 #include "TextRendererFactory.h"
 #include "WebKitView.h"
+#include "WebKitControl.h"
 #include "WebKitFrame.h"
 #include "WebKitBridge.h"
@@ -97 +98 @@
     iWebCoreSettings = CWebCoreSettings::NewL();
     iTextRendererFactory = CTextRendererFactory::InstanceL();
-        InitWCS();
+    InitWCS();
     }
 
@@ -186 +187 @@
         case TBrCtlDefs::ESettingsCharacterset:
             // SetWcsDefaultTextEncoding( enumerated charset in BrCtlDefs.h );
-            break;
+        break;
         default:
         ; // should not occur
@@ -201 +202 @@
 void CWcSettingsController::InitWCS( void )
     {
+    CWebKitControl& webKitControl(iWebKitFrame->WebKitView().WebKitControl());
     SetWcsMinimumFontSize( KDefaultMinimumFontSize );
     SetWcsMinimumLogicalFontSize( KDefaultMinimumLogicalFontSize );
-    SetWcsDefaultFontSize( KDefaultDefaultFontSize );
+    SetWcsDefaultFontSize( webKitControl.GetBrowserSettingL(TBrCtlDefs::ESettingsFontSize ));
     SetWcsDefaultFixedFontSize( KDefaultDefaultFixedFontSize );
     SetWcsJavaEnabled( KDefaultJavaEnabled );
-    SetWcsPluginsEnabled( KDefaultPluginsEnabled );
-    SetWcsJavaScriptEnabled( KDefaultJavaScriptEnabled );
-    SetWcsAutoRefreshEnabled( KDefaultAutoRefreshEnabled );
+    SetWcsPluginsEnabled( !webKitControl.GetBrowserSettingL(TBrCtlDefs::ESettingsDisableFlash ));
+    SetWcsJavaScriptEnabled( webKitControl.GetBrowserSettingL(TBrCtlDefs::ESettingsECMAScriptEnabled ));
+    SetWcsAutoRefreshEnabled( webKitControl.GetBrowserSettingL(TBrCtlDefs::ESettingsAutoRefresh ));
     SetWcsJavaScriptCanOpenWindowsAutomatically( KDefaultJavaScriptCanOpenWindowsAutomatically );
-    SetWcsWillLoadImagesAutomatically( KDefaultWillLoadImagesAutomatically );
+    SetWcsWillLoadImagesAutomatically( webKitControl.GetBrowserSettingL(TBrCtlDefs::ESettingsAutoLoadImages ));
     SetWcsShouldPrintBackgrounds( KDefaultShouldPrintBackgrounds );
 
     TFileName KDefaultUserStyleSheetLocation;
 
-        _LIT( KZDrive,"z:" );
-
-        // _LIT(KDC_APP_RESOURCE_DIR,"\\resource\\apps\\uiresourcefiles\\");    //      Application resource (.rsc)
-        _LIT( KFileName,"oem.css" );
+    _LIT( KZDrive,"z:" );
+
+    // _LIT(KDC_APP_RESOURCE_DIR,"\\resource\\apps\\uiresourcefiles\\");    //  Application resource (.rsc)
+    _LIT( KFileName,"oem.css" );
 
     KDefaultUserStyleSheetLocation += KZDrive;
@@ -401 +403 @@
 
 TBool CWcSettingsController::WcsWillLoadImagesAutomatically()
-        {
+    {
     return iWebCoreSettings->WillLoadImagesAutomatically();
-        }
+    }
 
 

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

@@ -985 +985 @@
     Frame().WebKitView().WebKitControl().DocumentComplete();
     // load favicon only for the top level frame
-    if( !Frame().Parent() && iFrame->WebKitView().WebKitControl().BrCtl().Capabilities() & TBrCtlDefs::ECapabilityFavicon)
+    if( (iFrame == &(iFrame->WebKitView().MainFrame())) && iFrame->WebKitView().WebKitControl().BrCtl().Capabilities() & TBrCtlDefs::ECapabilityFavicon)
         {
         TRAP_IGNORE(LoadFaviconL());

S60/branches/3.1m/WebKit/ChangeLog

@@ +1 @@
+yaharon, Reviewed by Yongjun.
+        DESC: [S60] OSS Browser crashes when accessing cnn.com, yahoo.com with Load images & sounds turned off.(SLON-6XY8JM )
+        http://bugs.webkit.org/show_bug.cgi?id=12622
+
+        * BrowserView/src/LoadListeners.cpp:
+        (CPageLoadListener::Complete):
+        (CResourceLoadListener::Complete):
+        * BrowserView/src/WcSettingsController.cpp:
+        (CWcSettingsController::InitWCS):
+        * BrowserView/src/webkitbridge.cpp:
+        (CWebKitBridge::DocumentComplete):
+
 yongjzha, Reviewed by Zalan.
         DESC: enable drawing 1px transparent image with EGray256 mask