diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-05 16:01:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-05 19:07:18 +0200 |
| commit | 09a0901b4be63e5f74cd0f5337e073890caebbdd (patch) | |
| tree | e8ddfb62a0c7e9ed9e9128f0418a1b796c5af609 /Source/WebCore/rendering/RenderTableSection.cpp | |
| parent | d6ffb6e0ba2941ff69c9b8eaf6ccf383c5d03063 (diff) | |
| parent | 621b83515d7ec0d54a1d77b98033d219abdc6d69 (diff) | |
| download | qtwebkit-09a0901b4be63e5f74cd0f5337e073890caebbdd.tar.gz | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'Source/WebCore/rendering/RenderTableSection.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderTableSection.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderTableSection.cpp b/Source/WebCore/rendering/RenderTableSection.cpp index c8452a47c..4bc186874 100644 --- a/Source/WebCore/rendering/RenderTableSection.cpp +++ b/Source/WebCore/rendering/RenderTableSection.cpp @@ -1081,7 +1081,9 @@ CellSpan RenderTableSection::spannedColumns(const LayoutRect& flippedRect) const return CellSpan(startColumn, endColumn); } - +#if defined(_MSC_VER) && _MSC_VER == 1700 +#pragma optimize("", off) +#endif void RenderTableSection::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset) { PaintPhase paintPhase = paintInfo.phase; @@ -1182,6 +1184,9 @@ void RenderTableSection::paintObject(PaintInfo& paintInfo, const LayoutPoint& pa } } } +#if defined(_MSC_VER) && _MSC_VER == 1700 +#pragma optimize("", on) +#endif void RenderTableSection::imageChanged(WrappedImagePtr, const IntRect*) { |