[haiku-webkit-commits] r401 - webkit/trunk/WebKit/haiku/WebPositive
- From: webkit@xxxxxxxxxxxxxxx
- To: haiku-webkit-commits@xxxxxxxxxxxxx
- Date: Wed, 07 Apr 2010 13:07:45 +0000
Author: stippi
Date: Wed Apr 7 13:07:44 2010
New Revision: 401
URL: http://mmlr.dyndns.org/changeset/401
Log:
Selecting the tab for which authentication was requested didn't work anymore.
Modified:
webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp
Modified: webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp
==============================================================================
--- webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp Wed Apr 7
13:00:55 2010 (r400)
+++ webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp Wed Apr 7
13:07:44 2010 (r401)
@@ -1168,7 +1168,13 @@
{
// Switch to the page for which this authentication is required.
if (view != CurrentWebView()) {
- fTabManager->SelectTab(view);
+ int32 tabIndex = fTabManager->TabForView(view);
+ if (tabIndex < 0) {
+ // page seems to be gone already?
+ return false;
+ }
+ fTabManager->SelectTab(tabIndex);
+ _TabChanged(tabIndex);
UpdateIfNeeded();
}
AuthenticationPanel* panel = new AuthenticationPanel(Frame());
@@ -1210,7 +1216,7 @@
{
BView* view = fTabManager->RemoveTab(index);
BWebView* webView = dynamic_cast<BWebView*>(view);
- if (webView)
+ if (webView != NULL)
webView->Shutdown();
else
delete view;
@@ -1229,12 +1235,12 @@
SetCurrentWebView(webView);
- if (webView) {
+ if (webView != NULL) {
_UpdateTitle(webView->MainFrameTitle());
PageUserData* userData = static_cast<PageUserData*>(
webView->GetUserData());
- if (userData && userData->FocusedView() != NULL)
+ if (userData != NULL && userData->FocusedView() != NULL)
userData->FocusedView()->MakeFocus(true);
else
webView->MakeFocus(true);
Other related posts:
- » [haiku-webkit-commits] r401 - webkit/trunk/WebKit/haiku/WebPositive - webkit
