summaryrefslogtreecommitdiffstats
path: root/WebCore/page
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2009-06-22 14:16:36 -0400
committerPatrick Scott <phanna@android.com>2009-06-22 14:16:36 -0400
commit8b69ec781c68f4bbaccf6245ef1d562eed206be8 (patch)
tree20d6d05ea4dbc25633421f240823c22866e4bcc0 /WebCore/page
parent263a3894c3719057dcbd85b9094eba072da13511 (diff)
downloadexternal_webkit-8b69ec781c68f4bbaccf6245ef1d562eed206be8.zip
external_webkit-8b69ec781c68f4bbaccf6245ef1d562eed206be8.tar.gz
external_webkit-8b69ec781c68f4bbaccf6245ef1d562eed206be8.tar.bz2
Remove ANDROID_USER_GESTURE as the bug it fixed no longer applies.
I tested the original bug and found that without this change, the link works perfectly fine. The only thing that does not work with this change is redirects within iframes that are to non-http protocols. This is ok since iframes can always change the parent window's location if this is the desired behavior.
Diffstat (limited to 'WebCore/page')
-rw-r--r--WebCore/page/FrameLoadRequest.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/WebCore/page/FrameLoadRequest.h b/WebCore/page/FrameLoadRequest.h
index 0f92c45..b84a1ec 100644
--- a/WebCore/page/FrameLoadRequest.h
+++ b/WebCore/page/FrameLoadRequest.h
@@ -33,26 +33,17 @@ namespace WebCore {
struct FrameLoadRequest {
public:
FrameLoadRequest()
-#ifdef ANDROID_USER_GESTURE
- : m_wasUserGesture(true)
-#endif
{
}
FrameLoadRequest(const ResourceRequest& resourceRequest)
: m_resourceRequest(resourceRequest)
-#ifdef ANDROID_USER_GESTURE
- , m_wasUserGesture(true)
-#endif
{
}
FrameLoadRequest(const ResourceRequest& resourceRequest, const String& frameName)
: m_resourceRequest(resourceRequest)
, m_frameName(frameName)
-#ifdef ANDROID_USER_GESTURE
- , m_wasUserGesture(true)
-#endif
{
}
@@ -64,17 +55,9 @@ namespace WebCore {
const String& frameName() const { return m_frameName; }
void setFrameName(const String& frameName) { m_frameName = frameName; }
-#ifdef ANDROID_USER_GESTURE
- void setWasUserGesture(bool wasUserGesture) { m_wasUserGesture = wasUserGesture; }
- bool wasUserGesture() const { return m_wasUserGesture; }
-#endif
-
private:
ResourceRequest m_resourceRequest;
String m_frameName;
-#ifdef ANDROID_USER_GESTURE
- bool m_wasUserGesture;
-#endif
};
}