FCL/sf/mw/web: comparison webengine/osswebengine/WebKit/s60/webcoresupport/WebFrameLoaderClient.cpp

equal deleted inserted replaced

-:7c90e6132015
+:10e98eab6f85
 void WebFrameLoaderClient::makeRepresentation(DocumentLoader* docLoader)
 {
 if (isWMLContent(m_response.mimeType())) {
 // call the WmlDispatcher Headers routine to set the WML flag
 if (! m_WmlContentListener) {
-m_WmlContentListener = CWmlDispatcher::NewL(brctl(m_webFrame), core(m_webFrame) );
+TRAPD(err, m_WmlContentListener = CWmlDispatcher::NewL(brctl(m_webFrame), core(m_webFrame) ));
-brctl(m_webFrame)->setWmlDispatcher(m_WmlContentListener);
+if((err == KErrNone) && (m_WmlContentListener != NULL))
+{
+brctl(m_webFrame)->setWmlDispatcher(m_WmlContentListener);
+}
 }
 TRAPD(err,m_WmlContentListener->HeadersL( 0, m_response ));
 }
 else{
 if (m_WmlContentListener) {
 FrameLoadTypeStandard == core(m_webFrame)->loader()->loadType()){
 m_webFrame->frameView()->topView()->resetZoomLevel();
 }
 if (!core(m_webFrame)->ownerElement()) {
-brctl(m_webFrame)->settings()->setTabbedNavigation(!(brctl(m_webFrame)->capabilities()&TBrCtlDefs::ECapabilityCursorNavigation));
+brctl(m_webFrame)->settings()->setNavigationType((brctl(m_webFrame)->capabilities()&TBrCtlDefs::ECapabilityCursorNavigation) ? SettingsContainer::NavigationTypeCursor : SettingsContainer::NavigationTypeTabbed);
 StaticObjectsContainer::instance()->webCursor()->cursorUpdate(true);
 m_webFrame->frameView()->topView()->tabbedNavigation()->clear();
 		}
 }
 }
 if (originalURL && [download respondsToSelector:@selector(_setOriginatingURL:)])
 [download _setOriginatingURL:originalURL];
 */
 StaticObjectsContainer::instance()->resourceLoaderDelegate()->download(handle, request, response);
