Commit 2f32f62e authored by jamesr@google.com's avatar jamesr@google.com

2011-02-24 James Robinson <jamesr@chromium.org>

        Unreviewed, rolling out r79584.
        http://trac.webkit.org/changeset/79584
        https://bugs.webkit.org/show_bug.cgi?id=44797

        [chromium] Patch does not compile if ENABLE_FULLSCREEN_API is
        not set

        * WebCore.gyp/WebCore.gyp:
        * WebCore.gypi:
2011-02-24  James Robinson  <jamesr@chromium.org>

        Unreviewed, rolling out r79584.
        http://trac.webkit.org/changeset/79584
        https://bugs.webkit.org/show_bug.cgi?id=44797

        [chromium] Patch does not compile if ENABLE_FULLSCREEN_API is
        not set

        * features.gypi:
        * public/WebSettings.h:
        * src/ChromeClientImpl.cpp:
        * src/ChromeClientImpl.h:
        * src/WebSettingsImpl.cpp:
        * src/WebSettingsImpl.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@79588 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent fd6d4228
2011-02-24 James Robinson <jamesr@chromium.org>
Unreviewed, rolling out r79584.
http://trac.webkit.org/changeset/79584
https://bugs.webkit.org/show_bug.cgi?id=44797
[chromium] Patch does not compile if ENABLE_FULLSCREEN_API is
not set
* WebCore.gyp/WebCore.gyp:
* WebCore.gypi:
2011-02-24 Carlos Garcia Campos <cgarcia@igalia.com>
Reviewed by Martin Robinson.
......
......@@ -533,22 +533,19 @@
},
{
'action_name': 'UserAgentStyleSheets',
# The .css files are in the same order as ../DerivedSources.make.
'inputs': [
'../css/make-css-file-arrays.pl',
'../css/html.css',
'../css/quirks.css',
'../css/view-source.css',
'../css/themeChromiumLinux.css', # Chromium only.
'../css/themeChromiumSkia.css', # Chromium only.
'../css/themeChromiumLinux.css',
'../css/themeChromiumSkia.css',
'../css/themeWin.css',
'../css/themeWinQuirks.css',
'../css/svg.css',
# Skip WML.
'../css/mathml.css',
'../css/mediaControls.css',
'../css/mediaControlsChromium.css',
'../css/fullscreen.css',
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/webkit/UserAgentStyleSheets.h',
......
......@@ -3898,8 +3898,6 @@
'rendering/RenderFrameBase.h',
'rendering/RenderFrameSet.cpp',
'rendering/RenderFrameSet.h',
'rendering/RenderFullScreen.cpp',
'rendering/RenderFullScreen.h',
'rendering/RenderHTMLCanvas.cpp',
'rendering/RenderHTMLCanvas.h',
'rendering/RenderIFrame.cpp',
......
2011-02-24 James Robinson <jamesr@chromium.org>
Unreviewed, rolling out r79584.
http://trac.webkit.org/changeset/79584
https://bugs.webkit.org/show_bug.cgi?id=44797
[chromium] Patch does not compile if ENABLE_FULLSCREEN_API is
not set
* features.gypi:
* public/WebSettings.h:
* src/ChromeClientImpl.cpp:
* src/ChromeClientImpl.h:
* src/WebSettingsImpl.cpp:
* src/WebSettingsImpl.h:
2011-02-24 Andrew Wilson <atwilson@chromium.org>
Unreviewed, rolling out r79570.
......
......@@ -56,7 +56,6 @@
'ENABLE_JAVASCRIPT_I18N_API=1',
'ENABLE_FILE_SYSTEM=1',
'ENABLE_FILTERS=1',
'ENABLE_FULLSCREEN_API=1',
'ENABLE_GEOLOCATION=1',
'ENABLE_ICONDATABASE=0',
'ENABLE_INDEXED_DATABASE=1',
......
......@@ -111,7 +111,6 @@ public:
virtual void setCaretBrowsingEnabled(bool) = 0;
virtual void setInteractiveFormValidationEnabled(bool) = 0;
virtual void setMinimumTimerInterval(double) = 0;
virtual void setFullScreenEnabled(bool) = 0;
protected:
~WebSettings() { }
......
......@@ -79,7 +79,6 @@
#include "WebPopupMenuInfo.h"
#include "WebPopupType.h"
#include "WebRect.h"
#include "WebSettings.h"
#include "WebTextDirection.h"
#include "WebURLRequest.h"
#include "WebViewClient.h"
......@@ -861,33 +860,6 @@ void ChromeClientImpl::exitFullscreenForNode(WebCore::Node* node)
m_webView->client()->exitFullscreenForNode(WebNode(node));
}
#if ENABLE(FULLSCREEN_API)
bool ChromeClientImpl::supportsFullScreenForElement(const WebCore::Element* element)
{
return m_webView->page()->settings()->fullScreenEnabled();
}
void ChromeClientImpl::enterFullScreenForElement(WebCore::Element* element)
{
// FIXME: We may need to call these someplace else when window resizes.
element->document()->webkitWillEnterFullScreenForElement(element);
element->document()->webkitDidEnterFullScreenForElement(element);
}
void ChromeClientImpl::exitFullScreenForElement(WebCore::Element* element)
{
// FIXME: We may need to call these someplace else when window resizes.
element->document()->webkitWillExitFullScreenForElement(element);
element->document()->webkitDidExitFullScreenForElement(element);
}
void ChromeClientImpl::fullScreenRendererChanged(RenderBox*)
{
// FIXME: Implement.
}
#endif
bool ChromeClientImpl::selectItemWritingDirectionIsNatural()
{
return false;
......
......@@ -38,11 +38,9 @@
namespace WebCore {
class AccessibilityObject;
class Element;
class FileChooser;
class PopupContainer;
class PopupMenuClient;
class RenderBox;
class SecurityOrigin;
struct WindowFeatures;
}
......@@ -165,13 +163,6 @@ public:
virtual void enterFullscreenForNode(WebCore::Node*);
virtual void exitFullscreenForNode(WebCore::Node*);
#if ENABLE(FULLSCREEN_API)
virtual bool supportsFullScreenForElement(const WebCore::Element*);
virtual void enterFullScreenForElement(WebCore::Element*);
virtual void exitFullScreenForElement(WebCore::Element*);
virtual void fullScreenRendererChanged(WebCore::RenderBox*);
#endif
// ChromeClientChromium methods:
virtual void popupOpened(WebCore::PopupContainer* popupContainer,
const WebCore::IntRect& bounds,
......
......@@ -360,9 +360,4 @@ void WebSettingsImpl::setMinimumTimerInterval(double interval)
m_settings->setMinDOMTimerInterval(interval);
}
void WebSettingsImpl::setFullScreenEnabled(bool enabled)
{
m_settings->setFullScreenEnabled(enabled);
}
} // namespace WebKit
......@@ -104,7 +104,6 @@ public:
virtual void setCaretBrowsingEnabled(bool);
virtual void setInteractiveFormValidationEnabled(bool);
virtual void setMinimumTimerInterval(double);
virtual void setFullScreenEnabled(bool);
private:
WebCore::Settings* m_settings;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment