ChangeLog

2012-06-29  Sergey Rogulenko  <rogulenko@google.com>

        Web Inspector: added DecodeImage and ResizeImage events to TimelineAgent

        https://bugs.webkit.org/show_bug.cgi?id=90277

        Reviewed by NOBODY (OOPS!).

        * English.lproj/localizedStrings.js:

        * inspector/InspectorInstrumentation.cpp:

        (WebCore::InspectorInstrumentation::willDecodeImageImpl):

        (WebCore):

        (WebCore::InspectorInstrumentation::didDecodeImageImpl):

        (WebCore::InspectorInstrumentation::willResizeImageImpl):

        (WebCore::InspectorInstrumentation::didResizeImageImpl):

        * inspector/InspectorInstrumentation.h:

        (InspectorInstrumentation):

        (WebCore::InspectorInstrumentation::willDecodeImage):

        (WebCore):

        (WebCore::InspectorInstrumentation::didDecodeImage):

        (WebCore::InspectorInstrumentation::willResizeImage):

        (WebCore::InspectorInstrumentation::didResizeImage):

        (WebCore::InspectorInstrumentation::willComposite):

        * inspector/InspectorTimelineAgent.cpp:

        (TimelineRecordType):

        (WebCore::InspectorTimelineAgent::ThreadSpecificInstance):

        (WebCore::InspectorTimelineAgent::willDecodeImage):

        (WebCore):

        (WebCore::InspectorTimelineAgent::didDecodeImage):

        (WebCore::InspectorTimelineAgent::willResizeImage):

        (WebCore::InspectorTimelineAgent::didResizeImage):

        * inspector/InspectorTimelineAgent.h:

        (InspectorTimelineAgent):

        (WebCore::InspectorTimelineAgent::instance):

        (WebCore::InspectorTimelineAgent::setInstance):

        * inspector/front-end/TimelineModel.js:

        * inspector/front-end/TimelinePanel.js:

        (WebInspector.TimelinePanel.prototype._mouseMove):

        * inspector/front-end/TimelinePresentationModel.js:

        (WebInspector.TimelinePresentationModel.recordStyle):

        (WebInspector.TimelinePresentationModel.Record.prototype.generatePopupContent):

        (WebInspector.TimelinePresentationModel.Record.prototype._getRecordDetails):

        * platform/graphics/skia/ImageSkia.cpp:

        (WebCore::computeResamplingMode):

        (WebCore::BitmapImage::draw):

2012-06-29  Sergey Rogulenko  <rogulenko@google.com>

        Web Inspector: added low-level instrumentation support for TimelineAgent

        https://bugs.webkit.org/show_bug.cgi?id=90264

        Reviewed by NOBODY (OOPS!).

        * inspector/InspectorInstrumentation.cpp:

        (WebCore::InspectorInstrumentation::startLowlevelInspectingForFrame):

        (WebCore):

        * inspector/InspectorInstrumentation.h:

        (InspectorInstrumentation):

        (WebCore::InspectorInstrumentation::stopLowlevelInspecting):

        (WebCore):

        * inspector/InspectorTimelineAgent.cpp:

        (WebCore):

        * inspector/InspectorTimelineAgent.h:

        (WebCore::InspectorTimelineAgent::instance):

        (WebCore::InspectorTimelineAgent::setInstance):

        (InspectorTimelineAgent):

2012-06-28  Balazs Kelemen  <kbalazs@webkit.org>

        [Qt] plugin is loaded to the web process via MainResourceLoader::substituteMIMETypeFromPluginDatabase

Source/WebCore/English.lproj/localizedStrings.js

@@localizedStrings["Open link in Resources panel"] = "Open link in Resources panel

localizedStrings["Other"] = "Other";

localizedStrings["Override device metrics"] = "Override device metrics";

localizedStrings["Paint"] = "Paint";

289localizedStrings["Decode Image"] = "Decode Image";

