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

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

Issue 334173006: Clean up GLSurfaceCGL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Incorporate review feedback Created 6 years, 6 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 <IOSurface/IOSurfaceAPI.h>
9 #include <list> 10 #include <list>
10 #include <map> 11 #include <map>
11 #include <string> 12 #include <string>
12 #include <utility> 13 #include <utility>
13 #include <vector> 14 #include <vector>
14 15
15 #include "base/mac/scoped_nsobject.h" 16 #include "base/mac/scoped_nsobject.h"
16 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
17 #include "base/memory/weak_ptr.h" 18 #include "base/memory/weak_ptr.h"
18 #include "base/time/time.h" 19 #include "base/time/time.h"
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 354
354 void SetTextInputActive(bool active); 355 void SetTextInputActive(bool active);
355 356
356 // Sends completed plugin IME notification and text back to the renderer. 357 // Sends completed plugin IME notification and text back to the renderer.
357 void PluginImeCompositionCompleted(const base::string16& text, int plugin_id); 358 void PluginImeCompositionCompleted(const base::string16& text, int plugin_id);
358 359
359 const std::string& selected_text() const { return selected_text_; } 360 const std::string& selected_text() const { return selected_text_; }
360 361
361 // Update the IOSurface to be drawn and call setNeedsDisplay on 362 // Update the IOSurface to be drawn and call setNeedsDisplay on
362 // |cocoa_view_|. 363 // |cocoa_view_|.
363 void CompositorSwapBuffers(uint64 surface_handle, 364 void CompositorSwapBuffers(IOSurfaceID surface_handle,
364 const gfx::Size& size, 365 const gfx::Size& size,
365 float scale_factor, 366 float scale_factor,
366 const std::vector<ui::LatencyInfo>& latency_info); 367 const std::vector<ui::LatencyInfo>& latency_info);
367 368
368 // Called when a GPU error is detected. Posts a task to destroy all 369 // Called when a GPU error is detected. Posts a task to destroy all
369 // compositing state. 370 // compositing state.
370 void GotAcceleratedCompositingError(); 371 void GotAcceleratedCompositingError();
371 372
372 // Sets the overlay view, which should be drawn in the same IOSurface 373 // Sets the overlay view, which should be drawn in the same IOSurface
373 // atop of this view, if both views are drawing accelerated content. 374 // atop of this view, if both views are drawing accelerated content.
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_; 615 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
615 616
616 base::WeakPtrFactory<RenderWidgetHostViewMac> 617 base::WeakPtrFactory<RenderWidgetHostViewMac>
617 software_frame_weak_ptr_factory_; 618 software_frame_weak_ptr_factory_;
618 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 619 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
619 }; 620 };
620 621
621 } // namespace content 622 } // namespace content
622 623
623 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 624 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698