Changeset 21492 in webkit
- Timestamp:
- May 15, 2007 11:20:12 AM (17 years ago)
- Location:
- S60/branches/3.1m/WebKit
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
S60/branches/3.1m/WebKit/BrowserView/src/WebKitControl.cpp
r21378 r21492 1790 1790 #endif // PROGRESS_LOG 1791 1791 1792 if ( iWebKitView->TabbedNavigation()) 1793 { 1794 if( iWebKitView->Cursor() ) 1795 { 1796 iWebKitView->Cursor()->CursorUpdate(EFalse); 1797 } 1798 1799 TWebCoreFocusedElementType elType = EWebCoreElementNone; 1800 iWebKitView->MainFrame().WebKitBridge().WebCoreBridge().TabbedNavigation(EWebNavDown,elType,ETrue); 1801 iWebKitView->SetFocusedElementType((TBrCtlDefs::TBrCtlElementType)elType); 1802 } 1803 else 1804 { 1805 if( iWebKitView->Cursor() ) 1806 { 1807 iWebKitView->Cursor()->CursorUpdate(iWebKitView->IsVisible()); 1808 TWebCoreFocusedElementType elType = EWebCoreElementNone; 1809 TRect rect = TRect(); 1810 TPoint pt = iWebKitView->Cursor()->Position() + iWebKitView->MainFrame().ToViewCoords(iWebKitView->MainFrame().ContentPosition()); 1811 iWebKitView->MainFrame().WebKitBridge().WebCoreBridge().NavigableNodeUnderCursor(pt, elType, rect); 1812 iWebKitView->SetFocusedElementType( (TBrCtlDefs::TBrCtlElementType)elType ); 1813 } 1814 } 1815 1792 1816 // Before resetting progress value be sure to send client at least one 1793 1817 // notification with final progress value … … 1802 1826 } 1803 1827 ResetProgress(); 1828 1804 1829 iBrCtl->HandleBrowserLoadEventL( TBrCtlDefs::EEventUrlLoadingFinished, 0, 0 ); 1805 1830 iBrCtl->HandleBrowserLoadEventL( TBrCtlDefs::EEventContentFinished, 0, 0 ); 1806 1831 iBrCtl->HandleBrowserLoadEventL( TBrCtlDefs::EEventLoadFinished, 0, 0 ); 1807 1808 // send error event 1832 // send error event 1809 1833 if( aError != KErrNone ) 1810 1834 { … … 1812 1836 } 1813 1837 1814 if ( iWebKitView->TabbedNavigation())1815 {1816 if( iWebKitView->Cursor() )1817 {1818 iWebKitView->Cursor()->CursorUpdate(EFalse);1819 }1820 1821 TWebCoreFocusedElementType elType = EWebCoreElementNone;1822 iWebKitView->MainFrame().WebKitBridge().WebCoreBridge().TabbedNavigation(EWebNavDown,elType,ETrue);1823 iWebKitView->SetFocusedElementType((TBrCtlDefs::TBrCtlElementType)elType);1824 }1825 else1826 {1827 if( iWebKitView->Cursor() )1828 {1829 iWebKitView->Cursor()->CursorUpdate(iWebKitView->IsVisible());1830 TWebCoreFocusedElementType elType = EWebCoreElementNone;1831 TRect rect = TRect();1832 TPoint pt = iWebKitView->Cursor()->Position() + iWebKitView->MainFrame().ToViewCoords(iWebKitView->MainFrame().ContentPosition());1833 iWebKitView->MainFrame().WebKitBridge().WebCoreBridge().NavigableNodeUnderCursor(pt, elType, rect);1834 iWebKitView->SetFocusedElementType( (TBrCtlDefs::TBrCtlElementType)elType );1835 }1836 }1837 1838 1838 1839 //If this load is because of a request from visual history list -
S60/branches/3.1m/WebKit/ChangeLog
r21465 r21492 1 2007-05-15 spadma 2 3 Reviewed by Zalan. 4 DESC: [S60] User cannot detach from flash object after the object uses connection 5 http://bugs.webkit.org/show_bug.cgi?id=13731 6 7 * BrowserView/src/WebKitControl.cpp: 8 (CWebKitControl::FinalProgressComplete): 9 1 10 ligman, reviewed by Sachin 2 11 DESC: Inputbox callback gets canceled before it has a chance to run. Setting it's priority to EPriorityUserInput
Note: See TracChangeset
for help on using the changeset viewer.