Un-inline dataLog dumpers for IntSize and IntPoint
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Aug 2013 00:25:49 +0000 (00:25 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Aug 2013 00:25:49 +0000 (00:25 +0000)
https://bugs.webkit.org/show_bug.cgi?id=119697

Reviewed by Sam Weinig.

.:

Avoid regressing build performance by moving IntSize::dump and IntPoint::dump elsewhere.

* Source/autotools/symbols.filter:

Source/WebCore:

Avoid regressing build performance by moving IntSize::dump and IntPoint::dump elsewhere.

* CMakeLists.txt:
* GNUmakefile.list.am:
* Target.pri:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* platform/graphics/IntPoint.cpp: Added.
(WebCore::IntPoint::dump):
* platform/graphics/IntPoint.h:
* platform/graphics/IntSize.cpp: Added.
(WebCore::IntSize::dump):
* platform/graphics/IntSize.h:

Tools:

* TestWebKitAPI/GNUmakefile.am:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

15 files changed:
ChangeLog
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Target.pri
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/graphics/IntPoint.cpp [new file with mode: 0644]
Source/WebCore/platform/graphics/IntPoint.h
Source/WebCore/platform/graphics/IntSize.cpp [new file with mode: 0644]
Source/WebCore/platform/graphics/IntSize.h
Source/autotools/symbols.filter
Tools/ChangeLog
Tools/TestWebKitAPI/GNUmakefile.am

index a23a11c..892c806 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-08-14  Tim Horton  <timothy_horton@apple.com>
+
+        Un-inline dataLog dumpers for IntSize and IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=119697
+
+        Reviewed by Sam Weinig.
+
+        Avoid regressing build performance by moving IntSize::dump and IntPoint::dump elsewhere.
+
+        * Source/autotools/symbols.filter:
+
 2013-08-14  Martin Robinson  <mrobinson@igalia.com>
 
         [GTK] [CMake] Add support for building TestWebKitAPI
index 0fa6cd7..f13ad2b 100644 (file)
@@ -1919,7 +1919,9 @@ set(WebCore_SOURCES
     platform/graphics/Image.cpp
     platform/graphics/ImageBuffer.cpp
     platform/graphics/ImageOrientation.cpp
+    platform/graphics/IntPoint.cpp
     platform/graphics/IntRect.cpp
+    platform/graphics/IntSize.cpp
     platform/graphics/MediaPlayer.cpp
     platform/graphics/Path.cpp
     platform/graphics/PathTraversalState.cpp
index 49dd79c..8ca6fbe 100644 (file)
@@ -1,3 +1,25 @@
+2013-08-14  Tim Horton  <timothy_horton@apple.com>
+
+        Un-inline dataLog dumpers for IntSize and IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=119697
+
+        Reviewed by Sam Weinig.
+
+        Avoid regressing build performance by moving IntSize::dump and IntPoint::dump elsewhere.
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * Target.pri:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/graphics/IntPoint.cpp: Added.
+        (WebCore::IntPoint::dump):
+        * platform/graphics/IntPoint.h:
+        * platform/graphics/IntSize.cpp: Added.
+        (WebCore::IntSize::dump):
+        * platform/graphics/IntSize.h:
+
 2013-08-14  Chris Fleizach  <cfleizach@apple.com>
 
         <https://webkit.org/b/119824> AX: WKView does not become first responder when the voiceover cursor lands on it
index d57f4c0..7800db0 100644 (file)
@@ -5851,11 +5851,13 @@ platform_sources += \
        Source/WebCore/platform/graphics/ImageSource.h \
        Source/WebCore/platform/graphics/InbandTextTrackPrivate.h \
        Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h \
+       Source/WebCore/platform/graphics/IntPoint.cpp \
        Source/WebCore/platform/graphics/IntPoint.h \
        Source/WebCore/platform/graphics/IntPointHash.h \
        Source/WebCore/platform/graphics/IntRect.cpp \
        Source/WebCore/platform/graphics/IntRect.h \
        Source/WebCore/platform/graphics/IntRectExtent.h \
+       Source/WebCore/platform/graphics/IntSize.cpp \
        Source/WebCore/platform/graphics/IntSize.h \
        Source/WebCore/platform/graphics/IntSizeHash.h \
        Source/WebCore/platform/graphics/LayoutBoxExtent.cpp \
index 634da2e..20d9ef4 100644 (file)
@@ -1010,7 +1010,9 @@ SOURCES += \
     platform/graphics/ImageBuffer.cpp \
     platform/graphics/ImageOrientation.cpp \
     platform/graphics/ImageSource.cpp \
+    platform/graphics/IntPoint.cpp \
     platform/graphics/IntRect.cpp \
+    platform/graphics/IntSize.cpp \
     platform/graphics/Path.cpp \
     platform/graphics/PathTraversalState.cpp \
     platform/graphics/Pattern.cpp \
index 8bc5a85..6b4a85f 100644 (file)
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\platform\graphics\IntPoint.cpp" />
     <ClCompile Include="..\platform\graphics\IntRect.cpp" />
+    <ClCompile Include="..\platform\graphics\IntSize.cpp" />
     <ClCompile Include="..\platform\graphics\LayoutBoxExtent.cpp" />
     <ClCompile Include="..\platform\graphics\LayoutRect.cpp" />
     <ClCompile Include="..\platform\graphics\MediaPlayer.cpp" />
index a7a69d1..92925f5 100644 (file)
     <ClCompile Include="..\platform\graphics\ImageSource.cpp">
       <Filter>platform\graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\platform\graphics\IntPoint.cpp">
+      <Filter>platform\graphics</Filter>
+    </ClCompile>
     <ClCompile Include="..\platform\graphics\IntRect.cpp">
       <Filter>platform\graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\platform\graphics\IntSize.cpp">
+      <Filter>platform\graphics</Filter>
+    </ClCompile>
     <ClCompile Include="..\platform\graphics\LayoutBoxExtent.cpp">
       <Filter>platform\graphics</Filter>
     </ClCompile>
index ebc5cc3..d92ba0e 100644 (file)
                2BE8E2C712A589EC00FAD550 /* HTMLMetaCharsetParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BE8E2C612A589EC00FAD550 /* HTMLMetaCharsetParser.h */; };
                2BE8E2C912A58A0100FAD550 /* HTMLMetaCharsetParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BE8E2C812A58A0100FAD550 /* HTMLMetaCharsetParser.cpp */; };
                2D3A0E3613A7D76100E85AF0 /* SVGParsingError.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D3A0E3513A7D76100E85AF0 /* SVGParsingError.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               2D46F04E17B96FBD005647F0 /* IntPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D46F04D17B96FBD005647F0 /* IntPoint.cpp */; };
