ChangeLog

2011-12-28  Sergio Villar Senin  <svillar@igalia.com>

        [GTK] Enable Web Timing

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

        Reviewed by NOBODY (OOPS!).

        Added WebTiming support to the GTK+ port. WebTiming allows

        developers to collect detailed network timing information per

        resource. It requires the new SoupMessage's "network-event"

        signal.

        * GNUmakefile.am:

        * bindings/gobject/GNUmakefile.am:

        * platform/network/soup/ResourceHandleSoup.cpp:

        (WebCore::cleanupSoupRequestOperation):

        (WebCore::sendRequestCallback):

        (WebCore::currentTimeMinusRequestTime):

        (WebCore::wroteBodyCallback):

        (WebCore::requestStartedCallback):

        (WebCore::networkEventCallback):

        (WebCore::startHTTPRequest):

        (WebCore::ResourceHandle::platformSetDefersLoading):

2011-12-26  Darin Adler  <darin@apple.com>

        Fix mutation observer build after didMoveToNewDocument change

Source/WebCore/GNUmakefile.am

@@FEATURE_DEFINES += ENABLE_DEVICE_ORIENTATION=1

webcore_cppflags += -DENABLE_DEVICE_ORIENTATION=1

endif  # END ENABLE_DEVICE_ORIENTATION

# ---

# Web Timing support

# ---

if ENABLE_WEB_TIMING

FEATURE_DEFINES += ENABLE_WEB_TIMING=1

webcore_cppflags += -DENABLE_WEB_TIMING=1

endif  # END ENABLE_WEB_TIMING

DerivedSources/WebCore/CSSPropertyNames.cpp: DerivedSources/WebCore/CSSPropertyNames.h

DerivedSources/WebCore/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/makeprop.pl

	cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in

Source/WebCore/bindings/gobject/GNUmakefile.am

@@webkitgtk_gdom_built_sources += \

	DerivedSources/webkit/WebKitDOMHTMLPropertiesCollectionPrivate.h

endif

if ENABLE_WEB_TIMING

webkitgtk_built_h_api += \

	$(top_builddir)/DerivedSources/webkit/WebKitDOMPerformance.h \

	$(top_builddir)/DerivedSources/webkit/WebKitDOMPerformanceNavigation.h \

	$(top_builddir)/DerivedSources/webkit/WebKitDOMPerformanceTiming.h

webkitgtk_gdom_built_sources += \

	DerivedSources/webkit/WebKitDOMPerformance.cpp \

	DerivedSources/webkit/WebKitDOMPerformancePrivate.h \

	DerivedSources/webkit/WebKitDOMPerformanceNavigation.cpp \

	DerivedSources/webkit/WebKitDOMPerformanceNavigationPrivate.h \

	DerivedSources/webkit/WebKitDOMPerformanceTiming.cpp \

	DerivedSources/webkit/WebKitDOMPerformanceTimingPrivate.h

endif

gdom_class_list := $(subst WebKitDOM,, $(filter-out %Private, $(basename $(notdir $(webkitgtk_gdom_built_sources)))))

gdom_class_list += Custom EventTarget Object

DerivedSources/webkit/webkitdom.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/bindings/gobject/GNUmakefile.am

Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@static void sendRequestCallback(GObject*, GAsyncResult*, gpointer);

static void readCallback(GObject*, GAsyncResult*, gpointer);

static void closeCallback(GObject*, GAsyncResult*, gpointer);

static bool startNonHTTPRequest(ResourceHandle*, KURL);

139static int currentTimeMinusRequestTime(double requestTime);

ResourceHandleInternal::~ResourceHandleInternal()

