Title: [170613] trunk/Source/WebKit2
- Revision
- 170613
- Author
- [email protected]
- Date
- 2014-06-30 16:26:42 -0700 (Mon, 30 Jun 2014)
Log Message
WebBackForwardListItems should hold on to PageState objects
https://bugs.webkit.org/show_bug.cgi?id=134467
Reviewed by Darin Adler.
* Shared/WebBackForwardListItem.cpp:
(WebKit::WebBackForwardListItem::WebBackForwardListItem):
(WebKit::WebBackForwardListItem::encode):
* Shared/WebBackForwardListItem.h:
(WebKit::WebBackForwardListItem::setOriginalURL):
(WebKit::WebBackForwardListItem::originalURL):
(WebKit::WebBackForwardListItem::setURL):
(WebKit::WebBackForwardListItem::url):
(WebKit::WebBackForwardListItem::setTitle):
(WebKit::WebBackForwardListItem::title):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170612 => 170613)
--- trunk/Source/WebKit2/ChangeLog 2014-06-30 23:24:15 UTC (rev 170612)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-30 23:26:42 UTC (rev 170613)
@@ -1,3 +1,21 @@
+2014-06-30 Anders Carlsson <[email protected]>
+
+ WebBackForwardListItems should hold on to PageState objects
+ https://bugs.webkit.org/show_bug.cgi?id=134467
+
+ Reviewed by Darin Adler.
+
+ * Shared/WebBackForwardListItem.cpp:
+ (WebKit::WebBackForwardListItem::WebBackForwardListItem):
+ (WebKit::WebBackForwardListItem::encode):
+ * Shared/WebBackForwardListItem.h:
+ (WebKit::WebBackForwardListItem::setOriginalURL):
+ (WebKit::WebBackForwardListItem::originalURL):
+ (WebKit::WebBackForwardListItem::setURL):
+ (WebKit::WebBackForwardListItem::url):
+ (WebKit::WebBackForwardListItem::setTitle):
+ (WebKit::WebBackForwardListItem::title):
+
2014-06-30 Benjamin Poulain <[email protected]>
Add a missing semicolon in WKContentViewInteraction
Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp (170612 => 170613)
--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp 2014-06-30 23:24:15 UTC (rev 170612)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp 2014-06-30 23:26:42 UTC (rev 170613)
@@ -34,11 +34,12 @@
static uint64_t highestUsedItemID = 0;
WebBackForwardListItem::WebBackForwardListItem(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID)
- : m_originalURL(originalURL)
- , m_url(url)
- , m_title(title)
- , m_itemID(itemID)
+ : m_itemID(itemID)
{
+ m_pageState.mainFrameState.originalURLString = originalURL;
+ m_pageState.mainFrameState.urlString = url;
+ m_pageState.title = title;
+
if (m_itemID > highestUsedItemID)
highestUsedItemID = m_itemID;
@@ -63,9 +64,9 @@
void WebBackForwardListItem::encode(IPC::ArgumentEncoder& encoder) const
{
- encoder << m_originalURL;
- encoder << m_url;
- encoder << m_title;
+ encoder << m_pageState.mainFrameState.originalURLString;
+ encoder << m_pageState.mainFrameState.urlString;
+ encoder << m_pageState.title;
encoder << m_itemID;
encoder << IPC::DataReference(m_backForwardData);
}
Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.h (170612 => 170613)
--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2014-06-30 23:24:15 UTC (rev 170612)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2014-06-30 23:26:42 UTC (rev 170613)
@@ -27,6 +27,7 @@
#define WebBackForwardListItem_h
#include "APIObject.h"
+#include "SessionState.h"
#include <wtf/PassRefPtr.h>
#include <wtf/text/WTFString.h>
@@ -48,14 +49,14 @@
uint64_t itemID() const { return m_itemID; }
- void setOriginalURL(const String& originalURL) { m_originalURL = originalURL; }
- const String& originalURL() const { return m_originalURL; }
+ void setOriginalURL(const String& originalURL) { m_pageState.mainFrameState.originalURLString = originalURL; }
+ const String& originalURL() const { return m_pageState.mainFrameState.originalURLString; }
- void setURL(const String& url) { m_url = url; }
- const String& url() const { return m_url; }
+ void setURL(const String& url) { m_pageState.mainFrameState.urlString = url; }
+ const String& url() const { return m_pageState.mainFrameState.urlString; }
- void setTitle(const String& title) { m_title = title; }
- const String& title() const { return m_title; }
+ void setTitle(const String& title) { m_pageState.title = title; }
+ const String& title() const { return m_pageState.title; }
void setBackForwardData(const uint8_t* buffer, size_t size);
const Vector<uint8_t>& backForwardData() const { return m_backForwardData; }
@@ -71,9 +72,7 @@
private:
WebBackForwardListItem(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID);
- String m_originalURL;
- String m_url;
- String m_title;
+ PageState m_pageState;
uint64_t m_itemID;
Vector<uint8_t> m_backForwardData;
String m_snapshotUUID;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
