Changeset 91056 in webkit
- Timestamp:
- Jul 14, 2011 11:56:22 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 1 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r91008 r91056 541 541 dom/ExceptionBase.cpp 542 542 dom/ExceptionCode.cpp 543 dom/ExceptionCodePlaceholder.cpp 543 544 dom/ExclusiveTrackList.cpp 544 545 dom/IconURL.cpp -
trunk/Source/WebCore/ChangeLog
r91053 r91056 1 2011-07-14 MORITA Hajime <morrita@google.com> 2 3 ExceptionCodePlaceholder should have its own ExceptionCodePlaceholder.cpp file 4 https://bugs.webkit.org/show_bug.cgi?id=64503 5 6 Reviewed by Darin Adler. 7 8 No new tests. Just a file reorg. 9 10 * CMakeLists.txt: 11 * GNUmakefile.list.am: 12 * WebCore.gypi: 13 * WebCore.pro: 14 * WebCore.vcproj/WebCore.vcproj: 15 * WebCore.xcodeproj/project.pbxproj: 16 * dom/DOMAllInOne.cpp: 17 * dom/ExceptionCodePlaceholder.cpp: Added. 18 (WebCore::NoExceptionAssertionChecker::NoExceptionAssertionChecker): 19 (WebCore::NoExceptionAssertionChecker::~NoExceptionAssertionChecker): 20 * dom/ExceptionCodePlaceholder.h: Removed NoExceptionAssertionChecker::m_function, which is loonger used. 21 1 22 2011-07-14 Mark Pilgrim <pilgrim@chromium.org> 2 23 -
trunk/Source/WebCore/GNUmakefile.list.am
r91008 r91056 1175 1175 Source/WebCore/dom/ExceptionCode.cpp \ 1176 1176 Source/WebCore/dom/ExceptionCode.h \ 1177 Source/WebCore/dom/ExceptionCodePlaceholder.cpp \ 1178 Source/WebCore/dom/ExceptionCodePlaceholder.h \ 1177 1179 Source/WebCore/dom/ExclusiveTrackList.cpp \ 1178 1180 Source/WebCore/dom/ExclusiveTrackList.h \ -
trunk/Source/WebCore/WebCore.gypi
r91008 r91056 529 529 'dom/EventTarget.h', 530 530 'dom/ExceptionCode.h', 531 'dom/ExceptionCodePlaceholder.h', 531 532 'dom/FragmentScriptingPermission.h', 532 533 'dom/KeyboardEvent.h', … … 2505 2506 'dom/ExceptionBase.h', 2506 2507 'dom/ExceptionCode.cpp', 2508 'dom/ExceptionCodePlaceholder.cpp', 2507 2509 'dom/ExclusiveTrackList.cpp', 2508 2510 'dom/ExclusiveTrackList.h', 2509 2511 'dom/HashChangeEvent.h', 2510 2512 'dom/IgnoreDestructiveWriteCountIncrementer.h', 2511 'dom/ExceptionCodePlaceholder.h',2512 2513 'dom/IconURL.cpp', 2513 2514 'dom/IconURL.h', -
trunk/Source/WebCore/WebCore.pro
r91008 r91056 498 498 dom/ExceptionBase.cpp \ 499 499 dom/ExceptionCode.cpp \ 500 dom/ExceptionCodePlaceholder.cpp \ 500 501 dom/ExclusiveTrackList.cpp \ 501 502 dom/IconURL.cpp \ -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r91008 r91056 45503 45503 </File> 45504 45504 <File 45505 RelativePath="..\dom\ExceptionCodePlaceholder.cpp" 45506 > 45507 <FileConfiguration 45508 Name="Debug|Win32" 45509 ExcludedFromBuild="true" 45510 > 45511 <Tool 45512 Name="VCCLCompilerTool" 45513 /> 45514 </FileConfiguration> 45515 <FileConfiguration 45516 Name="Release|Win32" 45517 ExcludedFromBuild="true" 45518 > 45519 <Tool 45520 Name="VCCLCompilerTool" 45521 /> 45522 </FileConfiguration> 45523 <FileConfiguration 45524 Name="Debug_Cairo_CFLite|Win32" 45525 ExcludedFromBuild="true" 45526 > 45527 <Tool 45528 Name="VCCLCompilerTool" 45529 /> 45530 </FileConfiguration> 45531 <FileConfiguration 45532 Name="Release_Cairo_CFLite|Win32" 45533 ExcludedFromBuild="true" 45534 > 45535 <Tool 45536 Name="VCCLCompilerTool" 45537 /> 45538 </FileConfiguration> 45539 <FileConfiguration 45540 Name="Debug_All|Win32" 45541 ExcludedFromBuild="true" 45542 > 45543 <Tool 45544 Name="VCCLCompilerTool" 45545 /> 45546 </FileConfiguration> 45547 <FileConfiguration 45548 Name="Production|Win32" 45549 ExcludedFromBuild="true" 45550 > 45551 <Tool 45552 Name="VCCLCompilerTool" 45553 /> 45554 </FileConfiguration> 45555 </File> 45556 <File 45557 RelativePath="..\dom\ExceptionCodePlaceholder.h" 45558 > 45559 </File> 45560 <File 45561 RelativePath="..\dom\ExclusiveTrackList.cpp" 45562 > 45563 <FileConfiguration 45564 Name="Debug|Win32" 45565 ExcludedFromBuild="true" 45566 > 45567 <Tool 45568 Name="VCCLCompilerTool" 45569 /> 45570 </FileConfiguration> 45571 <FileConfiguration 45572 Name="Release|Win32" 45573 ExcludedFromBuild="true" 45574 > 45575 <Tool 45576 Name="VCCLCompilerTool" 45577 /> 45578 </FileConfiguration> 45579 <FileConfiguration 45580 Name="Debug_Cairo_CFLite|Win32" 45581 ExcludedFromBuild="true" 45582 > 45583 <Tool 45584 Name="VCCLCompilerTool" 45585 /> 45586 </FileConfiguration> 45587 <FileConfiguration 45588 Name="Release_Cairo_CFLite|Win32" 45589 ExcludedFromBuild="true" 45590 > 45591 <Tool 45592 Name="VCCLCompilerTool" 45593 /> 45594 </FileConfiguration> 45595 <FileConfiguration 45596 Name="Debug_All|Win32" 45597 ExcludedFromBuild="true" 45598 > 45599 <Tool 45600 Name="VCCLCompilerTool" 45601 /> 45602 </FileConfiguration> 45603 <FileConfiguration 45604 Name="Production|Win32" 45605 ExcludedFromBuild="true" 45606 > 45607 <Tool 45608 Name="VCCLCompilerTool" 45609 /> 45610 </FileConfiguration> 45611 </File> 45612 <File 45505 45613 RelativePath="..\dom\ExclusiveTrackList.h" 45506 45614 > -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r91025 r91056 3330 3330 A7CA595E0B27BD9E00FA021D /* DragController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7CA595C0B27BD9E00FA021D /* DragController.cpp */; }; 3331 3331 A7CA59630B27C1F200FA021D /* DragClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A7CA59620B27C1F200FA021D /* DragClient.h */; settings = {ATTRIBUTES = (Private, ); }; }; 3332 A7CACDB113CE875C00BBBE3F /* ExceptionCodePlaceholder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7CACDB013CE875B00BBBE3F /* ExceptionCodePlaceholder.cpp */; }; 3332 3333 A7CFB3D10B7ED10A0070C32D /* DragImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7CFB3CF0B7ED10A0070C32D /* DragImage.cpp */; }; 3333 3334 A7CFB3D20B7ED10A0070C32D /* DragImage.h in Headers */ = {isa = PBXBuildFile; fileRef = A7CFB3D00B7ED10A0070C32D /* DragImage.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 9854 9855 A7CA595C0B27BD9E00FA021D /* DragController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DragController.cpp; sourceTree = "<group>"; }; 9855 9856 A7CA59620B27C1F200FA021D /* DragClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragClient.h; sourceTree = "<group>"; }; 9857 A7CACDB013CE875B00BBBE3F /* ExceptionCodePlaceholder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExceptionCodePlaceholder.cpp; sourceTree = "<group>"; }; 9856 9858 A7CFB3CF0B7ED10A0070C32D /* DragImage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DragImage.cpp; sourceTree = "<group>"; }; 9857 9859 A7CFB3D00B7ED10A0070C32D /* DragImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DragImage.h; sourceTree = "<group>"; }; … … 19639 19641 93831B560D087D6000E5C984 /* ExceptionCode.cpp */, 19640 19642 935FBCF109BA143B00E230B1 /* ExceptionCode.h */, 19643 A7CACDB013CE875B00BBBE3F /* ExceptionCodePlaceholder.cpp */, 19641 19644 A74BB76A13BDA86300FF7BF0 /* ExceptionCodePlaceholder.h */, 19642 19645 B12D233513560282002A28D4 /* ExclusiveTrackList.cpp */, … … 24056 24059 BC60D8F20D2A11E000B9918F /* ExceptionBase.cpp in Sources */, 24057 24060 93831B570D087D6000E5C984 /* ExceptionCode.cpp in Sources */, 24061 A7CACDB113CE875C00BBBE3F /* ExceptionCodePlaceholder.cpp in Sources */, 24058 24062 148AFDA60AF58360008CC700 /* ExceptionHandlers.mm in Sources */, 24059 24063 B12D233E13560282002A28D4 /* ExclusiveTrackList.cpp in Sources */, -
trunk/Source/WebCore/dom/DOMAllInOne.cpp
r89567 r91056 76 76 #include "ExceptionBase.cpp" 77 77 #include "ExceptionCode.cpp" 78 #include "ExceptionCodePlaceholder.cpp" 78 79 #include "ExclusiveTrackList.cpp" 79 80 #include "IconURL.cpp" -
trunk/Source/WebCore/dom/ExceptionCodePlaceholder.h
r90911 r91056 73 73 const char* m_file; 74 74 int m_line; 75 const char* m_function;76 75 }; 77 78 inline NoExceptionAssertionChecker::NoExceptionAssertionChecker(const char* file, int line)79 : ExceptionCodePlaceholder(0)80 , m_file(file)81 , m_line(line)82 {83 }84 85 inline NoExceptionAssertionChecker::~NoExceptionAssertionChecker()86 {87 ASSERT_AT(!m_code, m_file, m_line, "");88 }89 76 90 77 #define ASSERT_NO_EXCEPTION ::WebCore::NoExceptionAssertionChecker(__FILE__, __LINE__)
Note: See TracChangeset
for help on using the changeset viewer.