Fixing #44993, added style visibility check to the object frame, r=bu…

…ster
sailfishos · Sep 3, 2000 · 41dcfdd · 41dcfdd
1 parent e28d7b8
commit 41dcfdd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
@@ -1041,6 +1041,14 @@ nsObjectFrame::GetBaseURL(nsIURI* &aURL)
 PRBool
 nsObjectFrame::IsHidden() const
 {
+	// check the style visibility first
+  const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display);
+	if (disp != nsnull)
+  {
+    if(!disp->IsVisibleOrCollapsed())
+      return PR_TRUE;
+  }
+
   nsCOMPtr<nsIAtom> tag;
   mContent->GetTag(*getter_AddRefs(tag));
 

diff --git a/layout/html/base/src/nsObjectFrame.cpp b/layout/html/base/src/nsObjectFrame.cpp
@@ -1041,6 +1041,14 @@ nsObjectFrame::GetBaseURL(nsIURI* &aURL)
 PRBool
 nsObjectFrame::IsHidden() const
 {
+	// check the style visibility first
+  const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display);
+	if (disp != nsnull)
+  {
+    if(!disp->IsVisibleOrCollapsed())
+      return PR_TRUE;
+  }
+
   nsCOMPtr<nsIAtom> tag;
   mContent->GetTag(*getter_AddRefs(tag));