Title: [131582] trunk/Source/WebCore
- Revision
- 131582
- Author
- [email protected]
- Date
- 2012-10-17 03:46:48 -0700 (Wed, 17 Oct 2012)
Log Message
[Qt] Enable use of more AllInOne files
https://bugs.webkit.org/show_bug.cgi?id=99579
Patch by Simon Hausmann <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131581 => 131582)
--- trunk/Source/WebCore/ChangeLog 2012-10-17 10:40:10 UTC (rev 131581)
+++ trunk/Source/WebCore/ChangeLog 2012-10-17 10:46:48 UTC (rev 131582)
@@ -1,3 +1,20 @@
+2012-10-17 Simon Hausmann <[email protected]>
+
+ [Qt] Enable use of more AllInOne files
+ https://bugs.webkit.org/show_bug.cgi?id=99579
+
+ 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.
+
2012-10-17 Kent Tamura <[email protected]>
REGRESSION(r131421): Text baseline becomes incorrect after re-layout of input[type=time]
Modified: trunk/Source/WebCore/Target.pri (131581 => 131582)
--- trunk/Source/WebCore/Target.pri 2012-10-17 10:40:10 UTC (rev 131581)
+++ trunk/Source/WebCore/Target.pri 2012-10-17 10:46:48 UTC (rev 131582)
@@ -4063,7 +4063,10 @@
inspector/InspectorAllInOne.cpp \
loader/appcache/ApplicationCacheAllInOne.cpp \
platform/text/TextAllInOne.cpp \
- rendering/style/StyleAllInOne.cpp
+ rendering/style/StyleAllInOne.cpp \
+ html/HTMLElementsAllInOne.cpp \
+ editing/EditingAllInOne.cpp \
+ rendering/RenderingAllInOne.cpp
enable?(XSLT):use?(LIBXML2) {
ALL_IN_ONE_SOURCES += \
@@ -4073,9 +4076,6 @@
# These do not compile at the moment:
# css/MediaAllInOne.cpp
# css/CSSAllInOne.cpp
-# editing/EditingAllInOne.cpp
-# html/HTMLElementsAllInOne.cpp
-# rendering/RenderingAllInOne.cpp
# Make sure the derived sources are built
include(DerivedSources.pri)
Modified: trunk/Source/WebCore/editing/EditingAllInOne.cpp (131581 => 131582)
--- trunk/Source/WebCore/editing/EditingAllInOne.cpp 2012-10-17 10:40:10 UTC (rev 131581)
+++ trunk/Source/WebCore/editing/EditingAllInOne.cpp 2012-10-17 10:46:48 UTC (rev 131582)
@@ -67,7 +67,9 @@
#include <SetSelectionCommand.cpp>
#include <SimplifyMarkupCommand.cpp>
#include <SmartReplace.cpp>
+#if USE(CF)
#include <SmartReplaceCF.cpp>
+#endif
#include <SpellingCorrectionCommand.cpp>
#include <SpellChecker.cpp>
#include <SplitElementCommand.cpp>
Modified: trunk/Source/WebCore/html/HTMLElementsAllInOne.cpp (131581 => 131582)
--- trunk/Source/WebCore/html/HTMLElementsAllInOne.cpp 2012-10-17 10:40:10 UTC (rev 131581)
+++ trunk/Source/WebCore/html/HTMLElementsAllInOne.cpp 2012-10-17 10:46:48 UTC (rev 131582)
@@ -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"
Modified: trunk/Source/WebCore/rendering/RenderingAllInOne.cpp (131581 => 131582)
--- trunk/Source/WebCore/rendering/RenderingAllInOne.cpp 2012-10-17 10:40:10 UTC (rev 131581)
+++ trunk/Source/WebCore/rendering/RenderingAllInOne.cpp 2012-10-17 10:46:48 UTC (rev 131582)
@@ -95,7 +95,7 @@
#include "RenderScrollbarTheme.cpp"
#include "RenderSearchField.cpp"
#include "RenderSlider.cpp"
-#include "RenderSnapshottedPlugin.cpp"
+#include "RenderSnapshottedPlugIn.cpp"
#include "RenderTable.cpp"
#include "RenderTableCaption.cpp"
#include "RenderTableCell.cpp"
@@ -108,7 +108,9 @@
#include "RenderTextControlSingleLine.cpp"
#include "RenderTextFragment.cpp"
#include "RenderTheme.cpp"
+#if PLATFORM(WIN)
#include "RenderThemeWin.cpp"
+#endif
#include "RenderTreeAsText.cpp"
#include "RenderVideo.cpp"
#include "RenderView.cpp"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
