Diff
Modified: trunk/Source/WebCore/ChangeLog (124399 => 124400)
--- trunk/Source/WebCore/ChangeLog 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebCore/ChangeLog 2012-08-02 02:29:39 UTC (rev 124400)
@@ -1,3 +1,43 @@
+2012-08-01 James Robinson <[email protected]>
+
+ [chromium] Use new-style tracing macros with explicit category
+ https://bugs.webkit.org/show_bug.cgi?id=92928
+
+ Reviewed by Adam Barth.
+
+ The chromium tracing system supports using a string identifier for trace categories that can be used to filter
+ events. This switches over to setting an explicit category for all traces and removes the old-style
+ TRACE_EVENT() macro.
+
+ * bindings/v8/ScheduledAction.cpp:
+ (WebCore::ScheduledAction::execute):
+ * platform/ScrollAnimatorNone.cpp:
+ (WebCore::ScrollAnimatorNone::scroll):
+ (WebCore::ScrollAnimatorNone::animationTimerFired):
+ * platform/chromium/TraceEvent.h:
+ * platform/graphics/chromium/ProgramBinding.cpp:
+ (WebCore::ProgramBindingBase::init):
+ * platform/graphics/skia/ImageSkia.cpp:
+ (WebCore::drawResampledBitmap):
+ (WebCore::paintSkBitmap):
+ (WebCore::Image::drawPattern):
+ * platform/graphics/skia/NativeImageSkia.cpp:
+ (WebCore::NativeImageSkia::resizedBitmap):
+ * platform/graphics/skia/PlatformContextSkia.cpp:
+ (WebCore::PlatformContextSkia::bitmap):
+ * platform/image-decoders/bmp/BMPImageDecoder.cpp:
+ (WebCore::BMPImageDecoder::decode):
+ * platform/image-decoders/gif/GIFImageDecoder.cpp:
+ (WebCore::GIFImageDecoder::decode):
+ * platform/image-decoders/ico/ICOImageDecoder.cpp:
+ (WebCore::ICOImageDecoder::decode):
+ * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
+ (WebCore::JPEGImageDecoder::decode):
+ * platform/image-decoders/png/PNGImageDecoder.cpp:
+ (WebCore::PNGImageDecoder::decode):
+ * platform/image-decoders/webp/WEBPImageDecoder.cpp:
+ (WebCore::WEBPImageDecoder::decode):
+
2012-08-01 Mikhail Pozdnyakov <[email protected]>
[EFL] Crash at WebCore::toRenderSlider
Modified: trunk/Source/WebCore/bindings/v8/ScheduledAction.cpp (124399 => 124400)
--- trunk/Source/WebCore/bindings/v8/ScheduledAction.cpp 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebCore/bindings/v8/ScheduledAction.cpp 2012-08-02 02:29:39 UTC (rev 124400)
@@ -123,7 +123,7 @@
return; // JS may not be enabled.
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("ScheduledAction::execute", this, 0);
+ TRACE_EVENT0("v8", "ScheduledAction::execute");
#endif
v8::Context::Scope scope(v8Context);
Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp (124399 => 124400)
--- trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2012-08-02 02:29:39 UTC (rev 124400)
@@ -417,7 +417,7 @@
return ScrollAnimator::scroll(orientation, granularity, step, multiplier);
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("ScrollAnimatorNone::scroll", this, 0);
+ TRACE_EVENT0("webkit", "ScrollAnimatorNone::scroll");
#endif
// FIXME: get the type passed in. MouseWheel could also be by line, but should still have different
@@ -532,7 +532,7 @@
void ScrollAnimatorNone::animationTimerFired()
{
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("ScrollAnimatorNone::animationTimerFired", this, 0);
+ TRACE_EVENT0("webkit", "ScrollAnimatorNone::animationTimerFired");
#endif
double currentTime = WTF::monotonicallyIncreasingTime();
@@ -562,7 +562,7 @@
#endif
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("ScrollAnimatorNone::notifyPositionChanged", this, 0);
+ TRACE_EVENT0("webkit", "ScrollAnimatorNone::notifyPositionChanged");
#endif
notifyPositionChanged();
Modified: trunk/Source/WebCore/platform/chromium/TraceEvent.h (124399 => 124400)
--- trunk/Source/WebCore/platform/chromium/TraceEvent.h 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebCore/platform/chromium/TraceEvent.h 2012-08-02 02:29:39 UTC (rev 124400)
@@ -168,9 +168,6 @@
#include <wtf/DynamicAnnotations.h>
#include <wtf/text/CString.h>
-// Issues begin trace event here and end trace event when the current scope ends.
-#define TRACE_EVENT(name, id, extra) TRACE_EVENT2("webkit", name, "id", id, "extra", extra)
-
// By default, const char* argument values are assumed to have long-lived scope
// and will not be copied. Use this macro to force a const char* to be copied.
#define TRACE_STR_COPY(str) \
Modified: trunk/Source/WebCore/platform/graphics/chromium/ProgramBinding.cpp (124399 => 124400)
--- trunk/Source/WebCore/platform/graphics/chromium/ProgramBinding.cpp 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebCore/platform/graphics/chromium/ProgramBinding.cpp 2012-08-02 02:29:39 UTC (rev 124400)
@@ -65,7 +65,7 @@
void ProgramBindingBase::init(WebGraphicsContext3D* context, const String& vertexShader, const String& fragmentShader)
{
- TRACE_EVENT("ProgramBindingBase::init", this, 0);
+ TRACE_EVENT0("cc", "ProgramBindingBase::init");
m_vertexShaderId = loadShader(context, GraphicsContext3D::VERTEX_SHADER, vertexShader);
if (!m_vertexShaderId) {
if (!contextLost(context))
Modified: trunk/Source/WebCore/platform/graphics/skia/ImageSkia.cpp (124399 => 124400)
--- trunk/Source/WebCore/platform/graphics/skia/ImageSkia.cpp 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebCore/platform/graphics/skia/ImageSkia.cpp 2012-08-02 02:29:39 UTC (rev 124400)
@@ -178,7 +178,7 @@
static void drawResampledBitmap(SkCanvas& canvas, SkPaint& paint, const NativeImageSkia& bitmap, const SkIRect& srcIRect, const SkRect& destRect)
{
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("drawResampledBitmap", &canvas, 0);
+ TRACE_EVENT0("skia", "drawResampledBitmap");
#endif
// Apply forward transform to destRect to estimate required size of
// re-sampled bitmap, and use only in calls required to resize, or that
@@ -227,7 +227,7 @@
static void paintSkBitmap(PlatformContextSkia* platformContext, const NativeImageSkia& bitmap, const SkIRect& srcRect, const SkRect& destRect, const SkXfermode::Mode& compOp)
{
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("paintSkBitmap", platformContext, 0);
+ TRACE_EVENT0("skia", "paintSkBitmap");
#endif
SkPaint paint;
paint.setXfermodeMode(compOp);
@@ -313,7 +313,7 @@
const FloatRect& destRect)
{
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("Image::drawPattern", this, 0);
+ TRACE_EVENT0("skia", "Image::drawPattern");
#endif
FloatRect normSrcRect = normalizeRect(floatSrcRect);
if (destRect.isEmpty() || normSrcRect.isEmpty())
Modified: trunk/Source/WebCore/platform/graphics/skia/NativeImageSkia.cpp (124399 => 124400)
--- trunk/Source/WebCore/platform/graphics/skia/NativeImageSkia.cpp 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebCore/platform/graphics/skia/NativeImageSkia.cpp 2012-08-02 02:29:39 UTC (rev 124400)
@@ -75,7 +75,7 @@
const SkIRect& destVisibleSubset) const
{
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("NativeImageSkia::resizedBitmap", const_cast<NativeImageSkia*>(this), 0);
+ TRACE_EVENT0("skia", "NativeImageSkia::resizedBitmap");
#endif
if (!hasResizedBitmap(srcSubset, destWidth, destHeight)) {
bool shouldCache = isDataComplete()
@@ -85,7 +85,7 @@
m_image.extractSubset(&subset, srcSubset);
if (!shouldCache) {
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("nonCachedResize", const_cast<NativeImageSkia*>(this), 0);
+ TRACE_EVENT0("skia", "nonCachedResize");
#endif
// Just resize the visible subset and return it.
SkBitmap resizedImage = skia::ImageOperations::Resize(subset, skia::ImageOperations::RESIZE_LANCZOS3, destWidth, destHeight, destVisibleSubset);
@@ -93,7 +93,7 @@
return resizedImage;
} else {
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("cachedResize", const_cast<NativeImageSkia*>(this), 0);
+ TRACE_EVENT0("skia", "cachedResize");
#endif
m_resizedImage = skia::ImageOperations::Resize(subset, skia::ImageOperations::RESIZE_LANCZOS3, destWidth, destHeight);
}
Modified: trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp (124399 => 124400)
--- trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp 2012-08-02 02:29:39 UTC (rev 124400)
@@ -583,7 +583,7 @@
const SkBitmap* PlatformContextSkia::bitmap() const
{
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("PlatformContextSkia::bitmap", this, 0);
+ TRACE_EVENT0("skia", "PlatformContextSkia::bitmap");
#endif
return &m_canvas->getDevice()->accessBitmap(false);
}
Modified: trunk/Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp (124399 => 124400)
--- trunk/Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp 2012-08-02 02:29:39 UTC (rev 124400)
@@ -95,7 +95,7 @@
void BMPImageDecoder::decode(bool onlySize)
{
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("BMPImageDecoder::decode", this, 0);
+ TRACE_EVENT0("webkit", "BMPImageDecoder::decode");
#endif
if (failed())
return;
Modified: trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp (124399 => 124400)
--- trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp 2012-08-02 02:29:39 UTC (rev 124400)
@@ -315,7 +315,7 @@
void GIFImageDecoder::decode(unsigned haltAtFrame, GIFQuery query)
{
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("GIFImageDecoder::decode", this, 0);
+ TRACE_EVENT0("webkit", "GIFImageDecoder::decode");
#endif
if (failed())
return;
Modified: trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp (124399 => 124400)
--- trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp 2012-08-02 02:29:39 UTC (rev 124400)
@@ -158,7 +158,7 @@
void ICOImageDecoder::decode(size_t index, bool onlySize)
{
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("ICOImageDecoder::decode", this, 0);
+ TRACE_EVENT0("webkit", "ICOImageDecoder::decode");
#endif
if (failed())
return;
Modified: trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (124399 => 124400)
--- trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp 2012-08-02 02:29:39 UTC (rev 124400)
@@ -648,7 +648,7 @@
void JPEGImageDecoder::decode(bool onlySize)
{
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("JPEGImageDecoder::decode", this, 0);
+ TRACE_EVENT0("webkit", "JPEGImageDecoder::decode");
#endif
if (failed())
return;
Modified: trunk/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp (124399 => 124400)
--- trunk/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp 2012-08-02 02:29:39 UTC (rev 124400)
@@ -531,7 +531,7 @@
void PNGImageDecoder::decode(bool onlySize)
{
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("PNGImageDecoder::decode", this, 0);
+ TRACE_EVENT0("webkit", "PNGImageDecoder::decode");
#endif
if (failed())
return;
Modified: trunk/Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp (124399 => 124400)
--- trunk/Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp 2012-08-02 02:29:39 UTC (rev 124400)
@@ -88,7 +88,7 @@
bool WEBPImageDecoder::decode(bool onlySize)
{
#if PLATFORM(CHROMIUM)
- TRACE_EVENT("WEBPImageDecoder::decode", this, 0);
+ TRACE_EVENT0("webkit", "WEBPImageDecoder::decode");
#endif
if (failed())
return false;
Modified: trunk/Source/WebKit/chromium/ChangeLog (124399 => 124400)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-02 02:29:39 UTC (rev 124400)
@@ -1,5 +1,19 @@
2012-08-01 James Robinson <[email protected]>
+ [chromium] Use new-style tracing macros with explicit category
+ https://bugs.webkit.org/show_bug.cgi?id=92928
+
+ Reviewed by Adam Barth.
+
+ Set the category explicitly in traces.
+
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::updateAnimations):
+ (WebKit::WebViewImpl::layout):
+ (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+
+2012-08-01 James Robinson <[email protected]>
+
[chromium] Move compositor HUD font atlas initialization code out of compositor core
https://bugs.webkit.org/show_bug.cgi?id=92924
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (124399 => 124400)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-08-02 01:44:32 UTC (rev 124399)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-08-02 02:29:39 UTC (rev 124400)
@@ -1633,7 +1633,7 @@
void WebViewImpl::updateAnimations(double monotonicFrameBeginTime)
{
#if ENABLE(REQUEST_ANIMATION_FRAME)
- TRACE_EVENT("WebViewImpl::updateAnimations", this, 0);
+ TRACE_EVENT0("webkit", "WebViewImpl::updateAnimations");
WebFrameImpl* webframe = mainFrameImpl();
if (!webframe)
@@ -1656,7 +1656,7 @@
void WebViewImpl::layout()
{
- TRACE_EVENT("WebViewImpl::layout", this, 0);
+ TRACE_EVENT0("webkit", "WebViewImpl::layout");
PageWidgetDelegate::layout(m_page.get());
}
@@ -3631,7 +3631,7 @@
m_client->didActivateCompositor(m_layerTreeView.compositorIdentifier());
} else {
- TRACE_EVENT("WebViewImpl::setIsAcceleratedCompositingActive(true)", this, 0);
+ TRACE_EVENT0("webkit", "WebViewImpl::setIsAcceleratedCompositingActive(true)");
WebLayerTreeView::Settings layerTreeViewSettings;
layerTreeViewSettings.acceleratePainting = page()->settings()->acceleratedDrawingEnabled();
