From 77a66c1b8749d53908f12e5016e050c6b9b9c118 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 12 Sep 2014 02:05:32 -0300
Subject: [PATCH] Simplify DocumentApi::clearMask(): we just need the "cel"
 param

---
 src/app/commands/cmd_clear.cpp        | 3 +--
 src/app/document_api.cpp              | 7 ++++---
 src/app/document_api.h                | 2 +-
 src/app/ui/editor/pixels_movement.cpp | 4 +---
 src/app/util/clipboard.cpp            | 3 +--
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/app/commands/cmd_clear.cpp b/src/app/commands/cmd_clear.cpp
index f7772b571..b5ad918b5 100644
--- a/src/app/commands/cmd_clear.cpp
+++ b/src/app/commands/cmd_clear.cpp
@@ -99,8 +99,7 @@ void ClearCommand::onExecute(Context* context)
   {
     UndoTransaction undoTransaction(writer.context(), "Clear");
     DocumentApi api = document->getApi();
-    api.clearMask(writer.layer(), writer.cel(),
-                  app_get_color_to_clear_layer(writer.layer()));
+    api.clearMask(writer.cel());
     if (visibleMask)
       api.deselectMask();
 
diff --git a/src/app/document_api.cpp b/src/app/document_api.cpp
index a8e42216d..fb74fb0f9 100644
--- a/src/app/document_api.cpp
+++ b/src/app/document_api.cpp
@@ -1200,16 +1200,17 @@ void DocumentApi::clearImage(Image* image, color_t bgcolor)
 }
 
 // Clears the mask region in the current sprite with the specified background color.
-void DocumentApi::clearMask(Layer* layer, Cel* cel, color_t bgcolor)
+void DocumentApi::clearMask(Cel* cel)
 {
   ASSERT(cel);
-  ASSERT(layer == cel->layer());
 
   Image* image = (cel ? cel->image(): NULL);
   if (!image)
     return;
 
+  Layer* layer = cel->layer();
   Mask* mask = m_document->mask();
+  color_t bgcolor = bgColor(layer);
 
   // If the mask is empty or is not visible then we have to clear the
   // entire image in the cel.
@@ -1222,7 +1223,7 @@ void DocumentApi::clearMask(Layer* layer, Cel* cel, color_t bgcolor)
     // associated image).
     else {
       ASSERT(layer->isImage());
-      removeCel(static_cast<LayerImage*>(layer), cel);
+      removeCel(cel);
     }
   }
   else {
diff --git a/src/app/document_api.h b/src/app/document_api.h
index 3ecec6136..817e6c932 100644
--- a/src/app/document_api.h
+++ b/src/app/document_api.h
@@ -115,7 +115,7 @@ namespace app {
 
     // Image API
     void clearImage(Image* image, color_t bgcolor);
-    void clearMask(Layer* layer, Cel* cel, color_t bgcolor);
+    void clearMask(Cel* cel);
     void flipImage(Image* image, const gfx::Rect& bounds, raster::algorithm::FlipType flipType);
     void flipImageWithMask(Image* image, const Mask* mask, raster::algorithm::FlipType flipType, color_t bgcolor);
     void pasteImage(Sprite* sprite, Cel* cel, const Image* src_image, int x, int y, int opacity);
diff --git a/src/app/ui/editor/pixels_movement.cpp b/src/app/ui/editor/pixels_movement.cpp
index a39465467..5ab560d40 100644
--- a/src/app/ui/editor/pixels_movement.cpp
+++ b/src/app/ui/editor/pixels_movement.cpp
@@ -22,7 +22,6 @@
 
 #include "app/ui/editor/pixels_movement.h"
 
-#include "app/app.h"
 #include "app/document.h"
 #include "app/document_api.h"
 #include "app/modules/gui.h"
@@ -119,8 +118,7 @@ void PixelsMovement::cutMask()
   {
     ContextWriter writer(m_reader);
     if (writer.cel())
-      m_document->getApi().clearMask(m_layer, writer.cel(),
-        app_get_color_to_clear_layer(m_layer));
+      m_document->getApi().clearMask(writer.cel());
   }
 
   copyMask();
diff --git a/src/app/util/clipboard.cpp b/src/app/util/clipboard.cpp
index 7968cc1bd..0db92e65a 100644
--- a/src/app/util/clipboard.cpp
+++ b/src/app/util/clipboard.cpp
@@ -193,8 +193,7 @@ void clipboard::cut(ContextWriter& writer)
       UndoTransaction undoTransaction(writer.context(), "Cut");
       DocumentApi api(writer.document()->getApi());
 
-      api.clearMask(writer.layer(), writer.cel(),
-                    app_get_color_to_clear_layer(writer.layer()));
+      api.clearMask(writer.cel());
       api.deselectMask();
 
       undoTransaction.commit();