Title: [148969] trunk
- Revision
- 148969
- Author
- [email protected]
- Date
- 2013-04-23 09:03:46 -0700 (Tue, 23 Apr 2013)
Log Message
[BlackBerry] Do not access BackForwardListImpl from DRT
https://bugs.webkit.org/show_bug.cgi?id=115041
Patch by Xan Lopez <[email protected]> on 2013-04-23
Reviewed by Carlos Garcia Campos.
Source/WebKit/blackberry:
Export the necessary functionality in our BackForwardList port
client in order for DRT to work.
* WebCoreSupport/BackForwardListBlackBerry.cpp:
(WebCore::BackForwardListBlackBerry::backListWithLimit):
(WebCore):
(WebCore::BackForwardListBlackBerry::forwardListWithLimit):
(WebCore::BackForwardListBlackBerry::capacity):
* WebCoreSupport/BackForwardListBlackBerry.h:
(BackForwardListBlackBerry):
Tools:
Use the right class to access the bflist functionality.
* DumpRenderTree/blackberry/DumpRenderTree.cpp:
(BlackBerry::WebKit::dumpBackForwardListForWebView):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (148968 => 148969)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-04-23 15:53:15 UTC (rev 148968)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-04-23 16:03:46 UTC (rev 148969)
@@ -1,3 +1,21 @@
+2013-04-23 Xan Lopez <[email protected]>
+
+ [BlackBerry] Do not access BackForwardListImpl from DRT
+ https://bugs.webkit.org/show_bug.cgi?id=115041
+
+ Reviewed by Carlos Garcia Campos.
+
+ Export the necessary functionality in our BackForwardList port
+ client in order for DRT to work.
+
+ * WebCoreSupport/BackForwardListBlackBerry.cpp:
+ (WebCore::BackForwardListBlackBerry::backListWithLimit):
+ (WebCore):
+ (WebCore::BackForwardListBlackBerry::forwardListWithLimit):
+ (WebCore::BackForwardListBlackBerry::capacity):
+ * WebCoreSupport/BackForwardListBlackBerry.h:
+ (BackForwardListBlackBerry):
+
2013-04-23 Charles Wei <[email protected]>
[BlackBerry] Need to send out change event for date/color picker
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/BackForwardListBlackBerry.cpp (148968 => 148969)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/BackForwardListBlackBerry.cpp 2013-04-23 15:53:15 UTC (rev 148968)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/BackForwardListBlackBerry.cpp 2013-04-23 16:03:46 UTC (rev 148969)
@@ -112,6 +112,21 @@
return m_impl->entries();
}
+void BackForwardListBlackBerry::backListWithLimit(int limit, HistoryItemVector& list)
+{
+ m_impl->backListWithLimit(limit, list);
+}
+
+void BackForwardListBlackBerry::forwardListWithLimit(int limit, HistoryItemVector& list)
+{
+ m_impl->forwardListWithLimit(limit, list);
+}
+
+int BackForwardListBlackBerry::capacity()
+{
+ return m_impl->capacity();
+}
+
HistoryItem* BackForwardListBlackBerry::currentItem()
{
return m_impl->currentItem();
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/BackForwardListBlackBerry.h (148968 => 148969)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/BackForwardListBlackBerry.h 2013-04-23 15:53:15 UTC (rev 148968)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/BackForwardListBlackBerry.h 2013-04-23 16:03:46 UTC (rev 148969)
@@ -40,6 +40,9 @@
void clear();
HistoryItemVector& entries();
HistoryItem* currentItem();
+ void backListWithLimit(int, HistoryItemVector&);
+ void forwardListWithLimit(int, HistoryItemVector&);
+ int capacity();
private:
explicit BackForwardListBlackBerry(BlackBerry::WebKit::WebPagePrivate*);
Modified: trunk/Tools/ChangeLog (148968 => 148969)
--- trunk/Tools/ChangeLog 2013-04-23 15:53:15 UTC (rev 148968)
+++ trunk/Tools/ChangeLog 2013-04-23 16:03:46 UTC (rev 148969)
@@ -1,3 +1,15 @@
+2013-04-23 Xan Lopez <[email protected]>
+
+ [BlackBerry] Do not access BackForwardListImpl from DRT
+ https://bugs.webkit.org/show_bug.cgi?id=115041
+
+ Reviewed by Carlos Garcia Campos.
+
+ Use the right class to access the bflist functionality.
+
+ * DumpRenderTree/blackberry/DumpRenderTree.cpp:
+ (BlackBerry::WebKit::dumpBackForwardListForWebView):
+
2013-04-23 Carlos Garcia Campos <[email protected]>
[GTK] Add webkit_uri_request_get_http_headers to WebKit2 GTK+ API
Modified: trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp (148968 => 148969)
--- trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp 2013-04-23 15:53:15 UTC (rev 148968)
+++ trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp 2013-04-23 16:03:46 UTC (rev 148969)
@@ -22,7 +22,7 @@
#include "APICast.h"
#include "AccessibilityController.h"
#include "BackForwardController.h"
-#include "BackForwardListImpl.h"
+#include "BackForwardListBlackBerry.h"
#include "Credential.h"
#include "DatabaseTracker.h"
#include "DocumentLoader.h"
@@ -506,7 +506,8 @@
// FORMAT:
// " (file test):fast/loader/resources/click-fragment-link.html **nav target**"
// "curr-> (file test):fast/loader/resources/click-fragment-link.html#testfragment **nav target**"
- WebCore::BackForwardListImpl* bfList = static_cast<WebCore::BackForwardListImpl*>(mainFrame->page()->backForward()->client());
+ WebCore::BackForwardListBlackBerry* bfList = static_cast<WebCore::BackForwardListBlackBerry*>(mainFrame->page()->backForward()->client());
+
int maxItems = bfList->capacity();
WebCore::HistoryItemVector entries;
bfList->backListWithLimit(maxItems, entries);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
