Title: [172307] trunk/Source/WebKit2
- Revision
- 172307
- Author
- timothy_hor...@apple.com
- Date
- 2014-08-07 16:29:31 -0700 (Thu, 07 Aug 2014)
Log Message
setCustomSwipeViews inside didChangeBackForwardList client callback is ignored
https://bugs.webkit.org/show_bug.cgi?id=135633
<rdar://problem/17926507>
Reviewed by Sam Weinig.
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didChangeBackForwardList):
* UIProcess/ios/PageClientImplIOS.h:
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::clearCustomSwipeViews): Deleted.
* UIProcess/mac/PageClientImpl.h:
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::clearCustomSwipeViews): Deleted.
WebKit clears the set of custom swipe views at the end of WebPageProxy::didChangeBackForwardList,
*after* calling into the client. This means that if the client wants to setCustomSwipeViews in
didChangeBackForwardList, it won't be respected.
Since there's only one client of this SPI, let's just stop clearing the list of custom swipe
views in WebKit and leave that totally up to the client.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (172306 => 172307)
--- trunk/Source/WebKit2/ChangeLog 2014-08-07 23:26:10 UTC (rev 172306)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-07 23:29:31 UTC (rev 172307)
@@ -1,3 +1,27 @@
+2014-08-07 Timothy Horton <timothy_hor...@apple.com>
+
+ setCustomSwipeViews inside didChangeBackForwardList client callback is ignored
+ https://bugs.webkit.org/show_bug.cgi?id=135633
+ <rdar://problem/17926507>
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didChangeBackForwardList):
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::clearCustomSwipeViews): Deleted.
+ * UIProcess/mac/PageClientImpl.h:
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::clearCustomSwipeViews): Deleted.
+ WebKit clears the set of custom swipe views at the end of WebPageProxy::didChangeBackForwardList,
+ *after* calling into the client. This means that if the client wants to setCustomSwipeViews in
+ didChangeBackForwardList, it won't be respected.
+
+ Since there's only one client of this SPI, let's just stop clearing the list of custom swipe
+ views in WebKit and leave that totally up to the client.
+
2014-08-07 Enrica Casucci <enr...@apple.com>
[Services with UI] Action menu does not appear if selection includes both text and an image.
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (172306 => 172307)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2014-08-07 23:26:10 UTC (rev 172306)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2014-08-07 23:29:31 UTC (rev 172307)
@@ -182,7 +182,6 @@
virtual LayerOrView *acceleratedCompositingRootLayer() const = 0;
virtual PassRefPtr<ViewSnapshot> takeViewSnapshot() = 0;
virtual void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) = 0;
- virtual void clearCustomSwipeViews() = 0;
#endif
#if USE(APPKIT)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (172306 => 172307)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-08-07 23:26:10 UTC (rev 172306)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-08-07 23:29:31 UTC (rev 172307)
@@ -962,10 +962,6 @@
m_pageLoadState.setCanGoBack(transaction, m_backForwardList->backItem());
m_pageLoadState.setCanGoForward(transaction, m_backForwardList->forwardItem());
-
-#if PLATFORM(MAC)
- m_pageClient.clearCustomSwipeViews();
-#endif
}
void WebPageProxy::willGoToBackForwardListItem(uint64_t itemID, IPC::MessageDecoder& decoder)
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (172306 => 172307)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2014-08-07 23:26:10 UTC (rev 172306)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2014-08-07 23:29:31 UTC (rev 172307)
@@ -107,7 +107,6 @@
virtual PassRefPtr<ViewSnapshot> takeViewSnapshot() override;
virtual void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) override;
- virtual void clearCustomSwipeViews() override;
virtual void commitPotentialTapFailed() override;
virtual void didGetTapHighlightGeometries(uint64_t requestID, const WebCore::Color&, const Vector<WebCore::FloatQuad>& highlightedQuads, const WebCore::IntSize& topLeftRadius, const WebCore::IntSize& topRightRadius, const WebCore::IntSize& bottomLeftRadius, const WebCore::IntSize& bottomRightRadius) override;
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (172306 => 172307)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-08-07 23:26:10 UTC (rev 172306)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-08-07 23:29:31 UTC (rev 172307)
@@ -476,11 +476,6 @@
notImplemented();
}
-void PageClientImpl::clearCustomSwipeViews()
-{
- notImplemented();
-}
-
void PageClientImpl::commitPotentialTapFailed()
{
[m_contentView _commitPotentialTapFailed];
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h (172306 => 172307)
--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2014-08-07 23:26:10 UTC (rev 172306)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2014-08-07 23:29:31 UTC (rev 172307)
@@ -126,7 +126,6 @@
virtual PassRefPtr<ViewSnapshot> takeViewSnapshot() override;
virtual void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) override;
- virtual void clearCustomSwipeViews() override;
virtual void accessibilityWebProcessTokenReceived(const IPC::DataReference&);
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (172306 => 172307)
--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-08-07 23:26:10 UTC (rev 172306)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-08-07 23:29:31 UTC (rev 172307)
@@ -612,11 +612,6 @@
return [m_wkView _executeSavedCommandBySelector:NSSelectorFromString(selectorString)];
}
-void PageClientImpl::clearCustomSwipeViews()
-{
- return [m_wkView _setCustomSwipeViews:@[]];
-}
-
#if USE(DICTATION_ALTERNATIVES)
uint64_t PageClientImpl::addDictationAlternatives(const RetainPtr<NSTextAlternatives>& alternatives)
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
