Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(729)

Side by Side Diff: third_party/WebKit/WebCore/DerivedSources.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #include "JSDOMImplementation.cpp" 60 #include "JSDOMImplementation.cpp"
61 #include "JSDOMParser.cpp" 61 #include "JSDOMParser.cpp"
62 #include "JSDOMSelection.cpp" 62 #include "JSDOMSelection.cpp"
63 #include "JSDOMStringList.cpp" 63 #include "JSDOMStringList.cpp"
64 #include "JSDOMWindow.cpp" 64 #include "JSDOMWindow.cpp"
65 #include "JSElement.cpp" 65 #include "JSElement.cpp"
66 #include "JSEntity.cpp" 66 #include "JSEntity.cpp"
67 #include "JSEntityReference.cpp" 67 #include "JSEntityReference.cpp"
68 #include "JSEvent.cpp" 68 #include "JSEvent.cpp"
69 #include "JSEventException.cpp" 69 #include "JSEventException.cpp"
70 #include "JSEventTargetNode.cpp"
70 #include "JSFile.cpp" 71 #include "JSFile.cpp"
71 #include "JSFileList.cpp" 72 #include "JSFileList.cpp"
72 #include "JSHistory.cpp" 73 #include "JSHistory.cpp"
73 #include "JSHTMLAnchorElement.cpp" 74 #include "JSHTMLAnchorElement.cpp"
74 #include "JSHTMLAppletElement.cpp" 75 #include "JSHTMLAppletElement.cpp"
75 #include "JSHTMLAreaElement.cpp" 76 #include "JSHTMLAreaElement.cpp"
76 #include "JSHTMLAudioElement.cpp" 77 #include "JSHTMLAudioElement.cpp"
77 #include "JSHTMLBaseElement.cpp" 78 #include "JSHTMLBaseElement.cpp"
78 #include "JSHTMLBaseFontElement.cpp" 79 #include "JSHTMLBaseFontElement.cpp"
79 #include "JSHTMLBlockquoteElement.cpp" 80 #include "JSHTMLBlockquoteElement.cpp"
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 #include "UserAgentStyleSheetsData.cpp" 338 #include "UserAgentStyleSheetsData.cpp"
338 339
339 // On MSVC, including StaticConstructors.h causes all global objects not to be 340 // On MSVC, including StaticConstructors.h causes all global objects not to be
340 // automatically initialized by the C runtime. This is useful in some specific 341 // automatically initialized by the C runtime. This is useful in some specific
341 // cases (e.g., the *Names.cpp files), but can be dangerous in others. We don't 342 // cases (e.g., the *Names.cpp files), but can be dangerous in others. We don't
342 // want StaticConstructors.h to "pollute" all the source files we #include here 343 // want StaticConstructors.h to "pollute" all the source files we #include here
343 // accidentally, so we'll throw an error whenever any file includes it. 344 // accidentally, so we'll throw an error whenever any file includes it.
344 #ifdef StaticConstructors_h 345 #ifdef StaticConstructors_h
345 #error Don't include any file in DerivedSources.cpp that includes StaticConstruc tors.h 346 #error Don't include any file in DerivedSources.cpp that includes StaticConstruc tors.h
346 #endif 347 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/JavaScriptCore/wtf/chromium/MainThreadChromium.cpp ('k') | third_party/WebKit/WebCore/DerivedSources.make » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698