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

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

Issue 6532004: DO NOT SUBMIT (Closed) Base URL: git://git.webkit.org/WebKit.git@master
Patch Set: Migrate WebTextHelper Created 9 years, 10 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
OLDNEW
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
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
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 WebRange WebPopupMenuImpl::compositionRange()
257 {
258 return WebRange();
259 }
260
255 WebTextInputType WebPopupMenuImpl::textInputType() 261 WebTextInputType WebPopupMenuImpl::textInputType()
256 { 262 {
257 return WebTextInputTypeNone; 263 return WebTextInputTypeNone;
258 } 264 }
259 265
260 WebRect WebPopupMenuImpl::caretOrSelectionBounds() 266 WebRect WebPopupMenuImpl::caretOrSelectionBounds()
261 { 267 {
262 return WebRect(); 268 return WebRect();
263 } 269 }
264 270
271 WebRange WebPopupMenuImpl::caretOrSelectionRange()
272 {
273 return WebRange();
274 }
275
265 void WebPopupMenuImpl::setTextDirection(WebTextDirection direction) 276 void WebPopupMenuImpl::setTextDirection(WebTextDirection direction)
266 { 277 {
267 } 278 }
268 279
269 280
270 //----------------------------------------------------------------------------- 281 //-----------------------------------------------------------------------------
271 // WebCore::HostWindow 282 // WebCore::HostWindow
272 283
273 void WebPopupMenuImpl::invalidateContents(const IntRect&, bool) 284 void WebPopupMenuImpl::invalidateContents(const IntRect&, bool)
274 { 285 {
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 { 353 {
343 ASSERT(widget == m_widget); 354 ASSERT(widget == m_widget);
344 if (m_widget) { 355 if (m_widget) {
345 m_widget->setClient(0); 356 m_widget->setClient(0);
346 m_widget = 0; 357 m_widget = 0;
347 } 358 }
348 m_client->closeWidgetSoon(); 359 m_client->closeWidgetSoon();
349 } 360 }
350 361
351 } // namespace WebKit 362 } // namespace WebKit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698