Changeset 120694 in webkit

Timestamp:

Jun 19, 2012 1:55:09 AM (12 years ago)

Author:

sergio@webkit.org

Message:

Calling nativeImageForCurrentFrame() causes assertion failure: m_verifier.isSafeToUse()
​https://bugs.webkit.org/show_bug.cgi?id=67582

Reviewed by David Levin.

Source/WebCore:

Added a new synchronous method to the IconDatabase that returns a
native image for the platform instead of a WebCore::Image*.

• loader/icon/IconDatabase.cpp:

(WebCore::IconDatabase::synchronousNativeIconForPageURL):
(WebCore):

• loader/icon/IconDatabase.h:

(IconDatabase):

• loader/icon/IconDatabaseBase.h:

(WebCore::IconDatabaseBase::synchronousNativeIconForPageURL):
(IconDatabaseBase):

Source/WebKit/blackberry:

Use synchronousNativeIconForPageURL() to retrieve favicons.

• WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::dispatchDidReceiveIcon):

Source/WebKit/cf:

Fixes windows build.

• WebCoreSupport/WebInspectorClientCF.cpp:

Source/WebKit/efl:

Use synchronousNativeIconForPageURL() to retrieve favicons.

• ewk/ewk_history.cpp:

(ewk_history_item_icon_surface_get):
(ewk_history_item_icon_object_add):

• ewk/ewk_settings.cpp:

(ewk_settings_icon_database_icon_surface_get):
(ewk_settings_icon_database_icon_object_add):

Source/WebKit/gtk:

Use synchronousNativeIconForPageURL() to retrieve favicons.

• webkit/webkitfavicondatabase.cpp:

(getIconPixbufSynchronously):

Source/WebKit/qt:

Use synchronousNativeIconForPageURL() to retrieve favicons.

• Api/qwebhistory.cpp:

(QWebHistoryItem::icon):

• Api/qwebsettings.cpp:

(QWebSettings::iconForUrl):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/icon/IconDatabase.cpp (modified) (2 diffs)
• WebCore/loader/icon/IconDatabase.h (modified) (1 diff)
• WebCore/loader/icon/IconDatabaseBase.h (modified) (3 diffs)
• WebKit/blackberry/ChangeLog (modified) (1 diff)
• WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (modified) (1 diff)
• WebKit/cf/ChangeLog (modified) (1 diff)
• WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp (modified) (1 diff)
• WebKit/efl/ChangeLog (modified) (1 diff)
• WebKit/efl/ewk/ewk_history.cpp (modified) (2 diffs)
• WebKit/efl/ewk/ewk_settings.cpp (modified) (2 diffs)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/webkit/webkitfavicondatabase.cpp (modified) (2 diffs)
• WebKit/qt/Api/qwebhistory.cpp (modified) (1 diff)
• WebKit/qt/Api/qwebsettings.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/WebIconDatabase.cpp (modified) (1 diff)
• WebKit2/UIProcess/WebIconDatabase.h (modified) (2 diffs)
• WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-19  Sergio Villar Senin  <svillar@igalia.com>
+
+        Calling nativeImageForCurrentFrame() causes assertion failure: m_verifier.isSafeToUse()
+        https://bugs.webkit.org/show_bug.cgi?id=67582
+
+        Reviewed by David Levin.
+
+        Added a new synchronous method to the IconDatabase that returns a
+        native image for the platform instead of a WebCore::Image*.
+
+        * loader/icon/IconDatabase.cpp:
+        (WebCore::IconDatabase::synchronousNativeIconForPageURL):
+        (WebCore):
+        * loader/icon/IconDatabase.h:
+        (IconDatabase):
+        * loader/icon/IconDatabaseBase.h:
+        (WebCore::IconDatabaseBase::synchronousNativeIconForPageURL):
+        (IconDatabaseBase):
+
 2012-06-19  Andy Estes  <aestes@apple.com>
 

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

@@ -35 +35 @@
 #include "IconDatabaseClient.h"
 #include "IconRecord.h"
+#include "Image.h"
 #include "IntSize.h"
 #include "Logging.h"
@@ -291 +292 @@
     // delete the image on the secondary thread if the image already exists.
     return iconRecord->image(size);
+}
+
+NativeImagePtr IconDatabase::synchronousNativeIconForPageURL(const String& pageURLOriginal, const IntSize& size)
+{
+    Image* icon = synchronousIconForPageURL(pageURLOriginal, size);
+    if (!icon)
+        return 0;
+
+    MutexLocker locker(m_urlAndIconLock);
+    return icon->nativeImageForCurrentFrame();
 }
 

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

