Changeset 21493 in webkit

Timestamp:

May 15, 2007 11:21:10 AM (17 years ago)

Author:

spadma

Message:

2007-05-15 spadma

Reviewed by Zalan.
DESC: [S60] User cannot detach from flash object after the object uses connection
​http://bugs.webkit.org/show_bug.cgi?id=13731

• BrowserView/src/WebKitControl.cpp: (CWebKitControl::FinalProgressComplete):

Location:

S60/trunk/WebKit

Files:

• BrowserView/src/WebKitControl.cpp (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

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

@@ -1813 +1813 @@
 #endif // PROGRESS_LOG
 
+    if ( iWebKitView->TabbedNavigation())
+        {
+        if( iWebKitView->Cursor() )
+            {
+            iWebKitView->Cursor()->CursorUpdate(EFalse);
+            }
+
+        TWebCoreFocusedElementType elType = EWebCoreElementNone;
+        iWebKitView->MainFrame().WebKitBridge().WebCoreBridge().TabbedNavigation(EWebNavDown,elType,ETrue);
+        iWebKitView->SetFocusedElementType((TBrCtlDefs::TBrCtlElementType)elType);
+        }
+    else
+        {
+        if( iWebKitView->Cursor() )
+            {
+            iWebKitView->Cursor()->CursorUpdate(iWebKitView->IsVisible());
+            TWebCoreFocusedElementType elType = EWebCoreElementNone;
+            TRect rect = TRect();
+            TPoint pt = iWebKitView->Cursor()->Position() + iWebKitView->MainFrame().ToViewCoords(iWebKitView->MainFrame().ContentPosition());
+            iWebKitView->MainFrame().WebKitBridge().WebCoreBridge().NavigableNodeUnderCursor(pt, elType, rect);
+            iWebKitView->SetFocusedElementType( (TBrCtlDefs::TBrCtlElementType)elType );
+            }
+        }
+
     // Before resetting progress value be sure to send client at least one
     // notification with final progress value
@@ -1825 +1849 @@
         }
     ResetProgress();
+        
     iBrCtl->HandleBrowserLoadEventL( TBrCtlDefs::EEventUrlLoadingFinished, 0, 0 );
     iBrCtl->HandleBrowserLoadEventL( TBrCtlDefs::EEventContentFinished, 0, 0 );
     iBrCtl->HandleBrowserLoadEventL( TBrCtlDefs::EEventLoadFinished, 0, 0 );
-    
-    // To make sure we draw the scrollbars with the correct background color, force drawing them again
-    iBrCtl->DrawScrollbarBackground();
+        // send error event
     if( aError != KErrNone )
         {
@@ -1836 +1859 @@
         }
 
-    if ( iWebKitView->TabbedNavigation())
-        {
-        if( iWebKitView->Cursor() )
-            {
-            iWebKitView->Cursor()->CursorUpdate(EFalse);
-            }
-
-        TWebCoreFocusedElementType elType = EWebCoreElementNone;
-        iWebKitView->MainFrame().WebKitBridge().WebCoreBridge().TabbedNavigation(EWebNavDown,elType,ETrue);
-        iWebKitView->SetFocusedElementType((TBrCtlDefs::TBrCtlElementType)elType);
-        }
-    else
-        {
-        if( iWebKitView->Cursor() )
-            {
-            iWebKitView->Cursor()->CursorUpdate(iWebKitView->IsVisible());
-            TWebCoreFocusedElementType elType = EWebCoreElementNone;
-            TRect rect = TRect();
-            TPoint pt = iWebKitView->Cursor()->Position() + iWebKitView->MainFrame().ToViewCoords(iWebKitView->MainFrame().ContentPosition());
-            iWebKitView->MainFrame().WebKitBridge().WebCoreBridge().NavigableNodeUnderCursor(pt, elType, rect);
-            iWebKitView->SetFocusedElementType( (TBrCtlDefs::TBrCtlElementType)elType );
-            }
-        }
 
     //If this load is because of a request from visual history list

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+2007-05-15  spadma 
+
+        Reviewed by Zalan.
+        DESC: [S60] User cannot detach from flash object after the object uses connection
+        http://bugs.webkit.org/show_bug.cgi?id=13731
+
+        * BrowserView/src/WebKitControl.cpp:
+        (CWebKitControl::FinalProgressComplete):
+
 ligman, reviewed by Sachin
  DESC: Inputbox callback gets canceled before it has a chance to run. Setting it's priority to EPriorityUserInput