From fe84fda488a22a8077b50bc5050e319a5e2c14a6 Mon Sep 17 00:00:00 2001 From: "sjlee@webrtc.org" Date: Wed, 18 Sep 2013 01:37:31 +0000 Subject: [PATCH] Changing 'frame' method to 'bounds' method. BUG=2369 R=fischman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2223004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4773 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_render/ios/video_render_ios_gles20.mm | 14 +++++++------- .../video_render/ios/video_render_ios_view.mm | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/webrtc/modules/video_render/ios/video_render_ios_gles20.mm b/webrtc/modules/video_render/ios/video_render_ios_gles20.mm index a6b4738bd4..7bc46bfdad 100644 --- a/webrtc/modules/video_render/ios/video_render_ios_gles20.mm +++ b/webrtc/modules/video_render/ios/video_render_ios_gles20.mm @@ -234,11 +234,11 @@ int VideoRenderIosGles20::GetWindowRect(Rect& rect) { return -1; } - CGRect frame = [view_ frame]; - rect.top = frame.origin.x; - rect.left = frame.origin.y; - rect.bottom = frame.size.width; - rect.right = frame.size.height; + CGRect bounds = [view_ bounds]; + rect.top = bounds.origin.y; + rect.left = bounds.origin.x; + rect.bottom = bounds.size.height + bounds.origin.y; + rect.right = bounds.size.width + bounds.origin.x; return 0; } @@ -271,8 +271,8 @@ int VideoRenderIosGles20::StopRender() { int VideoRenderIosGles20::GetScreenResolution(uint& screen_width, uint& screen_height) { - screen_width = [view_ frame].size.width; - screen_height = [view_ frame].size.height; + screen_width = [view_ bounds].size.width; + screen_height = [view_ bounds].size.height; return 0; } diff --git a/webrtc/modules/video_render/ios/video_render_ios_view.mm b/webrtc/modules/video_render/ios/video_render_ios_view.mm index 1556659935..662c9676a6 100644 --- a/webrtc/modules/video_render/ios/video_render_ios_view.mm +++ b/webrtc/modules/video_render/ios/video_render_ios_view.mm @@ -121,8 +121,8 @@ using namespace webrtc; glBindFramebuffer(GL_FRAMEBUFFER, _defaultFrameBuffer); glViewport(0, 0, self.frame.size.width, self.frame.size.height); - return gles_renderer20_->Setup([self frame].size.width, - [self frame].size.height); + return gles_renderer20_->Setup([self bounds].size.width, + [self bounds].size.height); } - (BOOL)presentFramebuffer {