summaryrefslogtreecommitdiffstats
path: root/WebCore/page/Page.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/page/Page.cpp')
-rw-r--r--WebCore/page/Page.cpp51
1 files changed, 34 insertions, 17 deletions
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index d5074aa..5d023f5 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -6,7 +6,6 @@
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -21,6 +20,7 @@
#include "config.h"
#include "Page.h"
+#include "BackForwardController.h"
#include "BackForwardList.h"
#include "Base64.h"
#include "CSSStyleSelector.h"
@@ -29,7 +29,7 @@
#include "ContextMenuClient.h"
#include "ContextMenuController.h"
#include "DOMWindow.h"
-#include "DeviceOrientation.h"
+#include "DeviceOrientationController.h"
#include "DragController.h"
#include "EditorClient.h"
#include "Event.h"
@@ -85,8 +85,13 @@
#include "GeolocationController.h"
#endif
+<<<<<<< HEAD
#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
#include "PackageNotifier.h"
+=======
+#if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS)
+#include "InspectorApplicationCacheAgent.h"
+>>>>>>> webkit.org at r63173
#endif
namespace WebCore {
@@ -101,11 +106,19 @@ static void networkStateChanged()
{
Vector<RefPtr<Frame> > frames;
+#if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS)
+ bool isNowOnline = networkStateNotifier().onLine();
+#endif
+
// Get all the frames of all the pages in all the page groups
HashSet<Page*>::iterator end = allPages->end();
for (HashSet<Page*>::iterator it = allPages->begin(); it != end; ++it) {
for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext())
frames.append(frame);
+#if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS)
+ if (InspectorApplicationCacheAgent* applicationCacheAgent = (*it)->inspectorController()->applicationCacheAgent())
+ applicationCacheAgent->updateNetworkState(isNowOnline);
+#endif
}
AtomicString eventName = networkStateNotifier().onLine() ? eventNames().onlineEvent : eventNames().offlineEvent;
@@ -113,6 +126,7 @@ static void networkStateChanged()
frames[i]->document()->dispatchWindowEvent(Event::create(eventName, false, false));
}
+<<<<<<< HEAD
#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
static void onPackageResultAvailable()
{
@@ -125,6 +139,9 @@ static void onPackageResultAvailable()
#endif
Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, EditorClient* editorClient, DragClient* dragClient, InspectorClient* inspectorClient, PluginHalterClient* pluginHalterClient, GeolocationControllerClient* geolocationControllerClient, DeviceOrientationClient* deviceOrientationClient)
+=======
+Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, EditorClient* editorClient, DragClient* dragClient, InspectorClient* inspectorClient, PluginHalterClient* pluginHalterClient, GeolocationControllerClient* geolocationControllerClient, DeviceOrientationClient* deviceOrientationClient, BackForwardControllerClient* backForwardControllerClient)
+>>>>>>> webkit.org at r63173
: m_chrome(new Chrome(this, chromeClient))
, m_dragCaretController(new SelectionController(0, true))
#if ENABLE(DRAG_SUPPORT)
@@ -141,11 +158,11 @@ Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, Edi
, m_geolocationController(new GeolocationController(this, geolocationControllerClient))
#endif
#if ENABLE(DEVICE_ORIENTATION)
- , m_deviceOrientation(new DeviceOrientation(this, deviceOrientationClient))
+ , m_deviceOrientationController(new DeviceOrientationController(this, deviceOrientationClient))
#endif
, m_settings(new Settings(this))
, m_progress(new ProgressTracker)
- , m_backForwardList(BackForwardList::create(this))
+ , m_backForwardController(new BackForwardController(this, backForwardControllerClient))
, m_theme(RenderTheme::themeForPage(this))
, m_editorClient(editorClient)
, m_frameCount(0)
@@ -221,7 +238,7 @@ Page::~Page()
m_inspectorController->inspectedPageDestroyed();
#endif
- m_backForwardList->close();
+ backForwardList()->close();
#ifndef NDEBUG
pageCounter.decrement();
@@ -249,14 +266,14 @@ void Page::setOpenedByDOM()
m_openedByDOM = true;
}
-BackForwardList* Page::backForwardList()
+BackForwardList* Page::backForwardList() const
{
- return m_backForwardList.get();
+ return m_backForwardController->list();
}
bool Page::goBack()
{
- HistoryItem* item = m_backForwardList->backItem();
+ HistoryItem* item = backForwardList()->backItem();
if (item) {
goToItem(item, FrameLoadTypeBack);
@@ -267,7 +284,7 @@ bool Page::goBack()
bool Page::goForward()
{
- HistoryItem* item = m_backForwardList->forwardItem();
+ HistoryItem* item = backForwardList()->forwardItem();
if (item) {
goToItem(item, FrameLoadTypeForward);
@@ -280,9 +297,9 @@ bool Page::canGoBackOrForward(int distance) const
{
if (distance == 0)
return true;
- if (distance > 0 && distance <= m_backForwardList->forwardListCount())
+ if (distance > 0 && distance <= backForwardList()->forwardListCount())
return true;
- if (distance < 0 && -distance <= m_backForwardList->backListCount())
+ if (distance < 0 && -distance <= backForwardList()->backListCount())
return true;
return false;
}
@@ -292,16 +309,16 @@ void Page::goBackOrForward(int distance)
if (distance == 0)
return;
- HistoryItem* item = m_backForwardList->itemAtIndex(distance);
+ HistoryItem* item = backForwardList()->itemAtIndex(distance);
if (!item) {
if (distance > 0) {
- int forwardListCount = m_backForwardList->forwardListCount();
+ int forwardListCount = backForwardList()->forwardListCount();
if (forwardListCount > 0)
- item = m_backForwardList->itemAtIndex(forwardListCount);
+ item = backForwardList()->itemAtIndex(forwardListCount);
} else {
- int backListCount = m_backForwardList->backListCount();
+ int backListCount = backForwardList()->backListCount();
if (backListCount > 0)
- item = m_backForwardList->itemAtIndex(-backListCount);
+ item = backForwardList()->itemAtIndex(-backListCount);
}
}
@@ -335,7 +352,7 @@ void Page::goToItem(HistoryItem* item, FrameLoadType type)
int Page::getHistoryLength()
{
- return m_backForwardList->backListCount() + 1 + m_backForwardList->forwardListCount();
+ return backForwardList()->backListCount() + 1 + backForwardList()->forwardListCount();
}
void Page::setGlobalHistoryItem(HistoryItem* item)
generated by cgit v1.1 at 2024-06-01 15:41:40 +0000