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.bot@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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95248 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 1d4bfd4..84735d2 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-09-15  Sheriff Bot  <webkit.review.bot@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.fraser@apple.com>
 
         Attempt to fix Windows build after r95243.

diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
index a270a3f..1bdba5e 100755 (executable)
--- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -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"
                                                                >

diff --git a/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp b/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp
index f347c24..ec2a9ff 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp
+++ b/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp
@@ -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 @@ void LayerChangesFlusher::cancelPendingFlush(AbstractCACFLayerTreeHost* host)
 
 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);
 }
 

diff --git a/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp b/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp
index 683d703..4cb49e0 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp
+++ b/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp
@@ -183,8 +183,7 @@ PassRefPtr<PlatformCAAnimation> PlatformCAAnimation::copy() const
     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) {

diff --git a/Source/WebCore/platform/win/StructuredExceptionHandlerSupressor.h b/Source/WebCore/platform/win/StructuredExceptionHandlerSupressor.h
deleted file mode 100644 (file)
index 8da97f1..0000000
--- a/Source/WebCore/platform/win/StructuredExceptionHandlerSupressor.h
+++ /dev/null
@@ -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