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

Side by Side Diff: Source/WebKit/chromium/src/WebPagePopupImpl.cpp

Issue 14296003: Remove TOUCH_EVENTS and TOUCH_EVENT_TRACKING compile-time flags. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 { 131 {
132 return PlatformPageClient(this); 132 return PlatformPageClient(this);
133 } 133 }
134 134
135 virtual void setCursor(const WebCore::Cursor& cursor) OVERRIDE 135 virtual void setCursor(const WebCore::Cursor& cursor) OVERRIDE
136 { 136 {
137 if (m_popup->m_webView->client()) 137 if (m_popup->m_webView->client())
138 m_popup->m_webView->client()->didChangeCursor(WebCursorInfo(cursor)) ; 138 m_popup->m_webView->client()->didChangeCursor(WebCursorInfo(cursor)) ;
139 } 139 }
140 140
141 #if ENABLE(TOUCH_EVENTS)
142 virtual void needTouchEvents(bool needsTouchEvents) OVERRIDE 141 virtual void needTouchEvents(bool needsTouchEvents) OVERRIDE
143 { 142 {
144 m_popup->widgetClient()->hasTouchEventHandlers(needsTouchEvents); 143 m_popup->widgetClient()->hasTouchEventHandlers(needsTouchEvents);
145 } 144 }
146 #endif // ENABLE(TOUCH_EVENTS)
147 145
148 // PageClientChromium methods: 146 // PageClientChromium methods:
149 virtual WebKit::WebScreenInfo screenInfo() OVERRIDE 147 virtual WebKit::WebScreenInfo screenInfo() OVERRIDE
150 { 148 {
151 return m_popup->m_webView->client()->screenInfo(); 149 return m_popup->m_webView->client()->screenInfo();
152 } 150 }
153 151
154 WebPagePopupImpl* m_popup; 152 WebPagePopupImpl* m_popup;
155 }; 153 };
156 154
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 // We need them because the closing operation is asynchronous and the widget 362 // We need them because the closing operation is asynchronous and the widget
365 // can be closed while the WebViewImpl is unaware of it. 363 // can be closed while the WebViewImpl is unaware of it.
366 return adoptRef(new WebPagePopupImpl(client)).leakRef(); 364 return adoptRef(new WebPagePopupImpl(client)).leakRef();
367 #else 365 #else
368 UNUSED_PARAM(client); 366 UNUSED_PARAM(client);
369 return 0; 367 return 0;
370 #endif 368 #endif
371 } 369 }
372 370
373 } // namespace WebKit 371 } // namespace WebKit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698