Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1084)

Unified Diff: Source/core/history/CachedFrame.cpp

Issue 14296003: Remove TOUCH_EVENTS and TOUCH_EVENT_TRACKING compile-time flags. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/TouchList.idl ('k') | Source/core/html/HTMLInputElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/history/CachedFrame.cpp
diff --git a/Source/core/history/CachedFrame.cpp b/Source/core/history/CachedFrame.cpp
index bef5e07a7fed37c61b590b446b80a9836a0c6e66..7f933e0b5b499b477568adeccc95b31fda6fafc3 100644
--- a/Source/core/history/CachedFrame.cpp
+++ b/Source/core/history/CachedFrame.cpp
@@ -28,6 +28,8 @@
#include "AnimationController.h"
#include "CachedFramePlatformData.h"
+#include "Chrome.h"
+#include "ChromeClient.h"
#include "DOMWindow.h"
#include "Document.h"
#include "DocumentLoader.h"
@@ -53,12 +55,6 @@
#include "SVGDocumentExtensions.h"
#endif
-#if ENABLE(TOUCH_EVENTS)
-#include "Chrome.h"
-#include "ChromeClient.h"
-#endif
-
-
namespace WebCore {
#ifndef NDEBUG
@@ -126,10 +122,8 @@ void CachedFrameBase::restore()
HistoryItem* historyItem = frame->loader()->history()->currentItem();
m_document->enqueuePopstateEvent(historyItem && historyItem->stateObject() ? historyItem->stateObject() : SerializedScriptValue::nullValue());
-#if ENABLE(TOUCH_EVENTS)
if (m_document->hasTouchEventHandlers())
m_document->page()->chrome()->client()->needTouchEvents(true);
-#endif
m_document->documentDidResumeFromPageCache();
}
« no previous file with comments | « Source/core/dom/TouchList.idl ('k') | Source/core/html/HTMLInputElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698