ChangeLog

2011-02-25  Eric Carlson  <eric.carlson@apple.com>

        Reviewed by NOBODY (OOPS!).

        <audio> and <video> should respect private browsing mode

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

        <rdar://problem/9057699>

        No new tests, this is just the plumbing.

        * dom/Document.cpp:

        (WebCore::Document::privateBrowsingStateChanged): New.

        (WebCore::Document::registerForPrivateBrowsingStateChangedCallbacks): Ditto.

        (WebCore::Document::unregisterForPrivateBrowsingStateChangedCallbacks): Ditto.

        * dom/Document.h:

        * dom/Element.h:

        (WebCore::Element::privateBrowsingStateChanged): New.

        * html/HTMLMediaElement.cpp:

        (WebCore::HTMLMediaElement::HTMLMediaElement): Register for privacy mode changes.

        (WebCore::HTMLMediaElement::~HTMLMediaElement): Unregister for privacy mode changes.

        (WebCore::HTMLMediaElement::loadResource): Tell player current privacy mode.

        (WebCore::HTMLMediaElement::privateBrowsingStateChanged):  New, call through to MediaPlayer.

        * html/HTMLMediaElement.h:

        * page/Page.cpp:

        (WebCore::Page::privateBrowsingStateChanged): Call document()->privateBrowsingStateChanged.

        * platform/graphics/MediaPlayer.cpp:

        (WebCore::MediaPlayer::setPrivateBrowsingMode): New, call through to media engine.

        * platform/graphics/MediaPlayer.h:

        * platform/graphics/MediaPlayerPrivate.h:

        (WebCore::MediaPlayerPrivateInterface::setPrivateBrowsingMode):  Declare new interface.

2011-02-25  Chris Fleizach  <cfleizach@apple.com>

        Reviewed by Anders Carlsson.

79757

Source/WebCore/dom/Document.cpp

 *           (C) 1999 Antti Koivisto (koivisto@kde.org)

 *           (C) 2001 Dirk Mueller (mueller@kde.org)

 *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)

 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)

 * Copyright (C) 2008, 2009 Google Inc. All rights reserved.

 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)

@@void Document::unregisterForMediaVolumeC

    m_mediaVolumeCallbackElements.remove(e);

}

void Document::privateBrowsingStateChanged(bool privateBrowsingEnabled) 

{

    HashSet<Element*>::iterator end = m_privateBrowsingStateChangedElements.end();

    for (HashSet<Element*>::iterator i = m_privateBrowsingStateChangedElements.begin(); i != end; ++i)

        (*i)->privateBrowsingStateChanged(privateBrowsingEnabled);

}

void Document::registerForPrivateBrowsingStateChangedCallbacks(Element* e)

{

    m_privateBrowsingStateChangedElements.add(e);

}

void Document::unregisterForPrivateBrowsingStateChangedCallbacks(Element* e)

{

    m_privateBrowsingStateChangedElements.remove(e);

}

void Document::setShouldCreateRenderers(bool f)

