Title: [139417] trunk/Source
Revision
139417
Author
[email protected]
Date
2013-01-11 01:53:11 -0800 (Fri, 11 Jan 2013)

Log Message

[EFL] Fix unused parameter build error
https://bugs.webkit.org/show_bug.cgi?id=106639

Patch by KwangYong Choi <[email protected]> on 2013-01-11
Reviewed by Kentaro Hara.

Use UNUSED_PARAM macro to fix build error.

Source/WebCore:

No new tests, no behavior change.

* platform/efl/EflScreenUtilities.cpp:
(WebCore::isUsingEcoreX):
* platform/efl/RenderThemeEfl.cpp:
(WebCore::RenderThemeEfl::supportsDataListUI):

Source/WebKit/efl:

* WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
(DumpRenderTreeSupportEfl::intentMessagePorts):
* ewk/ewk_contextmenu.cpp:
(ewk_context_menu_destroy):
(ewk_context_menu_item_select):
* ewk/ewk_file_chooser.cpp:
(ewk_file_chooser_capture_get):
* ewk/ewk_frame.cpp:
(ewk_frame_feed_touch_event):
* ewk/ewk_intent.cpp:
(ewk_intent_action_get):
(ewk_intent_type_get):
(ewk_intent_service_get):
(ewk_intent_suggestions_get):
(ewk_intent_extra_get):
(ewk_intent_extra_names_get):
* ewk/ewk_intent_request.cpp:
(ewk_intent_request_ref):
(ewk_intent_request_unref):
(ewk_intent_request_intent_get):
* ewk/ewk_security_origin.cpp:
(ewk_security_origin_web_database_usage_get):
(ewk_security_origin_web_database_quota_get):
* ewk/ewk_settings.cpp:
(ewk_settings_shadow_dom_enable_set):
* ewk/ewk_view.cpp:
(ewk_view_context_menu_forward_event):
(ewk_view_setting_should_display_subtitles_get):
(ewk_view_setting_should_display_captions_get):
(ewk_view_setting_should_display_captions_set):
(ewk_view_setting_should_display_subtitles_set):
(ewk_view_setting_should_display_text_descriptions_get):
(ewk_view_setting_should_display_text_descriptions_set):

Source/WebKit2:

* UIProcess/API/efl/ewk_color_picker.cpp:
(ewk_color_picker_color_set):
(ewk_color_picker_color_get):
* UIProcess/API/efl/ewk_context.cpp:
(ewk_context_additional_plugin_path_set):
* UIProcess/API/efl/ewk_settings.cpp:
(ewk_settings_fullscreen_enabled_set):
(ewk_settings_fullscreen_enabled_get):
* UIProcess/API/efl/ewk_view.cpp:
(ewk_view_intent_deliver):
(ewk_view_feed_touch_event):
(ewk_view_touch_events_enabled_set):
(ewk_view_touch_events_enabled_get):
(ewk_view_fullscreen_exit):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (139416 => 139417)


--- trunk/Source/WebCore/ChangeLog	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebCore/ChangeLog	2013-01-11 09:53:11 UTC (rev 139417)
@@ -1,3 +1,19 @@
+2013-01-11  KwangYong Choi  <[email protected]>
+
+        [EFL] Fix unused parameter build error
+        https://bugs.webkit.org/show_bug.cgi?id=106639
+
+        Reviewed by Kentaro Hara.
+
+        Use UNUSED_PARAM macro to fix build error.
+
+        No new tests, no behavior change.
+
+        * platform/efl/EflScreenUtilities.cpp:
+        (WebCore::isUsingEcoreX):
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::supportsDataListUI):
+
 2013-01-11  Pavel Feldman  <[email protected]>
 
         Web Inspector [chromium]: Debugger.globalObjectCleared is not dispatched on reload after renderer swap

Modified: trunk/Source/WebCore/platform/efl/EflScreenUtilities.cpp (139416 => 139417)


--- trunk/Source/WebCore/platform/efl/EflScreenUtilities.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebCore/platform/efl/EflScreenUtilities.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -146,6 +146,7 @@
         || !strcmp(engine, "software_16_x11")
         || !strncmp(engine, "xrender", sizeof("xrender") - 1);
 #else
+    UNUSED_PARAM(evas);
     return false;
 #endif
 }

Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp (139416 => 139417)


--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -757,6 +757,7 @@
     // FIXME: We need to support other types.
     return type == InputTypeNames::range();
 #else
+    UNUSED_PARAM(type);
     return false;
 #endif
 }

Modified: trunk/Source/WebKit/efl/ChangeLog (139416 => 139417)


