- Revision
- 95248
- Author
- commit-qu...@webkit.org
- Date
- 2011-09-15 18:10:40 -0700 (Thu, 15 Sep 2011)
Log Message
Unreviewed, rolling out r95243 and r95246.
http://trac.webkit.org/changeset/95243
http://trac.webkit.org/changeset/95246
https://bugs.webkit.org/show_bug.cgi?id=68202
Broke the Windows build (Requested by smfr on #webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2011-09-15
* WebCore.vcproj/WebCore.vcproj:
* platform/graphics/ca/win/LayerChangesFlusher.cpp:
(WebCore::LayerChangesFlusher::hookCallback):
* platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
(PlatformCAAnimation::copy):
* platform/win/StructuredExceptionHandlerSupressor.h: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (95247 => 95248)
--- trunk/Source/WebCore/ChangeLog 2011-09-16 00:39:34 UTC (rev 95247)
+++ trunk/Source/WebCore/ChangeLog 2011-09-16 01:10:40 UTC (rev 95248)
@@ -1,3 +1,19 @@
+2011-09-15 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r95243 and r95246.
+ http://trac.webkit.org/changeset/95243
+ http://trac.webkit.org/changeset/95246
+ https://bugs.webkit.org/show_bug.cgi?id=68202
+
+ Broke the Windows build (Requested by smfr on #webkit).
+
+ * WebCore.vcproj/WebCore.vcproj:
+ * platform/graphics/ca/win/LayerChangesFlusher.cpp:
+ (WebCore::LayerChangesFlusher::hookCallback):
+ * platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
+ (PlatformCAAnimation::copy):
+ * platform/win/StructuredExceptionHandlerSupressor.h: Removed.
+
2011-09-15 Simon Fraser <simon.fra...@apple.com>
Attempt to fix Windows build after r95243.
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (95247 => 95248)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-09-16 00:39:34 UTC (rev 95247)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-09-16 01:10:40 UTC (rev 95248)
@@ -27324,58 +27324,6 @@
RelativePath="..\platform\win\SoundWin.cpp"
>
</File>
- <File
- RelativePath="..\platform\win\StructuredExceptionHandlerSupressor.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- DisableSpecificWarnings="4733"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- DisableSpecificWarnings="4733"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo_CFLite|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- DisableSpecificWarnings="4733"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo_CFLite|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- DisableSpecificWarnings="4733"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- DisableSpecificWarnings="4733"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Production|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- DisableSpecificWarnings="4733"
- />
- </FileConfiguration>
- </File>
<File
RelativePath="..\platform\win\SystemInfo.cpp"
>
@@ -30226,14 +30174,6 @@
RelativePath="..\platform\graphics\ca\win\LayerChangesFlusher.cpp"
>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- DisableSpecificWarnings="4733"
- />
- </FileConfiguration>
- <FileConfiguration
Name="Debug_Cairo_CFLite|Win32"
ExcludedFromBuild="true"
>
Modified: trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp (95247 => 95248)
--- trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp 2011-09-16 00:39:34 UTC (rev 95247)
+++ trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp 2011-09-16 01:10:40 UTC (rev 95248)
@@ -29,7 +29,6 @@
#if USE(ACCELERATED_COMPOSITING)
#include "AbstractCACFLayerTreeHost.h"
-#include "StructuredExceptionHandlerSupressor.h"
#include <wtf/StdLibExtras.h>
#include <wtf/Vector.h>
@@ -72,10 +71,6 @@
LRESULT LayerChangesFlusher::hookCallback(int code, WPARAM wParam, LPARAM lParam)
{
- // Supress the exception handler Windows puts around all hook calls so we can
- // crash for debugging purposes if an exception is hit.
- StructuredExceptionHandlerSupressor supressor;
-
return shared().hookFired(code, wParam, lParam);
}
Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp (95247 => 95248)
--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp 2011-09-16 00:39:34 UTC (rev 95247)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp 2011-09-16 01:10:40 UTC (rev 95248)
@@ -183,8 +183,7 @@
animation->setRemovedOnCompletion(isRemovedOnCompletion());
animation->setAdditive(isAdditive());
animation->copyTimingFunctionFrom(this);
- if (valueFunction())
- animation->setValueFunction(valueFunction());
+ animation->setValueFunction(valueFunction());
// Copy the specific Basic or Keyframe values
if (animationType() == Keyframe) {
Deleted: trunk/Source/WebCore/platform/win/StructuredExceptionHandlerSupressor.h (95247 => 95248)
--- trunk/Source/WebCore/platform/win/StructuredExceptionHandlerSupressor.h 2011-09-16 00:39:34 UTC (rev 95247)
+++ trunk/Source/WebCore/platform/win/StructuredExceptionHandlerSupressor.h 2011-09-16 01:10:40 UTC (rev 95248)
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef StructuredExceptionHandlerSupressor_h
-#define StructuredExceptionHandlerSupressor_h
-
-namespace WebCore {
-
-class StructuredExceptionHandlerSupressor {
- WTF_MAKE_NONCOPYABLE(StructuredExceptionHandlerSupressor);
-public:
- StructuredExceptionHandlerSupressor()
- {
- // Windows puts an __try/__except block around some calls, such as hooks.
- // The exception handler then ignores system exceptions like invalid addresses
- // and null pointers. This class can be used to remove this block and prevent
- // it from catching the exception. Typically this will cause the exception to crash
- // which is often desirable to allow crashlogs to be recorded for debugging purposed.
- // While this class is in scope we replace the Windows exception handler with 0xffffffff,
- // which indicates that the exception should not be handled.
-
- // Windows doesn't like assigning to member variables, so we need to get the value into
- // a local variable and store it afterwards.
- void* registration;
-
- __asm mov eax, FS:[0]
- __asm mov [registration], eax
- __asm mov eax, 0xffffffff
- __asm mov FS:[0], eax
-
- m_savedExceptionRegistration = registration;
- }
-
- ~StructuredExceptionHandlerSupressor()
- {
- // Restore the exception handler
- __asm mov eax, [m_savedExceptionRegistration]
- __asm mov FS:[0], eax
- }
-
-private:
- void* m_savedExceptionRegistration;
-};
-
-} // namespace WebCore
-
-#endif // StructuredExceptionHandlerSupressor_h
