[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mrobinson at webkit.org
mrobinson at webkit.org
Wed Dec 22 15:18:12 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit dcfa8d3aa9886a3ca25dba2cd6a6ef952a81558c
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 29 23:53:16 2010 +0000
2010-10-29 Martin Robinson <mrobinson at igalia.com>
Build fix for GTK+ after BackForwardListImpl introduction.
* webkit/webkitwebbackforwardlist.cpp:
(webkit_web_back_forward_list_new_with_web_view):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70955 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index cd11751..e7983ca 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-29 Martin Robinson <mrobinson at igalia.com>
+
+ Build fix for GTK+ after BackForwardListImpl introduction.
+
+ * webkit/webkitwebbackforwardlist.cpp:
+ (webkit_web_back_forward_list_new_with_web_view):
+
2010-10-29 Darin Adler <darin at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp b/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
index c5913fd..9b5bf8b 100644
--- a/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
+++ b/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
@@ -19,17 +19,15 @@
*/
#include "config.h"
-
#include "webkitwebbackforwardlist.h"
+
+#include "BackForwardListImpl.h"
+#include "HistoryItem.h"
#include "webkitprivate.h"
#include "webkitwebhistoryitem.h"
#include "webkitwebview.h"
-
#include <glib.h>
-#include "BackForwardListImpl.h"
-#include "HistoryItem.h"
-
/**
* SECTION:webkitwebbackforwardlist
* @short_description: The history of a #WebKitWebView
@@ -115,7 +113,7 @@ WebKitWebBackForwardList* webkit_web_back_forward_list_new_with_web_view(WebKitW
webBackForwardList = WEBKIT_WEB_BACK_FORWARD_LIST(g_object_new(WEBKIT_TYPE_WEB_BACK_FORWARD_LIST, NULL));
WebKitWebBackForwardListPrivate* priv = webBackForwardList->priv;
- priv->backForwardList = static_cast<BackForwardListImpl*>(core(webView)->backForwardList());
+ priv->backForwardList = static_cast<WebCore::BackForwardListImpl*>(core(webView)->backForwardList());
priv->backForwardList->setEnabled(TRUE);
return webBackForwardList;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list