OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 25 matching lines...) Expand all Loading... |
36 #include "FrameView.h" | 36 #include "FrameView.h" |
37 #include "IntRect.h" | 37 #include "IntRect.h" |
38 #include "painting/GraphicsContextBuilder.h" | 38 #include "painting/GraphicsContextBuilder.h" |
39 #include "PlatformKeyboardEvent.h" | 39 #include "PlatformKeyboardEvent.h" |
40 #include "PlatformMouseEvent.h" | 40 #include "PlatformMouseEvent.h" |
41 #include "PlatformWheelEvent.h" | 41 #include "PlatformWheelEvent.h" |
42 #include "SkiaUtils.h" | 42 #include "SkiaUtils.h" |
43 | 43 |
44 #include "WebInputEvent.h" | 44 #include "WebInputEvent.h" |
45 #include "WebInputEventConversion.h" | 45 #include "WebInputEventConversion.h" |
| 46 #include "WebRange.h" |
46 #include "WebRect.h" | 47 #include "WebRect.h" |
47 #include "WebWidgetClient.h" | 48 #include "WebWidgetClient.h" |
48 | 49 |
49 #include <skia/ext/platform_canvas.h> | 50 #include <skia/ext/platform_canvas.h> |
50 | 51 |
51 using namespace WebCore; | 52 using namespace WebCore; |
52 | 53 |
53 namespace WebKit { | 54 namespace WebKit { |
54 | 55 |
55 // WebPopupMenu --------------------------------------------------------------- | 56 // WebPopupMenu --------------------------------------------------------------- |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 bool WebPopupMenuImpl::confirmComposition() | 246 bool WebPopupMenuImpl::confirmComposition() |
246 { | 247 { |
247 return false; | 248 return false; |
248 } | 249 } |
249 | 250 |
250 bool WebPopupMenuImpl::confirmComposition(const WebString& text) | 251 bool WebPopupMenuImpl::confirmComposition(const WebString& text) |
251 { | 252 { |
252 return false; | 253 return false; |
253 } | 254 } |
254 | 255 |
| 256 bool WebPopupMenuImpl::compositionRange(unsigned* location, unsigned* length) |
| 257 { |
| 258 *location = 0; |
| 259 *length = 0; |
| 260 return false; |
| 261 } |
| 262 |
255 WebTextInputType WebPopupMenuImpl::textInputType() | 263 WebTextInputType WebPopupMenuImpl::textInputType() |
256 { | 264 { |
257 return WebTextInputTypeNone; | 265 return WebTextInputTypeNone; |
258 } | 266 } |
259 | 267 |
260 WebRect WebPopupMenuImpl::caretOrSelectionBounds() | 268 WebRect WebPopupMenuImpl::caretOrSelectionBounds() |
261 { | 269 { |
262 return WebRect(); | 270 return WebRect(); |
263 } | 271 } |
264 | 272 |
| 273 bool WebPopupMenuImpl::caretOrSelectionRange(unsigned* location, |
| 274 unsigned* length) |
| 275 { |
| 276 *location = 0; |
| 277 *length = 0; |
| 278 return false; |
| 279 } |
| 280 |
265 void WebPopupMenuImpl::setTextDirection(WebTextDirection direction) | 281 void WebPopupMenuImpl::setTextDirection(WebTextDirection direction) |
266 { | 282 { |
267 } | 283 } |
268 | 284 |
269 | 285 |
270 //----------------------------------------------------------------------------- | 286 //----------------------------------------------------------------------------- |
271 // WebCore::HostWindow | 287 // WebCore::HostWindow |
272 | 288 |
273 void WebPopupMenuImpl::invalidateContents(const IntRect&, bool) | 289 void WebPopupMenuImpl::invalidateContents(const IntRect&, bool) |
274 { | 290 { |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
342 { | 358 { |
343 ASSERT(widget == m_widget); | 359 ASSERT(widget == m_widget); |
344 if (m_widget) { | 360 if (m_widget) { |
345 m_widget->setClient(0); | 361 m_widget->setClient(0); |
346 m_widget = 0; | 362 m_widget = 0; |
347 } | 363 } |
348 m_client->closeWidgetSoon(); | 364 m_client->closeWidgetSoon(); |
349 } | 365 } |
350 | 366 |
351 } // namespace WebKit | 367 } // namespace WebKit |
OLD | NEW |