| Index: Source/core/testing/Internals.cpp
|
| diff --git a/Source/core/testing/Internals.cpp b/Source/core/testing/Internals.cpp
|
| index ee84fbfc31be8ffef88fe548329f7aeb731d54f6..3e4c2556a40df7ec931fedc34fd6c27d9a938057 100644
|
| --- a/Source/core/testing/Internals.cpp
|
| +++ b/Source/core/testing/Internals.cpp
|
| @@ -109,9 +109,7 @@
|
| #include "modules/battery/BatteryController.h"
|
| #endif
|
|
|
| -#if ENABLE(PAGE_POPUP)
|
| #include "core/page/PagePopupController.h"
|
| -#endif
|
|
|
| #include "core/platform/graphics/GraphicsLayer.h"
|
| #include "core/platform/graphics/chromium/GraphicsLayerChromium.h"
|
| @@ -135,9 +133,7 @@
|
|
|
| namespace WebCore {
|
|
|
| -#if ENABLE(PAGE_POPUP)
|
| static MockPagePopupDriver* s_pagePopupDriver = 0;
|
| -#endif
|
|
|
| using namespace HTMLNames;
|
|
|
| @@ -219,12 +215,10 @@ void Internals::resetToConsistentState(Page* page)
|
| TextRun::setAllowsRoundingHacks(false);
|
| WebCore::overrideUserPreferredLanguages(Vector<String>());
|
| WebCore::Settings::setUsesOverlayScrollbars(false);
|
| -#if ENABLE(PAGE_POPUP)
|
| delete s_pagePopupDriver;
|
| s_pagePopupDriver = 0;
|
| if (page->chrome())
|
| page->chrome()->client()->resetPagePopupDriver();
|
| -#endif
|
| if (page->inspectorController())
|
| page->inspectorController()->setProfilerEnabled(false);
|
| page->group().captionPreferences()->setTestingMode(false);
|
| @@ -811,7 +805,6 @@ void Internals::enableMockSpeechSynthesizer()
|
|
|
| void Internals::setEnableMockPagePopup(bool enabled, ExceptionCode& ec)
|
| {
|
| -#if ENABLE(PAGE_POPUP)
|
| Document* document = contextDocument();
|
| if (!document || !document->page() || !document->page()->chrome())
|
| return;
|
| @@ -823,18 +816,12 @@ void Internals::setEnableMockPagePopup(bool enabled, ExceptionCode& ec)
|
| if (!s_pagePopupDriver)
|
| s_pagePopupDriver = MockPagePopupDriver::create(page->mainFrame()).leakPtr();
|
| page->chrome()->client()->setPagePopupDriver(s_pagePopupDriver);
|
| -#else
|
| - UNUSED_PARAM(enabled);
|
| - UNUSED_PARAM(ec);
|
| -#endif
|
| }
|
|
|
| -#if ENABLE(PAGE_POPUP)
|
| PassRefPtr<PagePopupController> Internals::pagePopupController()
|
| {
|
| return s_pagePopupDriver ? s_pagePopupDriver->pagePopupController() : 0;
|
| }
|
| -#endif
|
|
|
| PassRefPtr<ClientRect> Internals::absoluteCaretBounds(ExceptionCode& ec)
|
| {
|
|
|