diff --git a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp
index 896582d05ad..fc9bf695725 100644
--- a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp
+++ b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp
@@ -549,7 +549,7 @@ ns4xPlugin::_invalidateregion(NPP npp, NPRegion invalidRegion)
     if (NS_OK == peer->QueryInterface(kIWindowlessPluginInstancePeerIID, (void **)&wpeer))
     {
       // XXX nsRegion & NPRegion are typedef'd to the same thing
-      wpeer->InvalidateRegion((nsPluginRegion*) invalidRegion);
+      wpeer->InvalidateRegion((nsPluginRegion)invalidRegion);
       NS_RELEASE(wpeer);
     }
 }
diff --git a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
index 0e822dafd52..2c262607097 100644
--- a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
+++ b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
@@ -170,9 +170,11 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window)
 
     nsresult error = NS_OK;
 
-    if (fCallbacks->setwindow) {
+    if (fCallbacks->setwindow)
+    {
         // XXX Turns out that NPPluginWindow and NPWindow are structurally
         // identical (on purpose!), so there's no need to make a copy.
+
         error = (nsresult) CallNPP_SetWindowProc(fCallbacks->setwindow,
                                                  &fNPP,
                                                  (NPWindow*) window);
@@ -180,6 +182,7 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window)
         // XXX In the old code, we'd just ignore any errors coming
         // back from the plugin's SetWindow(). Is this the correct
         // behavior?!?
+
         NS_ASSERTION(error == NS_OK, "error in setwindow");
     }
 
diff --git a/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp b/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp
index 896582d05ad..fc9bf695725 100644
--- a/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp
+++ b/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp
@@ -549,7 +549,7 @@ ns4xPlugin::_invalidateregion(NPP npp, NPRegion invalidRegion)
     if (NS_OK == peer->QueryInterface(kIWindowlessPluginInstancePeerIID, (void **)&wpeer))
     {
       // XXX nsRegion & NPRegion are typedef'd to the same thing
-      wpeer->InvalidateRegion((nsPluginRegion*) invalidRegion);
+      wpeer->InvalidateRegion((nsPluginRegion)invalidRegion);
       NS_RELEASE(wpeer);
     }
 }
diff --git a/mozilla/modules/plugin/nglsrc/ns4xPluginInstance.cpp b/mozilla/modules/plugin/nglsrc/ns4xPluginInstance.cpp
index 0e822dafd52..2c262607097 100644
--- a/mozilla/modules/plugin/nglsrc/ns4xPluginInstance.cpp
+++ b/mozilla/modules/plugin/nglsrc/ns4xPluginInstance.cpp
@@ -170,9 +170,11 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window)
 
     nsresult error = NS_OK;
 
-    if (fCallbacks->setwindow) {
+    if (fCallbacks->setwindow)
+    {
         // XXX Turns out that NPPluginWindow and NPWindow are structurally
         // identical (on purpose!), so there's no need to make a copy.
+
         error = (nsresult) CallNPP_SetWindowProc(fCallbacks->setwindow,
                                                  &fNPP,
                                                  (NPWindow*) window);
@@ -180,6 +182,7 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window)
         // XXX In the old code, we'd just ignore any errors coming
         // back from the plugin's SetWindow(). Is this the correct
         // behavior?!?
+
         NS_ASSERTION(error == NS_OK, "error in setwindow");
     }