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

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

Issue 227043012: mac: History swiping doesn't work right with iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to comment from avi. Created 6 years, 8 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 // 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_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE; 327 virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE;
328 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; 328 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
329 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 329 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
330 330
331 virtual void SetHasHorizontalScrollbar( 331 virtual void SetHasHorizontalScrollbar(
332 bool has_horizontal_scrollbar) OVERRIDE; 332 bool has_horizontal_scrollbar) OVERRIDE;
333 virtual void SetScrollOffsetPinning( 333 virtual void SetScrollOffsetPinning(
334 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; 334 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
335 virtual bool LockMouse() OVERRIDE; 335 virtual bool LockMouse() OVERRIDE;
336 virtual void UnlockMouse() OVERRIDE; 336 virtual void UnlockMouse() OVERRIDE;
337 virtual void UnhandledWheelEvent( 337 virtual void HandledWheelEvent(const blink::WebMouseWheelEvent& event,
338 const blink::WebMouseWheelEvent& event) OVERRIDE; 338 bool consumed) OVERRIDE;
339 339
340 // IPC::Sender implementation. 340 // IPC::Sender implementation.
341 virtual bool Send(IPC::Message* message) OVERRIDE; 341 virtual bool Send(IPC::Message* message) OVERRIDE;
342 342
343 // SoftwareFrameManagerClient implementation: 343 // SoftwareFrameManagerClient implementation:
344 virtual void SoftwareFrameWasFreed( 344 virtual void SoftwareFrameWasFreed(
345 uint32 output_surface_id, unsigned frame_id) OVERRIDE; 345 uint32 output_surface_id, unsigned frame_id) OVERRIDE;
346 virtual void ReleaseReferencesToSoftwareFrame() OVERRIDE; 346 virtual void ReleaseReferencesToSoftwareFrame() OVERRIDE;
347 347
348 virtual SkBitmap::Config PreferredReadbackFormat() OVERRIDE; 348 virtual SkBitmap::Config PreferredReadbackFormat() OVERRIDE;
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_; 641 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
642 642
643 base::WeakPtrFactory<RenderWidgetHostViewMac> 643 base::WeakPtrFactory<RenderWidgetHostViewMac>
644 software_frame_weak_ptr_factory_; 644 software_frame_weak_ptr_factory_;
645 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 645 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
646 }; 646 };
647 647
648 } // namespace content 648 } // namespace content
649 649
650 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 650 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698