Changeset 149823 in webkit
- Timestamp:
- May 9, 2013 11:02:34 AM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r149822 r149823 1 2013-05-09 Mike Fenton <mifenton@rim.com> 2 3 [BlackBerry] Style updates required based on new check-webkit-style 4 https://bugs.webkit.org/show_bug.cgi?id=115857 5 6 Reviewed by Rob Buis. 7 8 Update WebCore/platform/network/blackberry 9 to match check-webkit-style updates. 10 11 * platform/network/blackberry/NetworkJob.cpp: 12 (WebCore::NetworkJob::initialize): 13 (WebCore::NetworkJob::handleSetCookieHeader): 14 (WebCore::NetworkJob::sendResponseIfNeeded): 15 (WebCore::NetworkJob::shouldSendClientData): 16 * platform/network/blackberry/NetworkJob.h: 17 (NetworkJob): 18 * platform/network/blackberry/NetworkManager.cpp: 19 (WebCore::NetworkManager::startJob): 20 * platform/network/blackberry/rss/RSSFilterStream.cpp: 21 (WebCore::isRSSContent): 22 (WebCore::transcode): 23 1 24 2013-05-09 Mike Fenton <mifenton@rim.com> 2 25 -
trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp
r144326 r149823 117 117 118 118 bool NetworkJob::initialize(int playerId, 119 120 121 122 123 124 125 126 119 const String& pageGroupName, 120 const KURL& url, 121 const BlackBerry::Platform::NetworkRequest& request, 122 PassRefPtr<ResourceHandle> handle, 123 BlackBerry::Platform::NetworkStreamFactory* streamFactory, 124 Frame* frame, 125 int deferLoadingCount, 126 int redirectCount) 127 127 { 128 128 BLACKBERRY_ASSERT(handle); … … 170 170 BlackBerry::Platform::NetworkRequest::TargetType targetType = request.getTargetType(); 171 171 if ((targetType == BlackBerry::Platform::NetworkRequest::TargetIsMainFrame 172 173 172 || targetType == BlackBerry::Platform::NetworkRequest::TargetIsSubframe) 173 && !m_isOverrideContentType) { 174 174 RSSFilterStream* filter = new RSSFilterStream(); 175 175 filter->setWrappedStream(wrappedStream); … … 457 457 CookieManager& manager = cookieManager(); 458 458 if ((manager.cookiePolicy() == CookieStorageAcceptPolicyOnlyFromMainDocumentDomain) 459 && (m_handle->firstRequest().firstPartyForCookies() != url)460 && manager.getCookie(url, WithHttpOnlyCookies).isEmpty())459 && (m_handle->firstRequest().firstPartyForCookies() != url) 460 && manager.getCookie(url, WithHttpOnlyCookies).isEmpty()) 461 461 return; 462 462 manager.setCookies(url, value); … … 750 750 } else { 751 751 if (urlFilename.reverseFind('.') == notFound && !mimeExtension.isEmpty()) 752 suggestedFilename = urlFilename + '.' + mimeExtension;752 suggestedFilename = urlFilename + '.' + mimeExtension; 753 753 else 754 suggestedFilename = urlFilename;754 suggestedFilename = urlFilename; 755 755 } 756 756 } … … 1005 1005 { 1006 1006 return (!isRedirect(m_extendedStatusCode) || !m_response.httpHeaderFields().contains("Location")) 1007 1007 && !m_needsRetryAsFTPDirectory; 1008 1008 } 1009 1009 -
trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h
r143796 r149823 54 54 55 55 bool initialize(int playerId, 56 57 58 59 60 61 62 63 56 const String& pageGroupName, 57 const KURL&, 58 const BlackBerry::Platform::NetworkRequest&, 59 PassRefPtr<ResourceHandle>, 60 BlackBerry::Platform::NetworkStreamFactory*, 61 Frame*, 62 int deferLoadingCount, 63 int redirectCount); 64 64 PassRefPtr<ResourceHandle> handle() const { return m_handle; } 65 65 #ifndef NDEBUG -
trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp
r149769 r149823 159 159 160 160 const String& documentUrl = frame->document()->url().string(); 161 if (!documentUrl.isEmpty()) {161 if (!documentUrl.isEmpty()) 162 162 platformRequest.setReferrer(documentUrl); 163 }164 163 165 164 platformRequest.setSecurityOrigin(frame->document()->securityOrigin()->toRawString()); -
trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp
r149769 r149823 86 86 { 87 87 return type == RSSFilterStream::TypeRSS10 88 89 88 || type == RSSFilterStream::TypeRSS20 89 || type == RSSFilterStream::TypeRSSAtom; 90 90 } 91 91 … … 336 336 337 337 static TranscodeResult transcode(const char* sourceEncoding, 338 339 340 341 342 unsigned inttargetLength)338 const char* targetEncoding, 339 const char*& sourceStart, 340 int sourceLength, 341 char*& targetStart, 342 unsigned targetLength) 343 343 { 344 344 TextEncoding textEncodingSource(sourceEncoding);
Note: See TracChangeset
for help on using the changeset viewer.