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

Side by Side Diff: Source/platform/graphics/GraphicsContext.cpp

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « Source/platform/graphics/FrameData.cpp ('k') | Source/platform/graphics/GraphicsContextState.h » ('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 * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2013 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Google Inc. All rights reserved.
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 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 1890 matching lines...) Expand 10 before | Expand all | Expand 10 after
1901 return ImageBuffer::createColorSpaceFilter(ColorSpaceLinearRGB, ColorSpa ceDeviceRGB); 1901 return ImageBuffer::createColorSpaceFilter(ColorSpaceLinearRGB, ColorSpa ceDeviceRGB);
1902 case ColorFilterSRGBToLinearRGB: 1902 case ColorFilterSRGBToLinearRGB:
1903 return ImageBuffer::createColorSpaceFilter(ColorSpaceDeviceRGB, ColorSpa ceLinearRGB); 1903 return ImageBuffer::createColorSpaceFilter(ColorSpaceDeviceRGB, ColorSpa ceLinearRGB);
1904 case ColorFilterNone: 1904 case ColorFilterNone:
1905 break; 1905 break;
1906 default: 1906 default:
1907 ASSERT_NOT_REACHED(); 1907 ASSERT_NOT_REACHED();
1908 break; 1908 break;
1909 } 1909 }
1910 1910
1911 return 0; 1911 return nullptr;
1912 } 1912 }
1913 1913
1914 #if OS(MACOSX) 1914 #if OS(MACOSX)
1915 CGColorSpaceRef PLATFORM_EXPORT deviceRGBColorSpaceRef() 1915 CGColorSpaceRef PLATFORM_EXPORT deviceRGBColorSpaceRef()
1916 { 1916 {
1917 static CGColorSpaceRef deviceSpace = CGColorSpaceCreateDeviceRGB(); 1917 static CGColorSpaceRef deviceSpace = CGColorSpaceCreateDeviceRGB();
1918 return deviceSpace; 1918 return deviceSpace;
1919 } 1919 }
1920 #else 1920 #else
1921 void GraphicsContext::draw2xMarker(SkBitmap* bitmap, int index) 1921 void GraphicsContext::draw2xMarker(SkBitmap* bitmap, int index)
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
2032 2032
2033 void GraphicsContext::didDrawTextInRect(const SkRect& textRect) 2033 void GraphicsContext::didDrawTextInRect(const SkRect& textRect)
2034 { 2034 {
2035 if (m_trackTextRegion) { 2035 if (m_trackTextRegion) {
2036 TRACE_EVENT0("skia", "PlatformContextSkia::trackTextRegion"); 2036 TRACE_EVENT0("skia", "PlatformContextSkia::trackTextRegion");
2037 m_textRegion.join(textRect); 2037 m_textRegion.join(textRect);
2038 } 2038 }
2039 } 2039 }
2040 2040
2041 } 2041 }
OLDNEW
« no previous file with comments | « Source/platform/graphics/FrameData.cpp ('k') | Source/platform/graphics/GraphicsContextState.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698