[webkit-changes] [90661] trunk/Source/WebCore

Fri, 08 Jul 2011 13:29:14 -0700

Title: [90661] trunk/Source/WebCore
Revision
90661
Author
[email protected]
Date
2011-07-08 13:28:54 -0700 (Fri, 08 Jul 2011)

Log Message

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

Patch by Mike Reed <[email protected]> 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):

Modified Paths

Removed Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (90660 => 90661)


--- trunk/Source/WebCore/ChangeLog	2011-07-08 20:28:21 UTC (rev 90660)
+++ trunk/Source/WebCore/ChangeLog	2011-07-08 20:28:54 UTC (rev 90661)
@@ -1,3 +1,19 @@
+2011-07-08  Mike Reed  <[email protected]>
+
+        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  <[email protected]>
 
         Add framework for a new/dummy XMLDocumentParser

Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (90660 => 90661)


--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h	2011-07-08 20:28:21 UTC (rev 90660)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h	2011-07-08 20:28:54 UTC (rev 90661)
@@ -79,6 +79,7 @@
 #elif USE(SKIA)
 namespace WebCore {
 class PlatformContextSkia;
+typedef PlatformContextSkia GraphicsContextPlatformPrivate;
 }
 typedef WebCore::PlatformContextSkia PlatformGraphicsContext;
 #elif PLATFORM(HAIKU)
@@ -120,7 +121,9 @@
     class DrawingBuffer;
     class Font;
     class Generator;
+#if !USE(SKIA)
     class GraphicsContextPlatformPrivate;
+#endif
     class ImageBuffer;
     class IntRect;
     class RoundedIntRect;

Deleted: trunk/Source/WebCore/platform/graphics/skia/GraphicsContextPlatformPrivate.h (90660 => 90661)


--- trunk/Source/WebCore/platform/graphics/skia/GraphicsContextPlatformPrivate.h	2011-07-08 20:28:21 UTC (rev 90660)
+++ trunk/Source/WebCore/platform/graphics/skia/GraphicsContextPlatformPrivate.h	2011-07-08 20:28:54 UTC (rev 90661)
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2008, Google Inc. All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GraphicsContextPlatformPrivate_h
-#define GraphicsContextPlatformPrivate_h
-
-
-class PlatformContextSkia;
-
-namespace WebCore {
-
-// This class just holds onto a PlatformContextSkia for GraphicsContext.
-class GraphicsContextPlatformPrivate {
-    WTF_MAKE_NONCOPYABLE(GraphicsContextPlatformPrivate);
-public:
-    GraphicsContextPlatformPrivate(PlatformContextSkia* platformContext)
-        : m_context(platformContext) { }
-
-    PlatformContextSkia* context() { return m_context; }
-
-private:
-    // Non-owning pointer to the PlatformContext.
-    PlatformContextSkia* m_context;
-};
-
-}  // namespace WebCore
-
-#endif  // GraphicsContextPlatformPrivate_h

Modified: trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp (90660 => 90661)


--- trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp	2011-07-08 20:28:21 UTC (rev 90660)
+++ trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp	2011-07-08 20:28:54 UTC (rev 90661)
@@ -36,7 +36,6 @@
 #include "FloatRect.h"
 #include "Gradient.h"
 #include "GraphicsContextGPU.h"
-#include "GraphicsContextPlatformPrivate.h"
 #include "ImageBuffer.h"
 #include "IntRect.h"
 #include "NativeImageSkia.h"
@@ -226,19 +225,19 @@
 // no painting.
 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;
 }
 
 PlatformGraphicsContext* GraphicsContext::platformContext() const
 {
     ASSERT(!paintingDisabled());
-    return m_data->context();
+    return m_data;
 }
 
 // State saving ----------------------------------------------------------------

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to