{

@@static void cleanupSoupRequestOperation(ResourceHandle* handle, bool isDestroyin

    d->m_cancellable.clear();

    if (d->m_soupMessage) {

256 g_signal_handlers_disconnect_matched(d->m_soupMessage.get(), G_SIGNAL_MATCH_DATA,

257 0, 0, 0, 0, handle);

257 g_signal_handlers_disconnect_matched(d->m_soupMessage.get(), G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, handle);

258 g_signal_handlers_disconnect_matched(handle->defaultSession(), G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, handle);

        d->m_soupMessage.clear();

    }

@@static void sendRequestCallback(GObject* source, GAsyncResult* res, gpointer dat

        return;

    }

#if ENABLE(WEB_TIMING)

    if (d->m_response.resourceLoadTiming())

        d->m_response.resourceLoadTiming()->receiveHeadersEnd = currentTimeMinusRequestTime(d->m_response.resourceLoadTiming()->requestTime);

#endif

    GOwnPtr<GError> error;

    GInputStream* in = soup_request_send_finish(d->m_soupRequest.get(), res, &error.outPtr());

    if (error) {

@@static bool addFormElementsToSoupMessage(SoupMessage* message, const char* conte

    return true;

}

static int currentTimeMinusRequestTime(double requestTime)

{

    return static_cast<int>((monotonicallyIncreasingTime() - requestTime) * 1000.0);

}

#if ENABLE(WEB_TIMING)

static void wroteBodyCallback(SoupMessage *, gpointer data)

{

    RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(data);

    if (!handle)

        return;

    ResourceHandleInternal* d = handle->getInternal();

    if (!d->m_response.resourceLoadTiming())

        return;

    d->m_response.resourceLoadTiming()->sendEnd = currentTimeMinusRequestTime(d->m_response.resourceLoadTiming()->requestTime);

}

static void requestStartedCallback(SoupSession *, SoupMessage *soupMessage, SoupSocket *, gpointer data)

{

    RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(data);

    if (!handle)

        return;

    ResourceHandleInternal* d = handle->getInternal();

    if (!d->m_response.resourceLoadTiming())

        return;

    if (d->m_soupMessage.get() != soupMessage)

        return;

    d->m_response.resourceLoadTiming()->sendStart = currentTimeMinusRequestTime(d->m_response.resourceLoadTiming()->requestTime);

}

static void networkEventCallback(SoupMessage *, GSocketClientEvent event, GIOStream *, gpointer data)

{

    ResourceHandle* handle = static_cast<ResourceHandle*>(data);

    if (!handle)

        return;

    ResourceHandleInternal* d = handle->getInternal();

    if (d->m_cancelled)

        return;

    int deltaTime = currentTimeMinusRequestTime(d->m_response.resourceLoadTiming()->requestTime);

    switch (event) {

    case G_SOCKET_CLIENT_RESOLVING:

        d->m_response.resourceLoadTiming()->dnsStart = deltaTime;

        break;

    case G_SOCKET_CLIENT_RESOLVED:

        d->m_response.resourceLoadTiming()->dnsEnd = deltaTime;

        break;

    case G_SOCKET_CLIENT_CONNECTING:

        d->m_response.resourceLoadTiming()->connectStart = deltaTime;

        if (d->m_response.resourceLoadTiming()->dnsStart != -1)

            // WebCore/inspector/front-end/ResourceTimingView.js assumes that DNS time is included

            // in connection time so must substract here the DNS delta that will be added later.

            d->m_response.resourceLoadTiming()->connectStart -=

                d->m_response.resourceLoadTiming()->dnsEnd - d->m_response.resourceLoadTiming()->dnsStart;

        break;

    case G_SOCKET_CLIENT_CONNECTED:

        // Web Timing considers that connection time involves dns, proxy & TLS negotiation...

        // so we better pick G_SOCKET_CLIENT_COMPLETE for connectEnd

        break;

    case G_SOCKET_CLIENT_PROXY_NEGOTIATING:

        d->m_response.resourceLoadTiming()->proxyStart = deltaTime;

        break;

    case G_SOCKET_CLIENT_PROXY_NEGOTIATED:

        d->m_response.resourceLoadTiming()->proxyEnd = deltaTime;

        break;

    case G_SOCKET_CLIENT_TLS_HANDSHAKING:

        d->m_response.resourceLoadTiming()->sslStart = deltaTime;

        break;

    case G_SOCKET_CLIENT_TLS_HANDSHAKED:

        d->m_response.resourceLoadTiming()->sslEnd = deltaTime;

        break;

    case G_SOCKET_CLIENT_COMPLETE:

        d->m_response.resourceLoadTiming()->connectEnd = deltaTime;

        break;

    default:

        ASSERT_NOT_REACHED();

        break;

    }

}

#endif

static bool startHTTPRequest(ResourceHandle* handle)

{

    ASSERT(handle);

@@static bool startHTTPRequest(ResourceHandle* handle)

    g_signal_connect(soupMessage, "restarted", G_CALLBACK(restartedCallback), handle);

    g_signal_connect(soupMessage, "wrote-body-data", G_CALLBACK(wroteBodyDataCallback), handle);

#if ENABLE(WEB_TIMING)

    g_signal_connect(soupMessage, "network-event", G_CALLBACK(networkEventCallback), handle);

    g_signal_connect(soupMessage, "wrote-body", G_CALLBACK(wroteBodyCallback), handle);

    g_signal_connect(session, "request-started", G_CALLBACK(requestStartedCallback), handle);

#endif

    String firstPartyString = request.firstPartyForCookies().string();

    if (!firstPartyString.isEmpty()) {

        GOwnPtr<SoupURI> firstParty(soup_uri_new(firstPartyString.utf8().data()));

@@static bool startHTTPRequest(ResourceHandle* handle)

        && !addFormElementsToSoupMessage(soupMessage, contentType.data(), httpBody, d->m_bodySize)) {

        // We failed to prepare the body data, so just fail this load.

        g_signal_handlers_disconnect_matched(soupMessage, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, handle);

586 g_signal_handlers_disconnect_matched(session, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, handle);

        d->m_soupMessage.clear();

        return false;

    }

@@static bool startHTTPRequest(ResourceHandle* handle)

    // balanced by a deref() in cleanupSoupRequestOperation, which should always run

    handle->ref();

#if ENABLE(WEB_TIMING)

    d->m_response.setResourceLoadTiming(ResourceLoadTiming::create());

#endif

    // Make sure we have an Accept header for subresources; some sites

    // want this to serve some of their subresources

    if (!soup_message_headers_get_one(soupMessage->request_headers, "Accept"))

@@static bool startHTTPRequest(ResourceHandle* handle)

    // Send the request only if it's not been explicitly deferred.

    if (!d->m_defersLoading) {

#if ENABLE(WEB_TIMING)

        d->m_response.resourceLoadTiming()->requestTime = monotonicallyIncreasingTime();

#endif

        d->m_cancellable = adoptGRef(g_cancellable_new());

        soup_request_send_async(d->m_soupRequest.get(), d->m_cancellable.get(), sendRequestCallback, handle);

    }

@@void ResourceHandle::platformSetDefersLoading(bool defersLoading)

    // simply check for d->m_scheduledFailure because it's cleared as

    // soon as the failure event is fired.

    if (!hasBeenSent(this) && d->m_soupRequest) {

#if ENABLE(WEB_TIMING)

        if (d->m_response.resourceLoadTiming())

            d->m_response.resourceLoadTiming()->requestTime = monotonicallyIncreasingTime();

#endif

        d->m_cancellable = adoptGRef(g_cancellable_new());

        soup_request_send_async(d->m_soupRequest.get(), d->m_cancellable.get(), sendRequestCallback, this);

        return;

Tools/ChangeLog

2011-12-28  Sergio Villar Senin  <svillar@igalia.com>

        [GTK] Enable Web Timing

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

        Reviewed by NOBODY (OOPS!).

        Updated the jhbuild libsoup requirement. Also web timing is built

        by default whenever build-webkit is used.

        * Scripts/build-webkit:

        * gtk/jhbuild.modules:

2011-12-24  Kentaro Hara  <haraken@chromium.org>

        Add unittests for the C++ parser of prepare-ChangeLog

Tools/Scripts/build-webkit

@@my @features = (

      define => "ENABLE_WEB_SOCKETS", default => 1, value=> \$webSocketsSupport },

    { option => "web-timing", desc => "Toggle Web Timing support",

328 define => "ENABLE_WEB_TIMING", default => 0, value=> \$webTimingSupport },

328 define => "ENABLE_WEB_TIMING", default => (isGtk()), value=> \$webTimingSupport },

    { option => "workers", desc => "Toggle Web Workers support",

      define => "ENABLE_WORKERS", default => (isAppleWebKit() || isGtk() || isBlackBerry()), value => \$workersSupport },

Tools/gtk/jhbuild.modules

    </dependencies>

    <branch module="libsoup" version="2.37.2.1+git"

            repo="git.gnome.org"

131 tag="5cbfc~~48c~~af~~76ced2e28ee06c9e40523273601dc6~~"/>

131 tag="7c2f1956808b31ade19a5cb24d16a465ad575421"/>

  </autotools>

  <autotools id="fontconfig" autogen-sh="configure">

LayoutTests/ChangeLog

2011-12-28  Sergio Villar Senin  <svillar@igalia.com>

        [GTK] Enable Web Timing

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

        Reviewed by NOBODY (OOPS!).

        Removed some tests that are working fine now after adding Web

        Timing support.

        * platform/gtk/Skipped:

2011-12-26  Darin Adler  <darin@apple.com>

        Check in expected failures for a couple of tests.

LayoutTests/platform/gtk/Skipped

@@gamepad/

# Speech input is not yet enabled.

fast/speech

263 # Web Timing is ~~not~~ ~~enabled.~~

264 # http~~s://bugs.webkit.org/show_bug.cgi?id=42432~~

263# Web Timing issues

264# heap size limit undefined

265265fast/dom/Window/window-properties-performance.html

fast/dom/navigation-type-back-forward.html

fast/dom/navigation-type-navigate.html

fast/dom/navigation-type-reload.html

fast/dom/webtiming.html

fast/dom/webtiming-navigate-within-document.html

fast/dom/webtiming-document-open.html

266# cross-origin redirects

272267http/tests/misc/webtiming-origins.html

273 http/tests/misc/webtiming-one-redirect.php

274 http/tests/misc/webtiming-slow-load.php

268# SSL start is getting a value when it should apparently not

275269http/tests/misc/webtiming-ssl.php

276 http/tests/misc/webtiming-two-redirects.php

# FileSystem API is not supported.

fast/filesystem