290localizedStrings["Resize Image"] = "Resize Image";

localizedStrings["Parse"] = "Parse";

localizedStrings["Parser"] = "Parser";

localizedStrings["Path"] = "Path";

Source/WebCore/inspector/InspectorInstrumentation.cpp

@@void InspectorInstrumentation::didPaintImpl(const InspectorInstrumentationCookie

        pageAgent->didPaint();

}

void InspectorInstrumentation::willDecodeImageImpl(const LayoutRect& rect)

{

    InspectorTimelineAgent::willDecodeImage(rect);

}

void InspectorInstrumentation::didDecodeImageImpl()

{

    InspectorTimelineAgent::didDecodeImage();

}

void InspectorInstrumentation::willResizeImageImpl(const LayoutRect& rect)

{

    InspectorTimelineAgent::willResizeImage(rect);

}

void InspectorInstrumentation::didResizeImageImpl()

{

    InspectorTimelineAgent::didResizeImage();

}

void InspectorInstrumentation::willCompositeImpl(InstrumentingAgents* instrumentingAgents)

{

    if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())

Source/WebCore/inspector/InspectorInstrumentation.h

@@public:

    static void didLoadXHR(const InspectorInstrumentationCookie&);

    static InspectorInstrumentationCookie willPaint(Frame*, GraphicsContext*, const LayoutRect&);

    static void didPaint(const InspectorInstrumentationCookie&);

    static void willDecodeImage(const LayoutRect&);

    static void didDecodeImage();

    static void willResizeImage(const LayoutRect&);

    static void didResizeImage();

    static void willComposite(Page*);

    static void didComposite(Page*);

    static InspectorInstrumentationCookie willRecalculateStyle(Document*);

@@private:

    static void didLoadXHRImpl(const InspectorInstrumentationCookie&);

    static InspectorInstrumentationCookie willPaintImpl(InstrumentingAgents*, GraphicsContext*, const LayoutRect&, Frame*);

    static void didPaintImpl(const InspectorInstrumentationCookie&);

    static void willDecodeImageImpl(const LayoutRect&);

    static void didDecodeImageImpl();

    static void willResizeImageImpl(const LayoutRect&);

    static void didResizeImageImpl();

    static void willCompositeImpl(InstrumentingAgents*);

    static void didCompositeImpl(InstrumentingAgents*);

    static InspectorInstrumentationCookie willRecalculateStyleImpl(InstrumentingAgents*, Frame*);

@@inline void InspectorInstrumentation::didPaint(const InspectorInstrumentationCoo

#endif

}

inline void InspectorInstrumentation::willDecodeImage(const LayoutRect& rect)

{

#if ENABLE(INSPECTOR)

    FAST_RETURN_IF_NO_FRONTENDS(void());

    willDecodeImageImpl(rect);

#endif

}

inline void InspectorInstrumentation::didDecodeImage()

{

#if ENABLE(INSPECTOR)

    FAST_RETURN_IF_NO_FRONTENDS(void());

    didDecodeImageImpl();

#endif

}

inline void InspectorInstrumentation::willResizeImage(const LayoutRect& rect)

{

#if ENABLE(INSPECTOR)

    FAST_RETURN_IF_NO_FRONTENDS(void());

    willResizeImageImpl(rect);

#endif

}

inline void InspectorInstrumentation::didResizeImage()

{

#if ENABLE(INSPECTOR)

    FAST_RETURN_IF_NO_FRONTENDS(void());

    didResizeImageImpl();

#endif

}

inline void InspectorInstrumentation::willComposite(Page* page)