@@ -98 +98 @@
 
     virtual Image* synchronousIconForPageURL(const String&, const IntSize&);
+    virtual NativeImagePtr synchronousNativeIconForPageURL(const String& pageURLOriginal, const IntSize&);
     virtual String synchronousIconURLForPageURL(const String&);
     virtual bool synchronousIconDataKnownForIconURL(const String&);

trunk/Source/WebCore/loader/icon/IconDatabaseBase.h

@@ -27 +27 @@
 #define IconDatabaseBase_h
 
+#include "ImageSource.h"
 #include "SharedBuffer.h"
 
@@ -33 +34 @@
 #include <wtf/PassRefPtr.h>
 
-namespace WebCore { 
+namespace WebCore {
 
 class DocumentLoader;
@@ -179 +180 @@
     virtual IconLoadDecision synchronousLoadDecisionForIconURL(const String&, DocumentLoader*) { return IconLoadNo; }
     virtual Image* synchronousIconForPageURL(const String&, const IntSize&) { return 0; }
-    
+    virtual NativeImagePtr synchronousNativeIconForPageURL(const String&, const IntSize&) { return 0; }
+
     // Asynchronous calls we should use to replace the above when supported.
     virtual bool supportsAsynchronousMode() { return false; }

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-06-19  Sergio Villar Senin  <svillar@igalia.com>
+
+        Calling nativeImageForCurrentFrame() causes assertion failure: m_verifier.isSafeToUse()
+        https://bugs.webkit.org/show_bug.cgi?id=67582
+
+        Reviewed by David Levin.
+
+        Use synchronousNativeIconForPageURL() to retrieve favicons.
+
+        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+        (WebCore::FrameLoaderClientBlackBerry::dispatchDidReceiveIcon):
+
 2012-06-18  Antonio Gomes  <agomes@rim.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp

@@ -1150 +1150 @@
 {
     String url = m_frame->document()->url().string();
-    Image* img = iconDatabase().synchronousIconForPageURL(url, IntSize(10, 10));
-    if (!img || !img->data())
-        return;
-
-    NativeImageSkia* bitmap = img->nativeImageForCurrentFrame();
+    NativeImageSkia* bitmap = iconDatabase().synchronousNativeIconForPageURL(url, IntSize(10, 10));
     if (!bitmap)
         return;
+
     bitmap->lockPixels();
     String iconUrl = iconDatabase().synchronousIconURLForPageURL(url);

trunk/Source/WebKit/cf/ChangeLog

@@ +1 @@
+2012-06-19  Sergio Villar Senin  <svillar@igalia.com>
+
+        Calling nativeImageForCurrentFrame() causes assertion failure: m_verifier.isSafeToUse()
+        https://bugs.webkit.org/show_bug.cgi?id=67582
+
+        Reviewed by David Levin.
+
+        Fixes windows build.
+
+        * WebCoreSupport/WebInspectorClientCF.cpp:
+
 2011-12-20  Pavel Feldman  <pavel.feldman@gmail.com>
 

trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp

@@ -32 +32 @@
 #ifndef WTF_USE_CF
 #define WTF_USE_CF 1
+#endif
+
+#include <wtf/Platform.h>
+
+#if PLATFORM(WIN) && !OS(WINCE)
+#ifndef WTF_USE_CG
+#define WTF_USE_CG 1
+#endif
 #endif
 

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-06-19  Sergio Villar Senin  <svillar@igalia.com>
+
+        Calling nativeImageForCurrentFrame() causes assertion failure: m_verifier.isSafeToUse()
+        https://bugs.webkit.org/show_bug.cgi?id=67582
+
+        Reviewed by David Levin.
+
+        Use synchronousNativeIconForPageURL() to retrieve favicons.
+
+        * ewk/ewk_history.cpp:
+        (ewk_history_item_icon_surface_get):
+        (ewk_history_item_icon_object_add):
+        * ewk/ewk_settings.cpp:
+        (ewk_settings_icon_database_icon_surface_get):
+        (ewk_settings_icon_database_icon_object_add):
+
 2012-06-19  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebKit/efl/ewk/ewk_history.cpp

@@ -337 +337 @@
     EWK_HISTORY_ITEM_CORE_GET_OR_RETURN(item, core, 0);
 
-    WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(core->url(), WebCore::IntSize(16, 16));
+    WebCore::NativeImagePtr icon = WebCore::iconDatabase().synchronousNativeIconForPageURL(core->url(), WebCore::IntSize(16, 16));
+    if (!icon)
+        ERR("icon is NULL.");
+
+    return icon ? icon->surface() : 0;
+}
+
+Evas_Object* ewk_history_item_icon_object_add(const Ewk_History_Item* item, Evas* canvas)
+{
+    EWK_HISTORY_ITEM_CORE_GET_OR_RETURN(item, core, 0);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, 0);
+
+    WebCore::NativeImagePtr icon = WebCore::iconDatabase().synchronousNativeIconForPageURL(core->url(), WebCore::IntSize(16, 16));
     if (!icon) {
         ERR("icon is NULL.");
@@ -343 +355 @@
     }
 
-    WebCore::NativeImageCairo* nativeImage = icon->nativeImageForCurrentFrame();
-    return nativeImage ? nativeImage->surface() : 0;
-}
-
-Evas_Object* ewk_history_item_icon_object_add(const Ewk_History_Item* item, Evas* canvas)
-{
-    EWK_HISTORY_ITEM_CORE_GET_OR_RETURN(item, core, 0);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, 0);
-    WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(core->url(), WebCore::IntSize(16, 16));
-
-    if (!icon) {
-        ERR("icon is NULL.");
-        return 0;
-    }
-
-    WebCore::NativeImageCairo* nativeImage = icon->nativeImageForCurrentFrame();
-    return nativeImage ? ewk_util_image_from_cairo_surface_add(canvas, nativeImage->surface()) : 0;
+    cairo_surface_t* surface = icon->surface();
+    return surface ? ewk_util_image_from_cairo_surface_add(canvas, surface) : 0;
 }
 

