summaryrefslogtreecommitdiff
path: root/chromium/printing/metafile.h
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2013-11-21 14:09:57 +0100
committerAndras Becsi <andras.becsi@digia.com>2013-11-29 15:14:36 +0100
commiteb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch)
tree2c7c940e1dbee81b89d935626110816b494aa32c /chromium/printing/metafile.h
parent9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff)
downloadqtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/printing/metafile.h')
-rw-r--r--chromium/printing/metafile.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/printing/metafile.h b/chromium/printing/metafile.h
index ca0901b2b65..e331069b505 100644
--- a/chromium/printing/metafile.h
+++ b/chromium/printing/metafile.h
@@ -29,7 +29,7 @@ class Size;
class SkDevice;
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
namespace base {
struct FileDescriptor;
}
@@ -155,12 +155,12 @@ class PRINTING_EXPORT Metafile {
gfx::NativeDrawingContext context,
const CGRect rect,
const MacRenderPageParams& params) const = 0;
-#elif defined(OS_CHROMEOS)
+#elif defined(OS_CHROMEOS) || defined(OS_ANDROID)
// Saves the underlying data to the file associated with fd. This function
// should ONLY be called after the metafile is closed.
// Returns true if writing succeeded.
virtual bool SaveToFD(const base::FileDescriptor& fd) const = 0;
-#endif // if defined(OS_CHROMEOS)
+#endif // if defined(OS_CHROMEOS) || defined(OS_ANDROID)
};
} // namespace printing