Changeset 148052 in webkit

Timestamp:

Apr 9, 2013, 2:28:50 PM (12 years ago)

Author:

timothy_horton@apple.com

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/icon/IconDatabase.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-09  Tim Horton  <timothy_horton@apple.com>
+
+        [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  <eric.carlson@apple.com>
 

trunk/Source/WebCore/loader/icon/IconDatabase.cpp

@@ -599 +599 @@
 {
     ASSERT_NOT_SYNC_THREAD();
-    ASSERT(imageOriginal->isBitmapImage());
     
     // Cannot do anything with imageOriginal or iconURLOriginal that would end up storing them without deep copying first
@@ -608 +607 @@
     RefPtr<Image> image;
     if (imageOriginal) {
+        ASSERT(imageOriginal->isBitmapImage());
+
         OwnPtr<ImageBuffer> imageBuffer = ImageBuffer::create(imageOriginal->size());
         GraphicsContext* context = imageBuffer->context();