Diff
Modified: trunk/Source/WebCore/ChangeLog (98729 => 98730)
--- trunk/Source/WebCore/ChangeLog 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebCore/ChangeLog 2011-10-28 16:29:26 UTC (rev 98730)
@@ -1,3 +1,27 @@
+2011-10-28 Jochen Eisinger <[email protected]>
+
+ Rename a number of methods mentioning _javascript_ to just Script instead
+ https://bugs.webkit.org/show_bug.cgi?id=71105
+
+ Reviewed by Adam Barth.
+
+ * WebCore.exp.in:
+ * bindings/ScriptControllerBase.cpp:
+ (WebCore::ScriptController::canExecuteScripts):
+ * bindings/v8/V8Proxy.cpp:
+ (WebCore::V8Proxy::handleOutOfMemory):
+ * loader/FrameLoaderClient.h:
+ (WebCore::FrameLoaderClient::allowScript):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::canRequest):
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ (WebCore::Settings::setScriptEnabled):
+ * page/Settings.h:
+ (WebCore::Settings::isScriptEnabled):
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::dataChanged):
+
2011-10-28 Pavel Feldman <[email protected]>
Reset line numbers for scripts generated with document.write.
Modified: trunk/Source/WebCore/WebCore.exp.in (98729 => 98730)
--- trunk/Source/WebCore/WebCore.exp.in 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-10-28 16:29:26 UTC (rev 98730)
@@ -924,7 +924,7 @@
__ZN7WebCore8Settings19setShowDebugBordersEb
__ZN7WebCore8Settings20setCursiveFontFamilyERKN3WTF12AtomicStringE11UScriptCode
__ZN7WebCore8Settings20setFantasyFontFamilyERKN3WTF12AtomicStringE11UScriptCode
-__ZN7WebCore8Settings20setJavaScriptEnabledEb
+__ZN7WebCore8Settings16setScriptEnabledEb
__ZN7WebCore8Settings20setXSSAuditorEnabledEb
__ZN7WebCore8Settings21setShowRepaintCounterEb
__ZN7WebCore8Settings21setStandardFontFamilyERKN3WTF12AtomicStringE11UScriptCode
Modified: trunk/Source/WebCore/bindings/ScriptControllerBase.cpp (98729 => 98730)
--- trunk/Source/WebCore/bindings/ScriptControllerBase.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebCore/bindings/ScriptControllerBase.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -47,7 +47,7 @@
}
Settings* settings = m_frame->settings();
- const bool allowed = m_frame->loader()->client()->allowJavaScript(settings && settings->isJavaScriptEnabled());
+ const bool allowed = m_frame->loader()->client()->allowScript(settings && settings->isScriptEnabled());
if (!allowed && reason == AboutToExecuteScript)
m_frame->loader()->client()->didNotAllowScript();
return allowed;
Modified: trunk/Source/WebCore/bindings/v8/V8Proxy.cpp (98729 => 98730)
--- trunk/Source/WebCore/bindings/v8/V8Proxy.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebCore/bindings/v8/V8Proxy.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -238,7 +238,7 @@
// Disable JS.
Settings* settings = frame->settings();
ASSERT(settings);
- settings->setJavaScriptEnabled(false);
+ settings->setScriptEnabled(false);
return true;
}
Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (98729 => 98730)
--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2011-10-28 16:29:26 UTC (rev 98730)
@@ -299,7 +299,7 @@
virtual void didChangeScrollOffset() { }
- virtual bool allowJavaScript(bool enabledPerSettings) { return enabledPerSettings; }
+ virtual bool allowScript(bool enabledPerSettings) { return enabledPerSettings; }
virtual bool allowScriptFromSource(bool enabledPerSettings, const KURL&) { return enabledPerSettings; }
virtual bool allowPlugins(bool enabledPerSettings) { return enabledPerSettings; }
virtual bool allowImage(bool enabledPerSettings, const KURL&) { return enabledPerSettings; }
@@ -307,7 +307,7 @@
virtual bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin*, const KURL&) { return enabledPerSettings; }
// This callback notifies the client that the frame was about to run
- // _javascript_ but did not because allowJavaScript returned false. We
+ // _javascript_ but did not because allowScript returned false. We
// have a separate callback here because there are a number of places
// that need to know if _javascript_ is enabled but are not necessarily
// preparing to execute script.
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (98729 => 98730)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -320,7 +320,7 @@
if (frame()) {
Settings* settings = frame()->settings();
- if (!frame()->loader()->client()->allowScriptFromSource(!settings || settings->isJavaScriptEnabled(), url)) {
+ if (!frame()->loader()->client()->allowScriptFromSource(!settings || settings->isScriptEnabled(), url)) {
frame()->loader()->client()->didNotAllowScript();
return false;
}
Modified: trunk/Source/WebCore/page/Settings.cpp (98729 => 98730)
--- trunk/Source/WebCore/page/Settings.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebCore/page/Settings.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -135,7 +135,7 @@
, m_isMediaEnabled(true)
, m_arePluginsEnabled(false)
, m_localStorageEnabled(false)
- , m_isJavaScriptEnabled(false)
+ , m_isScriptEnabled(false)
, m_isWebSecurityEnabled(true)
, m_allowUniversalAccessFromFileURLs(true)
, m_allowFileAccessFromFileURLs(true)
@@ -366,9 +366,9 @@
m_loadsSiteIconsIgnoringImageLoadingSetting = loadsSiteIcons;
}
-void Settings::setJavaScriptEnabled(bool isJavaScriptEnabled)
+void Settings::setScriptEnabled(bool isScriptEnabled)
{
- m_isJavaScriptEnabled = isJavaScriptEnabled;
+ m_isScriptEnabled = isScriptEnabled;
}
void Settings::setWebSecurityEnabled(bool isWebSecurityEnabled)
Modified: trunk/Source/WebCore/page/Settings.h (98729 => 98730)
--- trunk/Source/WebCore/page/Settings.h 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebCore/page/Settings.h 2011-10-28 16:29:26 UTC (rev 98730)
@@ -113,11 +113,11 @@
void setLoadsSiteIconsIgnoringImageLoadingSetting(bool);
bool loadsSiteIconsIgnoringImageLoadingSetting() const { return m_loadsSiteIconsIgnoringImageLoadingSetting; }
- void setJavaScriptEnabled(bool);
- // Instead of calling isJavaScriptEnabled directly, please consider calling
+ void setScriptEnabled(bool);
+ // Instead of calling isScriptEnabled directly, please consider calling
// ScriptController::canExecuteScripts, which takes things like the
// HTML sandbox attribute into account.
- bool isJavaScriptEnabled() const { return m_isJavaScriptEnabled; }
+ bool isScriptEnabled() const { return m_isScriptEnabled; }
void setWebSecurityEnabled(bool);
bool isWebSecurityEnabled() const { return m_isWebSecurityEnabled; }
@@ -523,7 +523,7 @@
bool m_isMediaEnabled : 1;
bool m_arePluginsEnabled : 1;
bool m_localStorageEnabled : 1;
- bool m_isJavaScriptEnabled : 1;
+ bool m_isScriptEnabled : 1;
bool m_isWebSecurityEnabled : 1;
bool m_allowUniversalAccessFromFileURLs: 1;
bool m_allowFileAccessFromFileURLs: 1;
Modified: trunk/Source/WebCore/svg/graphics/SVGImage.cpp (98729 => 98730)
--- trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -287,7 +287,7 @@
// loaded by a top-level document.
m_page = adoptPtr(new Page(pageClients));
m_page->settings()->setMediaEnabled(false);
- m_page->settings()->setJavaScriptEnabled(false);
+ m_page->settings()->setScriptEnabled(false);
m_page->settings()->setPluginsEnabled(false);
RefPtr<Frame> frame = Frame::create(m_page.get(), 0, dummyFrameLoaderClient);
Modified: trunk/Source/WebKit/chromium/ChangeLog (98729 => 98730)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-28 16:29:26 UTC (rev 98730)
@@ -1,3 +1,18 @@
+2011-10-28 Jochen Eisinger <[email protected]>
+
+ Rename a number of methods mentioning _javascript_ to just Script instead
+ https://bugs.webkit.org/show_bug.cgi?id=71105
+
+ Reviewed by Adam Barth.
+
+ * src/FrameLoaderClientImpl.cpp:
+ (WebKit::FrameLoaderClientImpl::allowScript):
+ * src/FrameLoaderClientImpl.h:
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::collectGarbage):
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::setJavaScriptEnabled):
+
2011-10-28 Adam Barth <[email protected]>
Remove getExceptionCodeDescription()
Modified: trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (98729 => 98730)
--- trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -178,7 +178,7 @@
m_webFrame->client()->didChangeScrollOffset(m_webFrame);
}
-bool FrameLoaderClientImpl::allowJavaScript(bool enabledPerSettings)
+bool FrameLoaderClientImpl::allowScript(bool enabledPerSettings)
{
WebViewImpl* webview = m_webFrame->viewImpl();
if (webview && webview->permissionClient())
Modified: trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.h (98729 => 98730)
--- trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.h 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.h 2011-10-28 16:29:26 UTC (rev 98730)
@@ -196,7 +196,7 @@
virtual void didPerformFirstNavigation() const;
virtual void registerForIconNotification(bool listen = true);
virtual void didChangeScrollOffset();
- virtual bool allowJavaScript(bool enabledPerSettings);
+ virtual bool allowScript(bool enabledPerSettings);
virtual bool allowScriptFromSource(bool enabledPerSettings, const WebCore::KURL& scriptURL);
virtual bool allowPlugins(bool enabledPerSettings);
virtual bool allowImage(bool enabledPerSettings, const WebCore::KURL& imageURL);
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (98729 => 98730)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -857,7 +857,7 @@
{
if (!m_frame)
return;
- if (!m_frame->settings()->isJavaScriptEnabled())
+ if (!m_frame->settings()->isScriptEnabled())
return;
// FIXME: Move this to the ScriptController and make it JS neutral.
#if USE(V8)
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (98729 => 98730)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -117,7 +117,7 @@
void WebSettingsImpl::setJavaScriptEnabled(bool enabled)
{
- m_settings->setJavaScriptEnabled(enabled);
+ m_settings->setScriptEnabled(enabled);
}
void WebSettingsImpl::setWebSecurityEnabled(bool enabled)
Modified: trunk/Source/WebKit/efl/ChangeLog (98729 => 98730)
--- trunk/Source/WebKit/efl/ChangeLog 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-10-28 16:29:26 UTC (rev 98730)
@@ -1,3 +1,16 @@
+2011-10-28 Jochen Eisinger <[email protected]>
+
+ Rename a number of methods mentioning _javascript_ to just Script instead
+ https://bugs.webkit.org/show_bug.cgi?id=71105
+
+ Reviewed by Adam Barth.
+
+ * WebCoreSupport/FrameLoaderClientEfl.cpp:
+ (WebCore::FrameLoaderClientEfl::dispatchDidClearWindowObjectInWorld):
+ * ewk/ewk_view.cpp:
+ (_ewk_view_priv_new):
+ (ewk_view_setting_enable_scripts_set):
+
2011-10-27 Gustavo Lima Chaves <[email protected]>
[EFL] Fix variable renaming issue inside ewk_view.cpp
Modified: trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp (98729 => 98730)
--- trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -432,7 +432,7 @@
ASSERT(coreFrame);
Settings* settings = coreFrame->settings();
- if (!settings || !settings->isJavaScriptEnabled())
+ if (!settings || !settings->isScriptEnabled())
return;
Ewk_Window_Object_Cleared_Event event;
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (98729 => 98730)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -639,7 +639,7 @@
priv->pageSettings->setFixedFontFamily("monotype");
priv->pageSettings->setSansSerifFontFamily("sans");
priv->pageSettings->setStandardFontFamily("sans");
- priv->pageSettings->setJavaScriptEnabled(true);
+ priv->pageSettings->setScriptEnabled(true);
priv->pageSettings->setPluginsEnabled(true);
priv->pageSettings->setLocalStorageEnabled(true);
priv->pageSettings->setOfflineWebApplicationCacheEnabled(true);
@@ -678,7 +678,7 @@
priv->settings.autoShrinkImages = priv->pageSettings->shrinksStandaloneImagesToFit();
priv->settings.enableAutoResizeWindow = EINA_TRUE;
priv->settings.enableDeveloperExtras = priv->pageSettings->developerExtrasEnabled();
- priv->settings.enableScripts = priv->pageSettings->isJavaScriptEnabled();
+ priv->settings.enableScripts = priv->pageSettings->isScriptEnabled();
priv->settings.enablePlugins = priv->pageSettings->arePluginsEnabled();
priv->settings.enableFrameFlattening = priv->pageSettings->frameFlatteningEnabled();
priv->settings.scriptsWindowOpen = priv->pageSettings->_javascript_CanOpenWindowsAutomatically();
@@ -1965,7 +1965,7 @@
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, EINA_FALSE);
enable = !!enable;
if (priv->settings.enableScripts != enable) {
- priv->pageSettings->setJavaScriptEnabled(enable);
+ priv->pageSettings->setScriptEnabled(enable);
priv->settings.enableScripts = enable;
}
return EINA_TRUE;
Modified: trunk/Source/WebKit/gtk/ChangeLog (98729 => 98730)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-10-28 16:29:26 UTC (rev 98730)
@@ -1,3 +1,16 @@
+2011-10-28 Jochen Eisinger <[email protected]>
+
+ Rename a number of methods mentioning _javascript_ to just Script instead
+ https://bugs.webkit.org/show_bug.cgi?id=71105
+
+ Reviewed by Adam Barth.
+
+ * WebCoreSupport/FrameLoaderClientGtk.cpp:
+ (WebKit::FrameLoaderClient::dispatchDidClearWindowObjectInWorld):
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_update_settings):
+ (webkit_web_view_settings_notify):
+
2011-10-27 Martin Robinson <[email protected]>
[GTK] Remove most of the documentation errors from WebKit1
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (98729 => 98730)
--- trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -632,7 +632,7 @@
ASSERT(coreFrame);
Settings* settings = coreFrame->settings();
- if (!settings || !settings->isJavaScriptEnabled())
+ if (!settings || !settings->isScriptEnabled())
return;
// TODO: Consider using g_signal_has_handler_pending() to avoid the overhead
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (98729 => 98730)
--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -3119,7 +3119,7 @@
coreSettings->setLoadsImagesAutomatically(settingsPrivate->autoLoadImages);
coreSettings->setShrinksStandaloneImagesToFit(settingsPrivate->autoShrinkImages);
coreSettings->setShouldPrintBackgrounds(settingsPrivate->printBackgrounds);
- coreSettings->setJavaScriptEnabled(settingsPrivate->enableScripts);
+ coreSettings->setScriptEnabled(settingsPrivate->enableScripts);
coreSettings->setPluginsEnabled(settingsPrivate->enablePlugins);
coreSettings->setTextAreasAreResizable(settingsPrivate->resizableTextAreas);
coreSettings->setUserStyleSheetLocation(KURL(KURL(), settingsPrivate->userStylesheetURI.data()));
@@ -3214,7 +3214,7 @@
else if (name == g_intern_string("print-backgrounds"))
settings->setShouldPrintBackgrounds(g_value_get_boolean(&value));
else if (name == g_intern_string("enable-scripts"))
- settings->setJavaScriptEnabled(g_value_get_boolean(&value));
+ settings->setScriptEnabled(g_value_get_boolean(&value));
else if (name == g_intern_string("enable-plugins"))
settings->setPluginsEnabled(g_value_get_boolean(&value));
else if (name == g_intern_string("enable-dns-prefetching"))
Modified: trunk/Source/WebKit/mac/ChangeLog (98729 => 98730)
--- trunk/Source/WebKit/mac/ChangeLog 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-10-28 16:29:26 UTC (rev 98730)
@@ -1,3 +1,13 @@
+2011-10-28 Jochen Eisinger <[email protected]>
+
+ Rename a number of methods mentioning _javascript_ to just Script instead
+ https://bugs.webkit.org/show_bug.cgi?id=71105
+
+ Reviewed by Adam Barth.
+
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
2011-10-27 Joseph Pecoraro <[email protected]>
Reviewed by David Kilzer.
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (98729 => 98730)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2011-10-28 16:29:26 UTC (rev 98730)
@@ -1380,7 +1380,7 @@
settings->setFTPDirectoryTemplatePath([preferences _ftpDirectoryTemplatePath]);
settings->setLocalStorageDatabasePath([preferences _localStorageDatabasePath]);
settings->setJavaEnabled([preferences isJavaEnabled]);
- settings->setJavaScriptEnabled([preferences isJavaScriptEnabled]);
+ settings->setScriptEnabled([preferences isJavaScriptEnabled]);
settings->setWebSecurityEnabled([preferences isWebSecurityEnabled]);
settings->setAllowUniversalAccessFromFileURLs([preferences allowUniversalAccessFromFileURLs]);
settings->setAllowFileAccessFromFileURLs([preferences allowFileAccessFromFileURLs]);
Modified: trunk/Source/WebKit/qt/Api/qwebsettings.cpp (98729 => 98730)
--- trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -173,7 +173,7 @@
value = attributes.value(QWebSettings::_javascript_Enabled,
global->attributes.value(QWebSettings::_javascript_Enabled));
- settings->setJavaScriptEnabled(value);
+ settings->setScriptEnabled(value);
#if USE(ACCELERATED_COMPOSITING)
value = attributes.value(QWebSettings::AcceleratedCompositingEnabled,
global->attributes.value(QWebSettings::AcceleratedCompositingEnabled));
Modified: trunk/Source/WebKit/qt/ChangeLog (98729 => 98730)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-28 16:29:26 UTC (rev 98730)
@@ -1,3 +1,13 @@
+2011-10-28 Jochen Eisinger <[email protected]>
+
+ Rename a number of methods mentioning _javascript_ to just Script instead
+ https://bugs.webkit.org/show_bug.cgi?id=71105
+
+ Reviewed by Adam Barth.
+
+ * Api/qwebsettings.cpp:
+ (QWebSettingsPrivate::apply):
+
2011-10-28 Simon Hausmann <[email protected]>
[Qt] Adapt to QSG* to QQuick* API change in qtdeclarative
Modified: trunk/Source/WebKit/win/ChangeLog (98729 => 98730)
--- trunk/Source/WebKit/win/ChangeLog 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/win/ChangeLog 2011-10-28 16:29:26 UTC (rev 98730)
@@ -1,3 +1,15 @@
+2011-10-28 Jochen Eisinger <[email protected]>
+
+ Rename a number of methods mentioning _javascript_ to just Script instead
+ https://bugs.webkit.org/show_bug.cgi?id=71105
+
+ Reviewed by Adam Barth.
+
+ * WebFrame.cpp:
+ (WebFrame::dispatchDidClearWindowObjectInWorld):
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged):
+
2011-10-24 Geoffrey Garen <[email protected]>
Build fix: removed some cases of threadsafeCopy() that I missed in
Modified: trunk/Source/WebKit/win/WebFrame.cpp (98729 => 98730)
--- trunk/Source/WebKit/win/WebFrame.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/win/WebFrame.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -1951,7 +1951,7 @@
ASSERT(coreFrame);
Settings* settings = coreFrame->settings();
- if (!settings || !settings->isJavaScriptEnabled())
+ if (!settings || !settings->isScriptEnabled())
return;
COMPtr<IWebFrameLoadDelegate> frameLoadDelegate;
Modified: trunk/Source/WebKit/win/WebView.cpp (98729 => 98730)
--- trunk/Source/WebKit/win/WebView.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/win/WebView.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -4592,7 +4592,7 @@
hr = preferences->isJavaScriptEnabled(&enabled);
if (FAILED(hr))
return hr;
- settings->setJavaScriptEnabled(!!enabled);
+ settings->setScriptEnabled(!!enabled);
hr = preferences->_javascript_CanOpenWindowsAutomatically(&enabled);
if (FAILED(hr))
Modified: trunk/Source/WebKit/wince/ChangeLog (98729 => 98730)
--- trunk/Source/WebKit/wince/ChangeLog 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/wince/ChangeLog 2011-10-28 16:29:26 UTC (rev 98730)
@@ -1,3 +1,13 @@
+2011-10-28 Jochen Eisinger <[email protected]>
+
+ Rename a number of methods mentioning _javascript_ to just Script instead
+ https://bugs.webkit.org/show_bug.cgi?id=71105
+
+ Reviewed by Adam Barth.
+
+ * WebView.cpp:
+ (WebView::WebView):
+
2011-10-07 Patrick Gansterer <[email protected]>
Unreviewed build fix after r95604.
Modified: trunk/Source/WebKit/wince/WebView.cpp (98729 => 98730)
--- trunk/Source/WebKit/wince/WebView.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/wince/WebView.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -101,7 +101,7 @@
settings->setDefaultFontSize(14);
settings->setMinimumFontSize(8);
settings->setMinimumLogicalFontSize(8);
- settings->setJavaScriptEnabled(true);
+ settings->setScriptEnabled(true);
settings->setLoadsImagesAutomatically(true);
WebKit::FrameLoaderClientWinCE* loaderClient = new WebKit::FrameLoaderClientWinCE(this);
Modified: trunk/Source/WebKit/wx/ChangeLog (98729 => 98730)
--- trunk/Source/WebKit/wx/ChangeLog 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/wx/ChangeLog 2011-10-28 16:29:26 UTC (rev 98730)
@@ -1,3 +1,16 @@
+2011-10-28 Jochen Eisinger <[email protected]>
+
+ Rename a number of methods mentioning _javascript_ to just Script instead
+ https://bugs.webkit.org/show_bug.cgi?id=71105
+
+ Reviewed by Adam Barth.
+
+ * WebSettings.cpp:
+ (wxWebSettings::SetJavaScriptEnabled):
+ (wxWebSettings::IsJavaScriptEnabled):
+ * WebView.cpp:
+ (wxWebView::Create):
+
2011-09-24 Adam Barth <[email protected]>
Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
Modified: trunk/Source/WebKit/wx/WebSettings.cpp (98729 => 98730)
--- trunk/Source/WebKit/wx/WebSettings.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/wx/WebSettings.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -91,13 +91,13 @@
void wxWebSettings::SetJavaScriptEnabled(bool enabled)
{
if (m_settings)
- m_settings->setJavaScriptEnabled(enabled);
+ m_settings->setScriptEnabled(enabled);
}
bool wxWebSettings::IsJavaScriptEnabled() const
{
if (m_settings)
- return m_settings->isJavaScriptEnabled();
+ return m_settings->isScriptEnabled();
return false;
}
Modified: trunk/Source/WebKit/wx/WebView.cpp (98729 => 98730)
--- trunk/Source/WebKit/wx/WebView.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit/wx/WebView.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -413,7 +413,7 @@
settings->setFixedFontFamily("Courier New");
settings->setSansSerifFontFamily("Arial");
settings->setStandardFontFamily("Times New Roman");
- settings->setJavaScriptEnabled(true);
+ settings->setScriptEnabled(true);
#if ENABLE(SQL_DATABASE)
SetDatabasesEnabled(true);
Modified: trunk/Source/WebKit2/ChangeLog (98729 => 98730)
--- trunk/Source/WebKit2/ChangeLog 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-28 16:29:26 UTC (rev 98730)
@@ -1,3 +1,13 @@
+2011-10-28 Jochen Eisinger <[email protected]>
+
+ Rename a number of methods mentioning _javascript_ to just Script instead
+ https://bugs.webkit.org/show_bug.cgi?id=71105
+
+ Reviewed by Adam Barth.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2011-10-28 Csaba Osztrogonác <[email protected]>
[Qt] Adapt to QSG* to QQuick* API change in qtdeclarative
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (98729 => 98730)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-10-28 16:22:18 UTC (rev 98729)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-10-28 16:29:26 UTC (rev 98730)
@@ -1673,7 +1673,7 @@
#undef INITIALIZE_SETTINGS
- settings->setJavaScriptEnabled(store.getBoolValueForKey(WebPreferencesKey::_javascript_EnabledKey()));
+ settings->setScriptEnabled(store.getBoolValueForKey(WebPreferencesKey::_javascript_EnabledKey()));
settings->setLoadsImagesAutomatically(store.getBoolValueForKey(WebPreferencesKey::loadsImagesAutomaticallyKey()));
settings->setLoadsSiteIconsIgnoringImageLoadingSetting(store.getBoolValueForKey(WebPreferencesKey::loadsSiteIconsIgnoringImageLoadingPreferenceKey()));
settings->setPluginsEnabled(store.getBoolValueForKey(WebPreferencesKey::pluginsEnabledKey()));
