third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Side by Side Diff: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« no previous file with comments | « third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModuleTest.cpp ('k') | third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DAPITest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.	2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.

3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)	3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)

4 * Copyright (C) 2007 Alp Toker <alp@atoker.com>	4 * Copyright (C) 2007 Alp Toker <alp@atoker.com>

5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>	5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>

6 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>	6 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>

7 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.	7 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.

8 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.	8 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.

9 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.	9 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.

10 *	10 *

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55 #include "platform/graphics/DrawLooperBuilder.h"	55 #include "platform/graphics/DrawLooperBuilder.h"

56 #include "platform/graphics/ExpensiveCanvasHeuristicParameters.h"	56 #include "platform/graphics/ExpensiveCanvasHeuristicParameters.h"

57 #include "platform/graphics/ImageBuffer.h"	57 #include "platform/graphics/ImageBuffer.h"

58 #include "platform/graphics/StrokeData.h"	58 #include "platform/graphics/StrokeData.h"

59 #include "platform/graphics/skia/SkiaUtils.h"	59 #include "platform/graphics/skia/SkiaUtils.h"

60 #include "platform/text/BidiTextRun.h"	60 #include "platform/text/BidiTextRun.h"

61 #include "public/platform/Platform.h"	61 #include "public/platform/Platform.h"

62 #include "third_party/skia/include/core/SkCanvas.h"	62 #include "third_party/skia/include/core/SkCanvas.h"

63 #include "third_party/skia/include/core/SkImageFilter.h"	63 #include "third_party/skia/include/core/SkImageFilter.h"

64 #include "wtf/MathExtras.h"	64 #include "wtf/MathExtras.h"

	65 #include "wtf/OwnPtr.h"

65 #include "wtf/text/StringBuilder.h"	66 #include "wtf/text/StringBuilder.h"

66 #include "wtf/typed_arrays/ArrayBufferContents.h"	67 #include "wtf/typed_arrays/ArrayBufferContents.h"

67	68

68 namespace blink {	69 namespace blink {

69	70

70 static const char defaultFont[] = "10px sans-serif";	71 static const char defaultFont[] = "10px sans-serif";

71 static const char inherit[] = "inherit";	72 static const char inherit[] = "inherit";

72 static const char rtl[] = "rtl";	73 static const char rtl[] = "rtl";

73 static const char ltr[] = "ltr";	74 static const char ltr[] = "ltr";

74 static const double TryRestoreContextInterval = 0.5;	75 static const double TryRestoreContextInterval = 0.5;

(...skipping 982 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1057	1058

1058 unsigned CanvasRenderingContext2D::hitRegionsCount() const	1059 unsigned CanvasRenderingContext2D::hitRegionsCount() const

1059 {	1060 {

1060 if (m_hitRegionManager)	1061 if (m_hitRegionManager)

1061 return m_hitRegionManager->getHitRegionsCount();	1062 return m_hitRegionManager->getHitRegionsCount();

1062	1063

1063 return 0;	1064 return 0;

1064 }	1065 }

1065	1066

1066 } // namespace blink	1067 } // namespace blink

OLD	NEW