diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
| commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
| tree | e0af8413af65a8e30630563441af7bdb8478e513 /WebKit/gtk/webkit | |
| parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
| download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 | |
Merge WebKit at r72805: Initial merge by Git
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
Diffstat (limited to 'WebKit/gtk/webkit')
| -rw-r--r-- | WebKit/gtk/webkit/webkitwebdatasource.cpp | 2 | ||||
| -rw-r--r-- | WebKit/gtk/webkit/webkitwebframe.cpp | 4 | ||||
| -rw-r--r-- | WebKit/gtk/webkit/webkitwebview.cpp | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/WebKit/gtk/webkit/webkitwebdatasource.cpp b/WebKit/gtk/webkit/webkitwebdatasource.cpp index 3673a99..38c9c48 100644 --- a/WebKit/gtk/webkit/webkitwebdatasource.cpp +++ b/WebKit/gtk/webkit/webkitwebdatasource.cpp @@ -318,7 +318,7 @@ G_CONST_RETURN gchar* webkit_web_data_source_get_encoding(WebKitWebDataSource* w */ gboolean webkit_web_data_source_is_loading(WebKitWebDataSource* webDataSource) { - g_return_val_if_fail(WEBKIT_IS_WEB_DATA_SOURCE(webDataSource), FALSE); + g_return_val_if_fail(WEBKIT_IS_WEB_DATA_SOURCE(webDataSource), NULL); WebKitWebDataSourcePrivate* priv = webDataSource->priv; diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp index 0e0c3c6..fcb5197 100644 --- a/WebKit/gtk/webkit/webkitwebframe.cpp +++ b/WebKit/gtk/webkit/webkitwebframe.cpp @@ -847,7 +847,7 @@ gchar* webkit_web_frame_counter_value_for_element_by_id(WebKitWebFrame* frame, c */ int webkit_web_frame_page_number_for_element_by_id(WebKitWebFrame* frame, const gchar* id, float pageWidth, float pageHeight) { - g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), 0); + g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL); Frame* coreFrame = core(frame); if (!coreFrame) @@ -869,7 +869,7 @@ int webkit_web_frame_page_number_for_element_by_id(WebKitWebFrame* frame, const */ int webkit_web_frame_number_of_pages(WebKitWebFrame* frame, float pageWidth, float pageHeight) { - g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), 0); + g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL); Frame* coreFrame = core(frame); if (!coreFrame) diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp index 90be935..3e888f8 100644 --- a/WebKit/gtk/webkit/webkitwebview.cpp +++ b/WebKit/gtk/webkit/webkitwebview.cpp @@ -1670,10 +1670,8 @@ static gboolean webkit_web_view_query_tooltip(GtkWidget *widget, gint x, gint y, if (titleNode->isElementNode()) { String title = static_cast<Element*>(titleNode)->title(); if (!title.isEmpty()) { - if (FrameView* view = coreFrame->view()) { - GdkRectangle area = view->contentsToWindow(node->getRect()); - gtk_tooltip_set_tip_area(tooltip, &area); - } + GdkRectangle area = coreFrame->view()->contentsToWindow(node->getRect()); + gtk_tooltip_set_tip_area(tooltip, &area); gtk_tooltip_set_text(tooltip, title.utf8().data()); return TRUE; |