Commit 1bd7f0d9 authored by igsolla@chromium.org's avatar igsolla@chromium.org

Revert of Remove WebSettings::setDisallowFullscreenForNonMediaElements(bool)...

Revert of Remove WebSettings::setDisallowFullscreenForNonMediaElements(bool) (https://codereview.chromium.org/416013002/)

Reason for revert:
We need this for the Android WebView

Original issue's description:
> Remove WebSettings::setDisallowFullscreenForNonMediaElements(bool)
> 
> It is never called from Chromium.
> 
> Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=178831

TBR=jochen@chromium.org,qinmin@chromium.org,philipj@opera.com
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/422923002

git-svn-id: svn://svn.chromium.org/blink/trunk@179048 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 1956029a
...@@ -155,6 +155,9 @@ void FullscreenController::didExitFullScreen() ...@@ -155,6 +155,9 @@ void FullscreenController::didExitFullScreen()
void FullscreenController::enterFullScreenForElement(blink::Element* element) void FullscreenController::enterFullScreenForElement(blink::Element* element)
{ {
if (m_webViewImpl->settingsImpl()->disallowFullscreenForNonMediaElements() && !isHTMLMediaElement(element))
return;
// We are already transitioning to fullscreen for a different element. // We are already transitioning to fullscreen for a different element.
if (m_provisionalFullScreenElement) { if (m_provisionalFullScreenElement) {
m_provisionalFullScreenElement = element; m_provisionalFullScreenElement = element;
......
...@@ -58,6 +58,7 @@ WebSettingsImpl::WebSettingsImpl(Settings* settings, InspectorController* inspec ...@@ -58,6 +58,7 @@ WebSettingsImpl::WebSettingsImpl(Settings* settings, InspectorController* inspec
, m_viewportMetaNonUserScalableQuirk(false) , m_viewportMetaNonUserScalableQuirk(false)
, m_clobberUserAgentInitialScaleQuirk(false) , m_clobberUserAgentInitialScaleQuirk(false)
, m_mainFrameResizesAreOrientationChanges(false) , m_mainFrameResizesAreOrientationChanges(false)
, m_disallowFullscreenForNonMediaElements(false)
{ {
ASSERT(settings); ASSERT(settings);
} }
...@@ -695,4 +696,9 @@ void WebSettingsImpl::setMainFrameResizesAreOrientationChanges(bool enabled) ...@@ -695,4 +696,9 @@ void WebSettingsImpl::setMainFrameResizesAreOrientationChanges(bool enabled)
m_mainFrameResizesAreOrientationChanges = enabled; m_mainFrameResizesAreOrientationChanges = enabled;
} }
void WebSettingsImpl::setDisallowFullscreenForNonMediaElements(bool enabled)
{
m_disallowFullscreenForNonMediaElements = enabled;
}
} // namespace blink } // namespace blink
...@@ -89,6 +89,7 @@ public: ...@@ -89,6 +89,7 @@ public:
virtual void setDeviceScaleAdjustment(float) OVERRIDE; virtual void setDeviceScaleAdjustment(float) OVERRIDE;
virtual void setDeviceSupportsMouse(bool) OVERRIDE; virtual void setDeviceSupportsMouse(bool) OVERRIDE;
virtual void setDeviceSupportsTouch(bool) OVERRIDE; virtual void setDeviceSupportsTouch(bool) OVERRIDE;
virtual void setDisallowFullscreenForNonMediaElements(bool) OVERRIDE;
virtual void setDoubleTapToZoomEnabled(bool) OVERRIDE; virtual void setDoubleTapToZoomEnabled(bool) OVERRIDE;
virtual void setDownloadableBinaryFontsEnabled(bool) OVERRIDE; virtual void setDownloadableBinaryFontsEnabled(bool) OVERRIDE;
virtual void setEditingBehavior(EditingBehavior) OVERRIDE; virtual void setEditingBehavior(EditingBehavior) OVERRIDE;
...@@ -175,6 +176,7 @@ public: ...@@ -175,6 +176,7 @@ public:
bool showPaintRects() const { return m_showPaintRects; } bool showPaintRects() const { return m_showPaintRects; }
bool renderVSyncNotificationEnabled() const { return m_renderVSyncNotificationEnabled; } bool renderVSyncNotificationEnabled() const { return m_renderVSyncNotificationEnabled; }
bool autoZoomFocusedNodeToLegibleScale() const { return m_autoZoomFocusedNodeToLegibleScale; } bool autoZoomFocusedNodeToLegibleScale() const { return m_autoZoomFocusedNodeToLegibleScale; }
bool disallowFullscreenForNonMediaElements() const { return m_disallowFullscreenForNonMediaElements; }
bool doubleTapToZoomEnabled() const { return m_doubleTapToZoomEnabled; } bool doubleTapToZoomEnabled() const { return m_doubleTapToZoomEnabled; }
bool perTilePaintingEnabled() const { return m_perTilePaintingEnabled; } bool perTilePaintingEnabled() const { return m_perTilePaintingEnabled; }
bool supportDeprecatedTargetDensityDPI() const { return m_supportDeprecatedTargetDensityDPI; } bool supportDeprecatedTargetDensityDPI() const { return m_supportDeprecatedTargetDensityDPI; }
...@@ -209,6 +211,7 @@ private: ...@@ -209,6 +211,7 @@ private:
// can be removed any time after 2015. See http://crbug.com/313754. // can be removed any time after 2015. See http://crbug.com/313754.
bool m_clobberUserAgentInitialScaleQuirk; bool m_clobberUserAgentInitialScaleQuirk;
bool m_mainFrameResizesAreOrientationChanges; bool m_mainFrameResizesAreOrientationChanges;
bool m_disallowFullscreenForNonMediaElements;
}; };
} // namespace blink } // namespace blink
......
...@@ -106,6 +106,7 @@ public: ...@@ -106,6 +106,7 @@ public:
virtual void setDefaultFontSize(int) = 0; virtual void setDefaultFontSize(int) = 0;
virtual void setDefaultTextEncodingName(const WebString&) = 0; virtual void setDefaultTextEncodingName(const WebString&) = 0;
virtual void setDefaultVideoPosterURL(const WebString&) = 0; virtual void setDefaultVideoPosterURL(const WebString&) = 0;
virtual void setDisallowFullscreenForNonMediaElements(bool) = 0;
void setDeferred2dCanvasEnabled(bool) { } // temporary stub void setDeferred2dCanvasEnabled(bool) { } // temporary stub
virtual void setDeferredFiltersEnabled(bool) = 0; virtual void setDeferredFiltersEnabled(bool) = 0;
virtual void setDeferredImageDecodingEnabled(bool) = 0; virtual void setDeferredImageDecodingEnabled(bool) = 0;
......
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