Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (145344 => 145345)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-03-11 08:30:59 UTC (rev 145344)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-03-11 08:32:10 UTC (rev 145345)
@@ -1,3 +1,18 @@
+2013-03-11 Jochen Eisinger <[email protected]>
+
+ [chromium] remove obsolete user gesture methods from WebFrame
+ https://bugs.webkit.org/show_bug.cgi?id=111696
+
+ Reviewed by Adam Barth.
+
+ * public/WebFrame.h:
+ (WebFrame):
+ * src/FrameLoaderClientImpl.cpp:
+ (WebKit::FrameLoaderClientImpl::dispatchDidNavigateWithinPage):
+ * src/WebFrameImpl.cpp:
+ * src/WebFrameImpl.h:
+ (WebFrameImpl):
+
2013-03-09 Sadrul Habib Chowdhury <[email protected]>
[chromium] Remove deprecated flingStart.sourceDevice from WebGestureEvent
Modified: trunk/Source/WebKit/chromium/public/WebFrame.h (145344 => 145345)
--- trunk/Source/WebKit/chromium/public/WebFrame.h 2013-03-11 08:30:59 UTC (rev 145344)
+++ trunk/Source/WebKit/chromium/public/WebFrame.h 2013-03-11 08:32:10 UTC (rev 145345)
@@ -402,12 +402,6 @@
// Returns the number of registered unload listeners.
virtual unsigned unloadListenerCount() const = 0;
- // Returns true if a user gesture is currently being processed. Deprecated.
- virtual bool isProcessingUserGesture() const = 0;
-
- // Returns true if a consumable gesture exists and has been successfully consumed. Deprecated.
- virtual bool consumeUserGesture() const = 0;
-
// Returns true if this frame is in the process of opening a new frame
// with a suppressed opener.
virtual bool willSuppressOpenerInNewFrame() const = 0;
Modified: trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (145344 => 145345)
--- trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2013-03-11 08:30:59 UTC (rev 145344)
+++ trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2013-03-11 08:32:10 UTC (rev 145345)
@@ -61,6 +61,7 @@
#endif
#include "Settings.h"
#include "SocketStreamHandleInternal.h"
+#include "UserGestureIndicator.h"
#if ENABLE(REQUEST_AUTOCOMPLETE)
#include "WebAutofillClient.h"
#endif
@@ -689,11 +690,11 @@
// proper fix for this bug is identified and applied the following
// block may no longer be required.
//
- // FIXME: Why do we call isProcessingUserGesture here but none of
+ // FIXME: Why do we call processingUserGesture here but none of
// the other ports do?
bool wasClientRedirect =
(url == m_expectedClientRedirectDest && chainEnd == m_expectedClientRedirectSrc)
- || !m_webFrame->isProcessingUserGesture();
+ || !UserGestureIndicator::processingUserGesture();
if (wasClientRedirect) {
if (m_webFrame->client())
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (145344 => 145345)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-03-11 08:30:59 UTC (rev 145344)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-03-11 08:32:10 UTC (rev 145345)
@@ -173,7 +173,6 @@
#include "WebScriptSource.h"
#include "WebSecurityOrigin.h"
#include "WebSerializedScriptValue.h"
-#include "WebUserGestureIndicator.h"
#include "WebViewImpl.h"
#include "XPathResult.h"
#include "htmlediting.h"
@@ -1108,16 +1107,6 @@
return frame()->document()->domWindow()->pendingUnloadEventListeners();
}
-bool WebFrameImpl::isProcessingUserGesture() const
-{
- return WebUserGestureIndicator::isProcessingUserGesture();
-}
-
-bool WebFrameImpl::consumeUserGesture() const
-{
- return WebUserGestureIndicator::consumeUserGesture();
-}
-
bool WebFrameImpl::willSuppressOpenerInNewFrame() const
{
return frame()->loader()->suppressOpenerInNewFrame();
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.h (145344 => 145345)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.h 2013-03-11 08:30:59 UTC (rev 145344)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.h 2013-03-11 08:32:10 UTC (rev 145345)
@@ -163,8 +163,6 @@
virtual WebURLLoader* createAssociatedURLLoader(const WebURLLoaderOptions&);
virtual void commitDocumentData(const char* data, size_t length);
virtual unsigned unloadListenerCount() const;
- virtual bool isProcessingUserGesture() const;
- virtual bool consumeUserGesture() const;
virtual bool willSuppressOpenerInNewFrame() const;
virtual void replaceSelection(const WebString&);
virtual void insertText(const WebString&);
Modified: trunk/Tools/ChangeLog (145344 => 145345)
--- trunk/Tools/ChangeLog 2013-03-11 08:30:59 UTC (rev 145344)
+++ trunk/Tools/ChangeLog 2013-03-11 08:32:10 UTC (rev 145345)
@@ -1,3 +1,14 @@
+2013-03-11 Jochen Eisinger <[email protected]>
+
+ [chromium] remove obsolete user gesture methods from WebFrame
+ https://bugs.webkit.org/show_bug.cgi?id=111696
+
+ Reviewed by Adam Barth.
+
+ * DumpRenderTree/chromium/TestRunner/src/TestPlugin.cpp:
+ (WebTestRunner::TestPlugin::handleInputEvent):
+ * DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:
+
2013-03-10 Silvia Pfeiffer <[email protected]>
Unreviewed, add myself to commiters.py.
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestPlugin.cpp (145344 => 145345)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestPlugin.cpp 2013-03-11 08:30:59 UTC (rev 145344)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestPlugin.cpp 2013-03-11 08:32:10 UTC (rev 145345)
@@ -33,6 +33,7 @@
#include "WebPluginParams.h"
#include "WebTestDelegate.h"
#include "WebTouchPoint.h"
+#include "WebUserGestureIndicator.h"
#include <public/Platform.h>
#include <public/WebCompositorSupport.h>
#include <public/WebGraphicsContext3D.h>
@@ -515,7 +516,7 @@
if (m_printEventDetails)
printEventDetails(m_delegate, event);
if (m_printUserGestureStatus)
- m_delegate->printMessage(std::string("* ") + (m_frame->isProcessingUserGesture() ? "" : "not ") + "handling user gesture\n");
+ m_delegate->printMessage(std::string("* ") + (WebUserGestureIndicator::isProcessingUserGesture() ? "" : "not ") + "handling user gesture\n");
return false;
}
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp (145344 => 145345)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp 2013-03-11 08:30:59 UTC (rev 145344)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp 2013-03-11 08:32:10 UTC (rev 145345)
@@ -59,6 +59,7 @@
#include "WebTestDelegate.h"
#include "WebTestInterfaces.h"
#include "WebTestRunner.h"
+#include "WebUserGestureIndicator.h"
#include "WebUserMediaClientMock.h"
#include "WebView.h"
// FIXME: Including platform_canvas.h here is a layering violation.
@@ -156,7 +157,7 @@
void printFrameUserGestureStatus(WebTestDelegate* delegate, WebFrame* frame, const char* msg)
{
- bool isUserGesture = frame->isProcessingUserGesture();
+ bool isUserGesture = WebUserGestureIndicator::isProcessingUserGesture();
delegate->printMessage(string("Frame with user gesture \"") + (isUserGesture ? "true" : "false") + "\"" + msg);
}
