diff options
| author | commit-queue@webkit.org <commit-queue@webkit.org> | 2012-10-17 10:46:48 +0000 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 13:16:54 +0200 |
| commit | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (patch) | |
| tree | a6f7625024a386d8408d1466ec52e2765a331533 /Source/WebCore/html | |
| parent | d45ff9df96f475d5ae3b68eb709278eac93e6a92 (diff) | |
Enable use of more AllInOne files https://bugs.webkit.org/show_bug.cgi?id=99579
Patch by Simon Hausmann <simon.hausmann@digia.com> on 2012-10-17
Reviewed by Tor Arne Vestbø.
The AllInOne files reduce pressure during final link time because the object files contain less duplicated
symbols.
* Target.pri: Add HTMLElementsAllInOne, EditingAllInOne and RenderingAllInOne to the build
* editing/EditingAllInOne.cpp: Place a #if USE(CF) around the inclusion of SmartReplaceCF.cpp
* html/HTMLElementsAllInOne.cpp: Move HTMLPlugInElement.cpp to the top to fix builds on X11 based platforms
where the X headers get confused by the "Region" type that's also declared in WebCore.
* rendering/RenderingAllInOne.cpp: Fix build on case-sensitive file systems (Plugin -> PlugIn) and added a
#if PLATFORM(WIN) around the inclusion of RenderThemeWin.cpp.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@131582 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Diffstat (limited to 'Source/WebCore/html')
| -rw-r--r-- | Source/WebCore/html/HTMLElementsAllInOne.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebCore/html/HTMLElementsAllInOne.cpp b/Source/WebCore/html/HTMLElementsAllInOne.cpp index 3adde30c5..8847ae120 100644 --- a/Source/WebCore/html/HTMLElementsAllInOne.cpp +++ b/Source/WebCore/html/HTMLElementsAllInOne.cpp @@ -31,6 +31,9 @@ // This source file coalesces the HTML elements into a single object file to // reduce bloat and allow us to link release builds on 32-bit Windows. +// This file comes first due to the inclusion of conflicting X11 headers +#include "HTMLPlugInElement.cpp" + #include "HTMLAnchorElement.cpp" #include "HTMLAppletElement.cpp" #include "HTMLAreaElement.cpp" @@ -85,7 +88,6 @@ #include "HTMLOptionElement.cpp" #include "HTMLParagraphElement.cpp" #include "HTMLParamElement.cpp" -#include "HTMLPlugInElement.cpp" #include "HTMLPlugInImageElement.cpp" #include "HTMLPreElement.cpp" #include "HTMLProgressElement.cpp" |