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.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172307
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2014-08-07 Timothy Horton <timothy_horton@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 <enrica@apple.com>
[Services with UI] Action menu does not appear if selection includes both text and an image.
virtual LayerOrView *acceleratedCompositingRootLayer() const = 0;
virtual PassRefPtr<ViewSnapshot> takeViewSnapshot() = 0;
virtual void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) = 0;
- virtual void clearCustomSwipeViews() = 0;
#endif
#if USE(APPKIT)
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)
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;
notImplemented();
}
-void PageClientImpl::clearCustomSwipeViews()
-{
- notImplemented();
-}
-
void PageClientImpl::commitPotentialTapFailed()
{
[m_contentView _commitPotentialTapFailed];
virtual PassRefPtr<ViewSnapshot> takeViewSnapshot() override;
virtual void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) override;
- virtual void clearCustomSwipeViews() override;
virtual void accessibilityWebProcessTokenReceived(const IPC::DataReference&);
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)
{