← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-security

« back to all changes in this revision

Viewing changes to WebCore/inspector/front-end/ProfilesPanel.js

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-01-06 21:25:06 UTC
  • mfrom: (1.2.6 upstream) (4.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100106212506-gd0czn4zrwf1j19l
http://bugs.debian.org/529271
http://bugs.debian.org/559420
* New upstream release
- adds basic Content-Encoding support, thanks to soup
  (Closes: #529271)
- fixes over-advertising content types as supported by
  the media player (Closes: #559420)
* debian/control:
- updated libsoup build requirement (>= 2.28.2)
* debian/libwebkit-1.0-2.symbols:
- updated with new symbols
* debian/copyright:
- updated information since 1.1.17
* Imported patch from https://bugs.webkit.org/show_bug.cgi?id=30623
- I am shipping this patch because I believe it is correct, it is the
  way to go, it fixes a race, and it needs testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/inspector/front-end/ProfilesPanel.js
400
400
    _updateInterface: function()
401
401
    {
402
402
        // FIXME: Replace ProfileType-specific button visibility changes by a single ProfileType-agnostic "combo-button" visibility change.
403
 
        if (InspectorController.profilerEnabled()) {
 
403
        if (InspectorBackend.profilerEnabled()) {
404
404
            this.enableToggleButton.title = WebInspector.UIString("Profiling enabled. Click to disable.");
405
405
            this.enableToggleButton.toggled = true;
406
406
            for (var typeId in this._profileTypeButtonsByIdMap)
419
419
 
420
420
    _enableProfiling: function()
421
421
    {
422
 
        if (InspectorController.profilerEnabled())
 
422
        if (InspectorBackend.profilerEnabled())
423
423
            return;
424
424
        this._toggleProfiling(this.panelEnablerView.alwaysEnabled);
425
425
    },
426
426
 
427
427
    _toggleProfiling: function(optionalAlways)
428
428
    {
429
 
        if (InspectorController.profilerEnabled())
430
 
            InspectorController.disableProfiler(true);
 
429
        if (InspectorBackend.profilerEnabled())
 
430
            InspectorBackend.disableProfiler(true);
431
431
        else
432
 
            InspectorController.enableProfiler(!!optionalAlways);
 
432
            InspectorBackend.enableProfiler(!!optionalAlways);
433
433
    },
434
434
 
435
435
    _populateProfiles: function()
449
449
        }
450
450
 
451
451
        var callId = WebInspector.Callback.wrap(populateCallback);
452
 
        InspectorController.getProfileHeaders(callId);
 
452
        InspectorBackend.getProfileHeaders(callId);
453
453
 
454
454
        delete this._shouldPopulateProfiles;
455
455
    },