{

#if ENABLE(INSPECTOR)

Source/WebCore/inspector/InspectorTimelineAgent.cpp

#include "TimelineRecordFactory.h"

#include <wtf/CurrentTime.h>

52#include <wtf/ThreadSpecific.h>

namespace WebCore {

@@static const char BeginFrame[] = "BeginFrame";

static const char Layout[] = "Layout";

static const char RecalculateStyles[] = "RecalculateStyles";

static const char Paint[] = "Paint";

69static const char DecodeImage[] = "DecodeImage";

70static const char ResizeImage[] = "ResizeImage";

static const char CompositeLayers[] = "CompositeLayers";

static const char ParseHTML[] = "ParseHTML";

@@static const char CancelAnimationFrame[] = "CancelAnimationFrame";

static const char FireAnimationFrame[] = "FireAnimationFrame";

}

WTF::ThreadSpecific<InspectorTimelineAgent*>* InspectorTimelineAgent::ThreadSpecificInstance()

{

    AtomicallyInitializedStatic(WTF::ThreadSpecific<InspectorTimelineAgent*>*, instance = new WTF::ThreadSpecific<InspectorTimelineAgent*>());

    return instance;

}

void InspectorTimelineAgent::pushGCEventRecords()

{

    if (!m_gcEvents.size())

@@void InspectorTimelineAgent::didPaint()

    didCompleteCurrentRecord(TimelineRecordType::Paint);

}

void InspectorTimelineAgent::willDecodeImage(const LayoutRect& rect)

{

    if (instance())

        instance()->pushCurrentRecord(TimelineRecordFactory::createPaintData(rect), TimelineRecordType::DecodeImage, true, 0);

}

void InspectorTimelineAgent::didDecodeImage()

{

    if (instance())

        instance()->didCompleteCurrentRecord(TimelineRecordType::DecodeImage);

}

void InspectorTimelineAgent::willResizeImage(const LayoutRect& rect)

{

    if (instance())

        instance()->pushCurrentRecord(TimelineRecordFactory::createPaintData(rect), TimelineRecordType::ResizeImage, true, 0);

}

void InspectorTimelineAgent::didResizeImage()

{

    if (instance())

        instance()->didCompleteCurrentRecord(TimelineRecordType::ResizeImage);

}

void InspectorTimelineAgent::willComposite()

{

    pushCurrentRecord(InspectorObject::create(), TimelineRecordType::CompositeLayers, false, 0);

@@void InspectorTimelineAgent::willEvaluateScript(const String& url, int lineNumbe

{

    pushCurrentRecord(TimelineRecordFactory::createEvaluateScriptData(url, lineNumber), TimelineRecordType::EvaluateScript, true, frame);

}

321

354

void InspectorTimelineAgent::didEvaluateScript()

{

    didCompleteCurrentRecord(TimelineRecordType::EvaluateScript);

@@void InspectorTimelineAgent::didReceiveResourceData()

{

    didCompleteCurrentRecord(TimelineRecordType::ResourceReceivedData);

}

359

392

void InspectorTimelineAgent::willReceiveResourceResponse(unsigned long identifier, const ResourceResponse& response, Frame* frame)

{

    String requestId = IdentifiersFactory::requestId(identifier);

@@void InspectorTimelineAgent::didCompleteCurrentRecord(const String& type)

        entry.record->setNumber("endTime", timestamp());

        addRecordToTimeline(entry.record, type, entry.frameId);

    }

514 if (m_recordStack.isEmpty())

515 setInstance(0);

}

InspectorTimelineAgent::InspectorTimelineAgent(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorState* state, InspectorType type, InspectorClient* client)

@@void InspectorTimelineAgent::pushCurrentRecord(PassRefPtr<InspectorObject> data,

    if (frame && m_pageAgent)

        frameId = m_pageAgent->frameId(frame);

    m_recordStack.append(TimelineRecordEntry(record.release(), data, InspectorArray::create(), type, frameId));

551 setInstance(this);

}

void InspectorTimelineAgent::pushCancelableRecord(PassRefPtr<InspectorObject> data, const String& type, Frame* frame)

Source/WebCore/inspector/InspectorTimelineAgent.h

#include "ScriptGCEvent.h"

#include "ScriptGCEventListener.h"

#include <wtf/PassOwnPtr.h>

43#include <wtf/ThreadSpecific.h>

#include <wtf/Vector.h>

namespace WebCore {

@@public:

    void willPaint(const LayoutRect&, Frame*);

    void didPaint();

    static void willDecodeImage(const LayoutRect&);

    static void didDecodeImage();

    static void willResizeImage(const LayoutRect&);

    static void didResizeImage();

    void willComposite();

    void didComposite();

@@public:

    void didProcessTask();

private:

    static WTF::ThreadSpecific<InspectorTimelineAgent*>* ThreadSpecificInstance();

    static InspectorTimelineAgent* instance() { return **ThreadSpecificInstance(); }

    static void setInstance(InspectorTimelineAgent* inspectorTimelineAgent) { **ThreadSpecificInstance() = inspectorTimelineAgent; }

    struct TimelineRecordEntry {

        TimelineRecordEntry(PassRefPtr<InspectorObject> record, PassRefPtr<InspectorObject> data, PassRefPtr<InspectorArray> children, const String& type, const String& frameId, bool cancelable = false)

            : record(record), data(data), children(children), type(type), frameId(frameId), cancelable(cancelable)

@@private:

        String frameId;

        bool cancelable;

    };

159

168

    InspectorTimelineAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorState*, InspectorType, InspectorClient*);

    void pushCurrentRecord(PassRefPtr<InspectorObject>, const String& type, bool captureCallStack, Frame*);

    void setHeapSizeStatistic(InspectorObject* record);

164

173

    void didCompleteCurrentRecord(const String& type);

    void appendRecord(PassRefPtr<InspectorObject> data, const String& type, bool captureCallStack, Frame*);

    void pushCancelableRecord(PassRefPtr<InspectorObject>, const String& type, Frame*);

Source/WebCore/inspector/front-end/TimelineModel.js

@@WebInspector.TimelineModel.RecordType = {

    Layout: "Layout",

    RecalculateStyles: "RecalculateStyles",

    Paint: "Paint",

53 DecodeImage: "DecodeImage",

54 ResizeImage: "ResizeImage",

    CompositeLayers: "CompositeLayers",

    ParseHTML: "ParseHTML",

Source/WebCore/inspector/front-end/TimelinePanel.js

@@WebInspector.TimelinePanel.prototype = {

    {

        var anchor = this._getPopoverAnchor(e.target);

770 if (anchor && anchor.row && anchor.row._record.type === "Paint")

770 if (anchor && anchor.row && (anchor.row._record.type === "Paint" || anchor.row._record.type === "DecodeImage" || anchor.row._record.type === "ResizeImage"))

            this._highlightRect(anchor.row._record);

        else

            this._hideRectHighlight();

Source/WebCore/inspector/front-end/TimelinePresentationModel.js

@@WebInspector.TimelinePresentationModel.recordStyle = function(record)

    recordStyles[recordTypes.Layout] = { title: WebInspector.UIString("Layout"), category: categories["rendering"] };

    recordStyles[recordTypes.RecalculateStyles] = { title: WebInspector.UIString("Recalculate Style"), category: categories["rendering"] };

    recordStyles[recordTypes.Paint] = { title: WebInspector.UIString("Paint"), category: categories["painting"] };

76 recordStyles[recordTypes.DecodeImage] = { title: WebInspector.UIString("Decode Image"), category: categories["painting"] };

77 recordStyles[recordTypes.ResizeImage] = { title: WebInspector.UIString("Resize Image"), category: categories["painting"] };

    recordStyles[recordTypes.CompositeLayers] = { title: WebInspector.UIString("Composite Layers"), category: categories["painting"] };

    recordStyles[recordTypes.ParseHTML] = { title: WebInspector.UIString("Parse"), category: categories["loading"] };

    recordStyles[recordTypes.TimerInstall] = { title: WebInspector.UIString("Install Timer"), category: categories["scripting"] };

@@WebInspector.TimelinePresentationModel.Record.prototype = {

            case recordTypes.Paint:

                contentHelper._appendTextRow(WebInspector.UIString("Location"), WebInspector.UIString("(%d, %d)", this.data["x"], this.data["y"]));

                contentHelper._appendTextRow(WebInspector.UIString("Dimensions"), WebInspector.UIString("%d × %d", this.data["width"], this.data["height"]));

                break;

            case recordTypes.DecodeImage:

                contentHelper._appendTextRow(WebInspector.UIString("Location"), WebInspector.UIString("(%d, %d)", this.data["x"], this.data["y"]));

                contentHelper._appendTextRow(WebInspector.UIString("Dimensions"), WebInspector.UIString("%d × %d", this.data["width"], this.data["height"]));

                break;

            case recordTypes.ResizeImage:

                contentHelper._appendTextRow(WebInspector.UIString("Location"), WebInspector.UIString("(%d, %d)", this.data["x"], this.data["y"]));

                contentHelper._appendTextRow(WebInspector.UIString("Dimensions"), WebInspector.UIString("%d × %d", this.data["width"], this.data["height"]));

                break;

            case recordTypes.RecalculateStyles: // We don't want to see default details.

                break;

            default:

@@WebInspector.TimelinePresentationModel.Record.prototype = {

                return this.data ? this.data["type"] : null;

            case WebInspector.TimelineModel.RecordType.Paint:

                return this.data["width"] + "\u2009\u00d7\u2009" + this.data["height"];

            case WebInspector.TimelineModel.RecordType.DecodeImage:

                return this.data["width"] + "\u2009\u00d7\u2009" + this.data["height"];

            case WebInspector.TimelineModel.RecordType.ResizeImage:

                return this.data["width"] + "\u2009\u00d7\u2009" + this.data["height"];

            case WebInspector.TimelineModel.RecordType.TimerInstall:

            case WebInspector.TimelineModel.RecordType.TimerRemove:

                return this._linkifyTopCallFrame(this.data["timerId"]);

Source/WebCore/platform/graphics/skia/ImageSkia.cpp

11/*

3 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are

 * met:

7 *

 *     * 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

 *     * 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.

17 *

 * 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

#include "FloatRect.h"

#include "GraphicsContext.h"

#include "ImageObserver.h"

40#include "InspectorInstrumentation.h"

#include "Logging.h"

#include "NativeImageSkia.h"

#include "PlatformContextSkia.h"

@@static ResamplingMode computeResamplingMode(PlatformContextSkia* platformContext

    // High quality interpolation only enabled for scaling and translation.

    if (!(platformContext->canvas()->getTotalMatrix().getType() & (SkMatrix::kAffine_Mask | SkMatrix::kPerspective_Mask)))

        return RESAMPLE_AWESOME;

152

153

    return RESAMPLE_LINEAR;

}

@@void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect,

    // causing flicker and wasting CPU.

    startAnimation();

447 InspectorInstrumentation::willDecodeImage(IntRect(dstRect));

448

446449 NativeImageSkia* bm = nativeImageForCurrentFrame();

    InspectorInstrumentation::didDecodeImage();

    if (!bm)

        return; // It's too early and we don't have an image yet.

@@void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect,

    if (normSrcRect.isEmpty() || normDstRect.isEmpty())

        return; // Nothing to draw.

462 InspectorInstrumentation::willResizeImage(IntRect(dstRect));

463

    paintSkBitmap(ctxt->platformContext(),

                  *bm,

                  enclosingIntRect(normSrcRect),

                  normDstRect,

                  WebCoreCompositeToSkiaComposite(compositeOp));

470 InspectorInstrumentation::didResizeImage();

471

    if (ImageObserver* observer = imageObserver())

        observer->didDraw(this);

}