diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
| commit | 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (patch) | |
| tree | 52599cd0ab782b1768e23ad176f7618f98333cb6 /Source/WebCore/rendering/RenderTreeAsText.cpp | |
| parent | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (diff) | |
| download | qtwebkit-03e12282df9aa1e1fb05a8b90f1cfc2e08764cec.tar.gz | |
Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525 (http://svn.webkit.org/repository/webkit/trunk@107223)
Diffstat (limited to 'Source/WebCore/rendering/RenderTreeAsText.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderTreeAsText.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebCore/rendering/RenderTreeAsText.cpp b/Source/WebCore/rendering/RenderTreeAsText.cpp index 88ad4ac35..06e0fe98e 100644 --- a/Source/WebCore/rendering/RenderTreeAsText.cpp +++ b/Source/WebCore/rendering/RenderTreeAsText.cpp @@ -26,7 +26,6 @@ #include "config.h" #include "RenderTreeAsText.h" -#include "CSSMutableStyleDeclaration.h" #include "Document.h" #include "Frame.h" #include "FrameSelection.h" @@ -48,6 +47,7 @@ #include "RenderTableCell.h" #include "RenderView.h" #include "RenderWidget.h" +#include "StylePropertySet.h" #include <wtf/HexNumber.h> #include <wtf/UnusedParam.h> #include <wtf/Vector.h> @@ -183,7 +183,7 @@ static bool isEmptyOrUnstyledAppleStyleSpan(const Node* node) if (!node->hasChildNodes()) return true; - CSSMutableStyleDeclaration* inlineStyleDecl = elem->inlineStyleDecl(); + StylePropertySet* inlineStyleDecl = elem->inlineStyleDecl(); return (!inlineStyleDecl || inlineStyleDecl->isEmpty()); } @@ -617,10 +617,10 @@ static void write(TextStream& ts, RenderLayer& l, ts << " scrollX " << l.scrollXOffset(); if (l.scrollYOffset()) ts << " scrollY " << l.scrollYOffset(); - if (l.renderBox() && l.renderBox()->clientWidth() != l.scrollWidth()) - ts << " scrollWidth " << l.scrollWidth(); - if (l.renderBox() && l.renderBox()->clientHeight() != l.scrollHeight()) - ts << " scrollHeight " << l.scrollHeight(); + if (l.renderBox() && l.renderBox()->pixelSnappedClientWidth() != l.pixelSnappedScrollWidth()) + ts << " scrollWidth " << l.pixelSnappedScrollWidth(); + if (l.renderBox() && l.renderBox()->pixelSnappedClientHeight() != l.pixelSnappedScrollHeight()) + ts << " scrollHeight " << l.pixelSnappedScrollHeight(); } if (paintPhase == LayerPaintPhaseBackground) |