Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (91055 => 91056)
--- trunk/Source/WebCore/CMakeLists.txt 2011-07-15 06:49:28 UTC (rev 91055)
+++ trunk/Source/WebCore/CMakeLists.txt 2011-07-15 06:56:22 UTC (rev 91056)
@@ -540,6 +540,7 @@
dom/EventQueue.cpp
dom/ExceptionBase.cpp
dom/ExceptionCode.cpp
+ dom/ExceptionCodePlaceholder.cpp
dom/ExclusiveTrackList.cpp
dom/IconURL.cpp
dom/KeyboardEvent.cpp
Modified: trunk/Source/WebCore/ChangeLog (91055 => 91056)
--- trunk/Source/WebCore/ChangeLog 2011-07-15 06:49:28 UTC (rev 91055)
+++ trunk/Source/WebCore/ChangeLog 2011-07-15 06:56:22 UTC (rev 91056)
@@ -1,3 +1,24 @@
+2011-07-14 MORITA Hajime <[email protected]>
+
+ ExceptionCodePlaceholder should have its own ExceptionCodePlaceholder.cpp file
+ https://bugs.webkit.org/show_bug.cgi?id=64503
+
+ Reviewed by Darin Adler.
+
+ No new tests. Just a file reorg.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * WebCore.gypi:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/DOMAllInOne.cpp:
+ * dom/ExceptionCodePlaceholder.cpp: Added.
+ (WebCore::NoExceptionAssertionChecker::NoExceptionAssertionChecker):
+ (WebCore::NoExceptionAssertionChecker::~NoExceptionAssertionChecker):
+ * dom/ExceptionCodePlaceholder.h: Removed NoExceptionAssertionChecker::m_function, which is loonger used.
+
2011-07-14 Mark Pilgrim <[email protected]>
Remove LegacyDefaultOptionalArguments flag from WebGL
Modified: trunk/Source/WebCore/GNUmakefile.list.am (91055 => 91056)
--- trunk/Source/WebCore/GNUmakefile.list.am 2011-07-15 06:49:28 UTC (rev 91055)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2011-07-15 06:56:22 UTC (rev 91056)
@@ -1174,6 +1174,8 @@
Source/WebCore/dom/ExceptionBase.h \
Source/WebCore/dom/ExceptionCode.cpp \
Source/WebCore/dom/ExceptionCode.h \
+ Source/WebCore/dom/ExceptionCodePlaceholder.cpp \
+ Source/WebCore/dom/ExceptionCodePlaceholder.h \
Source/WebCore/dom/ExclusiveTrackList.cpp \
Source/WebCore/dom/ExclusiveTrackList.h \
Source/WebCore/dom/FragmentScriptingPermission.h \
Modified: trunk/Source/WebCore/WebCore.gypi (91055 => 91056)
--- trunk/Source/WebCore/WebCore.gypi 2011-07-15 06:49:28 UTC (rev 91055)
+++ trunk/Source/WebCore/WebCore.gypi 2011-07-15 06:56:22 UTC (rev 91056)
@@ -528,6 +528,7 @@
'dom/EventNames.h',
'dom/EventTarget.h',
'dom/ExceptionCode.h',
+ 'dom/ExceptionCodePlaceholder.h',
'dom/FragmentScriptingPermission.h',
'dom/KeyboardEvent.h',
'dom/MappedAttributeEntry.h',
@@ -2504,11 +2505,11 @@
'dom/ExceptionBase.cpp',
'dom/ExceptionBase.h',
'dom/ExceptionCode.cpp',
+ 'dom/ExceptionCodePlaceholder.cpp',
'dom/ExclusiveTrackList.cpp',
'dom/ExclusiveTrackList.h',
'dom/HashChangeEvent.h',
'dom/IgnoreDestructiveWriteCountIncrementer.h',
- 'dom/ExceptionCodePlaceholder.h',
'dom/IconURL.cpp',
'dom/IconURL.h',
'dom/KeyboardEvent.cpp',
Modified: trunk/Source/WebCore/WebCore.pro (91055 => 91056)
--- trunk/Source/WebCore/WebCore.pro 2011-07-15 06:49:28 UTC (rev 91055)
+++ trunk/Source/WebCore/WebCore.pro 2011-07-15 06:56:22 UTC (rev 91056)
@@ -497,6 +497,7 @@
dom/EventQueue.cpp \
dom/ExceptionBase.cpp \
dom/ExceptionCode.cpp \
+ dom/ExceptionCodePlaceholder.cpp \
dom/ExclusiveTrackList.cpp \
dom/IconURL.cpp \
dom/KeyboardEvent.cpp \
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (91055 => 91056)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-07-15 06:49:28 UTC (rev 91055)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-07-15 06:56:22 UTC (rev 91056)
@@ -45502,6 +45502,114 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\dom\ExceptionCodePlaceholder.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo_CFLite|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo_CFLite|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Production|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\dom\ExceptionCodePlaceholder.h"
+ >
+ </File>
+ <File
+ RelativePath="..\dom\ExclusiveTrackList.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo_CFLite|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo_CFLite|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Production|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\dom\ExclusiveTrackList.h"
>
</File>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (91055 => 91056)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-07-15 06:49:28 UTC (rev 91055)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-07-15 06:56:22 UTC (rev 91056)
@@ -3329,6 +3329,7 @@
A7CA595D0B27BD9E00FA021D /* DragController.h in Headers */ = {isa = PBXBuildFile; fileRef = A7CA595B0B27BD9E00FA021D /* DragController.h */; settings = {ATTRIBUTES = (Private, ); }; };
A7CA595E0B27BD9E00FA021D /* DragController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7CA595C0B27BD9E00FA021D /* DragController.cpp */; };
A7CA59630B27C1F200FA021D /* DragClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A7CA59620B27C1F200FA021D /* DragClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A7CACDB113CE875C00BBBE3F /* ExceptionCodePlaceholder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7CACDB013CE875B00BBBE3F /* ExceptionCodePlaceholder.cpp */; };
A7CFB3D10B7ED10A0070C32D /* DragImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7CFB3CF0B7ED10A0070C32D /* DragImage.cpp */; };
A7CFB3D20B7ED10A0070C32D /* DragImage.h in Headers */ = {isa = PBXBuildFile; fileRef = A7CFB3D00B7ED10A0070C32D /* DragImage.h */; settings = {ATTRIBUTES = (Private, ); }; };
A7CFB3D50B7ED1180070C32D /* DragImageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A7CFB3D40B7ED1180070C32D /* DragImageMac.mm */; };
@@ -9853,6 +9854,7 @@
A7CA595B0B27BD9E00FA021D /* DragController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragController.h; sourceTree = "<group>"; };
A7CA595C0B27BD9E00FA021D /* DragController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DragController.cpp; sourceTree = "<group>"; };
A7CA59620B27C1F200FA021D /* DragClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragClient.h; sourceTree = "<group>"; };
+ A7CACDB013CE875B00BBBE3F /* ExceptionCodePlaceholder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExceptionCodePlaceholder.cpp; sourceTree = "<group>"; };
A7CFB3CF0B7ED10A0070C32D /* DragImage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DragImage.cpp; sourceTree = "<group>"; };
A7CFB3D00B7ED10A0070C32D /* DragImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DragImage.h; sourceTree = "<group>"; };
A7CFB3D40B7ED1180070C32D /* DragImageMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DragImageMac.mm; sourceTree = "<group>"; };
@@ -19638,6 +19640,7 @@
BC60D8F10D2A11E000B9918F /* ExceptionBase.h */,
93831B560D087D6000E5C984 /* ExceptionCode.cpp */,
935FBCF109BA143B00E230B1 /* ExceptionCode.h */,
+ A7CACDB013CE875B00BBBE3F /* ExceptionCodePlaceholder.cpp */,
A74BB76A13BDA86300FF7BF0 /* ExceptionCodePlaceholder.h */,
B12D233513560282002A28D4 /* ExclusiveTrackList.cpp */,
B12D233613560282002A28D4 /* ExclusiveTrackList.h */,
@@ -24055,6 +24058,7 @@
E12EDBEA0B308E0B002704B6 /* EventTarget.cpp in Sources */,
BC60D8F20D2A11E000B9918F /* ExceptionBase.cpp in Sources */,
93831B570D087D6000E5C984 /* ExceptionCode.cpp in Sources */,
+ A7CACDB113CE875C00BBBE3F /* ExceptionCodePlaceholder.cpp in Sources */,
148AFDA60AF58360008CC700 /* ExceptionHandlers.mm in Sources */,
B12D233E13560282002A28D4 /* ExclusiveTrackList.cpp in Sources */,
6E67D2A61280E8A4008758F7 /* Extensions3DOpenGL.cpp in Sources */,
Modified: trunk/Source/WebCore/dom/DOMAllInOne.cpp (91055 => 91056)
--- trunk/Source/WebCore/dom/DOMAllInOne.cpp 2011-07-15 06:49:28 UTC (rev 91055)
+++ trunk/Source/WebCore/dom/DOMAllInOne.cpp 2011-07-15 06:56:22 UTC (rev 91056)
@@ -75,6 +75,7 @@
#include "EventTarget.cpp"
#include "ExceptionBase.cpp"
#include "ExceptionCode.cpp"
+#include "ExceptionCodePlaceholder.cpp"
#include "ExclusiveTrackList.cpp"
#include "IconURL.cpp"
#include "KeyboardEvent.cpp"
Added: trunk/Source/WebCore/dom/ExceptionCodePlaceholder.cpp (0 => 91056)
--- trunk/Source/WebCore/dom/ExceptionCodePlaceholder.cpp (rev 0)
+++ trunk/Source/WebCore/dom/ExceptionCodePlaceholder.cpp 2011-07-15 06:56:22 UTC (rev 91056)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2011 Google 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:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * 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.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ * OWNER OR 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.
+ */
+
+#include "config.h"
+#include "ExceptionCodePlaceholder.h"
+
+namespace WebCore {
+
+#if !ASSERT_DISABLED
+
+NoExceptionAssertionChecker::NoExceptionAssertionChecker(const char* file, int line)
+ : ExceptionCodePlaceholder(0)
+ , m_file(file)
+ , m_line(line)
+{
+}
+
+NoExceptionAssertionChecker::~NoExceptionAssertionChecker()
+{
+ ASSERT_AT(!m_code, m_file, m_line, "");
+}
+
+#endif
+
+}
Modified: trunk/Source/WebCore/dom/ExceptionCodePlaceholder.h (91055 => 91056)
--- trunk/Source/WebCore/dom/ExceptionCodePlaceholder.h 2011-07-15 06:49:28 UTC (rev 91055)
+++ trunk/Source/WebCore/dom/ExceptionCodePlaceholder.h 2011-07-15 06:56:22 UTC (rev 91056)
@@ -72,21 +72,8 @@
private:
const char* m_file;
int m_line;
- const char* m_function;
};
-inline NoExceptionAssertionChecker::NoExceptionAssertionChecker(const char* file, int line)
- : ExceptionCodePlaceholder(0)
- , m_file(file)
- , m_line(line)
-{
-}
-
-inline NoExceptionAssertionChecker::~NoExceptionAssertionChecker()
-{
- ASSERT_AT(!m_code, m_file, m_line, "");
-}
-
#define ASSERT_NO_EXCEPTION ::WebCore::NoExceptionAssertionChecker(__FILE__, __LINE__)
#endif
