diff options
author | Michael BrĂ¼ning <michael.bruning@digia.com> | 2013-03-21 12:07:03 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-21 14:19:51 +0100 |
commit | 1171a8c82433ce361b82659bb7b8189ddaa7b363 (patch) | |
tree | 9b2c32eedde81b5d70d4816441aa184597bc6537 | |
parent | 34983cc93dadd6f1be4f1088ba69d6a060cee15e (diff) | |
download | qtwebkit-1171a8c82433ce361b82659bb7b8189ddaa7b363.tar.gz |
Workaround for MSVC 2012 64 bit optimizer bug.
Having optimization turned on for the VS 2012 build causes a crash
in RenderTableSection::paintObject. The workaround for this is to
turn optimization off for this method until a fix in the compiler
has been provided.
This is tracked in bug https://bugs.webkit.org/show_bug.cgi?id=112900
for the upstream version of WebKit.
Please be aware that this is a work around for QtWebKit and did not go
through the WebKit review process and is therefore not part of WebKit
trunk as of now.
Task-number: QTBUG-30117
Change-Id: I76139eaa4c0f07de2d90d197c0b07ef4a576e585
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-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*) { |