| OLD | NEW |
| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 #include "third_party/skia/include/effects/SkCornerPathEffect.h" | 50 #include "third_party/skia/include/effects/SkCornerPathEffect.h" |
| 51 #include "third_party/skia/include/effects/SkLumaColorFilter.h" | 51 #include "third_party/skia/include/effects/SkLumaColorFilter.h" |
| 52 #include "third_party/skia/include/gpu/GrRenderTarget.h" | 52 #include "third_party/skia/include/gpu/GrRenderTarget.h" |
| 53 #include "third_party/skia/include/gpu/GrTexture.h" | 53 #include "third_party/skia/include/gpu/GrTexture.h" |
| 54 #include "wtf/Assertions.h" | 54 #include "wtf/Assertions.h" |
| 55 #include "wtf/MathExtras.h" | 55 #include "wtf/MathExtras.h" |
| 56 | 56 |
| 57 using namespace std; | 57 using namespace std; |
| 58 using blink::WebBlendMode; | 58 using blink::WebBlendMode; |
| 59 | 59 |
| 60 namespace WebCore { | 60 namespace blink { |
| 61 | 61 |
| 62 namespace { | 62 namespace { |
| 63 | 63 |
| 64 class CompatibleImageBufferSurface : public ImageBufferSurface { | 64 class CompatibleImageBufferSurface : public ImageBufferSurface { |
| 65 WTF_MAKE_NONCOPYABLE(CompatibleImageBufferSurface); WTF_MAKE_FAST_ALLOCATED; | 65 WTF_MAKE_NONCOPYABLE(CompatibleImageBufferSurface); WTF_MAKE_FAST_ALLOCATED; |
| 66 public: | 66 public: |
| 67 CompatibleImageBufferSurface(PassRefPtr<SkSurface> surface, const IntSize& s
ize, OpacityMode opacityMode) | 67 CompatibleImageBufferSurface(PassRefPtr<SkSurface> surface, const IntSize& s
ize, OpacityMode opacityMode) |
| 68 : ImageBufferSurface(size, opacityMode) | 68 : ImageBufferSurface(size, opacityMode) |
| 69 , m_surface(surface) | 69 , m_surface(surface) |
| 70 { | 70 { |
| (...skipping 1755 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1826 | 1826 |
| 1827 void GraphicsContext::didDrawTextInRect(const SkRect& textRect) | 1827 void GraphicsContext::didDrawTextInRect(const SkRect& textRect) |
| 1828 { | 1828 { |
| 1829 if (m_trackTextRegion) { | 1829 if (m_trackTextRegion) { |
| 1830 TRACE_EVENT0("skia", "GraphicsContext::didDrawTextInRect"); | 1830 TRACE_EVENT0("skia", "GraphicsContext::didDrawTextInRect"); |
| 1831 m_textRegion.join(textRect); | 1831 m_textRegion.join(textRect); |
| 1832 } | 1832 } |
| 1833 } | 1833 } |
| 1834 | 1834 |
| 1835 } | 1835 } |
| OLD | NEW |