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

Side by Side Diff: talk/media/devices/carbonvideorenderer.h

Issue 1553033002: Roll chromium_revision d66326c..4df108a (367167:367307) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Added references to bugs. Created 4 years, 11 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
« no previous file with comments | « talk/libjingle_tests.gyp ('k') | talk/media/devices/carbonvideorenderer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 static OSStatus DrawEventHandler(EventHandlerCallRef handler, 59 static OSStatus DrawEventHandler(EventHandlerCallRef handler,
60 EventRef event, 60 EventRef event,
61 void* data); 61 void* data);
62 rtc::scoped_ptr<uint8_t[]> image_; 62 rtc::scoped_ptr<uint8_t[]> image_;
63 rtc::CriticalSection image_crit_; 63 rtc::CriticalSection image_crit_;
64 int image_width_; 64 int image_width_;
65 int image_height_; 65 int image_height_;
66 int x_; 66 int x_;
67 int y_; 67 int y_;
68 CGImageRef image_ref_;
69 WindowRef window_ref_; 68 WindowRef window_ref_;
70 }; 69 };
71 70
72 } // namespace cricket 71 } // namespace cricket
73 72
74 #endif // TALK_MEDIA_DEVICES_CARBONVIDEORENDERER_H_ 73 #endif // TALK_MEDIA_DEVICES_CARBONVIDEORENDERER_H_
OLDNEW
« no previous file with comments | « talk/libjingle_tests.gyp ('k') | talk/media/devices/carbonvideorenderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698