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

Side by Side Diff: Tools/DumpRenderTree/chromium/WebViewHost.h

Issue 9479030: Merge 108724 - Don't clear IntentRequest callback pointers on stop() (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 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) 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 19 matching lines...) Expand all
30 30
31 #ifndef WebViewHost_h 31 #ifndef WebViewHost_h
32 #define WebViewHost_h 32 #define WebViewHost_h
33 33
34 #include "MockSpellCheck.h" 34 #include "MockSpellCheck.h"
35 #include "Task.h" 35 #include "Task.h"
36 #include "TestNavigationController.h" 36 #include "TestNavigationController.h"
37 #include "WebAccessibilityNotification.h" 37 #include "WebAccessibilityNotification.h"
38 #include "WebCursorInfo.h" 38 #include "WebCursorInfo.h"
39 #include "WebFrameClient.h" 39 #include "WebFrameClient.h"
40 #include "WebIntentRequest.h"
40 #include "WebSpellCheckClient.h" 41 #include "WebSpellCheckClient.h"
41 #include "WebViewClient.h" 42 #include "WebViewClient.h"
42 #include <wtf/HashMap.h> 43 #include <wtf/HashMap.h>
43 #include <wtf/HashSet.h> 44 #include <wtf/HashSet.h>
44 #include <wtf/Vector.h> 45 #include <wtf/Vector.h>
45 #include <wtf/text/WTFString.h> 46 #include <wtf/text/WTFString.h>
46 47
47 class LayoutTestController; 48 class LayoutTestController;
48 class SkCanvas; 49 class SkCanvas;
49 class TestShell; 50 class TestShell;
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 virtual void removeIdentifierForRequest(unsigned identifier); 228 virtual void removeIdentifierForRequest(unsigned identifier);
228 virtual void willSendRequest(WebKit::WebFrame*, unsigned identifier, WebKit: :WebURLRequest&, const WebKit::WebURLResponse&); 229 virtual void willSendRequest(WebKit::WebFrame*, unsigned identifier, WebKit: :WebURLRequest&, const WebKit::WebURLResponse&);
229 virtual void didReceiveResponse(WebKit::WebFrame*, unsigned identifier, cons t WebKit::WebURLResponse&); 230 virtual void didReceiveResponse(WebKit::WebFrame*, unsigned identifier, cons t WebKit::WebURLResponse&);
230 virtual void didFinishResourceLoad(WebKit::WebFrame*, unsigned identifier); 231 virtual void didFinishResourceLoad(WebKit::WebFrame*, unsigned identifier);
231 virtual void didFailResourceLoad(WebKit::WebFrame*, unsigned identifier, con st WebKit::WebURLError&); 232 virtual void didFailResourceLoad(WebKit::WebFrame*, unsigned identifier, con st WebKit::WebURLError&);
232 virtual void didDisplayInsecureContent(WebKit::WebFrame*); 233 virtual void didDisplayInsecureContent(WebKit::WebFrame*);
233 virtual void didRunInsecureContent(WebKit::WebFrame*, const WebKit::WebSecur ityOrigin&, const WebKit::WebURL&); 234 virtual void didRunInsecureContent(WebKit::WebFrame*, const WebKit::WebSecur ityOrigin&, const WebKit::WebURL&);
234 virtual void didDetectXSS(WebKit::WebFrame*, const WebKit::WebURL&, bool did BlockEntirePage); 235 virtual void didDetectXSS(WebKit::WebFrame*, const WebKit::WebURL&, bool did BlockEntirePage);
235 virtual void openFileSystem(WebKit::WebFrame*, WebKit::WebFileSystem::Type, long long size, bool create, WebKit::WebFileSystemCallbacks*); 236 virtual void openFileSystem(WebKit::WebFrame*, WebKit::WebFileSystem::Type, long long size, bool create, WebKit::WebFileSystemCallbacks*);
236 virtual bool willCheckAndDispatchMessageEvent(WebKit::WebFrame* source, WebK it::WebSecurityOrigin target, WebKit::WebDOMMessageEvent); 237 virtual bool willCheckAndDispatchMessageEvent(WebKit::WebFrame* source, WebK it::WebSecurityOrigin target, WebKit::WebDOMMessageEvent);
238 virtual void dispatchIntent(WebKit::WebFrame* source, const WebKit::WebInten tRequest&);
237 239
238 WebKit::WebDeviceOrientationClientMock* deviceOrientationClientMock(); 240 WebKit::WebDeviceOrientationClientMock* deviceOrientationClientMock();
239 241
240 // Spellcheck related helper APIs 242 // Spellcheck related helper APIs
241 MockSpellCheck* mockSpellCheck(); 243 MockSpellCheck* mockSpellCheck();
242 void finishLastTextCheck(); 244 void finishLastTextCheck();
243 245
244 // Geolocation client mocks for LayoutTestController 246 // Geolocation client mocks for LayoutTestController
245 WebKit::WebGeolocationClientMock* geolocationClientMock(); 247 WebKit::WebGeolocationClientMock* geolocationClientMock();
246 248
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 Vector<WebKit::WebWidget*> m_popupmenus; 398 Vector<WebKit::WebWidget*> m_popupmenus;
397 399
398 #if ENABLE(POINTER_LOCK) 400 #if ENABLE(POINTER_LOCK)
399 bool m_pointerLocked; 401 bool m_pointerLocked;
400 enum { 402 enum {
401 PointerLockWillSucceed, 403 PointerLockWillSucceed,
402 PointerLockWillFailAsync, 404 PointerLockWillFailAsync,
403 PointerLockWillFailSync 405 PointerLockWillFailSync
404 } m_pointerLockPlannedResult; 406 } m_pointerLockPlannedResult;
405 #endif 407 #endif
408
409 // For web intents: holds the current request, if any.
410 WebKit::WebIntentRequest m_currentRequest;
406 }; 411 };
407 412
408 #endif // WebViewHost_h 413 #endif // WebViewHost_h
OLDNEW
« no previous file with comments | « Source/WebCore/Modules/intents/IntentRequest.cpp ('k') | Tools/DumpRenderTree/chromium/WebViewHost.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698