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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/WebCore/rendering/RenderTreeAsText.cpp

Issue 21152: WebKit merge 40668:40722 part 1. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | « third_party/WebKit/WebCore/rendering/RenderTextControl.cpp ('k') | third_party/WebKit/WebCore/rendering/RenderView.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/WebCore/rendering/RenderTreeAsText.cpp
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderTreeAsText.cpp (revision 9310)
+++ third_party/WebKit/WebCore/rendering/RenderTreeAsText.cpp (working copy)
@@ -433,9 +433,9 @@
ts << " scrollX " << l.scrollXOffset();
if (l.scrollYOffset())
ts << " scrollY " << l.scrollYOffset();
- if (l.renderer()->clientWidth() != l.scrollWidth())
+ if (l.renderBox() && l.renderBox()->clientWidth() != l.scrollWidth())
ts << " scrollWidth " << l.scrollWidth();
- if (l.renderer()->clientHeight() != l.scrollHeight())
+ if (l.renderBox() && l.renderBox()->clientHeight() != l.scrollHeight())
ts << " scrollHeight " << l.scrollHeight();
}
« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderTextControl.cpp ('k') | third_party/WebKit/WebCore/rendering/RenderView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698