trunk/Source/WebKit/efl/ewk/ewk_settings.cpp

@@ -208 +208 @@
 
     WebCore::KURL kurl(WebCore::KURL(), WTF::String::fromUTF8(url));
-    WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(kurl.string(), WebCore::IntSize(16, 16));
+    WebCore::NativeImagePtr icon = WebCore::iconDatabase().synchronousNativeIconForPageURL(kurl.string(), WebCore::IntSize(16, 16));
+    if (!icon)
+        ERR("no icon for url %s", url);
+
+    return icon ? icon->surface() : 0;
+}
+
+Evas_Object* ewk_settings_icon_database_icon_object_get(const char* url, Evas* canvas)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(url, 0);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, 0);
+
+    WebCore::KURL kurl(WebCore::KURL(), WTF::String::fromUTF8(url));
+    WebCore::NativeImagePtr icon = WebCore::iconDatabase().synchronousNativeIconForPageURL(kurl.string(), WebCore::IntSize(16, 16));
 
     if (!icon) {
@@ -215 +228 @@
     }
 
-    WebCore::NativeImageCairo* nativeImage = icon->nativeImageForCurrentFrame();
-    return nativeImage ? nativeImage->surface() : 0;
-}
-
-Evas_Object* ewk_settings_icon_database_icon_object_get(const char* url, Evas* canvas)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(url, 0);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, 0);
-
-    WebCore::KURL kurl(WebCore::KURL(), WTF::String::fromUTF8(url));
-    WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(kurl.string(), WebCore::IntSize(16, 16));
-
-    if (!icon) {
-        ERR("no icon for url %s", url);
-        return 0;
-    }
-
-    WebCore::NativeImageCairo* nativeImage = icon->nativeImageForCurrentFrame();
-    return nativeImage ? ewk_util_image_from_cairo_surface_add(canvas, nativeImage->surface()) : 0;
+    cairo_surface_t* surface = icon->surface();
+    return surface ? ewk_util_image_from_cairo_surface_add(canvas, surface) : 0;
 }
 

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-06-19  Sergio Villar Senin  <svillar@igalia.com>
+
+        Calling nativeImageForCurrentFrame() causes assertion failure: m_verifier.isSafeToUse()
+        https://bugs.webkit.org/show_bug.cgi?id=67582
+
+        Reviewed by David Levin.
+
+        Use synchronousNativeIconForPageURL() to retrieve favicons.
+
+        * webkit/webkitfavicondatabase.cpp:
+        (getIconPixbufSynchronously):
+
 2012-06-18  Mario Sanchez Prada  <msanchez@igalia.com>
 

trunk/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp

@@ -25 +25 @@
 #include "DatabaseTracker.h"
 #include "FileSystem.h"
+#include "GdkCairoUtilities.h"
 #include "IconDatabase.h"
 #include "IconDatabaseClient.h"
@@ -395 +396 @@
     // The exact size we pass is irrelevant to the iconDatabase code.
     // We must pass something greater than 0x0 to get a pixbuf.
-    Image* icon = iconDatabase().synchronousIconForPageURL(pageURL, !iconSize.isZero() ? iconSize : IntSize(1, 1));
+    NativeImagePtr icon = iconDatabase().synchronousNativeIconForPageURL(pageURL, !iconSize.isZero() ? iconSize : IntSize(1, 1));
     if (!icon)
         return 0;
 
