<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166715] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166715">166715</a></dd>
<dt>Author</dt> <dd>abucur@adobe.com</dd>
<dt>Date</dt> <dd>2014-04-03 06:27:53 -0700 (Thu, 03 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions] Include region range information when printing the render tree
https://bugs.webkit.org/show_bug.cgi?id=131159
Reviewed by Mihnea Ovidenie.
With this change showRenderObject() will print the region range for objects inside
a flow thread. The format is:
Rs: <startRegion> Re: <endRegion>
Because this can be called anytime during debugging, it's necessary to disable the
current flow thread caching to prevent using the wrong flow thread for an object.
Tests: No new tests, no functional change.
* rendering/RenderFlowThread.cpp:
(WebCore::CurrentRenderFlowThreadDisabler::CurrentRenderFlowThreadDisabler):
(WebCore::CurrentRenderFlowThreadDisabler::~CurrentRenderFlowThreadDisabler):
* rendering/RenderFlowThread.h:
* rendering/RenderObject.cpp:
(WebCore::RenderObject::showRegionsInformation): Added.
(WebCore::RenderObject::showRenderObject):
* rendering/RenderObject.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadcpp">trunk/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadh">trunk/Source/WebCore/rendering/RenderFlowThread.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166714 => 166715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-03 10:46:51 UTC (rev 166714)
+++ trunk/Source/WebCore/ChangeLog 2014-04-03 13:27:53 UTC (rev 166715)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-04-03 Andrei Bucur <abucur@adobe.com>
+
+ [CSS Regions] Include region range information when printing the render tree
+ https://bugs.webkit.org/show_bug.cgi?id=131159
+
+ Reviewed by Mihnea Ovidenie.
+
+ With this change showRenderObject() will print the region range for objects inside
+ a flow thread. The format is:
+ Rs: <startRegion> Re: <endRegion>
+
+ Because this can be called anytime during debugging, it's necessary to disable the
+ current flow thread caching to prevent using the wrong flow thread for an object.
+
+ Tests: No new tests, no functional change.
+
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::CurrentRenderFlowThreadDisabler::CurrentRenderFlowThreadDisabler):
+ (WebCore::CurrentRenderFlowThreadDisabler::~CurrentRenderFlowThreadDisabler):
+ * rendering/RenderFlowThread.h:
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::showRegionsInformation): Added.
+ (WebCore::RenderObject::showRenderObject):
+ * rendering/RenderObject.h:
+
</ins><span class="cx"> 2014-04-03 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> RenderSnapshottedPlugIn::paint should use iterator for traversal.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (166714 => 166715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-04-03 10:46:51 UTC (rev 166714)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-04-03 13:27:53 UTC (rev 166715)
</span><span class="lines">@@ -130,27 +130,6 @@
</span><span class="cx"> m_regionsInvalidated = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class CurrentRenderFlowThreadDisabler {
- WTF_MAKE_NONCOPYABLE(CurrentRenderFlowThreadDisabler);
-public:
- CurrentRenderFlowThreadDisabler(RenderView* view)
- : m_view(view)
- , m_renderFlowThread(0)
- {
- m_renderFlowThread = m_view->flowThreadController().currentRenderFlowThread();
- if (m_renderFlowThread)
- view->flowThreadController().setCurrentRenderFlowThread(0);
- }
- ~CurrentRenderFlowThreadDisabler()
- {
- if (m_renderFlowThread)
- m_view->flowThreadController().setCurrentRenderFlowThread(m_renderFlowThread);
- }
-private:
- RenderView* m_view;
- RenderFlowThread* m_renderFlowThread;
-};
-
</del><span class="cx"> void RenderFlowThread::validateRegions()
</span><span class="cx"> {
</span><span class="cx"> if (m_regionsInvalidated) {
</span><span class="lines">@@ -1458,5 +1437,20 @@
</span><span class="cx"> controller.setCurrentRenderFlowThread(m_previousRenderFlowThread);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+CurrentRenderFlowThreadDisabler::CurrentRenderFlowThreadDisabler(RenderView* view)
+ : m_view(view)
+ , m_renderFlowThread(0)
+{
+ m_renderFlowThread = m_view->flowThreadController().currentRenderFlowThread();
+ if (m_renderFlowThread)
+ view->flowThreadController().setCurrentRenderFlowThread(0);
+}
</ins><span class="cx">
</span><ins>+CurrentRenderFlowThreadDisabler::~CurrentRenderFlowThreadDisabler()
+{
+ if (m_renderFlowThread)
+ m_view->flowThreadController().setCurrentRenderFlowThread(m_renderFlowThread);
+}
+
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (166714 => 166715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-04-03 10:46:51 UTC (rev 166714)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-04-03 13:27:53 UTC (rev 166715)
</span><span class="lines">@@ -348,6 +348,16 @@
</span><span class="cx"> RenderFlowThread* m_previousRenderFlowThread;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class CurrentRenderFlowThreadDisabler {
+ WTF_MAKE_NONCOPYABLE(CurrentRenderFlowThreadDisabler);
+public:
+ CurrentRenderFlowThreadDisabler(RenderView*);
+ ~CurrentRenderFlowThreadDisabler();
+private:
+ RenderView* m_view;
+ RenderFlowThread* m_renderFlowThread;
+};
+
</ins><span class="cx"> // This structure is used by PODIntervalTree for debugging.
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> template <> struct ValueToString<RenderRegion*> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (166714 => 166715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-04-03 10:46:51 UTC (rev 166714)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-04-03 13:27:53 UTC (rev 166715)
</span><span class="lines">@@ -1436,6 +1436,21 @@
</span><span class="cx"> showRenderObject(0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderObject::showRegionsInformation(int& printedCharacters) const
+{
+ CurrentRenderFlowThreadDisabler flowThreadDisabler(&view());
+
+ if (RenderFlowThread* flowThread = flowThreadContainingBlock()) {
+ const RenderBox* box = isBox() ? toRenderBox(this) : nullptr;
+ if (box) {
+ RenderRegion* startRegion = nullptr;
+ RenderRegion* endRegion = nullptr;
+ flowThread->getRegionRangeForBox(box, startRegion, endRegion);
+ printedCharacters += fprintf(stderr, " Rs:%p Re:%p", startRegion, endRegion);
+ }
+ }
+}
+
</ins><span class="cx"> void RenderObject::showRenderObject(int printedCharacters) const
</span><span class="cx"> {
</span><span class="cx"> // As this function is intended to be used when debugging, the
</span><span class="lines">@@ -1446,6 +1461,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> printedCharacters += fprintf(stderr, "%s %p", renderName(), this);
</span><ins>+ showRegionsInformation(printedCharacters);
</ins><span class="cx">
</span><span class="cx"> if (node()) {
</span><span class="cx"> if (printedCharacters)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (166714 => 166715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2014-04-03 10:46:51 UTC (rev 166714)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2014-04-03 13:27:53 UTC (rev 166715)
</span><span class="lines">@@ -277,8 +277,9 @@
</span><span class="cx"> void showRenderObject() const;
</span><span class="cx"> // We don't make printedCharacters an optional parameter so that
</span><span class="cx"> // showRenderObject can be called from gdb easily.
</span><del>- void showRenderObject(int printedCharacters) const;
- void showRenderTreeAndMark(const RenderObject* markedObject1 = 0, const char* markedLabel1 = 0, const RenderObject* markedObject2 = 0, const char* markedLabel2 = 0, int depth = 0) const;
</del><ins>+ void showRenderObject(int) const;
+ void showRenderTreeAndMark(const RenderObject* = 0, const char* = 0, const RenderObject* = 0, const char* = 0, int = 0) const;
+ void showRegionsInformation(int&) const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> public:
</span></span></pre>
</div>
</div>
</body>
</html>