Diff
Modified: trunk/Source/WebCore/ChangeLog (120884 => 120885)
--- trunk/Source/WebCore/ChangeLog 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebCore/ChangeLog 2012-06-20 23:49:53 UTC (rev 120885)
@@ -1,3 +1,26 @@
+2012-06-20 Garret Kelly <[email protected]>
+
+ Moving cookieEnabled/setCookieEnabled from Page to Settings.
+ https://bugs.webkit.org/show_bug.cgi?id=89545
+
+ Reviewed by Adam Barth.
+
+ * dom/Document.cpp:
+ (WebCore::Document::cookie):
+ (WebCore::Document::setCookie):
+ * page/Navigator.cpp:
+ (WebCore::Navigator::cookieEnabled):
+ * page/Page.h:
+ (Page):
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ * page/Settings.h:
+ (WebCore::Settings::setCookieEnabled):
+ (WebCore::Settings::cookieEnabled):
+ (Settings):
+ * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
+ (WebCore::MediaPlayerPrivateQuickTimeVisualContext::setUpCookiesForQuickTime):
+
2012-06-20 Adam Barth <[email protected]>
internals.settings.setDeviceScaleFactor doesn't work for WebKit2 and must be removed
Modified: trunk/Source/WebCore/dom/Document.cpp (120884 => 120885)
--- trunk/Source/WebCore/dom/Document.cpp 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebCore/dom/Document.cpp 2012-06-20 23:49:53 UTC (rev 120885)
@@ -4131,7 +4131,7 @@
String Document::cookie(ExceptionCode& ec) const
{
- if (page() && !page()->cookieEnabled())
+ if (page() && !page()->settings()->cookieEnabled())
return String();
// FIXME: The HTML5 DOM spec states that this attribute can raise an
@@ -4152,7 +4152,7 @@
void Document::setCookie(const String& value, ExceptionCode& ec)
{
- if (page() && !page()->cookieEnabled())
+ if (page() && !page()->settings()->cookieEnabled())
return;
// FIXME: The HTML5 DOM spec states that this attribute can raise an
Modified: trunk/Source/WebCore/page/Navigator.cpp (120884 => 120885)
--- trunk/Source/WebCore/page/Navigator.cpp 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebCore/page/Navigator.cpp 2012-06-20 23:49:53 UTC (rev 120885)
@@ -115,8 +115,8 @@
{
if (!m_frame)
return false;
-
- if (m_frame->page() && !m_frame->page()->cookieEnabled())
+
+ if (m_frame->page() && !m_frame->page()->settings()->cookieEnabled())
return false;
return cookiesEnabled(m_frame->document());
Modified: trunk/Source/WebCore/page/Page.h (120884 => 120885)
--- trunk/Source/WebCore/page/Page.h 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebCore/page/Page.h 2012-06-20 23:49:53 UTC (rev 120885)
@@ -237,9 +237,6 @@
bool inLowQualityImageInterpolationMode() const;
void setInLowQualityImageInterpolationMode(bool = true);
- bool cookieEnabled() const { return m_cookieEnabled; }
- void setCookieEnabled(bool enabled) { m_cookieEnabled = enabled; }
-
float mediaVolume() const { return m_mediaVolume; }
void setMediaVolume(float volume);
Modified: trunk/Source/WebCore/page/Settings.cpp (120884 => 120885)
--- trunk/Source/WebCore/page/Settings.cpp 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebCore/page/Settings.cpp 2012-06-20 23:49:53 UTC (rev 120885)
@@ -270,6 +270,7 @@
, m_needsDidFinishLoadOrderQuirk(false)
, m_fixedPositionCreatesStackingContext(false)
, m_syncXHRInDocumentsEnabled(true)
+ , m_cookieEnabled(true)
, m_windowFocusRestricted(true)
, m_loadsImagesAutomaticallyTimer(this, &Settings::loadsImagesAutomaticallyTimerFired)
, m_incrementalRenderingSuppressionTimeoutInSeconds(defaultIncrementalRenderingSuppressionTimeoutInSeconds)
Modified: trunk/Source/WebCore/page/Settings.h (120884 => 120885)
--- trunk/Source/WebCore/page/Settings.h 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebCore/page/Settings.h 2012-06-20 23:49:53 UTC (rev 120885)
@@ -586,6 +586,9 @@
static bool shouldRespectPriorityInCSSAttributeSetters();
#endif
+ void setCookieEnabled(bool enabled) { m_cookieEnabled = enabled; }
+ bool cookieEnabled() const { return m_cookieEnabled; }
+
private:
Settings(Page*);
@@ -750,6 +753,7 @@
bool m_fixedPositionCreatesStackingContext : 1;
bool m_syncXHRInDocumentsEnabled : 1;
+ bool m_cookieEnabled : 1;
bool m_windowFocusRestricted : 1;
Modified: trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp (120884 => 120885)
--- trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp 2012-06-20 23:49:53 UTC (rev 120885)
@@ -263,7 +263,7 @@
// download the movie into WinInet before asking QuickTime to open it.
Document* document = m_player->mediaPlayerClient()->mediaPlayerOwningDocument();
Frame* frame = document ? document->frame() : 0;
- if (!frame || !frame->page() || !frame->page()->cookieEnabled())
+ if (!frame || !frame->page() || !frame->page()->settings()->cookieEnabled())
return;
KURL movieURL = KURL(KURL(), url);
Modified: trunk/Source/WebKit/chromium/ChangeLog (120884 => 120885)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-20 23:49:53 UTC (rev 120885)
@@ -1,3 +1,17 @@
+2012-06-20 Garret Kelly <[email protected]>
+
+ Moving cookieEnabled/setCookieEnabled from Page to Settings, and
+ exposing through WebSettings.
+ https://bugs.webkit.org/show_bug.cgi?id=89545
+
+ Reviewed by Adam Barth.
+
+ * public/WebSettings.h:
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::setCookieEnabled):
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+
2012-06-20 Raymes Khoury <[email protected]>
Perform hit-test from correct frame in isRectTopmost()
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (120884 => 120885)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-06-20 23:49:53 UTC (rev 120885)
@@ -154,6 +154,7 @@
virtual void setMaxUntiledLayerSize(WebSize) = 0;
virtual void setFixedPositionCreatesStackingContext(bool) = 0;
virtual void setSyncXHRInDocumentsEnabled(bool) = 0;
+ virtual void setCookieEnabled(bool) = 0;
virtual bool forceSoftwareCompositing() const = 0;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (120884 => 120885)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-06-20 23:49:53 UTC (rev 120885)
@@ -622,5 +622,9 @@
m_settings->setSyncXHRInDocumentsEnabled(enabled);
}
+void WebSettingsImpl::setCookieEnabled(bool enabled)
+{
+ m_settings->setCookieEnabled(enabled);
+}
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (120884 => 120885)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-06-20 23:49:53 UTC (rev 120885)
@@ -149,6 +149,7 @@
virtual void setMediaPlaybackRequiresUserGesture(bool);
virtual bool viewportEnabled() const { return m_viewportEnabled; }
virtual void setSyncXHRInDocumentsEnabled(bool);
+ virtual void setCookieEnabled(bool);
bool showFPSCounter() const { return m_showFPSCounter; }
bool showPlatformLayerTree() const { return m_showPlatformLayerTree; }
Modified: trunk/Source/WebKit/mac/ChangeLog (120884 => 120885)
--- trunk/Source/WebKit/mac/ChangeLog 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-06-20 23:49:53 UTC (rev 120885)
@@ -1,3 +1,14 @@
+2012-06-20 Garret Kelly <[email protected]>
+
+ Moving cookieEnabled/setCookieEnabled from Page to Settings.
+ https://bugs.webkit.org/show_bug.cgi?id=89545
+
+ Reviewed by Adam Barth.
+
+ * WebView/WebView.mm:
+ (-[WebView _cookieEnabled]):
+ (-[WebView _setCookieEnabled:]):
+
2012-06-19 Dan Bernstein <[email protected]>
WebKit/mac part of: Paginated display API doesn’t allow setting the page progression direction
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (120884 => 120885)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2012-06-20 23:49:53 UTC (rev 120885)
@@ -2243,14 +2243,14 @@
- (BOOL)_cookieEnabled
{
if (_private->page)
- return _private->page->cookieEnabled();
+ return _private->page->settings()->cookieEnabled();
return YES;
}
- (void)_setCookieEnabled:(BOOL)enable
{
if (_private->page)
- _private->page->setCookieEnabled(enable);
+ _private->page->settings()->setCookieEnabled(enable);
}
- (void)_setAdditionalWebPlugInPaths:(NSArray *)newPaths
Modified: trunk/Source/WebKit/win/ChangeLog (120884 => 120885)
--- trunk/Source/WebKit/win/ChangeLog 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebKit/win/ChangeLog 2012-06-20 23:49:53 UTC (rev 120885)
@@ -1,3 +1,14 @@
+2012-06-20 Garret Kelly <[email protected]>
+
+ Moving cookieEnabled/setCookieEnabled from Page to Settings.
+ https://bugs.webkit.org/show_bug.cgi?id=89545
+
+ Reviewed by Adam Barth.
+
+ * WebView.cpp:
+ (WebView::setCookieEnabled):
+ (WebView::cookieEnabled):
+
2012-06-20 Julien Chaffraix <[email protected]>
Use IntSize in RenderLayer to represent scroll offsets
Modified: trunk/Source/WebKit/win/WebView.cpp (120884 => 120885)
--- trunk/Source/WebKit/win/WebView.cpp 2012-06-20 23:45:52 UTC (rev 120884)
+++ trunk/Source/WebKit/win/WebView.cpp 2012-06-20 23:49:53 UTC (rev 120885)
@@ -6020,7 +6020,7 @@
if (!m_page)
return E_FAIL;
- m_page->setCookieEnabled(enable);
+ m_page->settings()->setCookieEnabled(enable);
return S_OK;
}
@@ -6032,7 +6032,7 @@
if (!m_page)
return E_FAIL;
- *enabled = m_page->cookieEnabled();
+ *enabled = m_page->settings()->cookieEnabled();
return S_OK;
}
