Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No changes, just remove hard TABs from wxWebViewWebKit code.

Browse Source 
This will allow to commit other changes to this file without triggering svn
hook checking for the TABs absence.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-10-17 12:34:02 +00:00
parent 76c55941db
commit b16fa26914
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/osx/webview_webkit.mm
View File

@@ -495,18 +495,18 @@ wxString wxWebViewWebKit::GetPageSource() const
{ {
if (CanGetPageSource()) if (CanGetPageSource())
{ {
WebDataSource* dataSource = [[m_webView mainFrame] dataSource]; WebDataSource* dataSource = [[m_webView mainFrame] dataSource];
wxASSERT (dataSource != nil); wxASSERT (dataSource != nil);
id<WebDocumentRepresentation> representation = [dataSource representation]; id<WebDocumentRepresentation> representation = [dataSource representation];
wxASSERT (representation != nil); wxASSERT (representation != nil);
NSString* source = [representation documentSource]; NSString* source = [representation documentSource];
if (source == nil) if (source == nil)
{ {
return wxEmptyString; return wxEmptyString;
} }
return wxStringWithNSString( source ); return wxStringWithNSString( source );
} }
@@ -1116,7 +1116,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
break; break;
case NSURLErrorNoPermissionsToReadFile: case NSURLErrorNoPermissionsToReadFile:
*out = wxWEBVIEW_NAV_ERR_SECURITY; *out = wxWEBVIEW_NAV_ERR_SECURITY;
break; break;
case NSURLErrorServerCertificateHasBadDate: case NSURLErrorServerCertificateHasBadDate:
@@ -1148,17 +1148,17 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
wxWebViewNavigationError type; wxWebViewNavigationError type;
wxString description = nsErrorToWxHtmlError(error, &type); wxString description = nsErrorToWxHtmlError(error, &type);
wxWebViewEvent event(wxEVT_WEBVIEW_ERROR, wxWebViewEvent event(wxEVT_WEBVIEW_ERROR,
webKitWindow->GetId(), webKitWindow->GetId(),
wxStringWithNSString( url ), wxStringWithNSString( url ),
wxEmptyString); wxEmptyString);
event.SetString(description); event.SetString(description);
event.SetInt(type); event.SetInt(type);
if (webKitWindow && webKitWindow->GetEventHandler()) if (webKitWindow && webKitWindow->GetEventHandler())
{ {
webKitWindow->GetEventHandler()->ProcessEvent(event); webKitWindow->GetEventHandler()->ProcessEvent(event);
} }
} }
} }
@@ -1172,17 +1172,17 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
NSString *url = [[[[frame provisionalDataSource] request] URL] NSString *url = [[[[frame provisionalDataSource] request] URL]
absoluteString]; absoluteString];
wxWebViewNavigationError type; wxWebViewNavigationError type;
wxString description = nsErrorToWxHtmlError(error, &type); wxString description = nsErrorToWxHtmlError(error, &type);
wxWebViewEvent event(wxEVT_WEBVIEW_ERROR, wxWebViewEvent event(wxEVT_WEBVIEW_ERROR,
webKitWindow->GetId(), webKitWindow->GetId(),
wxStringWithNSString( url ), wxStringWithNSString( url ),
wxEmptyString); wxEmptyString);
event.SetString(description); event.SetString(description);
event.SetInt(type); event.SetInt(type);
if (webKitWindow && webKitWindow->GetEventHandler()) if (webKitWindow && webKitWindow->GetEventHandler())
webKitWindow->GetEventHandler()->ProcessEvent(event); webKitWindow->GetEventHandler()->ProcessEvent(event);
} }
} }
@@ -1275,7 +1275,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
} }
} }
return NO; return NO;
} }
+ (NSURLRequest *)canonicalRequestForRequest:(NSURLRequest *)request + (NSURLRequest *)canonicalRequestForRequest:(NSURLRequest *)request
@@ -1287,7 +1287,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
- (void)startLoading - (void)startLoading
{ {
NSURLRequest *request = [self request]; NSURLRequest *request = [self request];
NSString* path = [[request URL] absoluteString]; NSString* path = [[request URL] absoluteString];
id<NSURLProtocolClient> client = [self client]; id<NSURLProtocolClient> client = [self client];
@@ -1310,9 +1310,9 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
NSURLResponse *response = [[NSURLResponse alloc] initWithURL:[request URL] NSURLResponse *response = [[NSURLResponse alloc] initWithURL:[request URL]
MIMEType:wxNSStringWithWxString(file->GetMimeType()) MIMEType:wxNSStringWithWxString(file->GetMimeType())
expectedContentLength:length expectedContentLength:length
textEncodingName:nil]; textEncodingName:nil];
//Load the data, we malloc it so it is tidied up properly //Load the data, we malloc it so it is tidied up properly
void* buffer = malloc(length); void* buffer = malloc(length);
@@ -1320,16 +1320,16 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
NSData *data = [[NSData alloc] initWithBytesNoCopy:buffer length:length]; NSData *data = [[NSData alloc] initWithBytesNoCopy:buffer length:length];
//We do not support caching anything yet //We do not support caching anything yet
[client URLProtocol:self didReceiveResponse:response [client URLProtocol:self didReceiveResponse:response
cacheStoragePolicy:NSURLCacheStorageNotAllowed]; cacheStoragePolicy:NSURLCacheStorageNotAllowed];
//Set the data //Set the data
[client URLProtocol:self didLoadData:data]; [client URLProtocol:self didLoadData:data];
//Notify that we have finished //Notify that we have finished
[client URLProtocolDidFinishLoading:self]; [client URLProtocolDidFinishLoading:self];
[response release]; [response release];
} }
- (void)stopLoading - (void)stopLoading