OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ |
6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ | 6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ |
7 | 7 |
8 #include <deque> | 8 #include <deque> |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 24 matching lines...) Expand all Loading... | |
35 #include "content/public/common/top_controls_state.h" | 35 #include "content/public/common/top_controls_state.h" |
36 #include "content/public/renderer/render_view.h" | 36 #include "content/public/renderer/render_view.h" |
37 #include "content/renderer/mouse_lock_dispatcher.h" | 37 #include "content/renderer/mouse_lock_dispatcher.h" |
38 #include "content/renderer/render_frame_impl.h" | 38 #include "content/renderer/render_frame_impl.h" |
39 #include "content/renderer/render_view_pepper_helper.h" | 39 #include "content/renderer/render_view_pepper_helper.h" |
40 #include "content/renderer/render_widget.h" | 40 #include "content/renderer/render_widget.h" |
41 #include "content/renderer/renderer_webcookiejar_impl.h" | 41 #include "content/renderer/renderer_webcookiejar_impl.h" |
42 #include "content/renderer/stats_collection_observer.h" | 42 #include "content/renderer/stats_collection_observer.h" |
43 #include "ipc/ipc_platform_file.h" | 43 #include "ipc/ipc_platform_file.h" |
44 #include "third_party/WebKit/public/platform/WebFileSystem.h" | 44 #include "third_party/WebKit/public/platform/WebFileSystem.h" |
45 #include "third_party/WebKit/public/platform/WebFloatSize.h" | |
45 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" | 46 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" |
46 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" | 47 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" |
47 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" | 48 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" |
48 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" | 49 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" |
49 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" | 50 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" |
50 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIconURL.h" | 51 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIconURL.h" |
51 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 52 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
52 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationType.h" | 53 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationType.h" |
53 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" | 54 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" |
54 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializerClie nt.h" | 55 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializerClie nt.h" |
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
437 const WebKit::WebString& path, | 438 const WebKit::WebString& path, |
438 WebKit::WebFileChooserCompletion* chooser_completion); | 439 WebKit::WebFileChooserCompletion* chooser_completion); |
439 virtual void initializeHelperPluginWebFrame(WebKit::WebHelperPlugin*); | 440 virtual void initializeHelperPluginWebFrame(WebKit::WebHelperPlugin*); |
440 virtual void didStartLoading(); | 441 virtual void didStartLoading(); |
441 virtual void didStopLoading(); | 442 virtual void didStopLoading(); |
442 virtual void didChangeLoadProgress(WebKit::WebFrame* frame, | 443 virtual void didChangeLoadProgress(WebKit::WebFrame* frame, |
443 double load_progress); | 444 double load_progress); |
444 virtual void didCancelCompositionOnSelectionChange(); | 445 virtual void didCancelCompositionOnSelectionChange(); |
445 virtual void didChangeSelection(bool is_selection_empty); | 446 virtual void didChangeSelection(bool is_selection_empty); |
446 virtual void didExecuteCommand(const WebKit::WebString& command_name); | 447 virtual void didExecuteCommand(const WebKit::WebString& command_name); |
448 virtual void didScrollWithKeyboard(const WebKit::WebFloatSize& delta); | |
jamesr
2013/06/10 23:48:31
scrolls from the WebKit API are always integer del
Jinsuk Kim
2013/06/11 04:53:18
Done. Updated https://codereview.chromium.org/1573
| |
447 virtual bool handleCurrentKeyboardEvent(); | 449 virtual bool handleCurrentKeyboardEvent(); |
448 virtual WebKit::WebColorChooser* createColorChooser( | 450 virtual WebKit::WebColorChooser* createColorChooser( |
449 WebKit::WebColorChooserClient*, const WebKit::WebColor& initial_color); | 451 WebKit::WebColorChooserClient*, const WebKit::WebColor& initial_color); |
450 virtual bool runFileChooser( | 452 virtual bool runFileChooser( |
451 const WebKit::WebFileChooserParams& params, | 453 const WebKit::WebFileChooserParams& params, |
452 WebKit::WebFileChooserCompletion* chooser_completion); | 454 WebKit::WebFileChooserCompletion* chooser_completion); |
453 virtual void runModalAlertDialog(WebKit::WebFrame* frame, | 455 virtual void runModalAlertDialog(WebKit::WebFrame* frame, |
454 const WebKit::WebString& message); | 456 const WebKit::WebString& message); |
455 virtual bool runModalConfirmDialog(WebKit::WebFrame* frame, | 457 virtual bool runModalConfirmDialog(WebKit::WebFrame* frame, |
456 const WebKit::WebString& message); | 458 const WebKit::WebString& message); |
(...skipping 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1555 // use the Observer interface to filter IPC messages and receive frame change | 1557 // use the Observer interface to filter IPC messages and receive frame change |
1556 // notifications. | 1558 // notifications. |
1557 // --------------------------------------------------------------------------- | 1559 // --------------------------------------------------------------------------- |
1558 | 1560 |
1559 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); | 1561 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); |
1560 }; | 1562 }; |
1561 | 1563 |
1562 } // namespace content | 1564 } // namespace content |
1563 | 1565 |
1564 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ | 1566 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ |
OLD | NEW |