diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-05 14:34:32 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-05 14:34:32 -0800 |
| commit | 635860845790a19bf50bbc51ba8fb66a96dde068 (patch) | |
| tree | ef6ad9ff73a5b57f65249d4232a202fa77e6a140 /WebCore/rendering/RenderSVGInline.cpp | |
| parent | 8e35f3cfc7fba1d1c829dc557ebad6409cbe16a2 (diff) | |
| download | external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.zip external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.gz external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.bz2 | |
auto import from //depot/cupcake/@136594
Diffstat (limited to 'WebCore/rendering/RenderSVGInline.cpp')
| -rw-r--r-- | WebCore/rendering/RenderSVGInline.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/WebCore/rendering/RenderSVGInline.cpp b/WebCore/rendering/RenderSVGInline.cpp index 11da004..81e0924 100644 --- a/WebCore/rendering/RenderSVGInline.cpp +++ b/WebCore/rendering/RenderSVGInline.cpp @@ -2,7 +2,7 @@ * This file is part of the WebKit project. * * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> - * (C) 2006 Apple Computer Inc. + * Copyright (C) 2006 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -27,6 +27,7 @@ #include "RenderSVGInline.h" #include "SVGInlineFlowBox.h" +#include <wtf/UnusedParam.h> namespace WebCore { @@ -35,10 +36,16 @@ RenderSVGInline::RenderSVGInline(Node* n) { } -InlineBox* RenderSVGInline::createInlineBox(bool makePlaceHolderBox, bool isRootLineBox, bool isOnlyRun) +InlineBox* RenderSVGInline::createInlineBox(bool unusedMakePlaceHolderBox, bool unusedIsRootLineBox, bool) { - ASSERT(!(!isRootLineBox && (isReplaced() || makePlaceHolderBox))); - ASSERT(isInlineFlow()); +#if ASSERT_DISABLED + UNUSED_PARAM(unusedIsRootLineBox); + UNUSED_PARAM(unusedMakePlaceHolderBox); +#endif + + ASSERT(!(!unusedIsRootLineBox && (isReplaced() || unusedMakePlaceHolderBox))); + + ASSERT(isRenderInline()); InlineFlowBox* flowBox = new (renderArena()) SVGInlineFlowBox(this); |