+               2D46F05017B96FD2005647F0 /* IntSize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D46F04F17B96FD2005647F0 /* IntSize.cpp */; };
                2D481F00146B5C4C00AA7834 /* CrossfadeGeneratedImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D2FC0541460CD6F00263633 /* CrossfadeGeneratedImage.cpp */; };
                2D481F02146B5C5500AA7834 /* CrossfadeGeneratedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D2FC0551460CD6F00263633 /* CrossfadeGeneratedImage.h */; };
                2D481F03146B5C6500AA7834 /* GeneratorGeneratedImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D2FC0561460CD6F00263633 /* GeneratorGeneratedImage.cpp */; };
                2D2FC0561460CD6F00263633 /* GeneratorGeneratedImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeneratorGeneratedImage.cpp; sourceTree = "<group>"; };
                2D2FC0571460CD6F00263633 /* GeneratorGeneratedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneratorGeneratedImage.h; sourceTree = "<group>"; };
                2D3A0E3513A7D76100E85AF0 /* SVGParsingError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGParsingError.h; sourceTree = "<group>"; };
+               2D46F04D17B96FBD005647F0 /* IntPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntPoint.cpp; sourceTree = "<group>"; };
+               2D46F04F17B96FD2005647F0 /* IntSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntSize.cpp; sourceTree = "<group>"; };
                2D5BC42516F882BE007048D0 /* SecurityPolicyViolationEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecurityPolicyViolationEvent.h; sourceTree = "<group>"; };
                2D5BC42616F882BE007048D0 /* SecurityPolicyViolationEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SecurityPolicyViolationEvent.idl; sourceTree = "<group>"; };
                2D8287F416E4A0380086BD00 /* HitTestLocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HitTestLocation.cpp; sourceTree = "<group>"; };
                                B27535430B053814002CE64F /* ImageSource.h */,
                                07941793166EA04E009416C2 /* InbandTextTrackPrivate.h */,
                                07CE77D416712A6A00C55A47 /* InbandTextTrackPrivateClient.h */,
+                               2D46F04D17B96FBD005647F0 /* IntPoint.cpp */,
                                B27535440B053814002CE64F /* IntPoint.h */,
                                E462A4A0113E71BE004A4220 /* IntPointHash.h */,
                                B27535450B053814002CE64F /* IntRect.cpp */,
                                B27535460B053814002CE64F /* IntRect.h */,
                                A2B9217216C5CC420041DCD9 /* IntRectExtent.h */,
                                E134F5AA12EE343F004EC58D /* IntRectHash.h */,
+                               2D46F04F17B96FD2005647F0 /* IntSize.cpp */,
                                B27535470B053814002CE64F /* IntSize.h */,
                                B27535480B053814002CE64F /* IntSizeHash.h */,
                                65CC6BED16014EC0000ED27D /* Latin1TextIterator.h */,
                                A8C2280E11D4A59700D5A7D3 /* DocumentParser.cpp in Sources */,
                                4A4F48A916B0DFC000EDBB29 /* DocumentRuleSets.cpp in Sources */,
                                AD6E71AC1668899D00320C13 /* DocumentSharedObjectPool.cpp in Sources */,
