- Revision
- 98908
- Author
- [email protected]
- Date
- 2011-10-31 16:40:41 -0700 (Mon, 31 Oct 2011)
Log Message
[EFL] Rename ewk_view_setting_scripts_window_open_{get,set} after r93833
https://bugs.webkit.org/show_bug.cgi?id=71228
Patch by Raphael Kubo da Costa <[email protected]> on 2011-10-31
Reviewed by Antonio Gomes.
Source/WebKit/efl:
r93833 has introduced
ewk_view_setting_scripts_can_close_windows_{get,set}, but its
counterpart to allow scripts to open windows kept its weird name.
This makes the functions to allow windows to open and close windows to
have confusingly different name patterns.
* ewk/ewk_view.cpp:
(_ewk_view_priv_new):
(ewk_view_setting_scripts_can_open_windows_get):
(ewk_view_setting_scripts_can_open_windows_set):
* ewk/ewk_view.h:
Tools:
* DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
(DumpRenderTreeChrome::createNewWindow):
(DumpRenderTreeChrome::resetDefaultsToConsistentValues):
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (98907 => 98908)
--- trunk/Source/WebKit/efl/ChangeLog 2011-10-31 23:38:27 UTC (rev 98907)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-10-31 23:40:41 UTC (rev 98908)
@@ -1,3 +1,23 @@
+2011-10-31 Raphael Kubo da Costa <[email protected]>
+
+ [EFL] Rename ewk_view_setting_scripts_window_open_{get,set} after r93833
+ https://bugs.webkit.org/show_bug.cgi?id=71228
+
+ Reviewed by Antonio Gomes.
+
+ r93833 has introduced
+ ewk_view_setting_scripts_can_close_windows_{get,set}, but its
+ counterpart to allow scripts to open windows kept its weird name.
+
+ This makes the functions to allow windows to open and close windows to
+ have confusingly different name patterns.
+
+ * ewk/ewk_view.cpp:
+ (_ewk_view_priv_new):
+ (ewk_view_setting_scripts_can_open_windows_get):
+ (ewk_view_setting_scripts_can_open_windows_set):
+ * ewk/ewk_view.h:
+
2011-10-31 Tomasz Morawski <[email protected]>
[EFL] Make cache flush when max size of cache has been changed
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (98907 => 98908)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2011-10-31 23:38:27 UTC (rev 98907)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2011-10-31 23:40:41 UTC (rev 98908)
@@ -179,7 +179,7 @@
Eina_Bool enablePlugins : 1;
Eina_Bool enableFrameFlattening : 1;
Eina_Bool encodingDetector : 1;
- Eina_Bool scriptsWindowOpen : 1;
+ Eina_Bool scriptsCanOpenWindows : 1;
Eina_Bool scriptsCanCloseWindows : 1;
Eina_Bool resizableTextareas : 1;
Eina_Bool privateBrowsing : 1;
@@ -681,7 +681,7 @@
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();
+ priv->settings.scriptsCanOpenWindows = priv->pageSettings->_javascript_CanOpenWindowsAutomatically();
priv->settings.scriptsCanCloseWindows = priv->pageSettings->allowScriptsToCloseWindows();
priv->settings.resizableTextareas = priv->pageSettings->textAreasAreResizable();
priv->settings.privateBrowsing = priv->pageSettings->privateBrowsingEnabled();
@@ -2009,21 +2009,21 @@
return EINA_TRUE;
}
-Eina_Bool ewk_view_setting_scripts_window_open_get(const Evas_Object* ewkView)
+Eina_Bool ewk_view_setting_scripts_can_open_windows_get(const Evas_Object* ewkView)
{
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, EINA_FALSE);
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, EINA_FALSE);
- return priv->settings.scriptsWindowOpen;
+ return priv->settings.scriptsCanOpenWindows;
}
-Eina_Bool ewk_view_setting_scripts_window_open_set(Evas_Object* ewkView, Eina_Bool allow)
+Eina_Bool ewk_view_setting_scripts_can_open_windows_set(Evas_Object* ewkView, Eina_Bool allow)
{
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, EINA_FALSE);
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, EINA_FALSE);
allow = !!allow;
- if (priv->settings.scriptsWindowOpen != allow) {
+ if (priv->settings.scriptsCanOpenWindows != allow) {
priv->pageSettings->setJavaScriptCanOpenWindowsAutomatically(allow);
- priv->settings.scriptsWindowOpen = allow;
+ priv->settings.scriptsCanOpenWindows = allow;
}
return EINA_TRUE;
}
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.h (98907 => 98908)
--- trunk/Source/WebKit/efl/ewk/ewk_view.h 2011-10-31 23:38:27 UTC (rev 98907)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.h 2011-10-31 23:40:41 UTC (rev 98908)
@@ -1438,7 +1438,7 @@
* @return @c EINA_TRUE if the scripts can open the new windows
* @c EINA_FALSE if not or on failure
*/
-EAPI Eina_Bool ewk_view_setting_scripts_window_open_get(const Evas_Object *o);
+EAPI Eina_Bool ewk_view_setting_scripts_can_open_windows_get(const Evas_Object *o);
/**
* Enables/disables if the scripts can open the new windows.
@@ -1451,7 +1451,7 @@
*
* @see ewk_view_setting_enable_scripts_set
*/
-EAPI Eina_Bool ewk_view_setting_scripts_window_open_set(Evas_Object *o, Eina_Bool allow);
+EAPI Eina_Bool ewk_view_setting_scripts_can_open_windows_set(Evas_Object *o, Eina_Bool allow);
/**
* Returns whether scripts can close windows automatically.
Modified: trunk/Tools/ChangeLog (98907 => 98908)
--- trunk/Tools/ChangeLog 2011-10-31 23:38:27 UTC (rev 98907)
+++ trunk/Tools/ChangeLog 2011-10-31 23:40:41 UTC (rev 98908)
@@ -1,3 +1,14 @@
+2011-10-31 Raphael Kubo da Costa <[email protected]>
+
+ [EFL] Rename ewk_view_setting_scripts_window_open_{get,set} after r93833
+ https://bugs.webkit.org/show_bug.cgi?id=71228
+
+ Reviewed by Antonio Gomes.
+
+ * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+ (DumpRenderTreeChrome::createNewWindow):
+ (DumpRenderTreeChrome::resetDefaultsToConsistentValues):
+
2011-10-31 Eric Seidel <[email protected]>
webkitpy tests depend too much on the user's environment
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (98907 => 98908)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2011-10-31 23:38:27 UTC (rev 98907)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2011-10-31 23:40:41 UTC (rev 98908)
@@ -70,7 +70,7 @@
{
Evas_Object* newView = createView();
- ewk_view_setting_scripts_window_open_set(newView, EINA_TRUE);
+ ewk_view_setting_scripts_can_open_windows_set(newView, EINA_TRUE);
ewk_view_setting_scripts_can_close_windows_set(newView, EINA_TRUE);
m_extraViews.append(newView);
@@ -172,7 +172,7 @@
ewk_view_setting_page_cache_set(mainView(), EINA_FALSE);
ewk_view_setting_enable_auto_resize_window_set(mainView(), EINA_TRUE);
ewk_view_setting_enable_plugins_set(mainView(), EINA_TRUE);
- ewk_view_setting_scripts_window_open_set(mainView(), EINA_TRUE);
+ ewk_view_setting_scripts_can_open_windows_set(mainView(), EINA_TRUE);
ewk_view_setting_scripts_can_close_windows_set(mainView(), EINA_TRUE);
ewk_view_zoom_set(mainView(), 1.0, 0, 0);
