Changeset 19423 in webkit

Timestamp:

Feb 5, 2007 7:55:20 PM (17 years ago)

Author:

brmorris

Message:

bujtas, reviewed by Yongjun.

DESC: PartialImage() can end up in a dialog box which starts up a nested active scheduler JELE-6XSH3P
​http://bugs.webkit.org/show_bug.cgi?id=12550

Location:

S60/branches/3.1m/WebKit

Files:

• BrowserCore/Formcontrols/src/FControlInputWidget.cpp (modified) (1 diff)
• BrowserCore/Renderers/inc/StaticImageDecoder.h (modified) (1 diff)
• BrowserCore/Renderers/src/StaticImageDecoder.cpp (modified) (3 diffs)
• BrowserView/src/KeyEventHandler.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)

S60/branches/3.1m/WebKit/BrowserCore/Formcontrols/src/FControlInputWidget.cpp

@@ -507 +507 @@
       }
 
+    CWebKitView* webkitView = static_cast<CWebKitView*>(iParent);
+    CWebKitFrame* focused = webkitView->MainFrame().FocusedFrame();
+    // send keys to webcore
+    if (focused)
+        {        
+        // send as keypress/keyrelease
+        if (aType == EEventKeyDown)
+            {
+            focused->WebKitBridge().WebCoreBridge().KeyEvent(aKeyEvent,EFalse);
+            }
+        else if (aType == EEventKeyUp)
+            {
+            focused->WebKitBridge().WebCoreBridge().KeyEvent(aKeyEvent,ETrue);
+            }
+        }
+
     // Send arrow keys and OK key to list box first
     //if (aType == EEventKeyDown  &&

S60/branches/3.1m/WebKit/BrowserCore/Renderers/inc/StaticImageDecoder.h

@@ -93 +93 @@
         RPointerArray<CRawData> iQueue;
         CRawData*               iContext;   // current decoding data
+        TBool                   iBlocked;
     };
 

S60/branches/3.1m/WebKit/BrowserCore/Renderers/src/StaticImageDecoder.cpp

@@ -176 +176 @@
 void CStaticImageDecoder::LoadOneFrame()
     {
+    // the first frame, partial information is available
+    // PartialImage() can end up in a dialog box which
+    // starts up a nested active scheduler and since
+    // the page still being loaded in the background
+    // new image data could come to the image decoder.
+    // that's a fatal re-entry on the image decoder.
+    iBlocked = ETrue;
+    // the first frame, partial information is available
+    iContext->iObserver->PartialImage();
+    iBlocked = EFalse;
+
     // static image has only one frame; 
     const TFrameInfo& frameInfo = iDecoder->FrameInfo( 0 );
@@ -187 +198 @@
         {
         iDecoder->Convert( &iStatus, bmp, 0 );
-        }
-    
-    // the first frame, partial information is available
-    iContext->iObserver->PartialImage();
+        } 
     
     SetActive();
@@ -206 +214 @@
 void CStaticImageDecoder::StartLoading()
     {
-    if( !IsActive() )
+    // see LoadOneFrame for iBlocked
+    if( !IsActive() && !iBlocked )
         {
         // initalize decoding

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

@@ -180 +180 @@
                 case EKeyDownArrow:
                     {
+                    // Don't generate keyevent for arrows since they are oveloaded for pointer
+                    // unless it is tabbed navigation
+                    CWebKitFrame* focused = iWebKitView->MainFrame().FocusedFrame();
+                    if (iWebKitView->TabbedNavigation() && !iWebKitView->WebKitControl().InPageViewMode() && focused)
+                        {
+                        // send keyevent to the webcore
+                        focused->WebKitBridge().WebCoreBridge().KeyEvent(iLastEventKey,EFalse);
+                        }
                     keyResponse = HandleArrowKeysL(aKeyEvent);
                     break;

S60/branches/3.1m/WebKit/ChangeLog

@@ +1 @@
+bujtas, reviewed by Yongjun.
+        DESC: PartialImage() can end up in a dialog box which starts up a nested active scheduler JELE-6XSH3P
+         and since the page still being loaded in the background new image
+         data could come to the image decoder. that's a fatal re-entry on
+         the image decoder.
+
+        http://bugs.webkit.org/show_bug.cgi?id=12550
+
+        * BrowserCore/Renderers/inc/StaticImageDecoder.h:
+        * BrowserCore/Renderers/src/StaticImageDecoder.cpp:
+        (CStaticImageDecoder::LoadOneFrame):
+
 bujtas  <zbujtas@gmail.com>, Reviewed by Yongjun.
         DESC: browser is crashing if it is closed while a page is loading and closing and opening a new window crashes the browser as well TMCN-6XRQP2