Timeline: do not rely on UpdateLayer & PaintLayer trace events

Source/core/inspector/TimelineTraceEventProcessor.h

 /*
 * Copyright (C) 2013 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
@@ skipping 185 matching lines @@
     bool maybeEnterLayerTask(const TraceEvent&, TimelineThreadState&);
     void leaveLayerTask(TimelineThreadState&);
 
     void processBackgroundEvents();
     void processBackgroundEventsTask();
     PassRefPtr<JSONObject> createRecord(const TraceEvent&, const String& recordType, PassRefPtr<JSONObject> data = 0);
 
     void registerHandler(const char* name, char, TraceEventHandler);
 
     void onBeginFrame(const TraceEvent&);
-    void onUpdateLayerBegin(const TraceEvent&);
-    void onUpdateLayerEnd(const TraceEvent&);
-    void onPaintLayerBegin(const TraceEvent&);
-    void onPaintLayerEnd(const TraceEvent&);
     void onPaintSetupBegin(const TraceEvent&);
     void onPaintSetupEnd(const TraceEvent&);
     void onRasterTaskBegin(const TraceEvent&);
     void onRasterTaskEnd(const TraceEvent&);
     void onPaint(const TraceEvent&);
     void onImageDecodeBegin(const TraceEvent&);
     void onImageDecodeEnd(const TraceEvent&);
     void onLayerDeleted(const TraceEvent&);
     void onDrawLazyPixelRef(const TraceEvent&);
     void onDecodeLazyPixelRefBegin(const TraceEvent&);
@@ skipping 10 matching lines @@
     HandlersMap m_handlersByType;
     Mutex m_backgroundEventsMutex;
     Vector<TraceEvent> m_backgroundEvents;
     double m_lastEventProcessingTime;
     bool m_processEventsTaskInFlight;
 
     typedef HashMap<ThreadIdentifier, TimelineThreadState> ThreadStateMap;
     ThreadStateMap m_threadStates;
 
     HashMap<unsigned long long, long long> m_layerToNodeMap;
-    unsigned long long m_layerId;
     double m_paintSetupStart;
     double m_paintSetupEnd;
     RefPtr<JSONObject> m_gpuTask;
 
     struct ImageInfo {
         int backendNodeId;
         String url;
 
         ImageInfo() : backendNodeId(0) { }
         ImageInfo(int backendNodeId, String url) : backendNodeId(backendNodeId), url(url) { }
     };
     typedef HashMap<unsigned long long, ImageInfo> PixelRefToImageInfoMap;
     PixelRefToImageInfoMap m_pixelRefToImageInfo;
 };
 
 } // namespace WebCore
 
 #endif // !defined(TimelineTraceEventProcessor_h)