| Index: Source/platform/graphics/GraphicsContext.cpp
|
| diff --git a/Source/core/platform/graphics/GraphicsContext.cpp b/Source/platform/graphics/GraphicsContext.cpp
|
| similarity index 99%
|
| rename from Source/core/platform/graphics/GraphicsContext.cpp
|
| rename to Source/platform/graphics/GraphicsContext.cpp
|
| index 0be006cf772c58b71df2af4ebfaa4a6f5643aff0..23d116a6f36568e12714a76fcf3774839646c3eb 100644
|
| --- a/Source/core/platform/graphics/GraphicsContext.cpp
|
| +++ b/Source/platform/graphics/GraphicsContext.cpp
|
| @@ -25,13 +25,13 @@
|
| */
|
|
|
| #include "config.h"
|
| -#include "core/platform/graphics/GraphicsContext.h"
|
| +#include "platform/graphics/GraphicsContext.h"
|
|
|
| -#include "core/platform/graphics/BitmapImage.h"
|
| -#include "core/platform/graphics/Gradient.h"
|
| #include "platform/geometry/IntRect.h"
|
| #include "platform/geometry/RoundedRect.h"
|
| +#include "platform/graphics/BitmapImage.h"
|
| #include "platform/graphics/DisplayList.h"
|
| +#include "platform/graphics/Gradient.h"
|
| #include "platform/graphics/TextRunIterator.h"
|
| #include "platform/text/BidiResolver.h"
|
| #include "platform/weborigin/KURL.h"
|
| @@ -178,13 +178,15 @@ void GraphicsContext::restoreLayer()
|
| m_opaqueRegion.popCanvasLayer(this);
|
| }
|
|
|
| -void GraphicsContext::beginAnnotation(const GraphicsContextAnnotation& annotation)
|
| +void GraphicsContext::beginAnnotation(const char* rendererName, const char* paintPhase,
|
| + const String& elementId, const String& elementClass, const String& elementTag)
|
| {
|
| if (paintingDisabled())
|
| return;
|
|
|
| canvas()->beginCommentGroup("GraphicsContextAnnotation");
|
|
|
| + GraphicsContextAnnotation annotation(rendererName, paintPhase, elementId, elementClass, elementTag);
|
| AnnotationList annotations;
|
| annotation.asAnnotationList(annotations);
|
|
|
| @@ -1843,9 +1845,8 @@ PassRefPtr<SkColorFilter> GraphicsContext::WebCoreColorFilterToSkiaColorFilter(C
|
| return 0;
|
| }
|
|
|
| -
|
| #if OS(MACOSX)
|
| -CGColorSpaceRef deviceRGBColorSpaceRef()
|
| +CGColorSpaceRef PLATFORM_EXPORT deviceRGBColorSpaceRef()
|
| {
|
| static CGColorSpaceRef deviceSpace = CGColorSpaceCreateDeviceRGB();
|
| return deviceSpace;
|
|
|