Changeset 152103 in webkit

Timestamp:

Jun 27, 2013 9:33:05 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Removing the redundant checks after r152078
​https://bugs.webkit.org/show_bug.cgi?id=118117

Patch by Seokju Kwon <Seokju Kwon> on 2013-06-27
Reviewed by Simon Fraser.

Avoided redundant checks in RenderLayerCompositor::reasonsForCompositing() after r152078.

No new tests as no functionality change.

• inspector/InspectorLayerTreeAgent.cpp:

(WebCore::InspectorLayerTreeAgent::reasonsForCompositingLayer):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::logReasonsForCompositing):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorLayerTreeAgent.cpp (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-27  Seokju Kwon  <seokju.kwon@gmail.com>
+
+        Removing the redundant checks after r152078
+        https://bugs.webkit.org/show_bug.cgi?id=118117
+
+        Reviewed by Simon Fraser.
+
+        Avoided redundant checks in RenderLayerCompositor::reasonsForCompositing() after r152078.
+
+        No new tests as no functionality change.
+
+        * inspector/InspectorLayerTreeAgent.cpp:
+        (WebCore::InspectorLayerTreeAgent::reasonsForCompositingLayer):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::logReasonsForCompositing):
+
 2013-06-27  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp

@@ -254 +254 @@
     if (reasonsBitmask & CompositingReasonVideo)
         compositingReasons->setVideo(true);
-
-    if (reasonsBitmask & CompositingReasonCanvas)
+    else if (reasonsBitmask & CompositingReasonCanvas)
         compositingReasons->setCanvas(true);
-
-    if (reasonsBitmask & CompositingReasonPlugin)
+    else if (reasonsBitmask & CompositingReasonPlugin)
         compositingReasons->setPlugin(true);
-
-    if (reasonsBitmask & CompositingReasonIFrame)
+    else if (reasonsBitmask & CompositingReasonIFrame)
         compositingReasons->setIFrame(true);
     

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1912 +1912 @@
     if (reasons & CompositingReasonVideo)
         return "video";
-
-    if (reasons & CompositingReasonCanvas)
+    else if (reasons & CompositingReasonCanvas)
         return "canvas";
-
-    if (reasons & CompositingReasonPlugin)
+    else if (reasons & CompositingReasonPlugin)
         return "plugin";
-
-    if (reasons & CompositingReasonIFrame)
+    else if (reasons & CompositingReasonIFrame)
         return "iframe";