Changeset 175759 in webkit

Timestamp:

Nov 7, 2014 12:35:23 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Make it possible to associate snapshots with back/forward list items other than the current item.
​https://bugs.webkit.org/show_bug.cgi?id=138490

Patch by Anshu Chimala <​anshu@apple.com> on 2014-11-07
Reviewed by Tim Horton.

• UIProcess/API/Cocoa/WKViewPrivate.h:

Declare -saveBackForwardSnapshotForItem:, an alternative to -saveBackForwardSnapshotForCurrentItem that accepts a
back/forward list item as an argument.

• UIProcess/API/mac/WKView.mm:

(-[WKView saveBackForwardSnapshotForItem:]):
Pass the provided back/forward list item along to WebPageProxy::recordNavigationSnapshot().

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::recordNavigationSnapshot):
Overloaded to optionally take a back/forward list item as an argument. If one isn't provided, default to the current item
as before; otherwise, associate the snapshot with whichever item was provided.

• UIProcess/WebPageProxy.h:

Declare the new recordNavigationSnapshot() overload.

• UIProcess/mac/ViewSnapshotStore.h:

Make recordSnapshot() take a back/forward list item as an argument.

• UIProcess/mac/ViewSnapshotStore.mm:

(WebKit::ViewSnapshotStore::recordSnapshot):
Store the snapshot in the provided back/forward list item instead of in the current item.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKViewPrivate.h (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/mac/ViewSnapshotStore.h (modified) (1 diff)
• UIProcess/mac/ViewSnapshotStore.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-07  Anshu Chimala  <anshu@apple.com>
+
+        Make it possible to associate snapshots with back/forward list items other than the current item.
+        https://bugs.webkit.org/show_bug.cgi?id=138490
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKViewPrivate.h:
+        Declare -saveBackForwardSnapshotForItem:, an alternative to -saveBackForwardSnapshotForCurrentItem that accepts a
+        back/forward list item as an argument.
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView saveBackForwardSnapshotForItem:]):
+        Pass the provided back/forward list item along to WebPageProxy::recordNavigationSnapshot().
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::recordNavigationSnapshot):
+        Overloaded to optionally take a back/forward list item as an argument. If one isn't provided, default to the current item
+        as before; otherwise, associate the snapshot with whichever item was provided.
+        * UIProcess/WebPageProxy.h:
+        Declare the new recordNavigationSnapshot() overload.
+
+        * UIProcess/mac/ViewSnapshotStore.h:
+        Make recordSnapshot() take a back/forward list item as an argument.
+        * UIProcess/mac/ViewSnapshotStore.mm:
+        (WebKit::ViewSnapshotStore::recordSnapshot):
+        Store the snapshot in the provided back/forward list item instead of in the current item.
+
 2014-11-07  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h

@@ -110 +110 @@
 
 - (void)saveBackForwardSnapshotForCurrentItem;
+- (void)saveBackForwardSnapshotForItem:(WKBackForwardListItemRef)item;
 
 // Views must be layer-backed, have no transform applied, be in back-to-front z-order, and the whole set must be a contiguous opaque rectangle.

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -3706 +3706 @@
 }
 
+- (void)saveBackForwardSnapshotForItem:(WKBackForwardListItemRef)item
+{
+    _data->_page->recordNavigationSnapshot(*toImpl(item));
+}
+
 - (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef
 {

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -907 +907 @@
 void WebPageProxy::recordNavigationSnapshot()
 {
+    if (WebBackForwardListItem* item = m_backForwardList->currentItem())
+        recordNavigationSnapshot(*item);
+}
+
+void WebPageProxy::recordNavigationSnapshot(WebBackForwardListItem& item)
+{
     if (!m_shouldRecordNavigationSnapshots)
         return;
 
 #if PLATFORM(COCOA)
-    ViewSnapshotStore::shared().recordSnapshot(*this);
+    ViewSnapshotStore::shared().recordSnapshot(*this, item);
+#else
+    UNUSED_PARAM(item);
 #endif
 }

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -901 +901 @@
     void setShouldRecordNavigationSnapshots(bool shouldRecordSnapshots) { m_shouldRecordNavigationSnapshots = shouldRecordSnapshots; }
     void recordNavigationSnapshot();
+    void recordNavigationSnapshot(WebBackForwardListItem&);
 
 #if PLATFORM(COCOA)

trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h

@@ -118 +118 @@
     static ViewSnapshotStore& shared();
 
-    void recordSnapshot(WebPageProxy&);
+    void recordSnapshot(WebPageProxy&, WebBackForwardListItem&);
 
     void discardSnapshotImages();

trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm

@@ -107 +107 @@
 }
 
-void ViewSnapshotStore::recordSnapshot(WebPageProxy& webPageProxy)
+void ViewSnapshotStore::recordSnapshot(WebPageProxy& webPageProxy, WebBackForwardListItem& item)
 {
     if (webPageProxy.isShowingNavigationGestureSnapshot())
         return;
 
-    WebBackForwardListItem* item = webPageProxy.backForwardList().currentItem();
-
-    if (!item)
-        return;
-
     pruneSnapshots(webPageProxy);
 
-    webPageProxy.willRecordNavigationSnapshot(*item);
+    webPageProxy.willRecordNavigationSnapshot(item);
 
     RefPtr<ViewSnapshot> snapshot = webPageProxy.takeViewSnapshot();
@@ -129 +124 @@
     snapshot->setBackgroundColor(webPageProxy.pageExtendedBackgroundColor());
 
-    item->setSnapshot(snapshot.release());
+    item.setSnapshot(snapshot.release());
 }