Changeset 104568 in webkit

Timestamp:

Jan 10, 2012, 7:17:50 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Added smart pointers to Ewk_View_Paint_Context class and done minor refactoring.
​https://bugs.webkit.org/show_bug.cgi?id=75837

Patch by Tomasz Morawski <​t.morawski@samsung.com> on 2012-01-10
Reviewed by Ryosuke Niwa.

Changed graphicContext raw pointer to OwnPtr smart pointer.
Renamed cr to cairo and made it a RefPtr.

• ewk/ewk_view.cpp:

(ewk_view_paint_context_new): Adjust to auto pointers use.
(ewk_view_paint_context_free): Removed explicit raw pointers delete.
Adjust to auto pointers use:
(ewk_view_paint_context_save):
(ewk_view_paint_context_restore):
(ewk_view_paint_context_clip):
(ewk_view_paint_context_paint):
(ewk_view_paint_context_paint_contents):

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_view.cpp (modified) (7 diffs)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-01-10  Tomasz Morawski  <t.morawski@samsung.com>
+
+        [EFL] Added smart pointers to Ewk_View_Paint_Context class and done minor refactoring.
+        https://bugs.webkit.org/show_bug.cgi?id=75837
+
+        Reviewed by Ryosuke Niwa.
+
+        Changed graphicContext raw pointer to OwnPtr smart pointer.
+        Renamed cr to cairo and made it a RefPtr.
+
+        * ewk/ewk_view.cpp:
+        (ewk_view_paint_context_new): Adjust to auto pointers use.
+        (ewk_view_paint_context_free): Removed explicit raw pointers delete.
+        Adjust to auto pointers use:
+        (ewk_view_paint_context_save):
+        (ewk_view_paint_context_restore):
+        (ewk_view_paint_context_clip):
+        (ewk_view_paint_context_paint):
+        (ewk_view_paint_context_paint_contents):
+
 2012-01-09  Raphael Kubo da Costa  <kubo@profusion.mobi>
 

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -2563 +2563 @@
  */
 struct _Ewk_View_Paint_Context {
-    WebCore::GraphicsContext* graphicContext;
     WebCore::FrameView* view;
-    cairo_t* cr;
+    OwnPtr<WebCore::GraphicsContext> graphicContext;
+    RefPtr<cairo_t> cairo;
 };
 
-Ewk_View_Paint_Context* ewk_view_paint_context_new(Ewk_View_Private_Data* priv, cairo_t* cr)
+Ewk_View_Paint_Context* ewk_view_paint_context_new(Ewk_View_Private_Data* priv, cairo_t* cairo)
 {
     EINA_SAFETY_ON_NULL_RETURN_VAL(priv, 0);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(cr, 0);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(cairo, 0);
     EINA_SAFETY_ON_NULL_RETURN_VAL(priv->mainFrame, 0);
-    WebCore::FrameView* view = priv->mainFrame->view();
-    EINA_SAFETY_ON_NULL_RETURN_VAL(view, 0);
-    Ewk_View_Paint_Context* context = static_cast<Ewk_View_Paint_Context*>(malloc(sizeof(*context)));
-    EINA_SAFETY_ON_NULL_RETURN_VAL(context, 0);
-
-    context->graphicContext = new WebCore::GraphicsContext(cr);
-    if (!context->graphicContext) {
-        free(context);
-        return 0;
-    }
-    context->view = view;
-    context->cr = cairo_reference(cr);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(priv->mainFrame->view(), 0);
+
+    Ewk_View_Paint_Context* context = new Ewk_View_Paint_Context;
+    context->view = priv->mainFrame->view();
+    context->graphicContext = adoptPtr(new WebCore::GraphicsContext(cairo));
+    context->cairo = adoptRef(cairo_reference(cairo));
+
     return context;
 }
@@ -2591 +2586 @@
 {
     EINA_SAFETY_ON_NULL_RETURN(context);
-    delete context->graphicContext;
-    cairo_destroy(context->cr);
-    free(context);
+
+    delete context;
 }
 
@@ -2599 +2593 @@
 {
     EINA_SAFETY_ON_NULL_RETURN(context);
-    cairo_save(context->cr);
+
+    cairo_save(context->cairo.get());
     context->graphicContext->save();
 }
@@ -2606 +2601 @@
 {
     EINA_SAFETY_ON_NULL_RETURN(context);
+
     context->graphicContext->restore();
-    cairo_restore(context->cr);
+    cairo_restore(context->cairo.get());
 }
 
@@ -2614 +2610 @@
     EINA_SAFETY_ON_NULL_RETURN(context);
     EINA_SAFETY_ON_NULL_RETURN(area);
+
     context->graphicContext->clip(WebCore::IntRect(area->x, area->y, area->w, area->h));
 }
@@ -2626 +2623 @@
     if (context->view->isTransparent())
         context->graphicContext->clearRect(rect);
-    context->view->paint(context->graphicContext, rect);
+    context->view->paint(context->graphicContext.get(), rect);
 }
 
@@ -2639 +2636 @@
         context->graphicContext->clearRect(rect);
 
-    context->view->paintContents(context->graphicContext, rect);
+    context->view->paintContents(context->graphicContext.get(), rect);
 }