--- trunk/Source/WebKit/efl/ChangeLog	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit/efl/ChangeLog	2013-01-11 09:53:11 UTC (rev 139417)
@@ -1,3 +1,46 @@
+2013-01-11  KwangYong Choi  <[email protected]>
+
+        [EFL] Fix unused parameter build error
+        https://bugs.webkit.org/show_bug.cgi?id=106639
+
+        Reviewed by Kentaro Hara.
+
+        Use UNUSED_PARAM macro to fix build error.
+
+        * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+        (DumpRenderTreeSupportEfl::intentMessagePorts):
+        * ewk/ewk_contextmenu.cpp:
+        (ewk_context_menu_destroy):
+        (ewk_context_menu_item_select):
+        * ewk/ewk_file_chooser.cpp:
+        (ewk_file_chooser_capture_get):
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_feed_touch_event):
+        * ewk/ewk_intent.cpp:
+        (ewk_intent_action_get):
+        (ewk_intent_type_get):
+        (ewk_intent_service_get):
+        (ewk_intent_suggestions_get):
+        (ewk_intent_extra_get):
+        (ewk_intent_extra_names_get):
+        * ewk/ewk_intent_request.cpp:
+        (ewk_intent_request_ref):
+        (ewk_intent_request_unref):
+        (ewk_intent_request_intent_get):
+        * ewk/ewk_security_origin.cpp:
+        (ewk_security_origin_web_database_usage_get):
+        (ewk_security_origin_web_database_quota_get):
+        * ewk/ewk_settings.cpp:
+        (ewk_settings_shadow_dom_enable_set):
+        * ewk/ewk_view.cpp:
+        (ewk_view_context_menu_forward_event):
+        (ewk_view_setting_should_display_subtitles_get):
+        (ewk_view_setting_should_display_captions_get):
+        (ewk_view_setting_should_display_captions_set):
+        (ewk_view_setting_should_display_subtitles_set):
+        (ewk_view_setting_should_display_text_descriptions_get):
+        (ewk_view_setting_should_display_text_descriptions_set):
+
 2013-01-10  Christophe Dumez  <[email protected]>
 
         [EFL] Add gstreamer 1.0.5 to jhbuild

Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (139416 => 139417)


--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -670,6 +670,7 @@
     const WebCore::Intent* coreIntent = EWKPrivate::coreIntent(intent);
     return coreIntent ? coreIntent->messagePorts() : 0;
 #else
+    UNUSED_PARAM(intent);
     return 0;
 #endif
 }

Modified: trunk/Source/WebKit/efl/ewk/ewk_contextmenu.cpp (139416 => 139417)


--- trunk/Source/WebKit/efl/ewk/ewk_contextmenu.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit/efl/ewk/ewk_contextmenu.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -88,6 +88,7 @@
     ewk_context_menu_free(menu);
     return true;
 #else
+    UNUSED_PARAM(menu);
     return false;
 #endif
 }
@@ -127,6 +128,8 @@
     menu->controller->contextMenuItemSelected(&core);
     return true;
 #else
+    UNUSED_PARAM(menu);
+    UNUSED_PARAM(item);
     return false;
 #endif
 }

Modified: trunk/Source/WebKit/efl/ewk/ewk_file_chooser.cpp (139416 => 139417)


--- trunk/Source/WebKit/efl/ewk/ewk_file_chooser.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit/efl/ewk/ewk_file_chooser.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -99,6 +99,7 @@
 
     return EWK_FILE_CHOOSER_CAPTURE_TYPE_FILESYSTEM;
 #else
+    UNUSED_PARAM(chooser);
     return EWK_FILE_CHOOSER_CAPTURE_TYPE_INVALID;
 #endif
 }

Modified: trunk/Source/WebKit/efl/ewk/ewk_frame.cpp (139416 => 139417)


--- trunk/Source/WebKit/efl/ewk/ewk_frame.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit/efl/ewk/ewk_frame.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -995,6 +995,10 @@
 
     return smartData->frame->eventHandler()->handleTouchEvent(EWKPrivate::platformTouchEvent(x, y, points, action, modifiers));
 #else
+    UNUSED_PARAM(ewkFrame);
+    UNUSED_PARAM(action);
+    UNUSED_PARAM(points);
+    UNUSED_PARAM(modifiers);
     return false;
 #endif
 }

Modified: trunk/Source/WebKit/efl/ewk/ewk_intent.cpp (139416 => 139417)


--- trunk/Source/WebKit/efl/ewk/ewk_intent.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit/efl/ewk/ewk_intent.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -63,6 +63,7 @@
                              core->action().utf8().data());
     return ewkIntent->action;
 #else
+    UNUSED_PARAM(intent);
     return 0;
 #endif
 }
@@ -78,6 +79,7 @@
                              core->type().utf8().data());
     return ewkIntent->type;
 #else
+    UNUSED_PARAM(intent);
     return 0;
 #endif
 }
@@ -93,6 +95,7 @@
                              core->service().string().utf8().data());
     return ewkIntent->service;
 #else
