Title: [125570] trunk/Source/WebCore
- Revision
- 125570
- Author
- [email protected]
- Date
- 2012-08-14 09:36:02 -0700 (Tue, 14 Aug 2012)
Log Message
[BlackBerry] Avoid assertion failure in App Cache.
https://bugs.webkit.org/show_bug.cgi?id=93926
Reviewed by Rob Buis.
Short-circuit data url decoding if we know it's not a data URL to
avoid an assertion failure in debug mode. No functional change.
No new tests since this is just a debug mode assertion failure.
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::createResourceHandle):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (125569 => 125570)
--- trunk/Source/WebCore/ChangeLog 2012-08-14 16:12:17 UTC (rev 125569)
+++ trunk/Source/WebCore/ChangeLog 2012-08-14 16:36:02 UTC (rev 125570)
@@ -1,3 +1,18 @@
+2012-08-14 George Staikos <[email protected]>
+
+ [BlackBerry] Avoid assertion failure in App Cache.
+ https://bugs.webkit.org/show_bug.cgi?id=93926
+
+ Reviewed by Rob Buis.
+
+ Short-circuit data url decoding if we know it's not a data URL to
+ avoid an assertion failure in debug mode. No functional change.
+
+ No new tests since this is just a debug mode assertion failure.
+
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::createResourceHandle):
+
2012-08-14 Thiago Marcos P. Santos <[email protected]>
[EFL] Do not warn when the default theme is not found
Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (125569 => 125570)
--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2012-08-14 16:12:17 UTC (rev 125569)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2012-08-14 16:36:02 UTC (rev 125570)
@@ -498,7 +498,9 @@
target = ResourceRequest::targetTypeFromMimeType(mimeType);
}
if (target == ResourceRequest::TargetIsUnspecified) {
- String mimeType = mimeTypeFromDataURL(url);
+ String mimeType;
+ if (url.protocolIsData())
+ mimeType = mimeTypeFromDataURL(url);
if (!mimeType.isEmpty())
target = ResourceRequest::targetTypeFromMimeType(mimeType);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
