Changeset 104344 in webkit


Ignore:
Timestamp:
Jan 6, 2012 2:54:54 PM (12 years ago)
Author:
abarth@webkit.org
Message:

Move FrameDestructionObserver to its own file
​https://bugs.webkit.org/show_bug.cgi?id=75693

Reviewed by Eric Seidel.

We should have one class per file, on general principles. Also, this
make it possible to use this class in DOMWindow without introducing a
circular include dependency.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • page/Frame.cpp:
  • page/Frame.h:
  • page/FrameDestructionObserver.cpp: Added.

(WebCore::FrameDestructionObserver::FrameDestructionObserver):
(WebCore::FrameDestructionObserver::~FrameDestructionObserver):
(WebCore::FrameDestructionObserver::frameDestroyed):

  • page/FrameDestructionObserver.h: Added.

(WebCore::FrameDestructionObserver::frame):

  • plugins/DOMMimeType.h:
  • plugins/DOMPlugin.h:
Location:
trunk/Source/WebCore
Files:
2 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r104274 r104344  
    996996    page/Frame.cpp
    997997    page/FrameActionScheduler.cpp
     998    page/FrameDestructionObserver.cpp
    998999    page/FrameTree.cpp
    9991000    page/FrameView.cpp

  • trunk/Source/WebCore/ChangeLog

    r104341 r104344  
     12012-01-06  Adam Barth  <abarth@webkit.org>
     2
     3        Move FrameDestructionObserver to its own file
     4        https://bugs.webkit.org/show_bug.cgi?id=75693
     5
     6        Reviewed by Eric Seidel.
     7
     8        We should have one class per file, on general principles.  Also, this
     9        make it possible to use this class in DOMWindow without introducing a
     10        circular include dependency.
     11
     12        * CMakeLists.txt:
     13        * GNUmakefile.list.am:
     14        * Target.pri:
     15        * WebCore.gypi:
     16        * WebCore.vcproj/WebCore.vcproj:
     17        * page/Frame.cpp:
     18        * page/Frame.h:
     19        * page/FrameDestructionObserver.cpp: Added.
     20        (WebCore::FrameDestructionObserver::FrameDestructionObserver):
     21        (WebCore::FrameDestructionObserver::~FrameDestructionObserver):
     22        (WebCore::FrameDestructionObserver::frameDestroyed):
     23        * page/FrameDestructionObserver.h: Added.
     24        (WebCore::FrameDestructionObserver::frame):
     25        * plugins/DOMMimeType.h:
     26        * plugins/DOMPlugin.h:
     27
    1282012-01-06  Anders Carlsson  <andersca@apple.com>
    229

  • trunk/Source/WebCore/GNUmakefile.list.am

    r104274 r104344  
    26652665        Source/WebCore/page/FrameActionScheduler.cpp \
    26662666        Source/WebCore/page/FrameActionScheduler.h \
     2667        Source/WebCore/page/FrameDestructionObserver.cpp \
     2668        Source/WebCore/page/FrameDestructionObserver.h \
    26672669        Source/WebCore/page/FrameTree.cpp \
    26682670        Source/WebCore/page/FrameTree.h \

  • trunk/Source/WebCore/Target.pri

    r104285 r104344  
    974974    page/Frame.cpp \
    975975    page/FrameActionScheduler.cpp \
     976    page/FrameDestructionObserver.cpp \
    976977    page/FrameTree.cpp \
    977978    page/FrameView.cpp \

  • trunk/Source/WebCore/WebCore.gypi

    r104274 r104344  
    29972997            'page/FrameActionScheduler.cpp',
    29982998            'page/FrameActionScheduler.h',
     2999            'page/FrameDestructionObserver.cpp',
     3000            'page/FrameDestructionObserver.h',
    29993001            'page/FrameTree.cpp',
    30003002            'page/FrameView.cpp',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r104274 r104344  
    2525325253                                RelativePath="..\page\Frame.h"
    2525425254                                >
    25255                                 <File
    25256                                         RelativePath="..\page\FrameActionScheduler.cpp"
    25257                                         >
    25258                                 </File>
    25259                                 <File
    25260                                         RelativePath="..\page\FrameActionScheduler.h"
    25261                                         >
    25262                                 </File>
     25255                        </File>
     25256                        <File
     25257                                RelativePath="..\page\FrameActionScheduler.cpp"
     25258                                >
     25259                        </File>
     25260                        <File
     25261                                RelativePath="..\page\FrameActionScheduler.h"
     25262                                >
     25263                        </File>
     25264                        <File
     25265                                RelativePath="..\page\FrameDestructionObserver.cpp"
     25266                                >
     25267                        </File>
     25268                        <File
     25269                                RelativePath="..\page\FrameDestructionObserver.h"
     25270                                >
    2526325271                        </File>
    2526425272                        <File

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r104274 r104344  
    32703270                973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */; };
    32713271                973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 973E325510883B7C005BC493 /* ResourceLoadNotifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
     3272                974A862214B7ADBB003FDC76 /* FrameDestructionObserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 974A862014B7ADBB003FDC76 /* FrameDestructionObserver.cpp */; };
     3273                974A862314B7ADBB003FDC76 /* FrameDestructionObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 974A862114B7ADBB003FDC76 /* FrameDestructionObserver.h */; settings = {ATTRIBUTES = (Private, ); }; };
    32723274                974D2DA4146A535D00D51F8B /* SecurityPolicy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 974D2DA2146A535D00D51F8B /* SecurityPolicy.cpp */; };
    32733275                974D2DA5146A535D00D51F8B /* SecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 974D2DA3146A535D00D51F8B /* SecurityPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    1052610528                973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoadNotifier.cpp; sourceTree = "<group>"; };
    1052710529                973E325510883B7C005BC493 /* ResourceLoadNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadNotifier.h; sourceTree = "<group>"; };
     10530                974A862014B7ADBB003FDC76 /* FrameDestructionObserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameDestructionObserver.cpp; sourceTree = "<group>"; };
     10531                974A862114B7ADBB003FDC76 /* FrameDestructionObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameDestructionObserver.h; sourceTree = "<group>"; };
    1052810532                974D2DA2146A535D00D51F8B /* SecurityPolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecurityPolicy.cpp; sourceTree = "<group>"; };
    1052910533                974D2DA3146A535D00D51F8B /* SecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecurityPolicy.h; sourceTree = "<group>"; };
    … …  
    1566915673                                A7B070D0130A409C00A3763C /* FrameActionScheduler.cpp */,
    1567015674                                A7B070D1130A409C00A3763C /* FrameActionScheduler.h */,
     15675                                974A862014B7ADBB003FDC76 /* FrameDestructionObserver.cpp */,
     15676                                974A862114B7ADBB003FDC76 /* FrameDestructionObserver.h */,
    1567115677                                65A21482097A3F5300B9050A /* FrameTree.cpp */,
    1567215678                                65A21483097A3F5300B9050A /* FrameTree.h */,
    … …  
    2487724883                                977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */,
    2487824884                                FD537353137B651800008DCE /* ZeroPole.h in Headers */,
     24885                                974A862314B7ADBB003FDC76 /* FrameDestructionObserver.h in Headers */,
    2487924886                        );
    2488024887                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2778027787                                977E2E0E12F0FC9C00C13379 /* XSSAuditor.cpp in Sources */,
    2778127788                                FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
     27789                                974A862214B7ADBB003FDC76 /* FrameDestructionObserver.cpp in Sources */,
    2778227790                        );
    2778327791                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Source/WebCore/page/Frame.cpp

    r104279 r104344  
    4848#include "FloatQuad.h"
    4949#include "FocusController.h"
     50#include "FrameDestructionObserver.h"
    5051#include "FrameLoader.h"
    5152#include "FrameLoaderClient.h"
    … …  
    236237}
    237238
    238 FrameDestructionObserver::FrameDestructionObserver(Frame* frame)
    239     : m_frame(frame)
    240 {
    241     if (m_frame)
    242         m_frame->addDestructionObserver(this);
    243 }
    244 
    245 FrameDestructionObserver::~FrameDestructionObserver()
    246 {
    247     if (m_frame)
    248         m_frame->removeDestructionObserver(this);
    249 }
    250 
    251 void FrameDestructionObserver::frameDestroyed()
    252 {
    253     m_frame = 0;
    254 }
    255 
    256239void Frame::addDestructionObserver(FrameDestructionObserver* observer)
    257240{

  • trunk/Source/WebCore/page/Frame.h

    r104279 r104344  
    6464
    6565    class Document;
    66     class Frame;
     66    class FrameDestructionObserver;
    6767    class FrameView;
    6868    class HTMLTableCellElement;
    … …  
    7474    class TiledBackingStoreClient { };
    7575#endif
    76 
    77     class FrameDestructionObserver {
    78     public:
    79         explicit FrameDestructionObserver(Frame*);
    80         virtual void frameDestroyed();
    81         Frame* frame() const { return m_frame; }
    82 
    83     protected:
    84         virtual ~FrameDestructionObserver();
    85 
    86         Frame* m_frame;
    87     };
    8876
    8977    class Frame : public RefCounted<Frame>, public TiledBackingStoreClient {

  • trunk/Source/WebCore/plugins/DOMMimeType.h

    r104279 r104344  
    2222
    2323#include "Frame.h"
     24#include "FrameDestructionObserver.h"
    2425#include "PluginData.h"
    2526

  • trunk/Source/WebCore/plugins/DOMPlugin.h

    r104279 r104344  
    2121#define DOMPlugin_h
    2222
     23#include "FrameDestructionObserver.h"
    2324#include "DOMMimeType.h"
    2425#include <wtf/Forward.h>
Note: See TracChangeset for help on using the changeset viewer.