Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1280)

Unified Diff: Source/core/plugins/PluginOcclusionSupport.cpp

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/paint/ViewPainter.cpp ('k') | Source/core/rendering/RenderBlock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/plugins/PluginOcclusionSupport.cpp
diff --git a/Source/core/plugins/PluginOcclusionSupport.cpp b/Source/core/plugins/PluginOcclusionSupport.cpp
index 0772266504eb560343727160856f70001aeaa4e6..03e2fde96a947a5643fd4f10510ddbe7631222a4 100644
--- a/Source/core/plugins/PluginOcclusionSupport.cpp
+++ b/Source/core/plugins/PluginOcclusionSupport.cpp
@@ -37,8 +37,8 @@
#include "core/frame/LocalFrame.h"
#include "core/html/HTMLElement.h"
#include "core/html/HTMLFrameOwnerElement.h"
+#include "core/layout/LayoutBox.h"
#include "core/layout/LayoutObject.h"
-#include "core/rendering/RenderBox.h"
#include "platform/Widget.h"
#include "wtf/HashSet.h"
@@ -119,7 +119,7 @@ static bool intersectsRect(const LayoutObject* renderer, const IntRect& rect)
&& (!renderer->style() || renderer->style()->visibility() == VISIBLE);
}
-static void addToOcclusions(const RenderBox* renderer, Vector<IntRect>& occlusions)
+static void addToOcclusions(const LayoutBox* renderer, Vector<IntRect>& occlusions)
{
occlusions.append(IntRect(
roundedIntPoint(renderer->localToAbsolute()),
@@ -131,7 +131,7 @@ static void addTreeToOcclusions(const LayoutObject* renderer, const IntRect& fra
if (!renderer)
return;
if (renderer->isBox() && intersectsRect(renderer, frameRect))
- addToOcclusions(toRenderBox(renderer), occlusions);
+ addToOcclusions(toLayoutBox(renderer), occlusions);
for (LayoutObject* child = renderer->slowFirstChild(); child; child = child->nextSibling())
addTreeToOcclusions(child, frameRect, occlusions);
}
@@ -183,7 +183,7 @@ void getPluginOcclusions(Element* element, Widget* parentWidget, const IntRect&
if (isHTMLIFrameElement(*element) && intersectsRect(iframeRenderer, frameRect)) {
getObjectStack(iframeRenderer, &iframeZstack);
if (iframeIsAbovePlugin(iframeZstack, pluginZstack))
- addToOcclusions(toRenderBox(iframeRenderer), occlusions);
+ addToOcclusions(toLayoutBox(iframeRenderer), occlusions);
}
}
« no previous file with comments | « Source/core/paint/ViewPainter.cpp ('k') | Source/core/rendering/RenderBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698