Title: [93646] branches/safari-534.51-branch/Source/WebCore
- Revision
- 93646
- Author
- [email protected]
- Date
- 2011-08-23 16:01:06 -0700 (Tue, 23 Aug 2011)
Log Message
Merge https://bugs.webkit.org/show_bug.cgi?id=62901
Modified Paths
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (93645 => 93646)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-23 22:59:34 UTC (rev 93645)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-23 23:01:06 UTC (rev 93646)
@@ -1,3 +1,25 @@
+2011-08-23 Lucas Forschler <[email protected]>
+
+ Merged patch for: https://bugs.webkit.org/attachment.cgi?id=98041
+
+ 2011-06-21 Jer Noble <[email protected]>
+
+ Playing video from the manifest crashes on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=62901
+
+ No new tests. This will be covered by existing App Cache tests.
+
+ Two related fixes. 1) Null-check the CFStringRef and CFURLRef created in QTMovie::load() before
+ passing them to CFRelease(). 2) Call QTMovie::loadPath() instead of QTMovie::load() when loading
+ from the app cache.
+
+ * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
+ (WebCore::MediaPlayerPrivateQuickTimeVisualContext::loadInternal):
+ * platform/graphics/win/QTMovie.cpp:
+ (QTMovie::loadPath):
+ (QTMovie::load):
+
+
2011-08-18 Lucas Forschler <[email protected]>
<rdar://problem/9750868>
Modified: branches/safari-534.51-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp (93645 => 93646)
--- branches/safari-534.51-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp 2011-08-23 22:59:34 UTC (rev 93645)
+++ branches/safari-534.51-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp 2011-08-23 23:01:06 UTC (rev 93646)
@@ -379,7 +379,7 @@
ApplicationCacheHost* cacheHost = frame ? frame->loader()->documentLoader()->applicationCacheHost() : 0;
ApplicationCacheResource* resource = 0;
if (cacheHost && cacheHost->shouldLoadResourceFromApplicationCache(ResourceRequest(url), resource) && resource && !resource->path().isEmpty())
- m_movie->load(resource->path().characters(), resource->path().length(), m_player->preservesPitch());
+ m_movie->loadPath(resource->path().characters(), resource->path().length(), m_player->preservesPitch());
else
#endif
m_movie->load(url.characters(), url.length(), m_player->preservesPitch());
Modified: branches/safari-534.51-branch/Source/WebCore/platform/graphics/win/QTMovie.cpp (93645 => 93646)
--- branches/safari-534.51-branch/Source/WebCore/platform/graphics/win/QTMovie.cpp 2011-08-23 22:59:34 UTC (rev 93645)
+++ branches/safari-534.51-branch/Source/WebCore/platform/graphics/win/QTMovie.cpp 2011-08-23 23:01:06 UTC (rev 93646)
@@ -449,8 +449,10 @@
load(cfURL, preservesPitch);
- CFRelease(cfURL);
- CFRelease(urlStringRef);
+ if (cfURL)
+ CFRelease(cfURL);
+ if (urlStringRef)
+ CFRelease(urlStringRef);
}
void QTMovie::load(const UChar* url, int len, bool preservesPitch)
@@ -460,8 +462,10 @@
load(cfURL, preservesPitch);
- CFRelease(cfURL);
- CFRelease(urlStringRef);
+ if (cfURL)
+ CFRelease(cfURL);
+ if (urlStringRef)
+ CFRelease(urlStringRef);
}
void QTMovie::load(CFURLRef url, bool preservesPitch)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
