content/renderer/pepper_plugin_delegate_impl.cc - Issue 9271028: android build: progress on content and libjingle.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/pepper_plugin_delegate_impl.cc

Issue 9271028: android build: progress on content and libjingle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: simplify conditional to make work on non-Android Created 8 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:

Index: content/renderer/pepper_plugin_delegate_impl.cc

diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc

index 8bc1fb89596aa2ed5f2fc695ee99f66b8c27a685..af79687b619a648fdef796bc04dc0966bc844945 100644

--- a/content/renderer/pepper_plugin_delegate_impl.cc

+++ b/content/renderer/pepper_plugin_delegate_impl.cc

@@ -142,7 +142,7 @@ class PlatformImage2DImpl

*byte_count = dib_->size();

#if defined(OS_WIN)

return reinterpret_cast<intptr_t>(dib_->handle());

-#elif defined(OS_MACOSX)

+#elif defined(OS_MACOSX) || defined(OS_ANDROID)

return static_cast<intptr_t>(dib_->handle().fd);

#elif defined(OS_POSIX)

return static_cast<intptr_t>(dib_->handle());