Title: [148052] trunk/Source/WebCore
- Revision
- 148052
- Author
- [email protected]
- Date
- 2013-04-09 14:28:50 -0700 (Tue, 09 Apr 2013)
Log Message
[wk2] IconDatabase images should be decoded in the WebProcess
https://bugs.webkit.org/show_bug.cgi?id=112524
<rdar://problem/10133914>
Reviewed by Simon Fraser.
Move an ASSERT that dereferenced a pointer inside the null-check for that pointer.
* loader/icon/IconDatabase.cpp:
(WebCore::IconDatabase::setIconBitmapForIconURL):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (148051 => 148052)
--- trunk/Source/WebCore/ChangeLog 2013-04-09 21:25:20 UTC (rev 148051)
+++ trunk/Source/WebCore/ChangeLog 2013-04-09 21:28:50 UTC (rev 148052)
@@ -1,3 +1,16 @@
+2013-04-09 Tim Horton <[email protected]>
+
+ [wk2] IconDatabase images should be decoded in the WebProcess
+ https://bugs.webkit.org/show_bug.cgi?id=112524
+ <rdar://problem/10133914>
+
+ Reviewed by Simon Fraser.
+
+ Move an ASSERT that dereferenced a pointer inside the null-check for that pointer.
+
+ * loader/icon/IconDatabase.cpp:
+ (WebCore::IconDatabase::setIconBitmapForIconURL):
+
2013-04-09 Eric Carlson <[email protected]>
[Mac] user caption styles not applied to correct element
Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (148051 => 148052)
--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2013-04-09 21:25:20 UTC (rev 148051)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2013-04-09 21:28:50 UTC (rev 148052)
@@ -598,7 +598,6 @@
void IconDatabase::setIconBitmapForIconURL(PassRefPtr<Image> imageOriginal, const String& iconURLOriginal)
{
ASSERT_NOT_SYNC_THREAD();
- ASSERT(imageOriginal->isBitmapImage());
// Cannot do anything with imageOriginal or iconURLOriginal that would end up storing them without deep copying first
@@ -607,6 +606,8 @@
RefPtr<Image> image;
if (imageOriginal) {
+ ASSERT(imageOriginal->isBitmapImage());
+
OwnPtr<ImageBuffer> imageBuffer = ImageBuffer::create(imageOriginal->size());
GraphicsContext* context = imageBuffer->context();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
