Changeset 90661 in webkit

Timestamp:

Jul 8, 2011, 1:28:54 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

remove (empty) indirection between GraphicsContextPlatformPrivate and PlatformContextSkia
​https://bugs.webkit.org/show_bug.cgi?id=64178

Patch by Mike Reed <​reed@google.com> on 2011-07-08
Reviewed by Stephen White.

No new tests. no functionality change, other than removing an indirection that is not needed

• platform/graphics/GraphicsContext.h:
• platform/graphics/skia/GraphicsContextPlatformPrivate.h: Removed.
• platform/graphics/skia/GraphicsContextSkia.cpp:

(WebCore::GraphicsContext::platformInit):
(WebCore::GraphicsContext::platformDestroy):
(WebCore::GraphicsContext::platformContext):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext.h (modified) (2 diffs)
• platform/graphics/skia/GraphicsContextPlatformPrivate.h (deleted)
• platform/graphics/skia/GraphicsContextSkia.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-08  Mike Reed  <reed@google.com>
+
+        remove (empty) indirection between GraphicsContextPlatformPrivate and PlatformContextSkia
+        https://bugs.webkit.org/show_bug.cgi?id=64178
+
+        Reviewed by Stephen White.
+
+        No new tests. no functionality change, other than removing an indirection that is not needed
+
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/skia/GraphicsContextPlatformPrivate.h: Removed.
+        * platform/graphics/skia/GraphicsContextSkia.cpp:
+        (WebCore::GraphicsContext::platformInit):
+        (WebCore::GraphicsContext::platformDestroy):
+        (WebCore::GraphicsContext::platformContext):
+
 2011-07-08  Jeffrey Pfau  <jpfau@apple.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext.h

@@ -80 +80 @@
 namespace WebCore {
 class PlatformContextSkia;
+typedef PlatformContextSkia GraphicsContextPlatformPrivate;
 }
 typedef WebCore::PlatformContextSkia PlatformGraphicsContext;
@@ -121 +122 @@
     class Font;
     class Generator;
+#if !USE(SKIA)
     class GraphicsContextPlatformPrivate;
+#endif
     class ImageBuffer;
     class IntRect;

trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp

@@ -37 +37 @@
 #include "Gradient.h"
 #include "GraphicsContextGPU.h"
-#include "GraphicsContextPlatformPrivate.h"
 #include "ImageBuffer.h"
 #include "IntRect.h"
@@ -227 +226 @@
 void GraphicsContext::platformInit(PlatformGraphicsContext* gc)
 {
-    m_data = new GraphicsContextPlatformPrivate(gc);
-    setPaintingDisabled(!gc || !platformContext()->canvas());
+    // the caller owns the gc
+    m_data = gc;
+    setPaintingDisabled(!gc || !gc->canvas());
 }
 
 void GraphicsContext::platformDestroy()
 {
-    delete m_data;
 }
 
@@ -239 +238 @@
 {
     ASSERT(!paintingDisabled());
-    return m_data->context();
+    return m_data;
 }