diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 16:12:30 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 10:37:18 +0100 |
| commit | d937470c29d31833299da3bb47599e43db82852b (patch) | |
| tree | 0de35aa2c6de41d02ac7324eee75d74a99685b00 /Source/WebKit/android/jni/WebCoreFrameBridge.cpp | |
| parent | 192c49d02eeb9cf618784ffef9639f8df38e3c16 (diff) | |
| download | external_webkit-d937470c29d31833299da3bb47599e43db82852b.zip external_webkit-d937470c29d31833299da3bb47599e43db82852b.tar.gz external_webkit-d937470c29d31833299da3bb47599e43db82852b.tar.bz2 | |
Merge WebKit at r80534: Fix IconDatabase uses.
WebCore::iconDatabase() now returns a reference rather than a
pointer. Update our calls to reflect this.
See http://trac.webkit.org/changeset/80299
Change-Id: Iebf2f199fd8913e227572753cee2cf3a2e380985
Diffstat (limited to 'Source/WebKit/android/jni/WebCoreFrameBridge.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index 5caf633..6d278f0 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -562,7 +562,7 @@ WebFrame::loadStarted(WebCore::Frame* frame) // send it along with the page started notification. jobject favicon = NULL; if (isMainFrame) { - WebCore::Image* icon = WebCore::iconDatabase()->iconForPageURL(urlString, WebCore::IntSize(16, 16)); + WebCore::Image* icon = WebCore::iconDatabase().iconForPageURL(urlString, WebCore::IntSize(16, 16)); if (icon) favicon = webcoreImageToJavaBitmap(env, icon); LOGV("favicons", "Starting load with icon %p for %s", icon, url.string().utf8().data()); |