<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[20661] S60/branches/3.1m/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20661">20661</a></dd>
<dt>Author</dt> <dd>spadma</dd>
<dt>Date</dt> <dd>2007-04-02 11:37:26 -0700 (Mon, 02 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>2007-04-02 bujtas <zbujtas@gmail.com>
Reviewed by Sachin.
DESC: user hits cancel on connection dialog, send EventLoadError to the host app
http://bugs.webkit.org/show_bug.cgi?id=13257
* BrowserView/inc/WebKitControl.h:
* BrowserView/src/HttpLoaderEventToUiListener.cpp:
(CHttpLoaderEventToUiListener::ConnectionRequestCancelled):
* BrowserView/src/WebKitControl.cpp:
(CWebKitControl::HandleLoaderCommandL):
(CWebKitControl::FinalProgressComplete):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#S60branches31mWebKitBrowserViewincWebKitControlh">S60/branches/3.1m/WebKit/BrowserView/inc/WebKitControl.h</a></li>
<li><a href="#S60branches31mWebKitBrowserViewsrcHttpLoaderEventToUiListenercpp">S60/branches/3.1m/WebKit/BrowserView/src/HttpLoaderEventToUiListener.cpp</a></li>
<li><a href="#S60branches31mWebKitBrowserViewsrcWebKitControlcpp">S60/branches/3.1m/WebKit/BrowserView/src/WebKitControl.cpp</a></li>
<li><a href="#S60branches31mWebKitChangeLog">S60/branches/3.1m/WebKit/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="S60branches31mWebKitBrowserViewincWebKitControlh"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebKit/BrowserView/inc/WebKitControl.h (20660 => 20661)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebKit/BrowserView/inc/WebKitControl.h 2007-04-02 18:23:42 UTC (rev 20660)
+++ S60/branches/3.1m/WebKit/BrowserView/inc/WebKitControl.h 2007-04-02 18:37:26 UTC (rev 20661)
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> */
</span><span class="cx"> HBufC* PageInfoLC( TBrCtlDefs::TBrCtlPageInfo aBrCtlPageInfo );
</span><span class="cx">
</span><del>- /**
</del><ins>+ /**
</ins><span class="cx"> * LoadSavedPageL
</span><span class="cx"> * Parse and load the page data supplied via the buffer
</span><span class="cx"> * @since 3.x
</span><span class="lines">@@ -294,13 +294,13 @@
</span><span class="cx"> */
</span><span class="cx"> void LoadSavedPageL( const TDesC& aUid, TDesC& aSavedPageBuffer );
</span><span class="cx">
</span><del>- /**
- * HandleLoaderCommandL
- * Handle the commands related to resource loader
- * @since 3.x
</del><ins>+ /**
+ * HandleLoaderCommandL
+ * Handle the commands related to resource loader
+ * @since 3.x
</ins><span class="cx"> * @return void
</span><del>- */
- void HandleLoaderCommandL( TInt aCommand );
</del><ins>+ */
+ void HandleLoaderCommandL( TInt aCommand, TInt aError = KErrNone );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * LoadUrlL
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> void LoadUrlL( const TDesC& aUrl, TBrCtlDefs::TBrCtlCacheMode aBrCtlCacheMode );
</span><span class="cx">
</span><span class="cx">
</span><del>- /**
</del><ins>+ /**
</ins><span class="cx"> * CreateWindow
</span><span class="cx"> * Purpose
</span><span class="cx"> * @since 3.0
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> */
</span><span class="cx"> CWebKitView* FindWindowNamed(const TDesC& aFrameName);
</span><span class="cx">
</span><del>- /**
</del><ins>+ /**
</ins><span class="cx"> * DelegateWindowCommand
</span><span class="cx"> * From MWebClientBridge
</span><span class="cx"> * Purpose
</span><span class="lines">@@ -838,13 +838,13 @@
</span><span class="cx"> */
</span><span class="cx"> void ResetProgress();
</span><span class="cx">
</span><del>- /**
</del><ins>+ /**
</ins><span class="cx"> * FinalProgressComplete
</span><span class="cx"> *
</span><span class="cx"> * @since 3.x
</span><del>- * @return void
</del><ins>+ * @return void
</ins><span class="cx"> */
</span><del>- void FinalProgressComplete();
</del><ins>+ void FinalProgressComplete( TInt aError = KErrNone );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * CheckForCancelComplete
</span></span></pre></div>
<a id="S60branches31mWebKitBrowserViewsrcHttpLoaderEventToUiListenercpp"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebKit/BrowserView/src/HttpLoaderEventToUiListener.cpp (20660 => 20661)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebKit/BrowserView/src/HttpLoaderEventToUiListener.cpp 2007-04-02 18:23:42 UTC (rev 20660)
+++ S60/branches/3.1m/WebKit/BrowserView/src/HttpLoaderEventToUiListener.cpp 2007-04-02 18:37:26 UTC (rev 20661)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> //
</span><span class="cx"> void CHttpLoaderEventToUiListener::ConnectionRequestCancelled()
</span><span class="cx"> {
</span><del>- TRAP_IGNORE(iBrCtl->WebKitControl()->HandleLoaderCommandL(TBrCtlDefs::ECommandCancelFetch));
</del><ins>+ TRAP_IGNORE(iBrCtl->WebKitControl()->HandleLoaderCommandL(TBrCtlDefs::ECommandCancelFetch, KErrCancel));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // -----------------------------------------------------------------------------
</span></span></pre></div>
<a id="S60branches31mWebKitBrowserViewsrcWebKitControlcpp"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebKit/BrowserView/src/WebKitControl.cpp (20660 => 20661)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebKit/BrowserView/src/WebKitControl.cpp 2007-04-02 18:23:42 UTC (rev 20660)
+++ S60/branches/3.1m/WebKit/BrowserView/src/WebKitControl.cpp 2007-04-02 18:37:26 UTC (rev 20661)
</span><span class="lines">@@ -1107,7 +1107,7 @@
</span><span class="cx"> // -----------------------------------------------------------------------------
</span><span class="cx"> //
</span><span class="cx"> void CWebKitControl::HandleLoaderCommandL(
</span><del>- TInt aCommand )
</del><ins>+ TInt aCommand, TInt aError )
</ins><span class="cx"> {
</span><span class="cx"> switch( aCommand )
</span><span class="cx"> {
</span><span class="lines">@@ -1136,7 +1136,7 @@
</span><span class="cx"> wkDebug()<<"user cancel"<<flush;
</span><span class="cx"> #endif // PROGRESS_LOG
</span><span class="cx"> //
</span><del>- FinalProgressComplete();
</del><ins>+ FinalProgressComplete(aError);
</ins><span class="cx"> iCancelTimer->Cancel();
</span><span class="cx"> iCancelTimer->Start( 0, 0, TCallBack( &CancelCallback, this ) );
</span><span class="cx"> iCancelInProgress = ETrue;
</span><span class="lines">@@ -1736,7 +1736,7 @@
</span><span class="cx"> // CWebKitControl::FinalProgressComplete
</span><span class="cx"> //
</span><span class="cx"> // -----------------------------------------------------------------------------
</span><del>-void CWebKitControl::FinalProgressComplete()
</del><ins>+void CWebKitControl::FinalProgressComplete( TInt aError )
</ins><span class="cx"> {
</span><span class="cx"> #ifdef PERF_REGRESSION_LOG
</span><span class="cx"> HBufC* url = iWebKitView->MainFrame().WebKitBridge().Loader().PageUrl();
</span><span class="lines">@@ -1759,29 +1759,35 @@
</span><span class="cx"> iBrCtl->HandleBrowserLoadEventL( TBrCtlDefs::EEventContentFinished, 0, 0 );
</span><span class="cx"> iBrCtl->HandleBrowserLoadEventL( TBrCtlDefs::EEventLoadFinished, 0, 0 );
</span><span class="cx">
</span><del>- if ( iWebKitView->TabbedNavigation())
- {
</del><ins>+ // send error event
+ if( aError != KErrNone )
+ {
+ iBrCtl->HandleBrowserLoadEventL( TBrCtlDefs::EEventLoadError, 0, 0 );
+ }
+
+ if ( iWebKitView->TabbedNavigation())
+ {
</ins><span class="cx"> if( iWebKitView->Cursor() )
</span><span class="cx"> {
</span><span class="cx"> iWebKitView->Cursor()->CursorUpdate(EFalse);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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());
</del><span class="cx"> TWebCoreFocusedElementType elType = EWebCoreElementNone;
</span><del>- 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 );
</del><ins>+ iWebKitView->MainFrame().WebKitBridge().WebCoreBridge().TabbedNavigation(EWebNavDown,elType,ETrue);
+ iWebKitView->SetFocusedElementType((TBrCtlDefs::TBrCtlElementType)elType);
</ins><span class="cx"> }
</span><del>- }
</del><ins>+ 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 );
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> //If this load is because of a request from visual history list
</span><span class="cx"> //&& the current content position is 0,0 (i.e user hasnt scrolled since the page started loading),
</span></span></pre></div>
<a id="S60branches31mWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebKit/ChangeLog (20660 => 20661)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebKit/ChangeLog 2007-04-02 18:23:42 UTC (rev 20660)
+++ S60/branches/3.1m/WebKit/ChangeLog 2007-04-02 18:37:26 UTC (rev 20661)
</span><span class="lines">@@ -1,6 +1,19 @@
</span><span class="cx"> 2007-04-02 bujtas <zbujtas@gmail.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Sachin.
</span><ins>+ DESC: user hits cancel on connection dialog, send EventLoadError to the host app
+ http://bugs.webkit.org/show_bug.cgi?id=13257
+
+ * BrowserView/inc/WebKitControl.h:
+ * BrowserView/src/HttpLoaderEventToUiListener.cpp:
+ (CHttpLoaderEventToUiListener::ConnectionRequestCancelled):
+ * BrowserView/src/WebKitControl.cpp:
+ (CWebKitControl::HandleLoaderCommandL):
+ (CWebKitControl::FinalProgressComplete):
+
+2007-04-02 bujtas <zbujtas@gmail.com>
+
+ Reviewed by Sachin.
</ins><span class="cx"> DESC: implement client side accept header support
</span><span class="cx"> http://bugs.webkit.org/show_bug.cgi?id=13256
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>