From ebd5b0ef6e225bb85cb01dd5be52e88ae881b5be Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Thu, 3 Jul 2014 13:40:13 -0500
Subject: [PATCH] Bug 1029718. Skip transform calculation if region to
 transform is empty for layer event regions. r=mstange

This means that we keep empty regions empty instead of rounding out causing empty regions to become non-empty. It can be significant for perf. Bug 1016525 fixed this. Bug 977831 regressed this.
---
 layout/base/FrameLayerBuilder.cpp | 58 +++++++++++++++++--------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index f9f0a3f466d9..bd7cd17ff726 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2013,33 +2013,37 @@ ContainerState::PopThebesLayerData()
   ThebesLayerData* containingThebesLayerData =
      mLayerBuilder->GetContainingThebesLayerData();
   if (containingThebesLayerData) {
-    nsRect rect = nsLayoutUtils::TransformFrameRectToAncestor(
-      mContainerReferenceFrame,
-      data->mDispatchToContentHitRegion.GetBounds(),
-      containingThebesLayerData->mReferenceFrame);
-    containingThebesLayerData->mDispatchToContentHitRegion.Or(
-      containingThebesLayerData->mDispatchToContentHitRegion, rect);
-
-    rect = nsLayoutUtils::TransformFrameRectToAncestor(
-      mContainerReferenceFrame,
-      data->mMaybeHitRegion.GetBounds(),
-      containingThebesLayerData->mReferenceFrame);
-    containingThebesLayerData->mMaybeHitRegion.Or(
-      containingThebesLayerData->mMaybeHitRegion, rect);
-
-    // Our definitely-hit region must go to the maybe-hit-region since
-    // this function is an approximation.
-    gfx3DMatrix matrix = nsLayoutUtils::GetTransformToAncestor(
-      mContainerReferenceFrame, containingThebesLayerData->mReferenceFrame);
-    gfxMatrix matrix2D;
-    bool isPrecise = matrix.Is2D(&matrix2D) && !matrix2D.HasNonAxisAlignedTransform();
-    rect = nsLayoutUtils::TransformFrameRectToAncestor(
-      mContainerReferenceFrame,
-      data->mHitRegion.GetBounds(),
-      containingThebesLayerData->mReferenceFrame);
-    nsRegion* dest = isPrecise ? &containingThebesLayerData->mHitRegion
-                               : &containingThebesLayerData->mMaybeHitRegion;
-    dest->Or(*dest, rect);
+    if (!data->mDispatchToContentHitRegion.GetBounds().IsEmpty()) {
+      nsRect rect = nsLayoutUtils::TransformFrameRectToAncestor(
+        mContainerReferenceFrame,
+        data->mDispatchToContentHitRegion.GetBounds(),
+        containingThebesLayerData->mReferenceFrame);
+      containingThebesLayerData->mDispatchToContentHitRegion.Or(
+        containingThebesLayerData->mDispatchToContentHitRegion, rect);
+    }
+    if (!data->mMaybeHitRegion.GetBounds().IsEmpty()) {
+      nsRect rect = nsLayoutUtils::TransformFrameRectToAncestor(
+        mContainerReferenceFrame,
+        data->mMaybeHitRegion.GetBounds(),
+        containingThebesLayerData->mReferenceFrame);
+      containingThebesLayerData->mMaybeHitRegion.Or(
+        containingThebesLayerData->mMaybeHitRegion, rect);
+    }
+    if (!data->mHitRegion.GetBounds().IsEmpty()) {
+      // Our definitely-hit region must go to the maybe-hit-region since
+      // this function is an approximation.
+      gfx3DMatrix matrix = nsLayoutUtils::GetTransformToAncestor(
+        mContainerReferenceFrame, containingThebesLayerData->mReferenceFrame);
+      gfxMatrix matrix2D;
+      bool isPrecise = matrix.Is2D(&matrix2D) && !matrix2D.HasNonAxisAlignedTransform();
+      nsRect rect = nsLayoutUtils::TransformFrameRectToAncestor(
+        mContainerReferenceFrame,
+        data->mHitRegion.GetBounds(),
+        containingThebesLayerData->mReferenceFrame);
+      nsRegion* dest = isPrecise ? &containingThebesLayerData->mHitRegion
+                                 : &containingThebesLayerData->mMaybeHitRegion;
+      dest->Or(*dest, rect);
+    }
   } else {
     EventRegions regions;
     regions.mHitRegion = ScaleRegionToOutsidePixels(data->mHitRegion);