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

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

Issue 14280004: Revert removal of events (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 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)
142 virtual void needTouchEvents(bool needsTouchEvents) OVERRIDE 143 virtual void needTouchEvents(bool needsTouchEvents) OVERRIDE
143 { 144 {
144 m_popup->widgetClient()->hasTouchEventHandlers(needsTouchEvents); 145 m_popup->widgetClient()->hasTouchEventHandlers(needsTouchEvents);
145 } 146 }
147 #endif // ENABLE(TOUCH_EVENTS)
146 148
147 // PageClientChromium methods: 149 // PageClientChromium methods:
148 virtual WebKit::WebScreenInfo screenInfo() OVERRIDE 150 virtual WebKit::WebScreenInfo screenInfo() OVERRIDE
149 { 151 {
150 return m_popup->m_webView->client()->screenInfo(); 152 return m_popup->m_webView->client()->screenInfo();
151 } 153 }
152 154
153 WebPagePopupImpl* m_popup; 155 WebPagePopupImpl* m_popup;
154 }; 156 };
155 157
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 // We need them because the closing operation is asynchronous and the widget 365 // We need them because the closing operation is asynchronous and the widget
364 // can be closed while the WebViewImpl is unaware of it. 366 // can be closed while the WebViewImpl is unaware of it.
365 return adoptRef(new WebPagePopupImpl(client)).leakRef(); 367 return adoptRef(new WebPagePopupImpl(client)).leakRef();
366 #else 368 #else
367 UNUSED_PARAM(client); 369 UNUSED_PARAM(client);
368 return 0; 370 return 0;
369 #endif 371 #endif
370 } 372 }
371 373
372 } // namespace WebKit 374 } // 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