+                               2D46F04E17B96FBD005647F0 /* IntPoint.cpp in Sources */,
                                E47E276816036EDC00EE2AFB /* DocumentStyleSheetCollection.cpp in Sources */,
                                0B9056190F2578BE0095FF6A /* DocumentThreadableLoader.cpp in Sources */,
                                A8185F3A09765766005826D9 /* DocumentType.cpp in Sources */,
                                A8EA7CAE0A192B9C00A8EF5F /* HTMLHeadingElement.cpp in Sources */,
                                A8EA7CB30A192B9C00A8EF5F /* HTMLHRElement.cpp in Sources */,
                                A871DE260A152AC800B12A68 /* HTMLHtmlElement.cpp in Sources */,
+                               2D46F05017B96FD2005647F0 /* IntSize.cpp in Sources */,
                                A871DE240A152AC800B12A68 /* HTMLIFrameElement.cpp in Sources */,
                                A8EA7D310A19385500A8EF5F /* HTMLImageElement.cpp in Sources */,
                                A8EA7D300A19385500A8EF5F /* HTMLImageLoader.cpp in Sources */,
diff --git a/Source/WebCore/platform/graphics/IntPoint.cpp b/Source/WebCore/platform/graphics/IntPoint.cpp
new file mode 100644 (file)
index 0000000..b934051
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2013 Apple 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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 "IntPoint.h"
+
+#include <wtf/PrintStream.h>
+
+namespace WebCore {
+
+void IntPoint::dump(PrintStream& out) const
+{
+    out.printf("(%d, %d)", x(), y());
+}
+
+}
index 35cb4e1..e5c7a30 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "IntSize.h"
 #include <wtf/MathExtras.h>
-#include <wtf/PrintStream.h>
 
 #if USE(CG)
 typedef struct CGPoint CGPoint;
@@ -203,11 +202,6 @@ inline int IntPoint::distanceSquaredToPoint(const IntPoint& point) const
     return ((*this) - point).diagonalLengthSquared();
 }
 
-inline void IntPoint::dump(PrintStream& out) const
-{
-    out.printf("(%d, %d)", x(), y());
-}
-
 } // namespace WebCore
 
 #endif // IntPoint_h
diff --git a/Source/WebCore/platform/graphics/IntSize.cpp b/Source/WebCore/platform/graphics/IntSize.cpp
new file mode 100644 (file)
index 0000000..025dca9
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2013 Apple 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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 "IntSize.h"
+
+#include <wtf/PrintStream.h>
+
+namespace WebCore {
+
+void IntSize::dump(PrintStream& out) const
+{
+    out.printf("(%d x %d)", width(), height());
+}
+
+}
index f7d3550..3077458 100644 (file)
@@ -200,11 +200,6 @@ inline bool operator!=(const IntSize& a, const IntSize& b)
     return a.width() != b.width() || a.height() != b.height();
 }
 
-inline void IntSize::dump(PrintStream& out) const
-{
-    out.printf("(%d x %d)", width(), height());
-}
-
 } // namespace WebCore
 
 #endif // IntSize_h
index 0180ad7..43e6ba0 100644 (file)
@@ -314,6 +314,8 @@ _ZNK7WebCore10TimeRanges7nearestEd;
 _ZNK7WebCore13HitTestResult19rectBasedTestResultEv;
 _ZNK7WebCore4Node28deprecatedShadowAncestorNodeEv;
 _ZNK7WebCore7IntRect10intersectsERKS0_;
+_ZNK7WebCore7IntSize4dumpERN3WTF11PrintStreamE;
+_ZNK7WebCore8IntPoint4dumpERN3WTF11PrintStreamE;
 _ZNK7WebCore8Document13nodesFromRectEiijjjjj;
 _ZTVN7WebCore14StaticNodeListE;
 _ZN7WebCore6Editor26toggleOverwriteModeEnabledEv;
index f35be51..84f8b11 100644 (file)
@@ -1,3 +1,12 @@
+2013-08-14  Tim Horton  <timothy_horton@apple.com>
+
+        Un-inline dataLog dumpers for IntSize and IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=119697
+
+        Reviewed by Sam Weinig.
+
+        * TestWebKitAPI/GNUmakefile.am:
+
 2013-08-14  Ryosuke Niwa  <rniwa@webkit.org>
 
         Flakiness dashboard build fix.
index c000258..bcf0a51 100644 (file)
@@ -203,7 +203,9 @@ Programs_TestWebKitAPI_TestGtk_LDFLAGS = \
        $(Programs_TestWebKitAPI_TestWTF_LDFLAGS)
 
 Programs_TestWebKitAPI_TestGtk_SOURCES = \
+       Source/WebCore/platform/graphics/IntPoint.cpp \
        Source/WebCore/platform/graphics/IntRect.cpp \
+       Source/WebCore/platform/graphics/IntSize.cpp \
        Source/WebCore/platform/graphics/cairo/IntRectCairo.cpp \
        Source/WebCore/platform/graphics/gtk/IntRectGtk.cpp \
        Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp \