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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view.h

Issue 7618036: mac: Only let two-finger-scrolling trigger history if web doesn't swallow gesture (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mark2 Created 9 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/renderer_host/render_widget_host.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #if defined(OS_MACOSX) 9 #if defined(OS_MACOSX)
10 #include <OpenGL/OpenGL.h> 10 #include <OpenGL/OpenGL.h>
11 #endif 11 #endif
12 12
13 #include <string> 13 #include <string>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/process_util.h" 16 #include "base/process_util.h"
17 #include "third_party/skia/include/core/SkBitmap.h" 17 #include "third_party/skia/include/core/SkBitmap.h"
18 #include "third_party/skia/include/core/SkColor.h" 18 #include "third_party/skia/include/core/SkColor.h"
19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
20 #include "ui/base/ime/text_input_type.h" 21 #include "ui/base/ime/text_input_type.h"
21 #include "ui/base/range/range.h" 22 #include "ui/base/range/range.h"
22 #include "ui/gfx/native_widget_types.h" 23 #include "ui/gfx/native_widget_types.h"
23 #include "ui/gfx/rect.h" 24 #include "ui/gfx/rect.h"
24 #include "ui/gfx/surface/transport_dib.h" 25 #include "ui/gfx/surface/transport_dib.h"
25 26
26 namespace gfx { 27 namespace gfx {
27 class Rect; 28 class Rect;
28 class Size; 29 class Size;
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 virtual gfx::PluginWindowHandle GetCompositingSurface() = 0; 290 virtual gfx::PluginWindowHandle GetCompositingSurface() = 0;
290 291
291 // Toggles visual muting of the render view area. This is on when a 292 // Toggles visual muting of the render view area. This is on when a
292 // constrained window is showing, for example. |color| is the shade of 293 // constrained window is showing, for example. |color| is the shade of
293 // the overlay that covers the render view. If |animate| is true, the overlay 294 // the overlay that covers the render view. If |animate| is true, the overlay
294 // gradually fades in; otherwise it takes effect immediately. To remove the 295 // gradually fades in; otherwise it takes effect immediately. To remove the
295 // fade effect, pass a NULL value for |color|. In this case, |animate| is 296 // fade effect, pass a NULL value for |color|. In this case, |animate| is
296 // ignored. 297 // ignored.
297 virtual void SetVisuallyDeemphasized(const SkColor* color, bool animate) = 0; 298 virtual void SetVisuallyDeemphasized(const SkColor* color, bool animate) = 0;
298 299
300 virtual void UnhandledWheelEvent(const WebKit::WebMouseWheelEvent& event) {}
jam 2011/08/15 19:54:54 it looks like most of the functions in this class
Nico 2011/08/15 20:11:52 What's the advantage of that? I then have to add e
301
302 virtual void SetHasHorizontalScrollbar(bool has_horizontal_scrollbar) {}
303 virtual void SetScrollOffsetPinning(
304 bool is_pinned_to_left, bool is_pinned_to_right) {}
305
299 void set_popup_type(WebKit::WebPopupType popup_type) { 306 void set_popup_type(WebKit::WebPopupType popup_type) {
300 popup_type_ = popup_type; 307 popup_type_ = popup_type;
301 } 308 }
302 WebKit::WebPopupType popup_type() const { return popup_type_; } 309 WebKit::WebPopupType popup_type() const { return popup_type_; }
303 310
304 // Subclasses should override this method to do what is appropriate to set 311 // Subclasses should override this method to do what is appropriate to set
305 // the custom background for their platform. 312 // the custom background for their platform.
306 virtual void SetBackground(const SkBitmap& background); 313 virtual void SetBackground(const SkBitmap& background);
307 const SkBitmap& background() const { return background_; } 314 const SkBitmap& background() const { return background_; }
308 315
(...skipping 22 matching lines...) Expand all
331 338
332 // The current reserved area in view coordinates where contents should not be 339 // The current reserved area in view coordinates where contents should not be
333 // rendered to draw the resize corner, sidebar mini tabs etc. 340 // rendered to draw the resize corner, sidebar mini tabs etc.
334 gfx::Rect reserved_rect_; 341 gfx::Rect reserved_rect_;
335 342
336 private: 343 private:
337 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostView); 344 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostView);
338 }; 345 };
339 346
340 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_ 347 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698