-    GRefPtr<GdkPixbuf> pixbuf = adoptGRef(icon->getGdkPixbuf());
+    GRefPtr<GdkPixbuf> pixbuf = adoptGRef(cairoImageSurfaceToGdkPixbuf(icon->surface()));
     if (!pixbuf)
         return 0;
 
     // A size of (0, 0) means the maximum available size.
-    if (!iconSize.isZero() && (icon->width() != iconSize.width() || icon->height() != iconSize.height()))
+    int pixbufWidth = gdk_pixbuf_get_width(pixbuf.get());
+    int pixbufHeight = gdk_pixbuf_get_height(pixbuf.get());
+    if (!iconSize.isZero() && (pixbufWidth != iconSize.width() || pixbufHeight != iconSize.height()))
         pixbuf = gdk_pixbuf_scale_simple(pixbuf.get(), iconSize.width(), iconSize.height(), GDK_INTERP_BILINEAR);
     return pixbuf.leakRef();

trunk/Source/WebKit/qt/Api/qwebhistory.cpp

@@ -159 +159 @@
 {
     if (d->item)
-        return *WebCore::iconDatabase().synchronousIconForPageURL(d->item->url(), WebCore::IntSize(16, 16))->nativeImageForCurrentFrame();
+        return *WebCore::iconDatabase().synchronousNativeIconForPageURL(d->item->url(), WebCore::IntSize(16, 16));
 
     return QIcon();

trunk/Source/WebKit/qt/Api/qwebsettings.cpp

@@ -716 +716 @@
 {
     WebCore::initializeWebCoreQt();
-    WebCore::Image* image = WebCore::iconDatabase().synchronousIconForPageURL(WebCore::KURL(url).string(),
+    QPixmap* icon = WebCore::iconDatabase().synchronousNativeIconForPageURL(WebCore::KURL(url).string(),
                                 WebCore::IntSize(16, 16));
-    if (!image)
-        return QPixmap();
-
-    QPixmap* icon = image->nativeImageForCurrentFrame();
     if (!icon)
         return QPixmap();

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2012-06-19  Sergio Villar Senin  <svillar@igalia.com>
+
+        Calling nativeImageForCurrentFrame() causes assertion failure: m_verifier.isSafeToUse()
+        https://bugs.webkit.org/show_bug.cgi?id=67582
+
+        Reviewed by David Levin.
+
+        Use synchronousNativeIconForPageURL() to retrieve favicons.
+
+        * Api/qwebhistory.cpp:
+        (QWebHistoryItem::icon):
+        * Api/qwebsettings.cpp:
+        (QWebSettings::iconForUrl):
+
 2012-06-18  Andras Becsi  <andras.becsi@nokia.com>
 

trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp

@@ -191 +191 @@
 }
 
+WebCore::NativeImagePtr WebIconDatabase::nativeImageForPageURL(const String& pageURL, const WebCore::IntSize& iconSize)
+{
+    if (!m_webContext || !m_iconDatabaseImpl || !m_iconDatabaseImpl->isOpen() || pageURL.isEmpty())
+        return 0;
+
+    return m_iconDatabaseImpl->synchronousNativeIconForPageURL(pageURL, iconSize);
+}
+
 bool WebIconDatabase::isOpen()
 {

trunk/Source/WebKit2/UIProcess/WebIconDatabase.h

@@ -32 +32 @@
 #include "WebIconDatabaseClient.h"
 #include <WebCore/IconDatabaseClient.h>
+#include <WebCore/ImageSource.h>
 #include <WebCore/IntSize.h>
 #include <wtf/Forward.h>
@@ -79 +80 @@
 
     WebCore::Image* imageForPageURL(const String&, const WebCore::IntSize& iconSize = WebCore::IntSize(32, 32));
+    WebCore::NativeImagePtr nativeImageForPageURL(const String&, const WebCore::IntSize& iconSize = WebCore::IntSize(32, 32));
     bool isOpen();
 

trunk/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp

@@ -90 +90 @@
 
     WebCore::IntSize size(iconSize.width(), iconSize.height());
-    RefPtr<WebCore::Image> image = m_iconDatabase->imageForPageURL(pageURL, size);
-    if (!image)
-        return QImage();
 
-    QPixmap* nativeImage = image->nativeImageForCurrentFrame();
+    QPixmap* nativeImage = m_iconDatabase->nativeImageForPageURL(pageURL, size);
     if (!nativeImage)
         return QImage();