Changeset 19424 in webkit
- Timestamp:
- Feb 5, 2007 8:10:02 PM (17 years ago)
- Location:
- S60/trunk/WebKit
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
S60/trunk/WebKit/BrowserCore/Formcontrols/src/FControlInputWidget.cpp
r18812 r19424 521 521 } 522 522 523 CWebKitView* webkitView = static_cast<CWebKitView*>(iParent); 524 CWebKitFrame* focused = webkitView->MainFrame().FocusedFrame(); 525 // send keys to webcore 526 if (focused) 527 { 528 // send as keypress/keyrelease 529 if (aType == EEventKeyDown) 530 { 531 focused->WebKitBridge().WebCoreBridge().KeyEvent(aKeyEvent,EFalse); 532 } 533 else if (aType == EEventKeyUp) 534 { 535 focused->WebKitBridge().WebCoreBridge().KeyEvent(aKeyEvent,ETrue); 536 } 537 } 538 523 539 // Send arrow keys and OK key to list box first 524 540 //if (aType == EEventKeyDown && -
S60/trunk/WebKit/BrowserCore/Renderers/inc/StaticImageDecoder.h
r19406 r19424 93 93 RPointerArray<CRawData> iQueue; 94 94 CRawData* iContext; // current decoding data 95 TBool iBlocked; 95 96 }; 96 97 -
S60/trunk/WebKit/BrowserCore/Renderers/src/StaticImageDecoder.cpp
r19406 r19424 176 176 void CStaticImageDecoder::LoadOneFrame() 177 177 { 178 // the first frame, partial information is available 179 // PartialImage() can end up in a dialog box which 180 // starts up a nested active scheduler and since 181 // the page still being loaded in the background 182 // new image data could come to the image decoder. 183 // that's a fatal re-entry on the image decoder. 184 iBlocked = ETrue; 185 // the first frame, partial information is available 186 iContext->iObserver->PartialImage(); 187 iBlocked = EFalse; 188 178 189 // static image has only one frame; 179 190 const TFrameInfo& frameInfo = iDecoder->FrameInfo( 0 ); … … 187 198 { 188 199 iDecoder->Convert( &iStatus, bmp, 0 ); 189 } 190 191 // the first frame, partial information is available 192 iContext->iObserver->PartialImage(); 200 } 193 201 194 202 SetActive(); … … 206 214 void CStaticImageDecoder::StartLoading() 207 215 { 208 if( !IsActive() ) 216 // see LoadOneFrame for iBlocked 217 if( !IsActive() && !iBlocked ) 209 218 { 210 219 // initalize decoding -
S60/trunk/WebKit/BrowserView/src/KeyEventHandler.cpp
r19258 r19424 182 182 case EKeyDownArrow: 183 183 { 184 // Don't generate keyevent for arrows since they are oveloaded for pointer 185 // unless it is tabbed navigation 186 CWebKitFrame* focused = iWebKitView->MainFrame().FocusedFrame(); 187 if (iWebKitView->TabbedNavigation() && !iWebKitView->WebKitControl().InPageViewMode() && focused) 188 { 189 // send keyevent to the webcore 190 focused->WebKitBridge().WebCoreBridge().KeyEvent(iLastEventKey,EFalse); 191 } 184 192 keyResponse = HandleArrowKeysL(aKeyEvent); 185 193 break; -
S60/trunk/WebKit/ChangeLog
r19406 r19424 1 bujtas, reviewed by Yongjun. 2 DESC: PartialImage() can end up in a dialog box which starts up a nested active scheduler JELE-6XSH3P 3 and since the page still being loaded in the background new image 4 data could come to the image decoder. that's a fatal re-entry on 5 the image decoder. 6 7 http://bugs.webkit.org/show_bug.cgi?id=12550 8 9 * BrowserCore/Renderers/inc/StaticImageDecoder.h: 10 * BrowserCore/Renderers/src/StaticImageDecoder.cpp: 11 (CStaticImageDecoder::LoadOneFrame): 12 1 13 bujtas <zbujtas@gmail.com>, merged to s60/trunk by brad, reviewed by Yongjun. 2 14 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
Note: See TracChangeset
for help on using the changeset viewer.