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

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: 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 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 { 132 {
133 return PlatformPageClient(this); 133 return PlatformPageClient(this);
134 } 134 }
135 135
136 virtual void setCursor(const WebCore::Cursor& cursor) OVERRIDE 136 virtual void setCursor(const WebCore::Cursor& cursor) OVERRIDE
137 { 137 {
138 if (m_popup->m_webView->client()) 138 if (m_popup->m_webView->client())
139 m_popup->m_webView->client()->didChangeCursor(WebCursorInfo(cursor)) ; 139 m_popup->m_webView->client()->didChangeCursor(WebCursorInfo(cursor)) ;
140 } 140 }
141 141
142 #if ENABLE(TOUCH_EVENTS)
143 virtual void needTouchEvents(bool needsTouchEvents) OVERRIDE 142 virtual void needTouchEvents(bool needsTouchEvents) OVERRIDE
144 { 143 {
145 m_popup->widgetClient()->hasTouchEventHandlers(needsTouchEvents); 144 m_popup->widgetClient()->hasTouchEventHandlers(needsTouchEvents);
146 } 145 }
147 #endif // ENABLE(TOUCH_EVENTS)
148 146
149 // PageClientChromium methods: 147 // PageClientChromium methods:
150 virtual WebKit::WebScreenInfo screenInfo() OVERRIDE 148 virtual WebKit::WebScreenInfo screenInfo() OVERRIDE
151 { 149 {
152 return m_popup->m_webView->client()->screenInfo(); 150 return m_popup->m_webView->client()->screenInfo();
153 } 151 }
154 152
155 WebPagePopupImpl* m_popup; 153 WebPagePopupImpl* m_popup;
156 }; 154 };
157 155
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 // We need them because the closing operation is asynchronous and the widget 363 // We need them because the closing operation is asynchronous and the widget
366 // can be closed while the WebViewImpl is unaware of it. 364 // can be closed while the WebViewImpl is unaware of it.
367 return adoptRef(new WebPagePopupImpl(client)).leakRef(); 365 return adoptRef(new WebPagePopupImpl(client)).leakRef();
368 #else 366 #else
369 UNUSED_PARAM(client); 367 UNUSED_PARAM(client);
370 return 0; 368 return 0;
371 #endif 369 #endif
372 } 370 }
373 371
374 } // namespace WebKit 372 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebInputEventConversion.cpp ('k') | Source/WebKit/chromium/src/WebPopupMenuImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698