Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (116689 => 116690)
--- trunk/Source/WebCore/CMakeLists.txt 2012-05-10 21:44:03 UTC (rev 116689)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-05-10 21:52:01 UTC (rev 116690)
@@ -1104,6 +1104,7 @@
platform/DateComponents.cpp
platform/DragData.cpp
platform/DragImage.cpp
+ platform/EventTracer.cpp
platform/FileChooser.cpp
platform/FileIconLoader.cpp
platform/FileSystem.cpp
Modified: trunk/Source/WebCore/ChangeLog (116689 => 116690)
--- trunk/Source/WebCore/ChangeLog 2012-05-10 21:44:03 UTC (rev 116689)
+++ trunk/Source/WebCore/ChangeLog 2012-05-10 21:52:01 UTC (rev 116690)
@@ -1,3 +1,32 @@
+2012-05-10 Mark Pilgrim <[email protected]>
+
+ [Chromium] Call addTraceEvent and getTraceCategoryEnabledFlag directly
+ https://bugs.webkit.org/show_bug.cgi?id=85399
+
+ Reviewed by Adam Barth.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/EventTracer.cpp: Added.
+ (WebCore):
+ (WebCore::EventTracer::getTraceCategoryEnabledFlag):
+ (WebCore::EventTracer::addTraceEvent):
+ * platform/EventTracer.h: Added.
+ (WebCore):
+ (EventTracer):
+ * platform/chromium/EventTracerChromium.cpp: Added.
+ (WebCore):
+ (WebCore::EventTracer::getTraceCategoryEnabledFlag):
+ (WebCore::EventTracer::addTraceEvent):
+ * platform/chromium/PlatformSupport.h:
+ * platform/chromium/TraceEvent.h:
+
2012-05-10 Adam Barth <[email protected]>
ScrollView::fixedVisibleContentRect should be public
Modified: trunk/Source/WebCore/GNUmakefile.list.am (116689 => 116690)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-05-10 21:44:03 UTC (rev 116689)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-05-10 21:52:01 UTC (rev 116690)
@@ -3096,6 +3096,8 @@
Source/WebCore/platform/DragImage.cpp \
Source/WebCore/platform/DragImage.h \
Source/WebCore/platform/EventLoop.h \
+ Source/WebCore/platform/EventTracer.cpp \
+ Source/WebCore/platform/EventTracer.h \
Source/WebCore/platform/FileChooser.cpp \
Source/WebCore/platform/FileChooser.h \
Source/WebCore/platform/FileIconLoader.cpp \
Modified: trunk/Source/WebCore/Target.pri (116689 => 116690)
--- trunk/Source/WebCore/Target.pri 2012-05-10 21:44:03 UTC (rev 116689)
+++ trunk/Source/WebCore/Target.pri 2012-05-10 21:52:01 UTC (rev 116690)
@@ -1081,6 +1081,7 @@
platform/DateComponents.cpp \
platform/DragData.cpp \
platform/DragImage.cpp \
+ platform/EventTracer.cpp \
platform/FileChooser.cpp \
platform/FileIconLoader.cpp \
platform/FileStream.cpp \
@@ -2188,6 +2189,7 @@
platform/DateComponents.h \
platform/DragData.h \
platform/DragImage.h \
+ platform/EventTracer.h \
platform/FileChooser.h \
platform/FileStream.h \
platform/FileStreamClient.h \
Modified: trunk/Source/WebCore/WebCore.gypi (116689 => 116690)
--- trunk/Source/WebCore/WebCore.gypi 2012-05-10 21:44:03 UTC (rev 116689)
+++ trunk/Source/WebCore/WebCore.gypi 2012-05-10 21:52:01 UTC (rev 116690)
@@ -273,6 +273,7 @@
'platform/DateComponents.h',
'platform/DragData.h',
'platform/DragImage.h',
+ 'platform/EventTracer.h',
'platform/FileChooser.h',
'platform/FileStream.h',
'platform/FileStreamClient.h',
@@ -3299,6 +3300,7 @@
'platform/chromium/DragImageChromiumMac.cpp',
'platform/chromium/DragImageChromiumSkia.cpp',
'platform/chromium/DragImageRef.h',
+ 'platform/chromium/EventTracerChromium.cpp',
'platform/chromium/FileSystemChromium.cpp',
'platform/chromium/FileSystemChromiumLinux.cpp',
'platform/chromium/FileSystemChromiumMac.mm',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (116689 => 116690)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-05-10 21:44:03 UTC (rev 116689)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-05-10 21:52:01 UTC (rev 116690)
@@ -27726,6 +27726,14 @@
>
</File>
<File
+ RelativePath="..\platform\EventTracer.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\platform\EventTracer.h"
+ >
+ </File>
+ <File
RelativePath="..\platform\FileChooser.cpp"
>
</File>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (116689 => 116690)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-05-10 21:44:03 UTC (rev 116689)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-05-10 21:52:01 UTC (rev 116690)
@@ -5819,6 +5819,7 @@
D630E2AC149BF344005B2F93 /* HistogramSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = D630E2AB149BF344005B2F93 /* HistogramSupport.h */; };
D630E2AC149BF344005B2F94 /* StatsCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = D630E2AB149BF344005B2F94 /* StatsCounter.h */; };
D630E2AC149BF344005B2F95 /* MemoryUsageSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = D630E2AB149BF344005B2F95 /* MemoryUsageSupport.h */; };
+ D630E2AC149BF344005B2F96 /* EventTracer.h in Headers */ = {isa = PBXBuildFile; fileRef = D630E2AB149BF344005B2F96 /* EventTracer.h */; };
D6E276AF14637455001D280A /* MutationObserverRegistration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6E276AD14637455001D280A /* MutationObserverRegistration.cpp */; };
D6E276B014637455001D280A /* MutationObserverRegistration.h in Headers */ = {isa = PBXBuildFile; fileRef = D6E276AE14637455001D280A /* MutationObserverRegistration.h */; };
D6E528A3149A926D00EFE1F3 /* MutationObserverInterestGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6E528A1149A926D00EFE1F3 /* MutationObserverInterestGroup.cpp */; };
@@ -5826,6 +5827,7 @@
D6FDAEF3149C06190037B1E1 /* HistogramSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6FDAEF2149C06190037B1E1 /* HistogramSupport.cpp */; };
D6FDAEF3149C06190037B1E2 /* StatsCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6FDAEF2149C06190037B1E2 /* StatsCounter.cpp */; };
D6FDAEF3149C06190037B1E3 /* MemoryUsageSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6FDAEF2149C06190037B1E3 /* MemoryUsageSupport.cpp */; };
+ D6FDAEF3149C06190037B1E4 /* EventTracer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6FDAEF2149C06190037B1E4 /* EventTracer.cpp */; };
D70AD65713E1342B005B50B4 /* RenderRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D70AD65513E1342B005B50B4 /* RenderRegion.cpp */; };
D70AD65813E1342B005B50B4 /* RenderRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = D70AD65613E1342B005B50B4 /* RenderRegion.h */; };
D72F6D79153159A3001EE44E /* FlowThreadController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D72F6D77153159A3001EE44E /* FlowThreadController.cpp */; };
@@ -12970,6 +12972,7 @@
D630E2AB149BF344005B2F93 /* HistogramSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistogramSupport.h; sourceTree = "<group>"; };
D630E2AB149BF344005B2F94 /* StatsCounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatsCounter.h; sourceTree = "<group>"; };
D630E2AB149BF344005B2F95 /* MemoryUsageSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryUsageSupport.h; sourceTree = "<group>"; };
+ D630E2AB149BF344005B2F96 /* EventTracer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventTracer.h; sourceTree = "<group>"; };
D6E276AD14637455001D280A /* MutationObserverRegistration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutationObserverRegistration.cpp; sourceTree = "<group>"; };
D6E276AE14637455001D280A /* MutationObserverRegistration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutationObserverRegistration.h; sourceTree = "<group>"; };
D6E528A1149A926D00EFE1F3 /* MutationObserverInterestGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutationObserverInterestGroup.cpp; sourceTree = "<group>"; };
@@ -12977,6 +12980,7 @@
D6FDAEF2149C06190037B1E1 /* HistogramSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HistogramSupport.cpp; sourceTree = "<group>"; };
D6FDAEF2149C06190037B1E2 /* StatsCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StatsCounter.cpp; sourceTree = "<group>"; };
D6FDAEF2149C06190037B1E3 /* MemoryUsageSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryUsageSupport.cpp; sourceTree = "<group>"; };
+ D6FDAEF2149C06190037B1E4 /* EventTracer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventTracer.cpp; sourceTree = "<group>"; };
D70AD65513E1342B005B50B4 /* RenderRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderRegion.cpp; sourceTree = "<group>"; };
D70AD65613E1342B005B50B4 /* RenderRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderRegion.h; sourceTree = "<group>"; };
D72F6D77153159A3001EE44E /* FlowThreadController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FlowThreadController.cpp; sourceTree = "<group>"; };
@@ -20273,6 +20277,8 @@
A7CFB3CF0B7ED10A0070C32D /* DragImage.cpp */,
A7CFB3D00B7ED10A0070C32D /* DragImage.h */,
1CA19E150DC255CA0065A994 /* EventLoop.h */,
+ D6FDAEF2149C06190037B1E4 /* EventTracer.cpp */,
+ D630E2AB149BF344005B2F96 /* EventTracer.h */,
934FE9E40B5CA539003E4A73 /* FileChooser.cpp */,
066C772A0AB603B700238CC4 /* FileChooser.h */,
414B867113AD074E00B4B373 /* FileIconLoader.cpp */,
@@ -22740,6 +22746,7 @@
E12EDB7B0B308A78002704B6 /* EventTarget.h in Headers */,
97AA3CA5145237CC003E1DA6 /* EventTargetHeaders.h in Headers */,
97AA3CA6145237CC003E1DA6 /* EventTargetInterfaces.h in Headers */,
+ D630E2AC149BF344005B2F96 /* EventTracer.h in Headers */,
BC60D8F30D2A11E000B9918F /* ExceptionBase.h in Headers */,
935FBCF209BA143B00E230B1 /* ExceptionCode.h in Headers */,
973DC640145A9409002842C2 /* ExceptionCodeDescription.h in Headers */,
@@ -25906,6 +25913,7 @@
939885C308B7E3D100E707C4 /* EventNames.cpp in Sources */,
E0FEF372B27C53EAC1C1FBEE /* EventSource.cpp in Sources */,
E12EDBEA0B308E0B002704B6 /* EventTarget.cpp in Sources */,
+ D6FDAEF3149C06190037B1E4 /* EventTracer.cpp in Sources */,
BC60D8F20D2A11E000B9918F /* ExceptionBase.cpp in Sources */,
973DC63F145A9409002842C2 /* ExceptionCodeDescription.cpp in Sources */,
A7CACDB113CE875C00BBBE3F /* ExceptionCodePlaceholder.cpp in Sources */,
Added: trunk/Source/WebCore/platform/EventTracer.cpp (0 => 116690)
--- trunk/Source/WebCore/platform/EventTracer.cpp (rev 0)
+++ trunk/Source/WebCore/platform/EventTracer.cpp 2012-05-10 21:52:01 UTC (rev 116690)
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2011 Google 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:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * 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.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "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 THE COPYRIGHT
+ * OWNER 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 "EventTracer.h"
+
+namespace WebCore {
+
+const unsigned char* EventTracer::getTraceCategoryEnabledFlag(const char*)
+{
+ return 0;
+}
+
+int EventTracer::addTraceEvent(char,
+ const unsigned char*,
+ const char*,
+ unsigned long long,
+ int,
+ const char**,
+ const unsigned char*,
+ const unsigned long long*,
+ int,
+ long long,
+ unsigned char)
+{
+ return -1;
+}
+
+} // namespace WebCore
Added: trunk/Source/WebCore/platform/EventTracer.h (0 => 116690)
--- trunk/Source/WebCore/platform/EventTracer.h (rev 0)
+++ trunk/Source/WebCore/platform/EventTracer.h 2012-05-10 21:52:01 UTC (rev 116690)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2011 Google 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:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * 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.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "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 THE COPYRIGHT
+ * OWNER 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.
+ */
+
+#ifndef EventTracer_h
+#define EventTracer_h
+
+namespace WebCore {
+
+class EventTracer {
+public:
+ static const unsigned char* getTraceCategoryEnabledFlag(const char*);
+ static int addTraceEvent(char phase,
+ const unsigned char* categoryEnabledFlag,
+ const char* name,
+ unsigned long long id,
+ int numArgs,
+ const char** argNames,
+ const unsigned char* argTypes,
+ const unsigned long long* argValues,
+ int thresholdBeginId,
+ long long threshold,
+ unsigned char flags);
+};
+
+} // namespace WebCore
+
+#endif // EventTracer_h
Added: trunk/Source/WebCore/platform/chromium/EventTracerChromium.cpp (0 => 116690)
--- trunk/Source/WebCore/platform/chromium/EventTracerChromium.cpp (rev 0)
+++ trunk/Source/WebCore/platform/chromium/EventTracerChromium.cpp 2012-05-10 21:52:01 UTC (rev 116690)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2011 Google 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:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * 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.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "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 THE COPYRIGHT
+ * OWNER 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 "EventTracer.h"
+
+#include <public/Platform.h>
+
+namespace WebCore {
+
+const unsigned char* EventTracer::getTraceCategoryEnabledFlag(const char* categoryName)
+{
+ return WebKit::Platform::current()->getTraceCategoryEnabledFlag(categoryName);
+}
+
+int EventTracer::addTraceEvent(char phase,
+ const unsigned char* categoryEnabledFlag,
+ const char* name,
+ unsigned long long id,
+ int numArgs,
+ const char** argNames,
+ const unsigned char* argTypes,
+ const unsigned long long* argValues,
+ int thresholdBeginId,
+ long long threshold,
+ unsigned char flags)
+{
+ return WebKit::Platform::current()->addTraceEvent(phase, categoryEnabledFlag, name, id, numArgs, argNames, argTypes, argValues, thresholdBeginId, threshold, flags);
+}
+
+} // namespace WebCore
Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (116689 => 116690)
--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-05-10 21:44:03 UTC (rev 116689)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-05-10 21:52:01 UTC (rev 116690)
@@ -365,20 +365,6 @@
static void paintThemePart(GraphicsContext*, ThemePart, ThemePaintState, const IntRect&, const ThemePaintExtraParams*);
#endif
- // Trace Event --------------------------------------------------------
- static const unsigned char* getTraceCategoryEnabledFlag(const char* categoryName);
- static int addTraceEvent(char phase,
- const unsigned char* categoryEnabledFlag,
- const char* name,
- unsigned long long id,
- int numArgs,
- const char** argNames,
- const unsigned char* argTypes,
- const unsigned long long* argValues,
- int thresholdBeginId,
- long long threshold,
- unsigned char flags);
-
// Visited links ------------------------------------------------------
static LinkHash visitedLinkHash(const UChar* url, unsigned length);
static LinkHash visitedLinkHash(const KURL& base, const AtomicString& attributeURL);
Modified: trunk/Source/WebCore/platform/chromium/TraceEvent.h (116689 => 116690)
--- trunk/Source/WebCore/platform/chromium/TraceEvent.h 2012-05-10 21:44:03 UTC (rev 116689)
+++ trunk/Source/WebCore/platform/chromium/TraceEvent.h 2012-05-10 21:52:01 UTC (rev 116690)
@@ -163,7 +163,7 @@
#ifndef TraceEvent_h
#define TraceEvent_h
-#include "PlatformSupport.h"
+#include "EventTracer.h"
#include <wtf/DynamicAnnotations.h>
#include <wtf/text/CString.h>
@@ -463,7 +463,7 @@
// const unsigned char*
// TRACE_EVENT_API_GET_CATEGORY_ENABLED(const char* category_name)
#define TRACE_EVENT_API_GET_CATEGORY_ENABLED \
- WebCore::PlatformSupport::getTraceCategoryEnabledFlag
+ WebCore::EventTracer::getTraceCategoryEnabledFlag
// Add a trace event to the platform tracing system. Returns thresholdBeginId
// for use in a corresponding end TRACE_EVENT_API_ADD_TRACE_EVENT call.
@@ -480,7 +480,7 @@
// long long threshold,
// unsigned char flags)
#define TRACE_EVENT_API_ADD_TRACE_EVENT \
- WebCore::PlatformSupport::addTraceEvent
+ WebCore::EventTracer::addTraceEvent
////////////////////////////////////////////////////////////////////////////////
Modified: trunk/Source/WebKit/chromium/ChangeLog (116689 => 116690)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-10 21:44:03 UTC (rev 116689)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-10 21:52:01 UTC (rev 116690)
@@ -1,5 +1,17 @@
2012-05-10 Mark Pilgrim <[email protected]>
+ [Chromium] Call addTraceEvent and getTraceCategoryEnabledFlag directly
+ https://bugs.webkit.org/show_bug.cgi?id=85399
+
+ Reviewed by Adam Barth.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * src/PlatformSupport.cpp:
+ (WebCore):
+
+2012-05-10 Mark Pilgrim <[email protected]>
+
[Chromium] Remove WEBKIT_USING_SKIA ifdefs that are always true
https://bugs.webkit.org/show_bug.cgi?id=86121
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (116689 => 116690)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-05-10 21:44:03 UTC (rev 116689)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-05-10 21:52:01 UTC (rev 116690)
@@ -785,28 +785,6 @@
#endif
-// Trace Event ----------------------------------------------------------------
-
-const unsigned char* PlatformSupport::getTraceCategoryEnabledFlag(const char* categoryName)
-{
- return webKitPlatformSupport()->getTraceCategoryEnabledFlag(categoryName);
-}
-int PlatformSupport::addTraceEvent(char phase,
- const unsigned char* categoryEnabledFlag,
- const char* name,
- unsigned long long id,
- int numArgs,
- const char** argNames,
- const unsigned char* argTypes,
- const unsigned long long* argValues,
- int thresholdBeginId,
- long long threshold,
- unsigned char flags)
-{
- return webKitPlatformSupport()->addTraceEvent(
- phase, categoryEnabledFlag, name, id, numArgs, argNames, argTypes, argValues, thresholdBeginId, threshold, flags);
-}
-
// Visited Links --------------------------------------------------------------
LinkHash PlatformSupport::visitedLinkHash(const UChar* url, unsigned length)
