diff options
Diffstat (limited to 'WebCore/page/Page.cpp')
| -rw-r--r-- | WebCore/page/Page.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp index 4d8692e..1988040 100644 --- a/WebCore/page/Page.cpp +++ b/WebCore/page/Page.cpp @@ -29,6 +29,7 @@ #include "ContextMenuClient.h" #include "ContextMenuController.h" #include "DOMWindow.h" +#include "DeviceOrientation.h" #include "DragController.h" #include "EditorClient.h" #include "Event.h" @@ -112,6 +113,7 @@ static void networkStateChanged() frames[i]->document()->dispatchWindowEvent(Event::create(eventName, false, false)); } +<<<<<<< HEAD #if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) static void onPackageResultAvailable() { @@ -124,6 +126,9 @@ static void onPackageResultAvailable() #endif Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, EditorClient* editorClient, DragClient* dragClient, InspectorClient* inspectorClient, PluginHalterClient* pluginHalterClient, GeolocationControllerClient* geolocationControllerClient) +======= +Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, EditorClient* editorClient, DragClient* dragClient, InspectorClient* inspectorClient, PluginHalterClient* pluginHalterClient, GeolocationControllerClient* geolocationControllerClient, DeviceOrientationClient* deviceOrientationClient) +>>>>>>> webkit.org at r60074 : m_chrome(new Chrome(this, chromeClient)) , m_dragCaretController(new SelectionController(0, true)) #if ENABLE(DRAG_SUPPORT) @@ -139,6 +144,9 @@ Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, Edi #if ENABLE(CLIENT_BASED_GEOLOCATION) , m_geolocationController(new GeolocationController(this, geolocationControllerClient)) #endif +#if ENABLE(DEVICE_ORIENTATION) + , m_deviceOrientation(new DeviceOrientation(this, deviceOrientationClient)) +#endif , m_settings(new Settings(this)) , m_progress(new ProgressTracker) , m_backForwardList(BackForwardList::create(this)) @@ -173,6 +181,9 @@ Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, Edi #if !ENABLE(CLIENT_BASED_GEOLOCATION) UNUSED_PARAM(geolocationControllerClient); #endif +#if !ENABLE(CLIENT_DEVICE_ORIENTATION) + UNUSED_PARAM(deviceOrientationClient); +#endif if (!allPages) { allPages = new HashSet<Page*>; |