diff options
| -rw-r--r-- | WebCore/page/DOMWindow.cpp | 4 | ||||
| -rw-r--r-- | WebCore/page/Frame.cpp | 41 |
2 files changed, 4 insertions, 41 deletions
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp index 40b7494..d234973 100644 --- a/WebCore/page/DOMWindow.cpp +++ b/WebCore/page/DOMWindow.cpp @@ -763,7 +763,11 @@ void DOMWindow::focus() // If we're a top level window, bring the window to the front. if (m_frame == page->mainFrame()) +#ifdef ANDROID_USER_GESTURE + page->chrome()->focus(m_frame->loader()->isProcessingUserGesture()); +#else page->chrome()->focus(); +#endif if (!m_frame) return; diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp index 75a4598..186ac62 100644 --- a/WebCore/page/Frame.cpp +++ b/WebCore/page/Frame.cpp @@ -1429,47 +1429,6 @@ String Frame::documentTypeString() const return String(); } -<<<<<<< HEAD -void Frame::focusWindow() -{ - if (!page()) - return; - - // If we're a top level window, bring the window to the front. - if (!tree()->parent()) -#ifdef ANDROID_USER_GESTURE - // FrameLoader::isProcessingUserGesture() will be false when a - // different frame tries to focus this frame through javascript. - page()->chrome()->focus(m_loader.isProcessingUserGesture()); -#else - page()->chrome()->focus(); -#endif - - eventHandler()->focusDocumentView(); -} - -void Frame::unfocusWindow() -{ - if (!page()) - return; - - // If we're a top level window, deactivate the window. - if (!tree()->parent()) - page()->chrome()->unfocus(); -} - -void Frame::scheduleClose() -{ - if (!shouldClose()) - return; - - Chrome* chrome = page() ? page()->chrome() : 0; - if (chrome) - chrome->closeWindowSoon(); -} - -======= ->>>>>>> webkit.org at r61871 void Frame::respondToChangedSelection(const VisibleSelection& oldSelection, bool closeTyping) { bool isContinuousSpellCheckingEnabled = editor()->isContinuousSpellCheckingEnabled(); |