+    UNUSED_PARAM(intent);
     return 0;
 #endif
 }
@@ -108,6 +111,7 @@
         listOfSuggestions = eina_list_append(listOfSuggestions, eina_stringshare_add(it->string().utf8().data()));
     return listOfSuggestions;
 #else
+    UNUSED_PARAM(intent);
     return 0;
 #endif
 }
@@ -121,6 +125,8 @@
         return 0;
     return eina_stringshare_add(val->value.utf8().data());
 #else
+    UNUSED_PARAM(intent);
+    UNUSED_PARAM(key);
     return 0;
 #endif
 }
@@ -135,6 +141,7 @@
         listOfNames = eina_list_append(listOfNames, eina_stringshare_add(it->utf8().data()));
     return listOfNames;
 #else
+    UNUSED_PARAM(intent);
     return 0;
 #endif
 }

Modified: trunk/Source/WebKit/efl/ewk/ewk_intent_request.cpp (139416 => 139417)


--- trunk/Source/WebKit/efl/ewk/ewk_intent_request.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit/efl/ewk/ewk_intent_request.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -53,6 +53,8 @@
 #if ENABLE(WEB_INTENTS)
     EINA_SAFETY_ON_NULL_RETURN(request);
     ++request->__ref;
+#else
+    UNUSED_PARAM(request);
 #endif
 }
 
@@ -66,6 +68,8 @@
 
     ewk_intent_free(request->intent);
     delete request;
+#else
+    UNUSED_PARAM(request);
 #endif
 }
 
@@ -76,6 +80,7 @@
 
     return request->intent;
 #else
+    UNUSED_PARAM(request);
     return 0;
 #endif
 }

Modified: trunk/Source/WebKit/efl/ewk/ewk_security_origin.cpp (139416 => 139417)


--- trunk/Source/WebKit/efl/ewk/ewk_security_origin.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit/efl/ewk/ewk_security_origin.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -64,22 +64,24 @@
 
 uint64_t ewk_security_origin_web_database_usage_get(const Ewk_Security_Origin* origin)
 {
+#if ENABLE(SQL_DATABASE)
     EINA_SAFETY_ON_NULL_RETURN_VAL(origin, 0);
 
-#if ENABLE(SQL_DATABASE)
     return WebCore::DatabaseManager::manager().usageForOrigin(origin->securityOrigin.get());
 #else
+    UNUSED_PARAM(origin);
     return 0;
 #endif
 }
 
 uint64_t ewk_security_origin_web_database_quota_get(const Ewk_Security_Origin* origin)
 {
+#if ENABLE(SQL_DATABASE)
     EINA_SAFETY_ON_NULL_RETURN_VAL(origin, 0);
 
-#if ENABLE(SQL_DATABASE)
     return WebCore::DatabaseManager::manager().quotaForOrigin(origin->securityOrigin.get());
 #else
+    UNUSED_PARAM(origin)
     return 0;
 #endif
 }

Modified: trunk/Source/WebKit/efl/ewk/ewk_settings.cpp (139416 => 139417)


--- trunk/Source/WebKit/efl/ewk/ewk_settings.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit/efl/ewk/ewk_settings.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -264,6 +264,7 @@
     WebCore::RuntimeEnabledFeatures::setShadowDOMEnabled(enable);
     return true;
 #else
+    UNUSED_PARAM(enable);
     return false;
 #endif
 }

Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (139416 => 139417)


--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -1709,6 +1709,8 @@
 
     return true;
 #else
+    UNUSED_PARAM(ewkView);
+    UNUSED_PARAM(downEvent);
     return false;
 #endif
 }
@@ -4414,6 +4416,7 @@
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
     return priv->settings.shouldDisplaySubtitles;
 #else
+    UNUSED_PARAM(ewkView);
     return false;
 #endif
 }
@@ -4425,6 +4428,7 @@
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
     return priv->settings.shouldDisplayCaptions;
 #else
+    UNUSED_PARAM(ewkView);
     return false;
 #endif
 }
@@ -4439,6 +4443,9 @@
         priv->pageSettings->setShouldDisplayCaptions(enable);
         priv->settings.shouldDisplayCaptions = enable;
     }
+#else
+    UNUSED_PARAM(ewkView);
+    UNUSED_PARAM(enable);
 #endif
 }
 
@@ -4452,6 +4459,9 @@
         priv->pageSettings->setShouldDisplaySubtitles(enable);
         priv->settings.shouldDisplaySubtitles = enable;
     }
+#else
+    UNUSED_PARAM(ewkView);
+    UNUSED_PARAM(enable);
 #endif
 }
 
@@ -4462,6 +4472,7 @@
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
     return priv->settings.shouldDisplayTextDescriptions;
 #else
+    UNUSED_PARAM(ewkView);
     return false;
 #endif
 }
@@ -4476,6 +4487,9 @@
         priv->pageSettings->setShouldDisplayTextDescriptions(enable);
         priv->settings.shouldDisplayTextDescriptions = enable;
     }
+#else
+    UNUSED_PARAM(ewkView);
+    UNUSED_PARAM(enable);
 #endif
 }
 

Modified: trunk/Source/WebKit2/ChangeLog (139416 => 139417)


--- trunk/Source/WebKit2/ChangeLog	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit2/ChangeLog	2013-01-11 09:53:11 UTC (rev 139417)
@@ -1,3 +1,27 @@
+2013-01-11  KwangYong Choi  <[email protected]>
+
+        [EFL] Fix unused parameter build error
+        https://bugs.webkit.org/show_bug.cgi?id=106639
+
+        Reviewed by Kentaro Hara.
+
+        Use UNUSED_PARAM macro to fix build error.
+
+        * UIProcess/API/efl/ewk_color_picker.cpp:
+        (ewk_color_picker_color_set):
+        (ewk_color_picker_color_get):
+        * UIProcess/API/efl/ewk_context.cpp:
+        (ewk_context_additional_plugin_path_set):
+        * UIProcess/API/efl/ewk_settings.cpp:
+        (ewk_settings_fullscreen_enabled_set):
+        (ewk_settings_fullscreen_enabled_get):
+        * UIProcess/API/efl/ewk_view.cpp:
+        (ewk_view_intent_deliver):
+        (ewk_view_feed_touch_event):
+        (ewk_view_touch_events_enabled_set):
+        (ewk_view_touch_events_enabled_get):
+        (ewk_view_fullscreen_exit):
+
 2013-01-10  Carlos Garcia Campos  <[email protected]>
 
         [GTK] Add API to set the web extensions directory to WebKit2 GTK+

Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_color_picker.cpp (139416 => 139417)


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_color_picker.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_color_picker.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -58,6 +58,11 @@
 
     return true;
 #else
+    UNUSED_PARAM(colorPicker);
+    UNUSED_PARAM(r);
+    UNUSED_PARAM(g);
+    UNUSED_PARAM(b);
+    UNUSED_PARAM(a);
     return false;
 #endif
 }
@@ -79,6 +84,11 @@
 
     return true;
 #else
+    UNUSED_PARAM(colorPicker);
+    UNUSED_PARAM(r);
+    UNUSED_PARAM(g);
+    UNUSED_PARAM(b);
+    UNUSED_PARAM(a);
     return false;
 #endif
 }

Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (139416 => 139417)


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -326,13 +326,15 @@
 
 Eina_Bool ewk_context_additional_plugin_path_set(Ewk_Context* ewkContext, const char* path)
 {
+#if ENABLE(NETSCAPE_PLUGIN_API)
     EWK_OBJ_GET_IMPL_OR_RETURN(EwkContext, ewkContext, impl, false);
     EINA_SAFETY_ON_NULL_RETURN_VAL(path, false);
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
     impl->setAdditionalPluginPath(String::fromUTF8(path));
     return true;
 #else
+    UNUSED_PARAM(ewkContext);
+    UNUSED_PARAM(path);
     return false;
 #endif
 }

Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp (139416 => 139417)


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -89,6 +89,8 @@
     settings->preferences()->setFullScreenEnabled(enable);
     return true;
 #else
+    UNUSED_PARAM(settings);
+    UNUSED_PARAM(enable);
     return false;
 #endif
 }
@@ -99,6 +101,7 @@
     EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false);
     return settings->preferences()->fullScreenEnabled();
 #else
+    UNUSED_PARAM(settings);
     return false;
 #endif
 }

Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp (139416 => 139417)


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp	2013-01-11 09:45:03 UTC (rev 139416)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp	2013-01-11 09:53:11 UTC (rev 139417)
@@ -704,6 +704,8 @@
 
     return true;
 #else
+    UNUSED_PARAM(ewkView);
+    UNUSED_PARAM(intent);
     return false;
 #endif
 }
@@ -826,6 +828,10 @@
 
     return true;
 #else
+    UNUSED_PARAM(ewkView);
+    UNUSED_PARAM(type);
+    UNUSED_PARAM(points);
+    UNUSED_PARAM(modifiers);
     return false;
 #endif
 }
@@ -839,6 +845,8 @@
 
     return true;
 #else
+    UNUSED_PARAM(ewkView);
+    UNUSED_PARAM(enabled);
     return false;
 #endif
 }
@@ -850,6 +858,7 @@
 
     return impl->touchEventsEnabled();
 #else
+    UNUSED_PARAM(ewkView);
     return false;
 #endif
 }
@@ -918,6 +927,7 @@
 
     return true;
 #else
+    UNUSED_PARAM(ewkView);
     return false;
 #endif
 }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to