OLD | NEW |
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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 virtual long long getCurrentTimeInMillisecond() OVERRIDE; | 96 virtual long long getCurrentTimeInMillisecond() OVERRIDE; |
97 virtual WebKit::WebString getAbsoluteWebStringFromUTF8Path(const std::string
& path) OVERRIDE; | 97 virtual WebKit::WebString getAbsoluteWebStringFromUTF8Path(const std::string
& path) OVERRIDE; |
98 virtual WebKit::WebURL localFileToDataURL(const WebKit::WebURL&) OVERRIDE; | 98 virtual WebKit::WebURL localFileToDataURL(const WebKit::WebURL&) OVERRIDE; |
99 virtual WebKit::WebURL rewriteLayoutTestsURL(const std::string&) OVERRIDE; | 99 virtual WebKit::WebURL rewriteLayoutTestsURL(const std::string&) OVERRIDE; |
100 virtual WebTestRunner::WebPreferences* preferences() OVERRIDE; | 100 virtual WebTestRunner::WebPreferences* preferences() OVERRIDE; |
101 virtual void applyPreferences() OVERRIDE; | 101 virtual void applyPreferences() OVERRIDE; |
102 virtual std::string makeURLErrorDescription(const WebKit::WebURLError&) OVER
RIDE; | 102 virtual std::string makeURLErrorDescription(const WebKit::WebURLError&) OVER
RIDE; |
103 virtual void setClientWindowRect(const WebKit::WebRect&) OVERRIDE; | 103 virtual void setClientWindowRect(const WebKit::WebRect&) OVERRIDE; |
104 virtual void showDevTools() OVERRIDE; | 104 virtual void showDevTools() OVERRIDE; |
105 virtual void closeDevTools() OVERRIDE; | 105 virtual void closeDevTools() OVERRIDE; |
| 106 virtual void didChooserOpen() OVERRIDE; |
| 107 virtual void didChooserClose() OVERRIDE; |
| 108 virtual bool isChooserShown() OVERRIDE; |
| 109 |
106 virtual void evaluateInWebInspector(long, const std::string&) OVERRIDE; | 110 virtual void evaluateInWebInspector(long, const std::string&) OVERRIDE; |
107 virtual void clearAllDatabases() OVERRIDE; | 111 virtual void clearAllDatabases() OVERRIDE; |
108 virtual void setDatabaseQuota(int) OVERRIDE; | 112 virtual void setDatabaseQuota(int) OVERRIDE; |
109 virtual void setDeviceScaleFactor(float) OVERRIDE; | 113 virtual void setDeviceScaleFactor(float) OVERRIDE; |
110 virtual void setFocus(WebTestRunner::WebTestProxyBase*, bool) OVERRIDE; | 114 virtual void setFocus(WebTestRunner::WebTestProxyBase*, bool) OVERRIDE; |
111 virtual void setAcceptAllCookies(bool) OVERRIDE; | 115 virtual void setAcceptAllCookies(bool) OVERRIDE; |
112 virtual std::string pathToLocalResource(const std::string& url) OVERRIDE; | 116 virtual std::string pathToLocalResource(const std::string& url) OVERRIDE; |
113 virtual void setLocale(const std::string&) OVERRIDE; | 117 virtual void setLocale(const std::string&) OVERRIDE; |
114 virtual void testFinished() OVERRIDE; | 118 virtual void testFinished() OVERRIDE; |
115 virtual void testTimedOut() OVERRIDE; | 119 virtual void testTimedOut() OVERRIDE; |
(...skipping 12 matching lines...) Expand all Loading... |
128 virtual bool navigate(const TestNavigationEntry&, bool reload); | 132 virtual bool navigate(const TestNavigationEntry&, bool reload); |
129 | 133 |
130 // WebKit::WebPrerendererClient | 134 // WebKit::WebPrerendererClient |
131 virtual void willAddPrerender(WebKit::WebPrerender*) OVERRIDE; | 135 virtual void willAddPrerender(WebKit::WebPrerender*) OVERRIDE; |
132 | 136 |
133 // WebKit::WebViewClient | 137 // WebKit::WebViewClient |
134 virtual WebKit::WebView* createView(WebKit::WebFrame*, const WebKit::WebURLR
equest&, const WebKit::WebWindowFeatures&, const WebKit::WebString&, WebKit::Web
NavigationPolicy); | 138 virtual WebKit::WebView* createView(WebKit::WebFrame*, const WebKit::WebURLR
equest&, const WebKit::WebWindowFeatures&, const WebKit::WebString&, WebKit::Web
NavigationPolicy); |
135 virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType); | 139 virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType); |
136 virtual WebKit::WebWidget* createPopupMenu(const WebKit::WebPopupMenuInfo&); | 140 virtual WebKit::WebWidget* createPopupMenu(const WebKit::WebPopupMenuInfo&); |
137 virtual WebKit::WebStorageNamespace* createSessionStorageNamespace(unsigned
quota); | 141 virtual WebKit::WebStorageNamespace* createSessionStorageNamespace(unsigned
quota); |
| 142 virtual WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserC
lient*, const WebKit::WebColor&) OVERRIDE; |
| 143 |
138 virtual void didAddMessageToConsole(const WebKit::WebConsoleMessage&, const
WebKit::WebString& sourceName, unsigned sourceLine); | 144 virtual void didAddMessageToConsole(const WebKit::WebConsoleMessage&, const
WebKit::WebString& sourceName, unsigned sourceLine); |
139 virtual void didStartLoading(); | 145 virtual void didStartLoading(); |
140 virtual void didStopLoading(); | 146 virtual void didStopLoading(); |
141 virtual bool shouldBeginEditing(const WebKit::WebRange&); | 147 virtual bool shouldBeginEditing(const WebKit::WebRange&); |
142 virtual bool shouldEndEditing(const WebKit::WebRange&); | 148 virtual bool shouldEndEditing(const WebKit::WebRange&); |
143 virtual bool shouldInsertNode(const WebKit::WebNode&, const WebKit::WebRange
&, WebKit::WebEditingAction); | 149 virtual bool shouldInsertNode(const WebKit::WebNode&, const WebKit::WebRange
&, WebKit::WebEditingAction); |
144 virtual bool shouldInsertText(const WebKit::WebString&, const WebKit::WebRan
ge&, WebKit::WebEditingAction); | 150 virtual bool shouldInsertText(const WebKit::WebString&, const WebKit::WebRan
ge&, WebKit::WebEditingAction); |
145 virtual bool shouldChangeSelectedRange(const WebKit::WebRange& from, const W
ebKit::WebRange& to, WebKit::WebTextAffinity, bool stillSelecting); | 151 virtual bool shouldChangeSelectedRange(const WebKit::WebRange& from, const W
ebKit::WebRange& to, WebKit::WebTextAffinity, bool stillSelecting); |
146 virtual bool shouldDeleteRange(const WebKit::WebRange&); | 152 virtual bool shouldDeleteRange(const WebKit::WebRange&); |
147 virtual bool shouldApplyStyle(const WebKit::WebString& style, const WebKit::
WebRange&); | 153 virtual bool shouldApplyStyle(const WebKit::WebString& style, const WebKit::
WebRange&); |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 | 282 |
277 OwnPtr<webkit_support::TestMediaStreamClient> m_testMediaStreamClient; | 283 OwnPtr<webkit_support::TestMediaStreamClient> m_testMediaStreamClient; |
278 | 284 |
279 OwnPtr<TestNavigationController> m_navigationController; | 285 OwnPtr<TestNavigationController> m_navigationController; |
280 | 286 |
281 WebTestRunner::WebTaskList m_taskList; | 287 WebTestRunner::WebTaskList m_taskList; |
282 Vector<WebKit::WebWidget*> m_popupmenus; | 288 Vector<WebKit::WebWidget*> m_popupmenus; |
283 | 289 |
284 OwnPtr<webkit_support::DRTLayerTreeViewClient> m_layerTreeViewClient; | 290 OwnPtr<webkit_support::DRTLayerTreeViewClient> m_layerTreeViewClient; |
285 OwnPtr<WebKit::WebLayerTreeView> m_layerTreeView; | 291 OwnPtr<WebKit::WebLayerTreeView> m_layerTreeView; |
| 292 |
| 293 int m_chooserCount; |
286 }; | 294 }; |
287 | 295 |
288 #endif // WebViewHost_h | 296 #endif // WebViewHost_h |
OLD | NEW |