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

Side by Side Diff: ui/surface/transport_dib_win.cc

Issue 1618703006: Remove duplicate typedef (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Try to remove spurious dependency Created 4 years, 10 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 #include "ui/surface/transport_dib.h" 5 #include "ui/surface/transport_dib.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 // static 51 // static
52 TransportDIB* TransportDIB::CreateWithHandle(Handle handle) { 52 TransportDIB* TransportDIB::CreateWithHandle(Handle handle) {
53 return new TransportDIB(handle); 53 return new TransportDIB(handle);
54 } 54 }
55 55
56 // static 56 // static
57 bool TransportDIB::is_valid_handle(Handle dib) { 57 bool TransportDIB::is_valid_handle(Handle dib) {
58 return dib.IsValid(); 58 return dib.IsValid();
59 } 59 }
60 60
61 skia::PlatformCanvas* TransportDIB::GetPlatformCanvas(int w, int h, 61 SkCanvas* TransportDIB::GetPlatformCanvas(int w, int h,
62 bool opaque) { 62 bool opaque) {
63 // This DIB already mapped the file into this process, but PlatformCanvas 63 // This DIB already mapped the file into this process, but PlatformCanvas
64 // will map it again. 64 // will map it again.
65 DCHECK(!memory()) << "Mapped file twice in the same process."; 65 DCHECK(!memory()) << "Mapped file twice in the same process.";
66 66
67 // We can't check the canvas size before mapping, but it's safe because 67 // We can't check the canvas size before mapping, but it's safe because
68 // Windows will fail to map the section if the dimensions of the canvas 68 // Windows will fail to map the section if the dimensions of the canvas
69 // are too large. 69 // are too large.
70 skia::PlatformCanvas* canvas = skia::CreatePlatformCanvas( 70 SkCanvas* canvas = skia::CreatePlatformCanvas(
71 w, h, opaque, shared_memory_.handle().GetHandle(), 71 w, h, opaque, shared_memory_.handle().GetHandle(),
72 skia::RETURN_NULL_ON_FAILURE); 72 skia::RETURN_NULL_ON_FAILURE);
73 73
74 // Calculate the size for the memory region backing the canvas. 74 // Calculate the size for the memory region backing the canvas.
75 if (canvas) 75 if (canvas)
76 size_ = skia::PlatformCanvasStrideForWidth(w) * h; 76 size_ = skia::PlatformCanvasStrideForWidth(w) * h;
77 77
78 return canvas; 78 return canvas;
79 } 79 }
80 80
(...skipping 10 matching lines...) Expand all
91 return false; 91 return false;
92 } 92 }
93 93
94 size_ = shared_memory_.mapped_size(); 94 size_ = shared_memory_.mapped_size();
95 return true; 95 return true;
96 } 96 }
97 97
98 void* TransportDIB::memory() const { 98 void* TransportDIB::memory() const {
99 return shared_memory_.memory(); 99 return shared_memory_.memory();
100 } 100 }
OLDNEW
« ui/gfx/canvas_paint_mac.mm ('K') | « ui/surface/transport_dib_posix.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698