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

Unified Diff: content/renderer/pepper/ppb_image_data_impl.cc

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/npapi/webplugin_impl.cc ('k') | content/renderer/render_process_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/ppb_image_data_impl.cc
diff --git a/content/renderer/pepper/ppb_image_data_impl.cc b/content/renderer/pepper/ppb_image_data_impl.cc
index 80cc38dcd3dead824c9087574766442d7e1d8920..6abd8f50cf4ec0e57a045b652ab18dec4c3a1dd3 100644
--- a/content/renderer/pepper/ppb_image_data_impl.cc
+++ b/content/renderer/pepper/ppb_image_data_impl.cc
@@ -29,7 +29,7 @@ namespace {
// Returns true if the ImageData shared memory should be allocated in the
// browser process for the current platform.
bool IsBrowserAllocated() {
-#if defined(OS_POSIX) && !defined(TOOLKIT_GTK) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
// On the Mac, shared memory has to be created in the browser in order to
// work in the sandbox.
return true;
@@ -243,8 +243,6 @@ int32_t ImageDataPlatformBackend::GetSharedMemory(int* handle,
*byte_count = dib_->size();
#if defined(OS_WIN)
*handle = reinterpret_cast<intptr_t>(dib_->handle());
-#elif defined(TOOLKIT_GTK)
- *handle = static_cast<intptr_t>(dib_->handle());
#else
*handle = static_cast<intptr_t>(dib_->handle().fd);
#endif
« no previous file with comments | « content/renderer/npapi/webplugin_impl.cc ('k') | content/renderer/render_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698