+TRAP_IGNORE(
 brctl(m_webFrame)->HandleBrowserLoadEventL(TBrCtlDefs::EEventNewUrlContentArrived, 0, 0 ); // must send this for progress bar to go away
 brctl(m_webFrame)->HandleBrowserLoadEventL(TBrCtlDefs::EEventUrlLoadingFinished, 0, 0 );
 brctl(m_webFrame)->HandleBrowserLoadEventL(TBrCtlDefs::EEventContentFinished, 0, 0 );
 brctl(m_webFrame)->HandleBrowserLoadEventL(TBrCtlDefs::EEventLoadFinished, 0, 0 );
+);
 }
 void WebFrameLoaderClient::assignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&)
 {
 /*
 }
 }
 [webView _didChangeValueForKey:_WebMainFrameIconKey];
 */
+TRAP_IGNORE(
 brctl(m_webFrame)->HandleBrowserLoadEventL(TBrCtlDefs::EEventFaviconAvailable, 0, 0 );
+);
 notImplemented();
 }
 void WebFrameLoaderClient::dispatchDidStartProvisionalLoad()
 {
 if (implementations.delegateImplementsDidStartProvisionalLoadForFrame) {
 id frameLoadDelegate = WebViewGetFrameLoadDelegate(webView);
 implementations.didStartProvisionalLoadForFrameFunc(frameLoadDelegate, @selector(webView:didStartProvisionalLoadForFrame:), webView, m_webFrame.get());
 }
 */
+TRAP_IGNORE(
 brctl(m_webFrame)->HandleBrowserLoadEventL(TBrCtlDefs::EEventNewContentStart, 0, 0 );
+);
 notImplemented();
 }
 void WebFrameLoaderClient::dispatchDidReceiveTitle(const String& title)
 {
 if (implementations.delegateImplementsDidReceiveTitleForFrame) {
 id frameLoadDelegate = WebViewGetFrameLoadDelegate(webView);
 implementations.didReceiveTitleForFrameFunc(frameLoadDelegate, @selector(webView:didReceiveTitle:forFrame:), webView, title, m_webFrame.get());
 }
 */
+TRAP_IGNORE(
 brctl(m_webFrame)->HandleBrowserLoadEventL(TBrCtlDefs::EEventTitleAvailable, 0, 0 );
+);
 notImplemented();
 }
 void WebFrameLoaderClient::dispatchDidCommitLoad()
 {
 if (implementations.delegateImplementsDidCommitLoadForFrame) {
 id frameLoadDelegate = WebViewGetFrameLoadDelegate(webView);
 implementations.didCommitLoadForFrameFunc(frameLoadDelegate, @selector(webView:didCommitLoadForFrame:), webView, m_webFrame.get());
 }
 */
+TRAP_IGNORE(
 brctl(m_webFrame)->HandleBrowserLoadEventL(TBrCtlDefs::EEventTitleAvailable, 0, 0 );
+);
 }
 void WebFrameLoaderClient::dispatchDidFailProvisionalLoad(const ResourceError& error)
 {
 /*
 //
 if (brctl(m_webFrame)->wmlMode() && m_WmlContentListener) {
 m_WmlContentListener->HandleError(0,error.errorCode());
 }
 //
+TRAP_IGNORE(
 brctl(m_webFrame)->HandleBrowserLoadEventL(TBrCtlDefs::EEventLoadError, 0, 0 );
+);
 notImplemented();
 }
 void WebFrameLoaderClient::dispatchDidFailLoad(const ResourceError& error)
 {
 //
 if (brctl(m_webFrame)->wmlMode() && m_WmlContentListener) {
 m_WmlContentListener->HandleError(0,error.errorCode());
 }
 //
+TRAP_IGNORE(
 brctl(m_webFrame)->HandleBrowserLoadEventL(TBrCtlDefs::EEventLoadError, 0, 0 );
+);
 m_webFrame->frameView()->topView()->pageLoadFinished();
 notImplemented();
 }
 void WebFrameLoaderClient::dispatchDidFinishDocumentLoad() // called when parsing is finished
 if (implementations.delegateImplementsDidFirstLayoutInFrame) {
 id frameLoadDelegate = WebViewGetFrameLoadDelegate(webView);
 implementations.didFirstLayoutInFrameFunc(frameLoadDelegate, @selector(webView:didFirstLayoutInFrame:), webView, m_webFrame.get());
 }
 */
+TRAP_IGNORE(
 brctl(m_webFrame)->HandleBrowserLoadEventL(TBrCtlDefs::EEventNewContentDisplayed, 0, 0 );
+);
 }
 Frame* WebFrameLoaderClient::dispatchCreatePage()
 {
 /*
 }
 void WebFrameLoaderClient::postProgressStartedNotification()
 {
 //    [[NSNotificationCenter defaultCenter] postNotificationName:WebViewProgressStartedNotification object:getWebView(m_webFrame.get())];
+TRAP_IGNORE(
 brctl(m_webFrame)->HandleBrowserLoadEventL(TBrCtlDefs::EEventUrlLoadingStart, 0, 0 );
+);
 total_bytes = 0;
 #ifdef PERF_REGRESSION_LOG
 wkDebug()<<"Load started"<<mem<<flush;
 #endif // PERF_REGRESSION_LOG
 }
 #ifdef PERF_REGRESSION_LOG
 wkDebug()<<"Loading..."<<total_bytes<<"bytes"<<mem<<flush;
 #endif // PERF_REGRESSION_LOG
 //    [[NSNotificationCenter defaultCenter] postNotificationName:WebViewProgressEstimateChangedNotification object:getWebView(m_webFrame.get())];
 double estimatedProgress = core(m_webFrame)->page()->progress()->estimatedProgress();
+TRAP_IGNORE(
 brctl(m_webFrame)->HandleBrowserLoadEventL(TBrCtlDefs::EEventNewUrlContentArrived, total_bytes / estimatedProgress, 0 );
 brctl(m_webFrame)->HandleBrowserLoadEventL(TBrCtlDefs::EEventMoreUrlContentArrived, total_bytes, 0 );
+);
 }
 void WebFrameLoaderClient::postProgressFinishedNotification()
 {
 TRAP_IGNORE(postProgressFinishedNotificationL());
 }
 void WebFrameLoaderClient::committedLoad(DocumentLoader* loader, const char* data, int length)
 {
 if (brctl(m_webFrame)->wmlMode()) {
+TRAP_IGNORE(
 m_WmlContentListener->ResponseL( data, length );
+);
 return;
 }
 m_webFrame->bridge()->receivedData(data, length, m_response.textEncodingName());
 }
 }
 void WebFrameLoaderClient::frameLoadCompleted()
 {
 if (brctl(m_webFrame)->wmlMode()) {
+TRAP_IGNORE(
 m_WmlContentListener->CompleteL( 0, 0 );
+);
 return;
 }
 /*
 // Note: Can be called multiple times.
 // Even if already complete, we might have set a previous item on a frame that
 return String();
 }
 void WebFrameLoaderClient::windowObjectCleared() const
 {
-//    [m_webFrame->_private->bridge windowObjectCleared];
+if (m_webFrame && !m_webFrame->parentFrame()) {
-notImplemented();
+m_webFrame->frameView()->topView()->windowObjectCleared();
+}
 }
 void WebFrameLoaderClient::didPerformFirstNavigation() const
 {
 notImplemented();

changeset 13	10e98eab6f85
parent 8	7c90e6132015
child 16	a359256acfc6