| 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 18 matching lines...) Expand all Loading... |
| 29 | 29 |
| 30 #include "core/platform/graphics/BitmapImage.h" | 30 #include "core/platform/graphics/BitmapImage.h" |
| 31 #include "core/platform/graphics/Gradient.h" | 31 #include "core/platform/graphics/Gradient.h" |
| 32 #include "core/platform/graphics/ImageBuffer.h" | 32 #include "core/platform/graphics/ImageBuffer.h" |
| 33 #include "core/platform/graphics/skia/SkiaUtils.h" | 33 #include "core/platform/graphics/skia/SkiaUtils.h" |
| 34 #include "platform/geometry/IntRect.h" | 34 #include "platform/geometry/IntRect.h" |
| 35 #include "platform/geometry/RoundedRect.h" | 35 #include "platform/geometry/RoundedRect.h" |
| 36 #include "platform/graphics/DisplayList.h" | 36 #include "platform/graphics/DisplayList.h" |
| 37 #include "platform/graphics/TextRunIterator.h" | 37 #include "platform/graphics/TextRunIterator.h" |
| 38 #include "platform/text/BidiResolver.h" | 38 #include "platform/text/BidiResolver.h" |
| 39 #include "platform/weborigin/KURL.h" |
| 39 #include "third_party/skia/include/core/SkAnnotation.h" | 40 #include "third_party/skia/include/core/SkAnnotation.h" |
| 40 #include "third_party/skia/include/core/SkColorFilter.h" | 41 #include "third_party/skia/include/core/SkColorFilter.h" |
| 41 #include "third_party/skia/include/core/SkData.h" | 42 #include "third_party/skia/include/core/SkData.h" |
| 42 #include "third_party/skia/include/core/SkDevice.h" | 43 #include "third_party/skia/include/core/SkDevice.h" |
| 43 #include "third_party/skia/include/core/SkPicture.h" | 44 #include "third_party/skia/include/core/SkPicture.h" |
| 44 #include "third_party/skia/include/core/SkRRect.h" | 45 #include "third_party/skia/include/core/SkRRect.h" |
| 45 #include "third_party/skia/include/core/SkRefCnt.h" | 46 #include "third_party/skia/include/core/SkRefCnt.h" |
| 46 #include "third_party/skia/include/effects/SkBlurMaskFilter.h" | 47 #include "third_party/skia/include/effects/SkBlurMaskFilter.h" |
| 47 #include "third_party/skia/include/effects/SkCornerPathEffect.h" | 48 #include "third_party/skia/include/effects/SkCornerPathEffect.h" |
| 48 #include "third_party/skia/include/effects/SkLumaColorFilter.h" | 49 #include "third_party/skia/include/effects/SkLumaColorFilter.h" |
| 49 #include "weborigin/KURL.h" | |
| 50 #include "wtf/Assertions.h" | 50 #include "wtf/Assertions.h" |
| 51 #include "wtf/MathExtras.h" | 51 #include "wtf/MathExtras.h" |
| 52 | 52 |
| 53 #if OS(MACOSX) | 53 #if OS(MACOSX) |
| 54 #include <ApplicationServices/ApplicationServices.h> | 54 #include <ApplicationServices/ApplicationServices.h> |
| 55 #endif | 55 #endif |
| 56 | 56 |
| 57 using namespace std; | 57 using namespace std; |
| 58 | 58 |
| 59 namespace WebCore { | 59 namespace WebCore { |
| (...skipping 1884 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1944 | 1944 |
| 1945 void GraphicsContext::didDrawTextInRect(const SkRect& textRect) | 1945 void GraphicsContext::didDrawTextInRect(const SkRect& textRect) |
| 1946 { | 1946 { |
| 1947 if (m_trackTextRegion) { | 1947 if (m_trackTextRegion) { |
| 1948 TRACE_EVENT0("skia", "PlatformContextSkia::trackTextRegion"); | 1948 TRACE_EVENT0("skia", "PlatformContextSkia::trackTextRegion"); |
| 1949 m_textRegion.join(textRect); | 1949 m_textRegion.join(textRect); |
| 1950 } | 1950 } |
| 1951 } | 1951 } |
| 1952 | 1952 |
| 1953 } | 1953 } |
| OLD | NEW |