{

    m_createRenderers = f;

79328

Source/WebCore/dom/Document.h

@@public:

    void unregisterForMediaVolumeCallbacks(Element*);

    void mediaVolumeDidChange();

    void registerForPrivateBrowsingStateChangedCallbacks(Element*);

    void unregisterForPrivateBrowsingStateChangedCallbacks(Element*);

    void privateBrowsingStateChanged(bool);

    void setShouldCreateRenderers(bool);

    bool shouldCreateRenderers();

@@private:

    
    HashSet<Element*> m_documentActivationCallbackElements;

    HashSet<Element*> m_mediaVolumeCallbackElements;

1370 HashSet<Element*> m_privateBrowsingStateChangedElements;

    bool m_useSecureKeyboardEntryWhenActive;

79328

Source/WebCore/dom/Element.h

 *           (C) 1999 Antti Koivisto (koivisto@kde.org)

 *           (C) 2001 Peter Kelly (pmk@post.com)

 *           (C) 2001 Dirk Mueller (mueller@kde.org)

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Library General Public

@@public:

    // Use Document::registerForMediaVolumeCallbacks() to subscribe to this

    virtual void mediaVolumeDidChange() { }

    // Use Document::registerForPrivateBrowsingStateChangedCallbacks() to subscribe to this

    virtual void privateBrowsingStateChanged(bool) { }

    bool isFinishedParsingChildren() const { return isParsingChildrenFinished(); }

    virtual void finishParsingChildren();

    virtual void beginParsingChildren();

79328

Source/WebCore/html/HTMLMediaElement.cpp

11/*

 *

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

 * modification, are permitted provided that the following conditions

@@HTMLMediaElement::HTMLMediaElement(const

    LOG(Media, "HTMLMediaElement::HTMLMediaElement");

    document->registerForDocumentActivationCallbacks(this);

    document->registerForMediaVolumeCallbacks(this);

174 document->registerForPrivateBrowsingStateChangedCallbacks(this);

}

HTMLMediaElement::~HTMLMediaElement()

@@HTMLMediaElement::~HTMLMediaElement()

    setShouldDelayLoadEvent(false);

    document()->unregisterForDocumentActivationCallbacks(this);

    document()->unregisterForMediaVolumeCallbacks(this);

185 document()->unregisterForPrivateBrowsingStateChangedCallbacks(this);

}

void HTMLMediaElement::willMoveToNewOwnerDocument()

@@void HTMLMediaElement::loadResource(cons

    if (m_sendProgressEvents) 

        startProgressEventTimer();

    Settings* settings = document()->settings();

    bool privateMode = !settings || settings->privateBrowsingEnabled();

    m_player->setPrivateBrowsingMode(privateMode);

    if (!autoplay())

        m_player->setPreload(m_preload);

    m_player->setPreservesPitch(m_webkitPreservesPitch);

@@void HTMLMediaElement::clearMediaCacheFo

        m_player->clearMediaCacheForSite(site);

}

void HTMLMediaElement::privateBrowsingStateChanged(bool privateBrowsingMode)

{

    if (m_player)

        m_player->setPrivateBrowsingMode(privateBrowsingMode);

}

}

#endif

79744

Source/WebCore/html/HTMLMediaElement.h

@@public:

    void getSitesInMediaCache(Vector<String>&);

    void clearMediaCache();

    void clearMediaCacheForSite(const String&);

183

    void privateBrowsingStateChanged(bool);

protected:

    HTMLMediaElement(const QualifiedName&, Document*);

    virtual ~HTMLMediaElement();

79744

Source/WebCore/page/Page.cpp

11/*

 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)

 *

 * This library is free software; you can redistribute it and/or

@@void Page::privateBrowsingStateChanged()

{

    bool privateBrowsingEnabled = m_settings->privateBrowsingEnabled();

    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())

        frame->document()->privateBrowsingStateChanged(privateBrowsingEnabled);

    // Collect the PluginViews in to a vector to ensure that action the plug-in takes

    // from below privateBrowsingStateChanged does not affect their lifetime.

    Vector<RefPtr<PluginViewBase>, 32> pluginViewBases;

79328

Source/WebCore/platform/graphics/MediaPlayer.cpp

11/*

 *

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

 * modification, are permitted provided that the following conditions

@@void MediaPlayer::clearMediaCacheForSite

    m_private->clearMediaCacheForSite(site);

}

void MediaPlayer::setPrivateBrowsingMode(bool privateBrowsingMode)

{

    m_private->setPrivateBrowsingMode(privateBrowsingMode);

}

// Client callbacks.

void MediaPlayer::networkStateChanged()

{

79744

Source/WebCore/platform/graphics/MediaPlayer.h

11/*

 *

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

 * modification, are permitted provided that the following conditions

@@public:

    void getSitesInMediaCache(Vector<String>&);

    void clearMediaCache();

    void clearMediaCacheForSite(const String&);

294

    void setPrivateBrowsingMode(bool);

private:

    MediaPlayer(MediaPlayerClient*);

    void loadWithNextMediaEngine(MediaPlayerFactory*);

79744

Source/WebCore/platform/graphics/MediaPlayerPrivate.h

11/*

 *

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

 * modification, are permitted provided that the following conditions

@@public:

    void getSitesInMediaCache(Vector<String>&) { }

    void clearMediaCache() { }

    void clearMediaCacheForSite(const String&) { }

147

148 void setPrivateBrowsingMode(bool) { }

};

}

79744