https://bugs.webkit.org/show_bug.cgi?id=116449
Reviewed by Martin Robinson.
Fix the problematic concatenations of string literals so they are compilable under the C++11 standard. This
is simply a matter of separating the string and the string literal that are being concatenated with a space.
Source/WebCore:
* platform/graphics/gtk/FullscreenVideoControllerGtk.cpp:
* platform/gtk/FileSystemGtk.cpp:
(WebCore::sharedResourcesPath):
Source/WebKit2:
* UIProcess/API/gtk/tests/TestPrinting.cpp:
(testPrintOperationPrint):
* UIProcess/API/gtk/tests/WebExtensionTest.cpp:
(methodCallCallback):
Tools:
* ImageDiff/gtk/ImageDiff.cpp:
(printImage):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@150421
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
2013-05-20 Zan Dobersek <zdobersek@igalia.com>
2013-05-20 Zan Dobersek <zdobersek@igalia.com>
+ [GTK] Fix concatenations of string literals that are not C++11-compliant
+ https://bugs.webkit.org/show_bug.cgi?id=116449
+
+ Reviewed by Martin Robinson.
+
+ Fix the problematic concatenations of string literals so they are compilable under the C++11 standard. This
+ is simply a matter of separating the string and the string literal that are being concatenated with a space.
+
+ * platform/graphics/gtk/FullscreenVideoControllerGtk.cpp:
+ * platform/gtk/FileSystemGtk.cpp:
+ (WebCore::sharedResourcesPath):
+
+2013-05-20 Zan Dobersek <zdobersek@igalia.com>
+
[GTK] Support application/x-mimearchive mimetype for MHTML archives instead of message/rfc822
https://bugs.webkit.org/show_bug.cgi?id=116442
[GTK] Support application/x-mimearchive mimetype for MHTML archives instead of message/rfc822
https://bugs.webkit.org/show_bug.cgi?id=116442
#define ICON_NAME_SUFFIX
#endif
#define ICON_NAME_SUFFIX
#endif
-#define PLAY_ICON_NAME "media-playback-start"ICON_NAME_SUFFIX
-#define PAUSE_ICON_NAME "media-playback-pause"ICON_NAME_SUFFIX
-#define EXIT_FULLSCREEN_ICON_NAME "view-restore"ICON_NAME_SUFFIX
+#define PLAY_ICON_NAME "media-playback-start" ICON_NAME_SUFFIX
+#define PAUSE_ICON_NAME "media-playback-pause" ICON_NAME_SUFFIX
+#define EXIT_FULLSCREEN_ICON_NAME "view-restore" ICON_NAME_SUFFIX
GOwnPtr<gchar> runtimeDir(g_win32_get_package_installation_directory_of_module(hmodule));
GOwnPtr<gchar> dataPath(g_build_filename(runtimeDir.get(), "share", "webkitgtk-"WEBKITGTK_API_VERSION_STRING, NULL));
#else
GOwnPtr<gchar> runtimeDir(g_win32_get_package_installation_directory_of_module(hmodule));
GOwnPtr<gchar> dataPath(g_build_filename(runtimeDir.get(), "share", "webkitgtk-"WEBKITGTK_API_VERSION_STRING, NULL));
#else
- GOwnPtr<gchar> dataPath(g_build_filename(DATA_DIR, "webkitgtk-"WEBKITGTK_API_VERSION_STRING, NULL));
+ GOwnPtr<gchar> dataPath(g_build_filename(DATA_DIR, "webkitgtk-" WEBKITGTK_API_VERSION_STRING, NULL));
#endif
cachedPath = dataPath.get();
#endif
cachedPath = dataPath.get();
+2013-05-20 Zan Dobersek <zdobersek@igalia.com>
+
+ [GTK] Fix concatenations of string literals that are not C++11-compliant
+ https://bugs.webkit.org/show_bug.cgi?id=116449
+
+ Reviewed by Martin Robinson.
+
+ Fix the problematic concatenations of string literals so they are compilable under the C++11 standard. This
+ is simply a matter of separating the string and the string literal that are being concatenated with a space.
+
+ * UIProcess/API/gtk/tests/TestPrinting.cpp:
+ (testPrintOperationPrint):
+ * UIProcess/API/gtk/tests/WebExtensionTest.cpp:
+ (methodCallCallback):
+
2013-05-20 Commit Queue <commit-queue@webkit.org>
Unreviewed, rolling out r150384.
2013-05-20 Commit Queue <commit-queue@webkit.org>
Unreviewed, rolling out r150384.
webkit_print_operation_print(test->m_printOperation.get());
test->waitUntilPrintFinished();
webkit_print_operation_print(test->m_printOperation.get());
test->waitUntilPrintFinished();
- GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_query_info(outputFile.get(), G_FILE_ATTRIBUTE_STANDARD_SIZE","G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+ GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_query_info(outputFile.get(), G_FILE_ATTRIBUTE_STANDARD_SIZE "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
static_cast<GFileQueryInfoFlags>(0), 0, 0));
g_assert(fileInfo.get());
g_assert_cmpint(g_file_info_get_size(fileInfo.get()), >, 0);
static_cast<GFileQueryInfoFlags>(0), 0, 0));
g_assert(fileInfo.get());
g_assert_cmpint(g_file_info_get_size(fileInfo.get()), >, 0);
if (!page) {
g_dbus_method_invocation_return_error(
invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
if (!page) {
g_dbus_method_invocation_return_error(
invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
- "Invalid page ID: %"G_GUINT64_FORMAT, pageID);
+ "Invalid page ID: %" G_GUINT64_FORMAT, pageID);
return;
}
g_assert_cmpuint(webkit_web_page_get_id(page), ==, pageID);
return;
}
g_assert_cmpuint(webkit_web_page_get_id(page), ==, pageID);
2013-05-20 Zan Dobersek <zdobersek@igalia.com>
2013-05-20 Zan Dobersek <zdobersek@igalia.com>
+ [GTK] Fix concatenations of string literals that are not C++11-compliant
+ https://bugs.webkit.org/show_bug.cgi?id=116449
+
+ Reviewed by Martin Robinson.
+
+ Fix the problematic concatenations of string literals so they are compilable under the C++11 standard. This
+ is simply a matter of separating the string and the string literal that are being concatenated with a space.
+
+ * ImageDiff/gtk/ImageDiff.cpp:
+ (printImage):
+
+2013-05-20 Zan Dobersek <zdobersek@igalia.com>
+
[GTK] Pass GTEST_HAS_RTTI=0 cppflag to TestWebKitAPI programs at compilation-time
https://bugs.webkit.org/show_bug.cgi?id=116450
[GTK] Pass GTEST_HAS_RTTI=0 cppflag to TestWebKitAPI programs at compilation-time
https://bugs.webkit.org/show_bug.cgi?id=116450
return; // Don't bail out, as we can still use the percentage output.
}
return; // Don't bail out, as we can still use the percentage output.
}
- printf("Content-Length: %"G_GSIZE_FORMAT"\n", bufferSize);
+ printf("Content-Length: %" G_GSIZE_FORMAT "\n", bufferSize);
fwrite(buffer, 1, bufferSize, stdout);
}
fwrite(buffer, 1, bufferSize, stdout);
}