- Revision
- 118729
- Author
- [email protected]
- Date
- 2012-05-29 00:51:23 -0700 (Tue, 29 May 2012)
Log Message
[EFL] Compilation warning in DumpRenderTreeView.cpp
https://bugs.webkit.org/show_bug.cgi?id=87636
Patch by Christophe Dumez <[email protected]> on 2012-05-29
Reviewed by Filip Pizlo.
Source/WebKit/efl:
Fix return type of exceeded_application_cache_quota callback, it
should be int64_t, not uint64_t.
* ewk/ewk_view.h:
Tools:
Fix compilation error in DumpRenderTreeView.cpp due to wrong format
specifier in printf. Also fix the return type for
onExceededApplicationCacheQuota callback.
* DumpRenderTree/efl/DumpRenderTreeView.cpp:
(onExceededApplicationCacheQuota):
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (118728 => 118729)
--- trunk/Source/WebKit/efl/ChangeLog 2012-05-29 07:34:49 UTC (rev 118728)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-05-29 07:51:23 UTC (rev 118729)
@@ -1,3 +1,15 @@
+2012-05-29 Christophe Dumez <[email protected]>
+
+ [EFL] Compilation warning in DumpRenderTreeView.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=87636
+
+ Reviewed by Filip Pizlo.
+
+ Fix return type of exceeded_application_cache_quota callback, it
+ should be int64_t, not uint64_t.
+
+ * ewk/ewk_view.h:
+
2012-05-25 Jesus Sanchez-Palencia <[email protected]>
WebKitTestRunner needs to support layoutTestController.setJavaScriptProfilingEnabled
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.h (118728 => 118729)
--- trunk/Source/WebKit/efl/ewk/ewk_view.h 2012-05-29 07:34:49 UTC (rev 118728)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.h 2012-05-29 07:51:23 UTC (rev 118729)
@@ -177,7 +177,7 @@
Eina_Bool (*run_javascript_confirm)(Ewk_View_Smart_Data *sd, Evas_Object *frame, const char *message);
Eina_Bool (*run_javascript_prompt)(Ewk_View_Smart_Data *sd, Evas_Object *frame, const char *message, const char *defaultValue, char **value);
Eina_Bool (*should_interrupt_javascript)(Ewk_View_Smart_Data *sd);
- uint64_t (*exceeded_application_cache_quota)(Ewk_View_Smart_Data *sd, Ewk_Security_Origin* origin, int64_t defaultOriginQuota, int64_t totalSpaceNeeded);
+ int64_t (*exceeded_application_cache_quota)(Ewk_View_Smart_Data *sd, Ewk_Security_Origin* origin, int64_t defaultOriginQuota, int64_t totalSpaceNeeded);
uint64_t (*exceeded_database_quota)(Ewk_View_Smart_Data *sd, Evas_Object *frame, const char *databaseName, uint64_t current_size, uint64_t expected_size);
Eina_Bool (*run_open_panel)(Ewk_View_Smart_Data *sd, Evas_Object *frame, Eina_Bool allows_multiple_files, Eina_List *accept_types, Eina_List **selected_filenames);
Modified: trunk/Tools/ChangeLog (118728 => 118729)
--- trunk/Tools/ChangeLog 2012-05-29 07:34:49 UTC (rev 118728)
+++ trunk/Tools/ChangeLog 2012-05-29 07:51:23 UTC (rev 118729)
@@ -1,3 +1,17 @@
+2012-05-29 Christophe Dumez <[email protected]>
+
+ [EFL] Compilation warning in DumpRenderTreeView.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=87636
+
+ Reviewed by Filip Pizlo.
+
+ Fix compilation error in DumpRenderTreeView.cpp due to wrong format
+ specifier in printf. Also fix the return type for
+ onExceededApplicationCacheQuota callback.
+
+ * DumpRenderTree/efl/DumpRenderTreeView.cpp:
+ (onExceededApplicationCacheQuota):
+
2012-05-29 Hironori Bono <[email protected]>
Adding Hironori Bono to committers.py.
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeView.cpp (118728 => 118729)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeView.cpp 2012-05-29 07:34:49 UTC (rev 118728)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeView.cpp 2012-05-29 07:51:23 UTC (rev 118729)
@@ -120,7 +120,7 @@
return 5 * 1024 * 1024;
}
-static uint64_t onExceededApplicationCacheQuota(Ewk_View_Smart_Data*, Ewk_Security_Origin *origin, int64_t defaultOriginQuota, int64_t totalSpaceNeeded)
+static int64_t onExceededApplicationCacheQuota(Ewk_View_Smart_Data*, Ewk_Security_Origin *origin, int64_t defaultOriginQuota, int64_t totalSpaceNeeded)
{
if (gLayoutTestController->dumpApplicationCacheDelegateCallbacks()) {
// For example, numbers from 30000 - 39999 will output as 30000.
@@ -128,7 +128,7 @@
// sufficient to just get a range of 10000 to determine if we were
// above or below a threshold.
int64_t truncatedSpaceNeeded = (totalSpaceNeeded / 10000) * 10000;
- printf("UI DELEGATE APPLICATION CACHE CALLBACK: exceededApplicationCacheOriginQuotaForSecurityOrigin:{%s, %s, %i} totalSpaceNeeded:~%llu\n",
+ printf("UI DELEGATE APPLICATION CACHE CALLBACK: exceededApplicationCacheOriginQuotaForSecurityOrigin:{%s, %s, %i} totalSpaceNeeded:~%lld\n",
ewk_security_origin_protocol_get(origin),
ewk_security_origin_host_get(origin),
ewk_security_origin_port_get(origin),
