Diff
Modified: trunk/Source/WebCore/ChangeLog (155214 => 155215)
--- trunk/Source/WebCore/ChangeLog 2013-09-06 21:53:48 UTC (rev 155214)
+++ trunk/Source/WebCore/ChangeLog 2013-09-06 21:58:38 UTC (rev 155215)
@@ -1,3 +1,14 @@
+2013-09-06 Brent Fulgham <[email protected]>
+
+ [Windows] Unreviewed gardening: Spell 'Suppressor' properly
+
+ * WebCore.vcxproj/WebCore.vcxproj: Change StructuredExceptionHandlerSupressor to StructuredExceptionHandlerSuppressor
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto
+ * platform/graphics/ca/win/LayerChangesFlusher.cpp:
+ (WebCore::LayerChangesFlusher::hookCallback): Ditto
+ * platform/win/StructuredExceptionHandlerSuppressor.h: Copied from platform/win/StructuredExceptionHandlerSupressor.h.
+ * platform/win/StructuredExceptionHandlerSupressor.h: Removed.
+
2013-09-06 David Hyatt <[email protected]>
Add new RenderBlockFlow class.
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (155214 => 155215)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-09-06 21:53:48 UTC (rev 155214)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-09-06 21:58:38 UTC (rev 155215)
@@ -19361,7 +19361,7 @@
<ClInclude Include="..\platform\win\ScrollbarThemeWin.h" />
<ClInclude Include="..\platform\win\SearchPopupMenuWin.h" />
<ClInclude Include="..\platform\win\SoftLinking.h" />
- <ClInclude Include="..\platform\win\StructuredExceptionHandlerSupressor.h" />
+ <ClInclude Include="..\platform\win\StructuredExceptionHandlerSuppressor.h" />
<ClInclude Include="..\platform\win\SystemInfo.h" />
<ClInclude Include="..\platform\graphics\TextRenderingMode.h" />
<ClInclude Include="..\platform\win\WCDataObject.h" />
@@ -21444,4 +21444,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (155214 => 155215)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-09-06 21:53:48 UTC (rev 155214)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-09-06 21:58:38 UTC (rev 155215)
@@ -8388,7 +8388,7 @@
<ClInclude Include="..\platform\win\SoftLinking.h">
<Filter>platform\win</Filter>
</ClInclude>
- <ClInclude Include="..\platform\win\StructuredExceptionHandlerSupressor.h">
+ <ClInclude Include="..\platform\win\StructuredExceptionHandlerSuppressor.h">
<Filter>platform\win</Filter>
</ClInclude>
<ClInclude Include="..\platform\win\SystemInfo.h">
@@ -15881,4 +15881,4 @@
<Filter>plugins\win</Filter>
</MASM>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp (155214 => 155215)
--- trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp 2013-09-06 21:53:48 UTC (rev 155214)
+++ trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp 2013-09-06 21:58:38 UTC (rev 155215)
@@ -29,7 +29,7 @@
#if USE(ACCELERATED_COMPOSITING)
#include "AbstractCACFLayerTreeHost.h"
-#include "StructuredExceptionHandlerSupressor.h"
+#include "StructuredExceptionHandlerSuppressor.h"
#include <wtf/StdLibExtras.h>
#include <wtf/Vector.h>
@@ -74,7 +74,7 @@
{
// Supress the exception handler Windows puts around all hook calls so we can
// crash for debugging purposes if an exception is hit.
- StructuredExceptionHandlerSupressor supressor;
+ StructuredExceptionHandlerSuppressor supressor;
return shared().hookFired(code, wParam, lParam);
}
Copied: trunk/Source/WebCore/platform/win/StructuredExceptionHandlerSuppressor.h (from rev 155213, trunk/Source/WebCore/platform/win/StructuredExceptionHandlerSupressor.h) (0 => 155215)
--- trunk/Source/WebCore/platform/win/StructuredExceptionHandlerSuppressor.h (rev 0)
+++ trunk/Source/WebCore/platform/win/StructuredExceptionHandlerSuppressor.h 2013-09-06 21:58:38 UTC (rev 155215)
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2011, 2013 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 StructuredExceptionHandlerSuppressor_h
+#define StructuredExceptionHandlerSuppressor_h
+
+namespace WebCore {
+
+#pragma warning(push)
+#pragma warning(disable: 4733) // Disable "not registered as safe handler" warning
+
+class StructuredExceptionHandlerSuppressor {
+ WTF_MAKE_NONCOPYABLE(StructuredExceptionHandlerSuppressor);
+public:
+ StructuredExceptionHandlerSuppressor()
+ {
+ // 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.
+ //
+ // See http://www.microsoft.com/msj/0197/Exception/Exception.aspx
+
+ // 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;
+ }
+
+ ~StructuredExceptionHandlerSuppressor()
+ {
+ // Restore the exception handler
+ __asm mov eax, [m_savedExceptionRegistration]
+ __asm mov FS:[0], eax
+ }
+
+private:
+ void* m_savedExceptionRegistration;
+};
+
+#pragma warning(pop)
+
+} // namespace WebCore
+
+#endif // StructuredExceptionHandlerSuppressor_h
Deleted: trunk/Source/WebCore/platform/win/StructuredExceptionHandlerSupressor.h (155214 => 155215)
--- trunk/Source/WebCore/platform/win/StructuredExceptionHandlerSupressor.h 2013-09-06 21:53:48 UTC (rev 155214)
+++ trunk/Source/WebCore/platform/win/StructuredExceptionHandlerSupressor.h 2013-09-06 21:58:38 UTC (rev 155215)
@@ -1,76 +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 {
-
-#pragma warning(push)
-#pragma warning(disable: 4733) // Disable "not registered as safe handler" warning
-
-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.
- //
- // See http://www.microsoft.com/msj/0197/Exception/Exception.aspx
-
- // 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;
-};
-
-#pragma warning(pop)
-
-} // namespace WebCore
-
-#endif // StructuredExceptionHandlerSupressor_h
