Changeset 156625 in webkit for trunk/Source/WebCore/page/Page.cpp

Timestamp:

Sep 29, 2013, 9:36:35 PM (12 years ago)

Author:

[email protected]

Message:

Cleanup PageThrottler and PageConsole a bit
​https://bugs.webkit.org/show_bug.cgi?id=122085

Reviewed by Anders Carlsson.

• html/HTMLMediaElement.h:
• loader/FrameLoader.cpp:

(WebCore::FrameLoader::completed):

• loader/FrameLoader.h:
• loader/SubresourceLoader.cpp:

(WebCore::SubresourceLoader::checkForHTTPStatusCodeError):
(WebCore::SubresourceLoader::didFinishLoading):
(WebCore::SubresourceLoader::didFail):
(WebCore::SubresourceLoader::willCancel):

• loader/SubresourceLoader.h:

Store the PageActivityAssertionToken as a std::unique_ptr.

• page/Page.cpp:

(WebCore::Page::Page):
Use createOwned and pass this by reference for the PageThrottler and PageConsole.
(WebCore::Page::~Page):
Remove unnecessary clearing of an OwnPtr that is about to be destroyed.

• page/Page.h:

Make m_pageThrottler const and return it as a reference.

• page/PageActivityAssertionToken.cpp:

(WebCore::PageActivityAssertionToken::PageActivityAssertionToken):
(WebCore::PageActivityAssertionToken::~PageActivityAssertionToken):

• page/PageActivityAssertionToken.h:

Take the PageThrottler by reference in the constructor. It is never null.

• page/PageConsole.cpp:

(WebCore::PageConsole::PageConsole):
(WebCore::PageConsole::~PageConsole):
(WebCore::PageConsole::addMessage):

• page/PageConsole.h:

Pass and store the Page as a reference and remove an extraneous null check. Remove
the create function.

• page/PageThrottler.cpp:

(WebCore::PageThrottler::PageThrottler):
(WebCore::PageThrottler::~PageThrottler):
(WebCore::PageThrottler::createActivityToken):
(WebCore::PageThrottler::throttlePage):
(WebCore::PageThrottler::unthrottlePage):
(WebCore::PageThrottler::addActivityToken):
(WebCore::PageThrottler::removeActivityToken):

• page/PageThrottler.h:

Pass and store the Page as a reference. Move the creation of PageActivityAssertionToken here
to aid encapsulation.

File:

• trunk/Source/WebCore/page/Page.cpp (modified) (3 diffs)

trunk/Source/WebCore/page/Page.cpp

@@ -186 +186 @@
     , m_alternativeTextClient(pageClients.alternativeTextClient)
     , m_scriptedAnimationsSuspended(false)
-    , m_pageThrottler(PageThrottler::create(this))
-    , m_console(PageConsole::create(this))
+    , m_pageThrottler(createOwned<PageThrottler>(*this))
+    , m_console(createOwned<PageConsole>(*this))
     , m_lastSpatialNavigationCandidatesCount(0) // NOTE: Only called from Internals for Spatial Navigation testing.
     , m_framesHandlingBeforeUnloadEvent(0)
@@ -236 +236 @@
     pageCounter.decrement();
 #endif
-
-    m_pageThrottler.clear();
 }
 
@@ -1506 +1504 @@
 }
 
-PassOwnPtr<PageActivityAssertionToken> Page::createActivityToken()
-{
-    return adoptPtr(new PageActivityAssertionToken(m_pageThrottler.get()));
+std::unique_ptr<PageActivityAssertionToken> Page::createActivityToken()
+{
+    return m_pageThrottler->createActivityToken();
 }