[haiku-webkit-commits] r332 - webkit/trunk/WebKit/haiku/API

  • From: webkit@xxxxxxxxxxxxxxx
  • To: haiku-webkit-commits@xxxxxxxxxxxxx
  • Date: Fri, 19 Mar 2010 13:02:02 +0000

Author: stippi
Date: Fri Mar 19 13:02:02 2010
New Revision: 332
URL: http://mmlr.dyndns.org/changeset/332

Log:
If an icon for a URL is not available, still post the reply message. The
notification is also used to potentially remove icons when the page changes.

Modified:
   webkit/trunk/WebKit/haiku/API/WebSettings.cpp

Modified: webkit/trunk/WebKit/haiku/API/WebSettings.cpp
==============================================================================
--- webkit/trunk/WebKit/haiku/API/WebSettings.cpp       Fri Mar 19 11:36:36 
2010        (r331)
+++ webkit/trunk/WebKit/haiku/API/WebSettings.cpp       Fri Mar 19 13:02:02 
2010        (r332)
@@ -371,15 +371,14 @@
     WebCore::Image* image = 
WebCore::iconDatabase()->iconForPageURL(url.String(),
         WebCore::IntSize(16, 16));
 
+    reply.AddString("url", url.String());
     if (image) {
         const BBitmap* bitmap = image->nativeImageForCurrentFrame();
         BMessage iconArchive;
-        if (bitmap && bitmap->Archive(&iconArchive) == B_OK) {
-            reply.AddString("url", url.String());
+        if (bitmap && bitmap->Archive(&iconArchive) == B_OK)
             reply.AddMessage("icon", &iconArchive);
-            target.SendMessage(&reply);
-        }
     }
+    target.SendMessage(&reply);
 }
 
 void BWebSettings::_HandleSetOfflineStoragePath(const BString& path)

Other related posts:

  • » [haiku-webkit-commits] r332 - webkit/trunk/WebKit/haiku/API - webkit