[webkit-changes] [159090] trunk/Source/WebKit2

[gns]

Title: [159090] trunk/Source/WebKit2








Revision 159090
Author g...@gnome.org
Date 2013-11-11 17:55:35 -0800 (Mon, 11 Nov 2013)


Log Message
REGRESSION(r158976): Web Inspector: unable to start docked or dock
https://bugs.webkit.org/show_bug.cgi?id=124148

Reviewed by Timothy Hatcher.

* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::canAttach): check for a level that is greater than 1 rather than 0
to deny attachment, since 1 is the first level of inspectors.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (159089 => 159090)

--- trunk/Source/WebKit2/ChangeLog	2013-11-12 01:51:39 UTC (rev 159089)
+++ trunk/Source/WebKit2/ChangeLog	2013-11-12 01:55:35 UTC (rev 159090)
@@ -1,3 +1,14 @@
+2013-11-11  Gustavo Noronha Silva  g...@gnome.org
+
+REGRESSION(r158976): Web Inspector: unable to start docked or dock
+https://bugs.webkit.org/show_bug.cgi?id=124148
+
+Reviewed by Timothy Hatcher.
+
+* UIProcess/WebInspectorProxy.cpp:
+(WebKit::WebInspectorProxy::canAttach): check for a level that is greater than 1 rather than 0
+to deny attachment, since 1 is the first level of inspectors.
+
 2013-11-11  Anders Carlsson  ander...@apple.com
 
 FrameFilter can just be an std::function instead


Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (159089 => 159090)

--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp	2013-11-12 01:51:39 UTC (rev 159089)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp	2013-11-12 01:55:35 UTC (rev 159090)
@@ -549,7 +549,7 @@
 return true;
 
 // Don't allow attaching to another inspector -- two inspectors in one window is too much!
-if (m_level  0)
+if (m_level  1)
 return false;
 
 // Don't allow the attach if the window would be too small to accommodate the minimum inspector height.






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [165457] trunk/Tools

[gns]

Title: [165457] trunk/Tools








Revision 165457
Author g...@gnome.org
Date 2014-03-11 17:19:40 -0700 (Tue, 11 Mar 2014)


Log Message
[GTK][CMake] --update-gtk has no effect
https://bugs.webkit.org/show_bug.cgi?id=130088

Patch by Gustavo Noronha Silva gustavo.noro...@collabora.com on 2014-03-11
Reviewed by Philippe Normand.

* Scripts/webkitdirs.pm:
(buildCMakeProjectOrExit): call update-webkitgtk-libs if --update-gtk has been passed
as an argument.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitdirs.pm




Diff

Modified: trunk/Tools/ChangeLog (165456 => 165457)

--- trunk/Tools/ChangeLog	2014-03-12 00:19:25 UTC (rev 165456)
+++ trunk/Tools/ChangeLog	2014-03-12 00:19:40 UTC (rev 165457)
@@ -1,3 +1,14 @@
+2014-03-11  Gustavo Noronha Silva  gustavo.noro...@collabora.com
+
+[GTK][CMake] --update-gtk has no effect
+https://bugs.webkit.org/show_bug.cgi?id=130088
+
+Reviewed by Philippe Normand.
+
+* Scripts/webkitdirs.pm:
+(buildCMakeProjectOrExit): call update-webkitgtk-libs if --update-gtk has been passed
+as an argument.
+
 2014-03-10  Myles C. Maxfield  mmaxfi...@apple.com
 
 Add System Font to the list of whitelisted DRT fonts


Modified: trunk/Tools/Scripts/webkitdirs.pm (165456 => 165457)

--- trunk/Tools/Scripts/webkitdirs.pm	2014-03-12 00:19:25 UTC (rev 165456)
+++ trunk/Tools/Scripts/webkitdirs.pm	2014-03-12 00:19:40 UTC (rev 165457)
@@ -2076,6 +2076,10 @@
 system(perl, $sourceDir/Tools/Scripts/update-webkitefl-libs) == 0 or die $!;
 }
 
+if (isGtk()  checkForArgumentAndRemoveFromARGV(--update-gtk)) {
+system(perl, $sourceDir/Tools/Scripts/update-webkitgtk-libs) == 0 or die $!;
+}
+
 $returnCode = exitStatus(generateBuildSystemFromCMakeProject($port, $prefixPath, @cmakeArgs));
 exit($returnCode) if $returnCode;
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [163339] trunk/Source/WTF

[gns]

Title: [163339] trunk/Source/WTF








Revision 163339
Author g...@gnome.org
Date 2014-02-03 16:26:58 -0800 (Mon, 03 Feb 2014)


Log Message
[GTK][CMake] Enable SUBPIXEL_LAYOUT in FeatureDefines.h like EFL does
https://bugs.webkit.org/show_bug.cgi?id=128136

Reviewed by Martin Robinson.

* wtf/FeatureDefines.h: enable SUBPIXEL_LAYOUT if it's not set, for GTK+.

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/FeatureDefines.h




Diff

Modified: trunk/Source/WTF/ChangeLog (163338 => 163339)

--- trunk/Source/WTF/ChangeLog	2014-02-04 00:17:05 UTC (rev 163338)
+++ trunk/Source/WTF/ChangeLog	2014-02-04 00:26:58 UTC (rev 163339)
@@ -1,3 +1,12 @@
+2014-02-03  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK][CMake] Enable SUBPIXEL_LAYOUT in FeatureDefines.h like EFL does
+https://bugs.webkit.org/show_bug.cgi?id=128136
+
+Reviewed by Martin Robinson.
+
+* wtf/FeatureDefines.h: enable SUBPIXEL_LAYOUT if it's not set, for GTK+.
+
 2014-02-03  Mark Hahnenberg  mhahnenb...@apple.com
 
 Turn GenGC on


Modified: trunk/Source/WTF/wtf/FeatureDefines.h (163338 => 163339)

--- trunk/Source/WTF/wtf/FeatureDefines.h	2014-02-04 00:17:05 UTC (rev 163338)
+++ trunk/Source/WTF/wtf/FeatureDefines.h	2014-02-04 00:26:58 UTC (rev 163339)
@@ -327,6 +327,10 @@
 #endif
 #endif
 
+#if !defined(ENABLE_SUBPIXEL_LAYOUT)
+#define ENABLE_SUBPIXEL_LAYOUT 1
+#endif
+
 #if !defined(ENABLE_8BIT_TEXTRUN)
 #define ENABLE_8BIT_TEXTRUN 1
 #endif






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [164076] trunk

[gns]

Title: [164076] trunk








Revision 164076
Author g...@gnome.org
Date 2014-02-13 16:35:24 -0800 (Thu, 13 Feb 2014)


Log Message
[GTK][CMake] Generate GObject DOM bindings .symbols files
https://bugs.webkit.org/show_bug.cgi?id=126210

Reviewed by Martin Robinson.

.:

* Source/PlatformGTK.cmake: add checking DOM bindings API as a dependency
for documentation generation.

Source/WebCore:

No new tests. Build change only.

* CMakeLists.txt: list Quota module files and IDLs even if the feature
is disabled, for GTK, since we rely on that for our DOM bindings.
* PlatformGTK.cmake: add a new target to check for DOM symbols API by
running the new python script.
* bindings/gobject/GNUmakefile.am: call the new python script instead
of using a custom rule.

Tools:

* gtk/check-gdom-symbols: Added. Checks symbols compatibility.
(should_update_symbols_file):

Modified Paths

trunk/ChangeLog
trunk/Source/PlatformGTK.cmake
trunk/Source/WebCore/CMakeLists.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/PlatformGTK.cmake
trunk/Source/WebCore/bindings/gobject/GNUmakefile.am
trunk/Tools/ChangeLog


Added Paths

trunk/Tools/gtk/check-gdom-symbols




Diff

Modified: trunk/ChangeLog (164075 => 164076)

--- trunk/ChangeLog	2014-02-14 00:30:15 UTC (rev 164075)
+++ trunk/ChangeLog	2014-02-14 00:35:24 UTC (rev 164076)
@@ -1,3 +1,13 @@
+2014-02-04  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK][CMake] Generate GObject DOM bindings .symbols files
+https://bugs.webkit.org/show_bug.cgi?id=126210
+
+Reviewed by Martin Robinson.
+
+* Source/PlatformGTK.cmake: add checking DOM bindings API as a dependency
+for documentation generation.
+
 2014-02-13  Xabier Rodriguez Calvar  calva...@igalia.com
 
 [GTK] MEDIA_CONTROLS_SCRIPT support


Modified: trunk/Source/PlatformGTK.cmake (164075 => 164076)

--- trunk/Source/PlatformGTK.cmake	2014-02-14 00:30:15 UTC (rev 164075)
+++ trunk/Source/PlatformGTK.cmake	2014-02-14 00:35:24 UTC (rev 164076)
@@ -4,6 +4,7 @@
 add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
 
 set(DocumentationDependencies
+generate-gdom-symbols-file
 ${CMAKE_SOURCE_DIR}/Source/WebKit/gtk/docs/webkitenvironment.xml
 )
 


Modified: trunk/Source/WebCore/CMakeLists.txt (164075 => 164076)

--- trunk/Source/WebCore/CMakeLists.txt	2014-02-14 00:30:15 UTC (rev 164075)
+++ trunk/Source/WebCore/CMakeLists.txt	2014-02-14 00:35:24 UTC (rev 164076)
@@ -2735,7 +2735,10 @@
 )
 endif ()
 
-if (ENABLE_QUOTA)
+# On the GTK+ autotools build we used to add these files even if QUOTA is disabled, and
+# because of that we generate GObject bindings for some of the objects. We need to do
+# the same for the cmake build, for now.
+if (ENABLE_QUOTA OR PORT STREQUAL GTK)
 list(APPEND WebCore_SOURCES
 Modules/quota/DOMWindowQuota.cpp
 Modules/quota/NavigatorStorageQuota.cpp


Modified: trunk/Source/WebCore/ChangeLog (164075 => 164076)

--- trunk/Source/WebCore/ChangeLog	2014-02-14 00:30:15 UTC (rev 164075)
+++ trunk/Source/WebCore/ChangeLog	2014-02-14 00:35:24 UTC (rev 164076)
@@ -1,3 +1,19 @@
+2014-02-04  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK][CMake] Generate GObject DOM bindings .symbols files
+https://bugs.webkit.org/show_bug.cgi?id=126210
+
+Reviewed by Martin Robinson.
+
+No new tests. Build change only.
+
+* CMakeLists.txt: list Quota module files and IDLs even if the feature
+is disabled, for GTK, since we rely on that for our DOM bindings.
+* PlatformGTK.cmake: add a new target to check for DOM symbols API by
+running the new python script.
+* bindings/gobject/GNUmakefile.am: call the new python script instead
+of using a custom rule.
+
 2014-02-13  Myles C. Maxfield  mmaxfi...@apple.com
 
 text-decoration-skip: ink skips randomly when using SVG fonts


Modified: trunk/Source/WebCore/PlatformGTK.cmake (164075 => 164076)

--- trunk/Source/WebCore/PlatformGTK.cmake	2014-02-14 00:30:15 UTC (rev 164075)
+++ trunk/Source/WebCore/PlatformGTK.cmake	2014-02-14 00:35:24 UTC (rev 164076)
@@ -667,11 +667,15 @@
  ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
  ${WEBCORE_DIR}/bindings/gobject/WebKitDOMCustom.h
 )
+file(GLOB GObjectDOMBindingsSymbolsFiles
+${WEBCORE_DIR}/bindings/gobject/WebKitDOM*.symbols
+)
 
 foreach (file ${GObjectDOMBindings_IDL_FILES})
 get_filename_component(classname ${file} NAME_WE)
 list(APPEND GObjectDOMBindings_CLASS_LIST ${classname})
 list(APPEND GObjectDOMBindings_INSTALLED_HEADERS ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}.h)
+list(APPEND GObjectDOMBindingsSymbolsFiles ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}.symbols)
 endforeach ()
 
 # Propagate this variable to the parent scope, so that it can be used in other parts of the build.
@@ -694,7 +698,7 @@
 )
 
 

[webkit-changes] [159170] trunk/Source/WebKit2

[gns]

Title: [159170] trunk/Source/WebKit2








Revision 159170
Author g...@gnome.org
Date 2013-11-12 17:59:37 -0800 (Tue, 12 Nov 2013)


Log Message
Unreviewed try at fixing the GTK+ build.

* UIProcess/soup/WebSoupRequestManagerProxy.h: rename TypedAPIObject to API:TypedObject.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (159169 => 159170)

--- trunk/Source/WebKit2/ChangeLog	2013-11-13 01:50:07 UTC (rev 159169)
+++ trunk/Source/WebKit2/ChangeLog	2013-11-13 01:59:37 UTC (rev 159170)
@@ -1,3 +1,9 @@
+2013-11-12  Gustavo Noronha Silva  g...@gnome.org
+
+Unreviewed try at fixing the GTK+ build.
+
+* UIProcess/soup/WebSoupRequestManagerProxy.h: rename TypedAPIObject to API:TypedObject.
+
 2013-11-12  Nick Diego Yamane  nick.yam...@openbossa.org
 
 [EFL][GTK] Remove MutableArray leftovers from build systems


Modified: trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h (159169 => 159170)

--- trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h	2013-11-13 01:50:07 UTC (rev 159169)
+++ trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h	2013-11-13 01:59:37 UTC (rev 159170)
@@ -34,7 +34,7 @@
 class WebContext;
 class WebData;
 
-class WebSoupRequestManagerProxy : public TypedAPIObjectAPIObject::TypeSoupRequestManager, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebSoupRequestManagerProxy : public API::TypedObjectAPI::Object::TypeSoupRequestManager, public WebContextSupplement, private CoreIPC::MessageReceiver {
 public:
 static const char* supplementName();
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [159837] trunk

[gns]

Title: [159837] trunk








Revision 159837
Author g...@gnome.org
Date 2013-11-28 04:40:59 -0800 (Thu, 28 Nov 2013)


Log Message
[GTK] Support custom types for drag and drop data
https://bugs.webkit.org/show_bug.cgi?id=124659

Patch by Gustavo Noronha Silva gustavo.noro...@collabora.com on 2013-11-27
Reviewed by Martin Robinson.

Source/WebCore:

Covered by fast/events/drag-customData.html.

* platform/gtk/DataObjectGtk.cpp:
(WebCore::DataObjectGtk::unknownTypes): returns a hash map with all custom types set.
(WebCore::DataObjectGtk::clearAllExceptFilenames): clear custom types.
* platform/gtk/DataObjectGtk.h:
(WebCore::DataObjectGtk::hasUnknownTypeData): returns whether custom types are set.
(WebCore::DataObjectGtk::unknownTypeData): returns the data for a custom type.
(WebCore::DataObjectGtk::setUnknownTypeData): sets the data for a custom type.
* platform/gtk/PasteboardGtk.cpp:
(WebCore::Pasteboard::writeString): handle unknown types as custom.
(WebCore::Pasteboard::writePasteboard): ditto.
(WebCore::Pasteboard::hasData): also check for custom types.
(WebCore::Pasteboard::types): also obtain the list of custom types.
(WebCore::Pasteboard::readString): handle unknown types as custom.
* platform/gtk/PasteboardHelper.cpp:
(WebCore::initGdkAtoms): new unknown atom.
(WebCore::PasteboardHelper::PasteboardHelper): add custom type to the list of targets.
(WebCore::PasteboardHelper::fillSelectionData): turns any custom types' data into a GVariant, which
is in turn serialized to a single string for GtkSelectionData to hold.
(WebCore::PasteboardHelper::targetListForDataObject): add custom data to the target list if any is
set.
(WebCore::PasteboardHelper::fillDataObjectFromDropData): retrieve the custom types and their data
from the serialized GVariant string held by GtkSelectionData.
(WebCore::PasteboardHelper::dropAtomsForContext): handle custom types.

Source/WebKit2:

* Shared/gtk/ArgumentCodersGtk.cpp:
(CoreIPC::encodeDataObject): encode the unknown types data.
(CoreIPC::decodeDataObject): decode the unknown types data.

LayoutTests:

* platform/gtk/TestExpectations: remove failure expectation for test that now passes.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/gtk/TestExpectations
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp
trunk/Source/WebCore/platform/gtk/DataObjectGtk.h
trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp
trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (159836 => 159837)

--- trunk/LayoutTests/ChangeLog	2013-11-28 10:28:04 UTC (rev 159836)
+++ trunk/LayoutTests/ChangeLog	2013-11-28 12:40:59 UTC (rev 159837)
@@ -1,3 +1,12 @@
+2013-11-27  Gustavo Noronha Silva  gustavo.noro...@collabora.com
+
+[GTK] Support custom types for drag and drop data
+https://bugs.webkit.org/show_bug.cgi?id=124659
+
+Reviewed by Martin Robinson.
+
+* platform/gtk/TestExpectations: remove failure expectation for test that now passes.
+
 2013-11-27  Filip Pizlo  fpi...@apple.com
 
 Infer one-time scopes


Modified: trunk/LayoutTests/platform/gtk/TestExpectations (159836 => 159837)

--- trunk/LayoutTests/platform/gtk/TestExpectations	2013-11-28 10:28:04 UTC (rev 159836)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2013-11-28 12:40:59 UTC (rev 159837)
@@ -220,14 +220,15 @@
 webkit.org/b/98940 fast/events/drag-dataTransferItemList.html [ Skip ]
 webkit.org/b/98940 fast/events/drag-dataTransferItemList-file-handling.html [ Skip ]
 
+# Custom MIME type support in DataTransfer is not yet implemented; this test was added
+# by Google while implementing a different pasteboard API that was only being used by
+# Chromium and Qt, might make sense to remove.
+webkit.org/b/99068 editing/pasteboard/clipboard-customData.html [ Failure ]
+
 # setAutomaticLinkDetectionEnabled is not yet implemented.
 webkit.org/b/99069 editing/inserting/typing-space-to-trigger-smart-link.html [ Failure ]
 webkit.org/b/85463 editing/inserting/smart-link-when-caret-is-moved-before-URL.html [ Failure ]
 
-# Custom MIME type support in DataTransfer is not yet implemented.
-webkit.org/b/99068 editing/pasteboard/clipboard-customData.html [ Failure ]
-webkit.org/b/99068 fast/events/drag-customData.html [ Failure ]
-
 # PasteBoard::plainText() does not support file names.
 webkit.org/b/99070 editing/pasteboard/drag-files-to-editable-element.html [ Failure ]
 


Modified: trunk/Source/WebCore/ChangeLog (159836 => 159837)

--- trunk/Source/WebCore/ChangeLog	2013-11-28 10:28:04 UTC (rev 159836)
+++ trunk/Source/WebCore/ChangeLog	2013-11-28 12:40:59 UTC (rev 159837)
@@ -1,3 +1,36 @@
+2013-11-27  Gustavo Noronha Silva  gustavo.noro...@collabora.com
+
+[GTK] Support custom types for drag and drop data
+https://bugs.webkit.org/show_bug.cgi?id=124659
+
+Reviewed by Martin Robinson.
+
+  

[webkit-changes] [159843] trunk/Source/WebKit/gtk

[gns]

Title: [159843] trunk/Source/WebKit/gtk








Revision 159843
Author g...@gnome.org
Date 2013-11-28 08:02:34 -0800 (Thu, 28 Nov 2013)


Log Message
REGRESSION(r154658): webkit_web_view_get_view_source_mode always returns false
https://bugs.webkit.org/show_bug.cgi?id=124954

Patch by Gustavo Noronha Silva gustavo.noro...@collabora.com on 2013-11-28
Reviewed by Carlos Garcia Campos.

* tests/testwebview.c: new test to ensure setting and getting source mode work as intended.
* webkit/webkitwebview.cpp:
(webkit_web_view_get_view_source_mode): actually return the value we query from WebCore.

Modified Paths

trunk/Source/WebKit/gtk/ChangeLog
trunk/Source/WebKit/gtk/tests/testwebview.c
trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp




Diff

Modified: trunk/Source/WebKit/gtk/ChangeLog (159842 => 159843)

--- trunk/Source/WebKit/gtk/ChangeLog	2013-11-28 15:46:53 UTC (rev 159842)
+++ trunk/Source/WebKit/gtk/ChangeLog	2013-11-28 16:02:34 UTC (rev 159843)
@@ -1,3 +1,14 @@
+2013-11-28  Gustavo Noronha Silva  gustavo.noro...@collabora.com
+
+REGRESSION(r154658): webkit_web_view_get_view_source_mode always returns false
+https://bugs.webkit.org/show_bug.cgi?id=124954
+
+Reviewed by Carlos Garcia Campos.
+
+* tests/testwebview.c: new test to ensure setting and getting source mode work as intended.
+* webkit/webkitwebview.cpp:
+(webkit_web_view_get_view_source_mode): actually return the value we query from WebCore.
+
 2013-11-18  Carlos Garcia Campos  cgar...@igalia.com
 
 Unreviewed. Update NEWS and Versions.m4 for 2.3.2 release.


Modified: trunk/Source/WebKit/gtk/tests/testwebview.c (159842 => 159843)

--- trunk/Source/WebKit/gtk/tests/testwebview.c	2013-11-28 15:46:53 UTC (rev 159842)
+++ trunk/Source/WebKit/gtk/tests/testwebview.c	2013-11-28 16:02:34 UTC (rev 159843)
@@ -687,6 +687,27 @@
 gtk_widget_destroy(window);
 }
 
+static void test_webkit_web_view_source_mode()
+{
+GtkWidget* web_view;
+
+web_view = webkit_web_view_new();
+
+webkit_web_view_load_string(WEBKIT_WEB_VIEW(web_view), htmlbody/body/html, NULL, NULL, NULL);
+
+g_assert(!webkit_web_view_get_view_source_mode(WEBKIT_WEB_VIEW(web_view)));
+
+webkit_web_view_set_view_source_mode(WEBKIT_WEB_VIEW(web_view), TRUE);
+
+g_assert(webkit_web_view_get_view_source_mode(WEBKIT_WEB_VIEW(web_view)));
+
+webkit_web_view_set_view_source_mode(WEBKIT_WEB_VIEW(web_view), FALSE);
+
+g_assert(!webkit_web_view_get_view_source_mode(WEBKIT_WEB_VIEW(web_view)));
+
+gtk_widget_destroy(web_view);
+}
+
 int main(int argc, char** argv)
 {
 SoupServer* server;
@@ -719,6 +740,7 @@
 g_test_add_data_func(/webkit/webview/fullscreen, GINT_TO_POINTER(FALSE), test_webkit_web_view_fullscreen);
 g_test_add_data_func(/webkit/webview/fullscreen-blocked, GINT_TO_POINTER(TRUE), test_webkit_web_view_fullscreen);
 g_test_add_func(/webkit/webview/file-chooser, test_webkit_web_view_file_chooser);
+g_test_add_func(/webkit/webview/source-mode, test_webkit_web_view_source_mode);
 
 return g_test_run ();
 }


Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (159842 => 159843)

--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp	2013-11-28 15:46:53 UTC (rev 159842)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp	2013-11-28 16:02:34 UTC (rev 159843)
@@ -5191,9 +5191,7 @@
 {
 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
 
-core(webView)-mainFrame().inViewSourceMode();
-
-return FALSE;
+return core(webView)-mainFrame().inViewSourceMode();
 }
 
 // Internal subresource management






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [159926] trunk/Source/WebKit/gtk

[gns]

Title: [159926] trunk/Source/WebKit/gtk








Revision 159926
Author g...@gnome.org
Date 2013-12-02 02:44:53 -0800 (Mon, 02 Dec 2013)


Log Message
[GTK] GTK2 paint code path does not render AC layers
https://bugs.webkit.org/show_bug.cgi?id=124967

Patch by Gustavo Noronha Silva gustavo.noro...@collabora.com on 2013-12-02
Reviewed by Carlos Garcia Campos.

* webkit/webkitwebview.cpp:
(webkit_web_view_expose_event): also paint AC layers when painting the widget,
when AC is on.

Modified Paths

trunk/Source/WebKit/gtk/ChangeLog
trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp




Diff

Modified: trunk/Source/WebKit/gtk/ChangeLog (159925 => 159926)

--- trunk/Source/WebKit/gtk/ChangeLog	2013-12-02 10:40:07 UTC (rev 159925)
+++ trunk/Source/WebKit/gtk/ChangeLog	2013-12-02 10:44:53 UTC (rev 159926)
@@ -1,3 +1,14 @@
+2013-12-02  Gustavo Noronha Silva  gustavo.noro...@collabora.com
+
+[GTK] GTK2 paint code path does not render AC layers
+https://bugs.webkit.org/show_bug.cgi?id=124967
+
+Reviewed by Carlos Garcia Campos.
+
+* webkit/webkitwebview.cpp:
+(webkit_web_view_expose_event): also paint AC layers when painting the widget,
+when AC is on.
+
 2013-11-28  Gustavo Noronha Silva  gustavo.noro...@collabora.com
 
 REGRESSION(r154658): webkit_web_view_get_view_source_mode always returns false


Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (159925 => 159926)

--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp	2013-12-02 10:40:07 UTC (rev 159925)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp	2013-12-02 10:44:53 UTC (rev 159926)
@@ -671,6 +671,17 @@
 gdk_region_get_rectangles(event-region, rects.outPtr(), rectCount);
 
 RefPtrcairo_t cr = adoptRef(gdk_cairo_create(event-window));
+
+WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW(widget)-priv;
+#if USE(TEXTURE_MAPPER)
+GdkRectangle clipRect;
+gdk_region_get_clipbox(event-region, clipRect);
+if (priv-acceleratedCompositingContext-renderLayersToWindow(cr.get(), clipRect)) {
+GTK_WIDGET_CLASS(webkit_web_view_parent_class)-expose_event(widget, event);
+return FALSE;
+}
+#endif
+
 for (int i = 0; i  rectCount; i++) {
 copyRectFromCairoSurfaceToContext(WEBKIT_WEB_VIEW(widget)-priv-backingStore-cairoSurface(),
   cr.get(), IntSize(), IntRect(rects.get()[i]));






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [160269] trunk/Source/WebCore

[gns]

Title: [160269] trunk/Source/WebCore








Revision 160269
Author g...@gnome.org
Date 2013-12-07 03:50:34 -0800 (Sat, 07 Dec 2013)


Log Message
ubuntu software center hits _XReadEvents() error
https://bugs.webkit.org/show_bug.cgi?id=123480

Reviewed by Martin Robinson.

* platform/gtk/WidgetBackingStoreGtkX11.cpp:
(WebCore::WidgetBackingStoreGtkX11::~WidgetBackingStoreGtkX11): clear the surface
before freeing the associated pixmap.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (160268 => 160269)

--- trunk/Source/WebCore/ChangeLog	2013-12-07 06:41:33 UTC (rev 160268)
+++ trunk/Source/WebCore/ChangeLog	2013-12-07 11:50:34 UTC (rev 160269)
@@ -1,3 +1,14 @@
+2013-12-07  Gustavo Noronha Silva  g...@gnome.org
+
+ubuntu software center hits _XReadEvents() error
+https://bugs.webkit.org/show_bug.cgi?id=123480
+
+Reviewed by Martin Robinson.
+
+* platform/gtk/WidgetBackingStoreGtkX11.cpp:
+(WebCore::WidgetBackingStoreGtkX11::~WidgetBackingStoreGtkX11): clear the surface
+before freeing the associated pixmap.
+
 2013-12-06  Tim Horton  timothy_hor...@apple.com
 
 [mac] Keep around more decoded image data, since it's purgeable


Modified: trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp (160268 => 160269)

--- trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp	2013-12-07 06:41:33 UTC (rev 160268)
+++ trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp	2013-12-07 11:50:34 UTC (rev 160269)
@@ -51,6 +51,8 @@
 
 WidgetBackingStoreGtkX11::~WidgetBackingStoreGtkX11()
 {
+// The pixmap needs to exist when the surface is destroyed, so begin by clearing it.
+m_surface.clear();
 XFreePixmap(m_display, m_pixmap);
 XFreeGC(m_display, m_gc);
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [160270] trunk/Source

[gns]

Title: [160270] trunk/Source








Revision 160270
Author g...@gnome.org
Date 2013-12-07 05:03:10 -0800 (Sat, 07 Dec 2013)


Log Message
Fix API test expectation following 160220.

Rubber-stamped by Martin Robinson.

Source/WebKit/gtk:

* tests/testatkroles.c:
(finish_loading): rename variable documentFrame - document.
(test_webkit_atk_get_role_document_frame): check for ATK_ROLE_DOCUMENT_WEB instead of
ATK_ROLE_DOCUMENT_FRAME.
(test_webkit_atk_get_role_heading): rename variable documentFrame - document.
(test_webkit_atk_get_role_image): ditto.
(test_webkit_atk_get_role_link): ditto.
(test_webkit_atk_get_role_list_and_item): ditto.
(test_webkit_atk_get_role_paragraph): ditto.
(test_webkit_atk_get_role_section): ditto.
(test_webkit_atk_get_role_table): ditto.
(test_webkit_atk_get_role_separator): ditto.
(test_webkit_atk_get_role_combobox): ditto.
(test_webkit_atk_get_role_form): ditto.
(test_webkit_atk_get_role_check_box): ditto.
(test_webkit_atk_get_role_entry): ditto.
(test_webkit_atk_get_role_label): ditto.
(test_webkit_atk_get_role_listbox): ditto.
(test_webkit_atk_get_role_password_text): ditto.
(test_webkit_atk_get_role_push_button): ditto.
(test_webkit_atk_get_role_radio_button): ditto.

Source/WebKit2:

* UIProcess/API/gtk/tests/TestWebKitAccessibility.cpp:
(testAtspiBasicHierarchy): check for ATK_ROLE_DOCUMENT_WEB instead of ATK_ROLE_DOCUMENT_FRAME.

Modified Paths

trunk/Source/WebKit/gtk/ChangeLog
trunk/Source/WebKit/gtk/tests/testatkroles.c
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitAccessibility.cpp




Diff

Modified: trunk/Source/WebKit/gtk/ChangeLog (160269 => 160270)

--- trunk/Source/WebKit/gtk/ChangeLog	2013-12-07 11:50:34 UTC (rev 160269)
+++ trunk/Source/WebKit/gtk/ChangeLog	2013-12-07 13:03:10 UTC (rev 160270)
@@ -1,3 +1,31 @@
+2013-12-07  Gustavo Noronha Silva  g...@gnome.org
+
+Fix API test expectation following 160220.
+
+Rubber-stamped by Martin Robinson.
+
+* tests/testatkroles.c:
+(finish_loading): rename variable documentFrame - document.
+(test_webkit_atk_get_role_document_frame): check for ATK_ROLE_DOCUMENT_WEB instead of
+ATK_ROLE_DOCUMENT_FRAME.
+(test_webkit_atk_get_role_heading): rename variable documentFrame - document.
+(test_webkit_atk_get_role_image): ditto.
+(test_webkit_atk_get_role_link): ditto.
+(test_webkit_atk_get_role_list_and_item): ditto.
+(test_webkit_atk_get_role_paragraph): ditto.
+(test_webkit_atk_get_role_section): ditto.
+(test_webkit_atk_get_role_table): ditto.
+(test_webkit_atk_get_role_separator): ditto.
+(test_webkit_atk_get_role_combobox): ditto.
+(test_webkit_atk_get_role_form): ditto.
+(test_webkit_atk_get_role_check_box): ditto.
+(test_webkit_atk_get_role_entry): ditto.
+(test_webkit_atk_get_role_label): ditto.
+(test_webkit_atk_get_role_listbox): ditto.
+(test_webkit_atk_get_role_password_text): ditto.
+(test_webkit_atk_get_role_push_button): ditto.
+(test_webkit_atk_get_role_radio_button): ditto.
+
 2013-12-05  Carlos Garcia Campos  cgar...@igalia.com
 
 [GTK] Fix GObject introspection warnings in webkitspellchecker


Modified: trunk/Source/WebKit/gtk/tests/testatkroles.c (160269 => 160270)

--- trunk/Source/WebKit/gtk/tests/testatkroles.c	2013-12-07 11:50:34 UTC (rev 160269)
+++ trunk/Source/WebKit/gtk/tests/testatkroles.c	2013-12-07 13:03:10 UTC (rev 160270)
@@ -45,7 +45,7 @@
 #define HTML_RADIO_BUTTON htmlbodyinput type='radio' /This is a test./body/html
 
 typedef struct {
-AtkObject* documentFrame;
+AtkObject* document;
 AtkObject* obj;
 AtkRole role;
 GtkWidget* webView;
@@ -64,12 +64,12 @@
 // bug 72390 for more details on this change.
 // https://bugs.webkit.org/show_bug.cgi?id=72390
 AtkObject* rootObject = gtk_widget_get_accessible(fixture-webView);
-fixture-documentFrame = atk_object_ref_accessible_child(rootObject, 0);
-g_assert(fixture-documentFrame);
+fixture-document = atk_object_ref_accessible_child(rootObject, 0);
+g_assert(fixture-document);
 
 // Remove the reference added by ref_accessible_child() and
 // return, since we don't need to keep that extra ref at all.
-g_object_unref(fixture-documentFrame);
+g_object_unref(fixture-document);
 return FALSE;
 }
 
@@ -110,24 +110,24 @@
 
 static void test_webkit_atk_get_role_document_frame(AtkRolesFixture* fixture, gconstpointer data)
 {
-fixture-role = atk_object_get_role(fixture-documentFrame);
-g_assert(fixture-role == ATK_ROLE_DOCUMENT_FRAME);
+fixture-role = atk_object_get_role(fixture-document);
+g_assert(fixture-role == ATK_ROLE_DOCUMENT_WEB);
 }
 
 static void test_webkit_atk_get_role_heading(AtkRolesFixture* fixture, gconstpointer data)
 {
-get_child_and_test_role(fixture-documentFrame, 0, ATK_ROLE_HEADING);
-

[webkit-changes] [160274] trunk/Tools

[gns]

Title: [160274] trunk/Tools








Revision 160274
Author g...@gnome.org
Date 2013-12-07 09:39:33 -0800 (Sat, 07 Dec 2013)


Log Message
[GTK] Run each gtest subtest separately instead of in one go
https://bugs.webkit.org/show_bug.cgi?id=125386

Reviewed by Martin Robinson.

This is what other ports are doing (except they build each test as a separate binary)
and will help with the timeouts we sometimes hit because it applies to the full test
run.

* Scripts/run-gtk-tests:
(TestRunner._get_tests_from_google_test_suite): get a list of available sub-tests.
(TestRunner._run_google_test): run a single subtest from a gtest binary.
(TestRunner._run_google_test_suite): call the binary once per subtest.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/run-gtk-tests




Diff

Modified: trunk/Tools/ChangeLog (160273 => 160274)

--- trunk/Tools/ChangeLog	2013-12-07 16:50:25 UTC (rev 160273)
+++ trunk/Tools/ChangeLog	2013-12-07 17:39:33 UTC (rev 160274)
@@ -1,3 +1,19 @@
+2013-12-07  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK] Run each gtest subtest separately instead of in one go
+https://bugs.webkit.org/show_bug.cgi?id=125386
+
+Reviewed by Martin Robinson.
+
+This is what other ports are doing (except they build each test as a separate binary)
+and will help with the timeouts we sometimes hit because it applies to the full test
+run.
+
+* Scripts/run-gtk-tests:
+(TestRunner._get_tests_from_google_test_suite): get a list of available sub-tests.
+(TestRunner._run_google_test): run a single subtest from a gtest binary.
+(TestRunner._run_google_test_suite): call the binary once per subtest.
+
 2013-12-07  Dániel Bátyai  batyai.dan...@stud.u-szeged.hu
 
 Move PrettyPatch related code to prettypatch.py


Modified: trunk/Tools/Scripts/run-gtk-tests (160273 => 160274)

--- trunk/Tools/Scripts/run-gtk-tests	2013-12-07 16:50:25 UTC (rev 160273)
+++ trunk/Tools/Scripts/run-gtk-tests	2013-12-07 17:39:33 UTC (rev 160274)
@@ -324,20 +324,45 @@
 
 return self._run_test_command(tester_command, self._options.timeout)
 
-def _run_test_google(self, test_program):
-tester_command = [test_program]
-skipped_tests_cases = self._test_cases_to_skip(test_program)
-if skipped_tests_cases:
-tester_command.append(--gtest_filter=-%s % :.join(skipped_tests_cases))
+def _get_tests_from_google_test_suite(self, test_program):
+try:
+output = subprocess.check_output([test_program, '--gtest_list_tests'])
+except subprocess.CalledProcessError:
+sys.stderr.write(ERROR: could not list available tests for binary %s.\n % (test_program))
+sys.stderr.flush()
+return 1
 
-return self._run_test_command(tester_command, self._options.timeout)
+skipped_test_cases = self._test_cases_to_skip(test_program)
 
+tests = []
+prefix = None
+for line in output.split('\n'):
+if not line.startswith('  '):
+prefix = line
+continue
+else:
+test_name = prefix + line.strip()
+if not test_name in skipped_test_cases:
+tests.append(test_name)
+return tests
+
+def _run_google_test(self, test_program, subtest):
+test_command = [test_program, '--gtest_filter=%s' % (subtest)]
+return self._run_test_command(test_command, self._options.timeout)
+
+def _run_google_test_suite(self, test_program):
+for subtest in self._get_tests_from_google_test_suite(test_program):
+retcode = self._run_google_test(test_program, subtest)
+if retcode:
+return retcode
+return 0
+
 def _run_test(self, test_program):
 if unittests in test_program or WebKit2APITests in test_program:
 return self._run_test_glib(test_program)
 
 if TestWebKitAPI in test_program:
-return self._run_test_google(test_program)
+return self._run_google_test_suite(test_program)
 
 return 1
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [160304] trunk/Source/WebKit2

[gns]

Title: [160304] trunk/Source/WebKit2








Revision 160304
Author g...@gnome.org
Date 2013-12-09 01:55:49 -0800 (Mon, 09 Dec 2013)


Log Message
[GTK] run-webkit-tests may DOS the system, specially in debug builds
https://bugs.webkit.org/show_bug.cgi?id=125436

Reviewed by Martin Robinson.

* GNUmakefile.am: use -no-fast-install for WebKitWebProcess and WebKitPluginProcess so
they do not need to be relinked the first time they are executed in-tree.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/GNUmakefile.am




Diff

Modified: trunk/Source/WebKit2/ChangeLog (160303 => 160304)

--- trunk/Source/WebKit2/ChangeLog	2013-12-09 09:54:09 UTC (rev 160303)
+++ trunk/Source/WebKit2/ChangeLog	2013-12-09 09:55:49 UTC (rev 160304)
@@ -1,3 +1,13 @@
+2013-12-09  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK] run-webkit-tests may DOS the system, specially in debug builds
+https://bugs.webkit.org/show_bug.cgi?id=125436
+
+Reviewed by Martin Robinson.
+
+* GNUmakefile.am: use -no-fast-install for WebKitWebProcess and WebKitPluginProcess so
+they do not need to be relinked the first time they are executed in-tree.
+
 2013-12-09  Zan Dobersek  zdober...@igalia.com
 
 [GTK][WK2] Move WebFullScreenManagerProxyGtk logic to PageClientImpl


Modified: trunk/Source/WebKit2/GNUmakefile.am (160303 => 160304)

--- trunk/Source/WebKit2/GNUmakefile.am	2013-12-09 09:54:09 UTC (rev 160303)
+++ trunk/Source/WebKit2/GNUmakefile.am	2013-12-09 09:55:49 UTC (rev 160304)
@@ -539,6 +539,9 @@
 	$(GTK_UNIX_PRINTING_LIBS) \
 	$(LIBSOUP_LIBS)
 
+Programs_WebKitWebProcess_LDFLAGS = \
+	-no-fast-install
+
 libWebCoreGtk2_la_SOURCES = \
 	$(webcoregtk_sources)
 
@@ -756,6 +759,9 @@
 	$(WINMM_LIBS) \
 	$(ZLIB_LIBS)
 
+Programs_WebKitPluginProcess_LDFLAGS = \
+	-no-fast-install
+
 Programs_WebKitPluginProcess_CXXFLAGS = \
 	-fvisibility-inlines-hidden \
 	$(global_cxxflags)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [160305] trunk/LayoutTests

[gns]

Title: [160305] trunk/LayoutTests








Revision 160305
Author g...@gnome.org
Date 2013-12-09 03:45:44 -0800 (Mon, 09 Dec 2013)


Log Message
accessibility/press-targets-center-point.html should not depend on font layout
https://bugs.webkit.org/show_bug.cgi?id=125387

Reviewed by Chris Fleizach.

* accessibility/press-targets-center-point.html: use explicit sizes for heights (and width
for vertical writing mode), so that font layout does not alter the results.
* platform/gtk/TestExpectations: remove failure expectation for accessibility/press-targets-center-point.html

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/accessibility/press-targets-center-point.html
trunk/LayoutTests/platform/gtk/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (160304 => 160305)

--- trunk/LayoutTests/ChangeLog	2013-12-09 09:55:49 UTC (rev 160304)
+++ trunk/LayoutTests/ChangeLog	2013-12-09 11:45:44 UTC (rev 160305)
@@ -1,3 +1,14 @@
+2013-12-09  Gustavo Noronha Silva  g...@gnome.org
+
+accessibility/press-targets-center-point.html should not depend on font layout
+https://bugs.webkit.org/show_bug.cgi?id=125387
+
+Reviewed by Chris Fleizach.
+
+* accessibility/press-targets-center-point.html: use explicit sizes for heights (and width
+for vertical writing mode), so that font layout does not alter the results.
+* platform/gtk/TestExpectations: remove failure expectation for accessibility/press-targets-center-point.html
+
 2013-12-08  Ryosuke Niwa  rn...@webkit.org
 
 getComputedStyle border-radius shorthand omits vertical radius information


Modified: trunk/LayoutTests/accessibility/press-targets-center-point.html (160304 => 160305)

--- trunk/LayoutTests/accessibility/press-targets-center-point.html	2013-12-09 09:55:49 UTC (rev 160304)
+++ trunk/LayoutTests/accessibility/press-targets-center-point.html	2013-12-09 11:45:44 UTC (rev 160305)
@@ -16,16 +16,16 @@
 /head
 body
 
-div class=target id=t0 style=width:160px;target/div
+div class=target id=t0 style=height: 18px; width:160px;target/div
 pActual: span class=result id=a0waiting/spanbrExpected: span class=result id=e0waiting/span/p
 
-div class=target id=t1 style=-webkit-transform:translate(160px, 160px); width:240px;translate transform target/div
+div class=target id=t1 style=-webkit-transform:translate(160px, 160px); height: 18px; width:240px;translate transform target/div
 pActual: span class=result id=a1waiting/spanbrExpected: span class=result id=e1waiting/span/p
 
-div class=target id=t2 style=-webkit-writing-mode:vertical-lr;vertical left-to-right writing mode target/div
+div class=target id=t2 style=-webkit-writing-mode:vertical-lr; width: 18px;vertical left-to-right writing mode target/div
 pActual: span class=result id=a2waiting/spanbrExpected: span class=result id=e2waiting/span/p
 
-div class=target id=t3 style=direction:rtl; width:240px;right-to-left direction target/div
+div class=target id=t3 style=direction:rtl; height: 18px; width:240px;right-to-left direction target/div
 pActual: span class=result id=a3waiting/spanbrExpected: span class=result id=e3waiting/span/p
 
 p id=description/p


Modified: trunk/LayoutTests/platform/gtk/TestExpectations (160304 => 160305)

--- trunk/LayoutTests/platform/gtk/TestExpectations	2013-12-09 09:55:49 UTC (rev 160304)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2013-12-09 11:45:44 UTC (rev 160305)
@@ -1519,8 +1519,6 @@
 
 webkit.org/b/125406 fast/regions/relative-in-absolute-borders-overflow.html [ ImageOnlyFailure ]
 
-webkit.org/b/125409 accessibility/press-targets-center-point.html [ Failure ] 
-
 #
 # End of Tests failing
 #






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [160352] trunk/Source/WebCore

[gns]

Title: [160352] trunk/Source/WebCore








Revision 160352
Author g...@gnome.org
Date 2013-12-10 02:07:31 -0800 (Tue, 10 Dec 2013)


Log Message
[Soup] Send original encoded data size to didReceiveBuffer
https://bugs.webkit.org/show_bug.cgi?id=125410

Reviewed by Martin Robinson.

No tests, the only way to test this seems to be through the inspector UI.

* platform/network/ResourceHandle.h:
* platform/network/ResourceHandleInternal.h:
(WebCore::ResourceHandleInternal::ResourceHandleInternal): data member to track stream
position.
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::ResourceHandle::currentStreamPosition): obtains the current stream position by querying
the first seekable input stream we find.
(WebCore::nextMultipartResponsePartCallback): store the position before we start reading a new part.
(WebCore::sendRequestCallback): store the position before we start reading the response body.
(WebCore::readCallback): pass the position delta to didReceiveData.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/ResourceHandle.h
trunk/Source/WebCore/platform/network/ResourceHandleInternal.h
trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (160351 => 160352)

--- trunk/Source/WebCore/ChangeLog	2013-12-10 07:19:00 UTC (rev 160351)
+++ trunk/Source/WebCore/ChangeLog	2013-12-10 10:07:31 UTC (rev 160352)
@@ -1,3 +1,23 @@
+2013-12-09  Gustavo Noronha Silva  g...@gnome.org
+
+[Soup] Send original encoded data size to didReceiveBuffer
+https://bugs.webkit.org/show_bug.cgi?id=125410
+
+Reviewed by Martin Robinson.
+
+No tests, the only way to test this seems to be through the inspector UI.
+
+* platform/network/ResourceHandle.h:
+* platform/network/ResourceHandleInternal.h:
+(WebCore::ResourceHandleInternal::ResourceHandleInternal): data member to track stream
+position.
+* platform/network/soup/ResourceHandleSoup.cpp:
+(WebCore::ResourceHandle::currentStreamPosition): obtains the current stream position by querying
+the first seekable input stream we find.
+(WebCore::nextMultipartResponsePartCallback): store the position before we start reading a new part.
+(WebCore::sendRequestCallback): store the position before we start reading the response body.
+(WebCore::readCallback): pass the position delta to didReceiveData.
+
 2013-12-09  Andreas Kling  akl...@apple.com
 
 Clear out font width measurement caches on memory pressure.


Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (160351 => 160352)

--- trunk/Source/WebCore/platform/network/ResourceHandle.h	2013-12-10 07:19:00 UTC (rev 160351)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h	2013-12-10 10:07:31 UTC (rev 160352)
@@ -178,6 +178,7 @@
 void sendPendingRequest();
 bool cancelledOrClientless();
 void ensureReadBuffer();
+size_t currentStreamPosition() const;
 static SoupSession* defaultSession();
 static SoupSession* createTestingSession();
 static SoupSession* createPrivateBrowsingSession();


Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (160351 => 160352)

--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h	2013-12-10 07:19:00 UTC (rev 160351)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h	2013-12-10 10:07:31 UTC (rev 160352)
@@ -110,6 +110,7 @@
 , m_bodySize(0)
 , m_bodyDataSent(0)
 , m_redirectCount(0)
+, m_previousPosition(0)
 #endif
 #if PLATFORM(MAC)
 , m_startWhenScheduled(false)
@@ -201,6 +202,7 @@
 unsigned long m_bodyDataSent;
 SoupSession* soupSession();
 int m_redirectCount;
+size_t m_previousPosition;
 #endif
 #if PLATFORM(GTK)
 struct {


Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (160351 => 160352)

--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp	2013-12-10 07:19:00 UTC (rev 160351)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp	2013-12-10 10:07:31 UTC (rev 160352)
@@ -4,7 +4,7 @@
  * Copyright (C) 2008 Xan Lopez x...@gnome.org
  * Copyright (C) 2008, 2010 Collabora Ltd.
  * Copyright (C) 2009 Holger Hans Peter Freyther
- * Copyright (C) 2009 Gustavo Noronha Silva g...@gnome.org
+ * Copyright (C) 2009, 2013 Gustavo Noronha Silva g...@gnome.org
  * Copyright (C) 2009 Christian Dywan christ...@imendio.com
  * Copyright (C) 2009, 2010, 2011, 2012 Igalia S.L.
  * Copyright (C) 2009 John Kjellberg john.kjellb...@power.alstom.com
@@ -606,6 +606,18 @@
 return true;
 }
 
+size_t ResourceHandle::currentStreamPosition() const
+{
+GInputStream* baseStream = d-m_inputStream.get();
+while (!G_IS_SEEKABLE(baseStream)  G_IS_FILTER_INPUT_STREAM(baseStream))
+baseStream = 

[webkit-changes] [160354] trunk/Source/WebCore

[gns]

Title: [160354] trunk/Source/WebCore








Revision 160354
Author g...@gnome.org
Date 2013-12-10 02:19:06 -0800 (Tue, 10 Dec 2013)


Log Message
[GTK] REGRESSION: www.yahoo.com redirects to the mobile version after UA change
https://bugs.webkit.org/show_bug.cgi?id=125444

Reviewed by Martin Robinson.

* platform/gtk/UserAgentGtk.cpp:
(WebCore::platformVersionForUAString): more correctly pretend we're Mac OS X.
(WebCore::standardUserAgent): ditto.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/gtk/UserAgentGtk.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (160353 => 160354)

--- trunk/Source/WebCore/ChangeLog	2013-12-10 10:18:29 UTC (rev 160353)
+++ trunk/Source/WebCore/ChangeLog	2013-12-10 10:19:06 UTC (rev 160354)
@@ -1,3 +1,14 @@
+2013-12-10  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK] REGRESSION: www.yahoo.com redirects to the mobile version after UA change
+https://bugs.webkit.org/show_bug.cgi?id=125444
+
+Reviewed by Martin Robinson.
+
+* platform/gtk/UserAgentGtk.cpp:
+(WebCore::platformVersionForUAString): more correctly pretend we're Mac OS X.
+(WebCore::standardUserAgent): ditto.
+
 2013-12-09  Gustavo Noronha Silva  g...@gnome.org
 
 [Soup] Send original encoded data size to didReceiveBuffer


Modified: trunk/Source/WebCore/platform/gtk/UserAgentGtk.cpp (160353 => 160354)

--- trunk/Source/WebCore/platform/gtk/UserAgentGtk.cpp	2013-12-10 10:18:29 UTC (rev 160353)
+++ trunk/Source/WebCore/platform/gtk/UserAgentGtk.cpp	2013-12-10 10:19:06 UTC (rev 160354)
@@ -30,13 +30,10 @@
 
 #if OS(UNIX)
 #include sys/utsname.h
-#elif OS(WINDOWS)
-#include SystemInfo.h
 #endif
 
 namespace WebCore {
 
-#if OS(DARWIN) || OS(UNIX)
 static const char* cpuDescriptionForUAString()
 {
 #if CPU(PPC) || CPU(PPC64)
@@ -49,38 +46,16 @@
 return Unknown;
 #endif
 }
-#endif
 
-static const char* platformForUAString()
-{
-#if PLATFORM(X11)
-return X11;
-#elif OS(WINDOWS)
-return ;
-#elif PLATFORM(MAC)
-return Macintosh;
-#elif defined(GDK_WINDOWING_DIRECTFB)
-return DirectFB;
-#else
-return Unknown;
-#endif
-}
-
 static String platformVersionForUAString()
 {
 DEFINE_STATIC_LOCAL(String, uaOSVersion, (String()));
 if (!uaOSVersion.isEmpty())
 return uaOSVersion;
 
-#if OS(WINDOWS)
-uaOSVersion = windowsVersionForUAString();
-#elif OS(DARWIN) || OS(UNIX)
 // We will always claim to be Safari in Mac OS X, since Safari in Linux triggers the iOS path on
 // some websites.
 uaOSVersion = String::format(%s Mac OS X, cpuDescriptionForUAString());
-#else
-uaOSVersion = String(Unknown);
-#endif
 return uaOSVersion;
 }
 
@@ -95,9 +70,9 @@
 // wrong can cause sites to load the wrong _javascript_, CSS, or custom fonts. In some cases
 // sites won't load resources at all.
 DEFINE_STATIC_LOCAL(const CString, uaVersion, (String::format(%i.%i, USER_AGENT_GTK_MAJOR_VERSION, USER_AGENT_GTK_MINOR_VERSION).utf8()));
-DEFINE_STATIC_LOCAL(const String, staticUA, (String::format(Mozilla/5.0 (%s; %s) AppleWebKit/%s (KHTML, like Gecko) Safari/%s,
-platformForUAString(), platformVersionForUAString().utf8().data(),
-uaVersion.data(), uaVersion.data(;
+DEFINE_STATIC_LOCAL(const String, staticUA, (String::format(Mozilla/5.0 (Macintosh; %s) AppleWebKit/%s (KHTML, like Gecko) Safari/%s,
+platformVersionForUAString().utf8().data(), uaVersion.data(), uaVersion.data(;
+
 if (applicationName.isEmpty())
 return staticUA;
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [160435] trunk/Source/WebKit2

[gns]

Title: [160435] trunk/Source/WebKit2








Revision 160435
Author g...@gnome.org
Date 2013-12-11 08:40:43 -0800 (Wed, 11 Dec 2013)


Log Message
[GTK] Support right-side attachment of the inspector
https://bugs.webkit.org/show_bug.cgi?id=124126

Reviewed by Carlos Garcia Campos.

* UIProcess/API/C/gtk/WKInspectorClientGtk.h: add changed attached width callback.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseAddWebInspector): take attachment side parameter into account when adding the
inspector view.
(webkitWebViewBaseContainerRemove): renamed inspectorViewHeight to inspectorViewSize.
(resizeWebKitWebViewBaseFromAllocation): take attachment side into account when allocating the
sizes for the inspector view and the inspected view.
(webkitWebViewBaseSetInspectorViewSize): renamed from webkitWebViewBaseSetInspectorViewHeight.
* UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
* UIProcess/gtk/WebInspectorClientGtk.cpp:
(WebKit::WebInspectorClientGtk::didChangeAttachedWidth): notify client that view width has changed.
* UIProcess/gtk/WebInspectorClientGtk.h:
* UIProcess/gtk/WebInspectorProxyGtk.cpp:
(WebKit::WebInspectorProxy::platformAttach): use attachment side for setting the default size
for the inspector view.
(WebKit::WebInspectorProxy::platformSetAttachedWindowHeight): use the new generic SetInspectorViewSize.
(WebKit::WebInspectorProxy::platformSetAttachedWindowWidth): allow setting the inspector view width.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/C/gtk/WKInspectorClientGtk.h
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
trunk/Source/WebKit2/UIProcess/gtk/WebInspectorClientGtk.cpp
trunk/Source/WebKit2/UIProcess/gtk/WebInspectorClientGtk.h
trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (160434 => 160435)

--- trunk/Source/WebKit2/ChangeLog	2013-12-11 16:28:27 UTC (rev 160434)
+++ trunk/Source/WebKit2/ChangeLog	2013-12-11 16:40:43 UTC (rev 160435)
@@ -1,3 +1,28 @@
+2013-12-11  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK] Support right-side attachment of the inspector
+https://bugs.webkit.org/show_bug.cgi?id=124126
+
+Reviewed by Carlos Garcia Campos.
+
+* UIProcess/API/C/gtk/WKInspectorClientGtk.h: add changed attached width callback.
+* UIProcess/API/gtk/WebKitWebViewBase.cpp:
+(webkitWebViewBaseAddWebInspector): take attachment side parameter into account when adding the
+inspector view.
+(webkitWebViewBaseContainerRemove): renamed inspectorViewHeight to inspectorViewSize.
+(resizeWebKitWebViewBaseFromAllocation): take attachment side into account when allocating the
+sizes for the inspector view and the inspected view.
+(webkitWebViewBaseSetInspectorViewSize): renamed from webkitWebViewBaseSetInspectorViewHeight.
+* UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
+* UIProcess/gtk/WebInspectorClientGtk.cpp:
+(WebKit::WebInspectorClientGtk::didChangeAttachedWidth): notify client that view width has changed.
+* UIProcess/gtk/WebInspectorClientGtk.h:
+* UIProcess/gtk/WebInspectorProxyGtk.cpp:
+(WebKit::WebInspectorProxy::platformAttach): use attachment side for setting the default size
+for the inspector view.
+(WebKit::WebInspectorProxy::platformSetAttachedWindowHeight): use the new generic SetInspectorViewSize.
+(WebKit::WebInspectorProxy::platformSetAttachedWindowWidth): allow setting the inspector view width.
+
 2013-12-11  Brendan Long  b.l...@cablelabs.com
 
 [GTK] Add enable-mediasource property to WebKitWebSettings


Modified: trunk/Source/WebKit2/UIProcess/API/C/gtk/WKInspectorClientGtk.h (160434 => 160435)

--- trunk/Source/WebKit2/UIProcess/API/C/gtk/WKInspectorClientGtk.h	2013-12-11 16:28:27 UTC (rev 160434)
+++ trunk/Source/WebKit2/UIProcess/API/C/gtk/WKInspectorClientGtk.h	2013-12-11 16:40:43 UTC (rev 160435)
@@ -36,6 +36,7 @@
 typedef void (*WKInspectorClientGtkInspectorDidCloseCallback)(WKInspectorRef inspector, const void* clientInfo);
 typedef void (*WKInspectorClientGtkInspectedURLChangedCallback)(WKInspectorRef inspector, WKStringRef url, const void* clientInfo);
 typedef void (*WKInspectorClientGtkDidChangeAttachedHeightCallback)(WKInspectorRef inspector, unsigned height, const void* clientInfo);
+typedef void (*WKInspectorClientGtkDidChangeAttachedWidthCallback)(WKInspectorRef inspector, unsigned width, const void* clientInfo);
 
 typedef struct WKInspectorClientGtkBase {
 int version;
@@ -52,6 +53,7 @@
 WKInspectorClientGtkInspectorCallback   attach;
 WKInspectorClientGtkInspectorCallback   detach;
 WKInspectorClientGtkDidChangeAttachedHeightCallback didChangeAttachedHeight;
+WKInspectorClientGtkDidChangeAttachedWidthCallback  

[webkit-changes] [160797] trunk

[gns]

Title: [160797] trunk








Revision 160797
Author g...@gnome.org
Date 2013-12-18 15:05:09 -0800 (Wed, 18 Dec 2013)


Log Message
[GTK][CMake] Remove binary size optimizations we do not use in the autotools build
https://bugs.webkit.org/show_bug.cgi?id=125947

Reviewed by Martin Robinson.

* Source/cmake/OptionsGTK.cmake: remove the relevant flags.

Modified Paths

trunk/ChangeLog
trunk/Source/cmake/OptionsGTK.cmake




Diff

Modified: trunk/ChangeLog (160796 => 160797)

--- trunk/ChangeLog	2013-12-18 22:50:40 UTC (rev 160796)
+++ trunk/ChangeLog	2013-12-18 23:05:09 UTC (rev 160797)
@@ -1,3 +1,12 @@
+2013-12-18  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK][CMake] Remove binary size optimizations we do not use in the autotools build
+https://bugs.webkit.org/show_bug.cgi?id=125947
+
+Reviewed by Martin Robinson.
+
+* Source/cmake/OptionsGTK.cmake: remove the relevant flags.
+
 2013-12-18  Carlos Garcia Campos  cgar...@igalia.com
 
 Unreviewed. Update NEWS and Versions.m4 for 2.3.3 release.


Modified: trunk/Source/cmake/OptionsGTK.cmake (160796 => 160797)

--- trunk/Source/cmake/OptionsGTK.cmake	2013-12-18 22:50:40 UTC (rev 160796)
+++ trunk/Source/cmake/OptionsGTK.cmake	2013-12-18 23:05:09 UTC (rev 160797)
@@ -139,13 +139,6 @@
 set(ENABLE_SVG_FONTS 0)
 endif ()
 
-# Optimize binary size for release builds by removing dead sections on unix/gcc
-if (CMAKE_COMPILER_IS_GNUCC AND UNIX AND NOT APPLE)
-set(CMAKE_C_FLAGS_RELEASE -ffunction-sections -fdata-sections ${CMAKE_C_FLAGS_RELEASE})
-set(CMAKE_CXX_FLAGS_RELEASE -ffunction-sections -fdata-sections ${CMAKE_CXX_FLAGS_RELEASE})
-set(CMAKE_SHARED_LINKER_FLAGS_RELEASE -Wl,--gc-sections ${CMAKE_SHARED_LINKER_FLAGS_RELEASE})
-endif ()
-
 if (${OPENGL_FOUND} AND (${GLX_FOUND} OR ${EGL_FOUND}))
 set(ENABLE_WEBGL 1)
 set(ENABLE_TEXTURE_MAPPER 1)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [160799] trunk

[gns]

Title: [160799] trunk








Revision 160799
Author g...@gnome.org
Date 2013-12-18 15:12:02 -0800 (Wed, 18 Dec 2013)


Log Message
[GTK][CMake] Use thin archives if building on Linux, only way to get non-shared-core debug builds
https://bugs.webkit.org/show_bug.cgi?id=125951

Reviewed by Martin Robinson.

* Source/cmake/OptionsGTK.cmake: append T for thin archives to the flags passed to ar,
also use u, which is used in the autotools build (it avoids adding a file twice).

Modified Paths

trunk/ChangeLog
trunk/Source/cmake/OptionsGTK.cmake




Diff

Modified: trunk/ChangeLog (160798 => 160799)

--- trunk/ChangeLog	2013-12-18 23:11:02 UTC (rev 160798)
+++ trunk/ChangeLog	2013-12-18 23:12:02 UTC (rev 160799)
@@ -1,5 +1,15 @@
 2013-12-18  Gustavo Noronha Silva  g...@gnome.org
 
+[GTK][CMake] Use thin archives if building on Linux, only way to get non-shared-core debug builds
+https://bugs.webkit.org/show_bug.cgi?id=125951
+
+Reviewed by Martin Robinson.
+
+* Source/cmake/OptionsGTK.cmake: append T for thin archives to the flags passed to ar,
+also use u, which is used in the autotools build (it avoids adding a file twice).
+
+2013-12-18  Gustavo Noronha Silva  g...@gnome.org
+
 [GTK][CMake] Remove binary size optimizations we do not use in the autotools build
 https://bugs.webkit.org/show_bug.cgi?id=125947
 


Modified: trunk/Source/cmake/OptionsGTK.cmake (160798 => 160799)

--- trunk/Source/cmake/OptionsGTK.cmake	2013-12-18 23:11:02 UTC (rev 160798)
+++ trunk/Source/cmake/OptionsGTK.cmake	2013-12-18 23:12:02 UTC (rev 160799)
@@ -88,6 +88,13 @@
 set(DATA_BUILD_DIR ${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME})
 set(DATA_INSTALL_DIR ${DATADIR}/webkitgtk-3.0)
 
+if (${CMAKE_SYSTEM_NAME} STREQUAL Linux)
+set(CMAKE_CXX_ARCHIVE_CREATE CMAKE_AR cruT TARGET LINK_FLAGS OBJECTS)
+set(CMAKE_C_ARCHIVE_CREATE CMAKE_AR cruT TARGET LINK_FLAGS OBJECTS)
+set(CMAKE_CXX_ARCHIVE_APPEND CMAKE_AR ruT TARGET LINK_FLAGS OBJECTS)
+set(CMAKE_C_ARCHIVE_APPEND CMAKE_AR ruT TARGET LINK_FLAGS OBJECTS)
+endif ()
+
 add_definitions(-DBUILDING_GTK__=1)
 add_definitions(-DGETTEXT_PACKAGE=WebKitGTK-3.0)
 add_definitions(-DDATA_DIR=${DATADIR})






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [160812] trunk

[gns]

Title: [160812] trunk








Revision 160812
Author g...@gnome.org
Date 2013-12-18 17:35:02 -0800 (Wed, 18 Dec 2013)


Log Message
[GTK][CMake] make libjavascriptcoregtk a public shared library again
https://bugs.webkit.org/show_bug.cgi?id=125512

Reviewed by Martin Robinson.

.:

* CMakeLists.txt: make _javascript_Core always be a shared library for the GTK+ port.
* Source/cmake/WebKitHelpers.cmake: make -fvisibility=hidden not be applied for GTK+,
visibility of some symbols is required for threading to be initialized properly by
WebKit2 processes, and we will rely on a linker script that will be added later on,
for production builds.

Source/_javascript_Core:

* CMakeLists.txt: use target type instead of SHARED_CORE to decide whether
_javascript_Core is a shared library, since it's always shared for GTK+ regardless
of SHARED_CORE.

Modified Paths

trunk/CMakeLists.txt
trunk/ChangeLog
trunk/Source/_javascript_Core/CMakeLists.txt
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/cmake/WebKitHelpers.cmake




Diff

Modified: trunk/CMakeLists.txt (160811 => 160812)

--- trunk/CMakeLists.txt	2013-12-19 01:22:56 UTC (rev 160811)
+++ trunk/CMakeLists.txt	2013-12-19 01:35:02 UTC (rev 160812)
@@ -116,7 +116,11 @@
 set(_javascript_Core_LIBRARY_TYPE SHARED)
 set(WebCore_LIBRARY_TYPE SHARED)
 else ()
-set(_javascript_Core_LIBRARY_TYPE STATIC)
+if (${PORT} STREQUAL GTK)
+set(_javascript_Core_LIBRARY_TYPE SHARED)
+else ()
+set(_javascript_Core_LIBRARY_TYPE STATIC)
+endif ()
 set(WebCore_LIBRARY_TYPE STATIC)
 endif ()
 


Modified: trunk/ChangeLog (160811 => 160812)

--- trunk/ChangeLog	2013-12-19 01:22:56 UTC (rev 160811)
+++ trunk/ChangeLog	2013-12-19 01:35:02 UTC (rev 160812)
@@ -1,3 +1,16 @@
+2013-12-18  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK][CMake] make libjavascriptcoregtk a public shared library again
+https://bugs.webkit.org/show_bug.cgi?id=125512
+
+Reviewed by Martin Robinson.
+
+* CMakeLists.txt: make _javascript_Core always be a shared library for the GTK+ port.
+* Source/cmake/WebKitHelpers.cmake: make -fvisibility=hidden not be applied for GTK+,
+visibility of some symbols is required for threading to be initialized properly by
+WebKit2 processes, and we will rely on a linker script that will be added later on,
+for production builds.
+
 2013-12-16  Martin Robinson  mrobin...@igalia.com
 
 [GTK] [CMake] Add support for building WebKit1


Modified: trunk/Source/_javascript_Core/CMakeLists.txt (160811 => 160812)

--- trunk/Source/_javascript_Core/CMakeLists.txt	2013-12-19 01:22:56 UTC (rev 160811)
+++ trunk/Source/_javascript_Core/CMakeLists.txt	2013-12-19 01:35:02 UTC (rev 160812)
@@ -761,7 +761,7 @@
 set_target_properties(_javascript_Core PROPERTIES OUTPUT_NAME ${_javascript_Core_OUTPUT_NAME})
 endif ()
 
-if (SHARED_CORE)
+if (${_javascript_Core_LIBRARY_TYPE} STREQUAL SHARED_LIBRARY)
 set_target_properties(_javascript_Core PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
 install(TARGETS _javascript_Core DESTINATION ${LIB_INSTALL_DIR})
 endif ()


Modified: trunk/Source/_javascript_Core/ChangeLog (160811 => 160812)

--- trunk/Source/_javascript_Core/ChangeLog	2013-12-19 01:22:56 UTC (rev 160811)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-12-19 01:35:02 UTC (rev 160812)
@@ -1,3 +1,14 @@
+2013-12-18  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK][CMake] make libjavascriptcoregtk a public shared library again
+https://bugs.webkit.org/show_bug.cgi?id=125512
+
+Reviewed by Martin Robinson.
+
+* CMakeLists.txt: use target type instead of SHARED_CORE to decide whether
+_javascript_Core is a shared library, since it's always shared for GTK+ regardless
+of SHARED_CORE.
+
 2013-12-18  Benjamin Poulain  benja...@webkit.org
 
 Add a simple stack abstraction for x86_64


Modified: trunk/Source/cmake/WebKitHelpers.cmake (160811 => 160812)

--- trunk/Source/cmake/WebKitHelpers.cmake	2013-12-19 01:22:56 UTC (rev 160811)
+++ trunk/Source/cmake/WebKitHelpers.cmake	2013-12-19 01:35:02 UTC (rev 160812)
@@ -24,7 +24,9 @@
 set(OLD_COMPILE_FLAGS -fno-tree-sra ${OLD_COMPILE_FLAGS})
 endif ()
 
-if (NOT SHARED_CORE)
+# For GTK+ we will rely on a linker script to deal with symbol visibility on
+# production builds, we want all symbols visible for development builds.
+if (NOT SHARED_CORE AND NOT ${PORT} STREQUAL GTK)
 set(OLD_COMPILE_FLAGS -fvisibility=hidden ${OLD_COMPILE_FLAGS})
 endif ()
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [160816] trunk/Source

[gns]

Title: [160816] trunk/Source








Revision 160816
Author g...@gnome.org
Date 2013-12-18 18:22:32 -0800 (Wed, 18 Dec 2013)


Log Message
Unreviewed cmake build fix for GTK+.

Source/WebKit:

* PlatformGTK.cmake: add missing include directory.

Source/WebKit2:

* PlatformGTK.cmake: fix paths for files that were moved.

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/PlatformGTK.cmake
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/PlatformGTK.cmake




Diff

Modified: trunk/Source/WebKit/ChangeLog (160815 => 160816)

--- trunk/Source/WebKit/ChangeLog	2013-12-19 02:21:33 UTC (rev 160815)
+++ trunk/Source/WebKit/ChangeLog	2013-12-19 02:22:32 UTC (rev 160816)
@@ -1,3 +1,9 @@
+2013-12-18  Gustavo Noronha Silva  g...@gnome.org
+
+Unreviewed cmake build fix for GTK+.
+
+* PlatformGTK.cmake: add missing include directory.
+
 2013-12-16  Martin Robinson  mrobin...@igalia.com
 
 [GTK] [CMake] Add support for building WebKit1


Modified: trunk/Source/WebKit/PlatformGTK.cmake (160815 => 160816)

--- trunk/Source/WebKit/PlatformGTK.cmake	2013-12-19 02:21:33 UTC (rev 160815)
+++ trunk/Source/WebKit/PlatformGTK.cmake	2013-12-19 02:22:32 UTC (rev 160816)
@@ -13,6 +13,7 @@
 ${THIRDPARTY_DIR}/ANGLE/include
 ${THIRDPARTY_DIR}/ANGLE/include/KHR
 ${THIRDPARTY_DIR}/ANGLE/include/GLSLANG
+${WEBCORE_DIR}/ForwardingHeaders
 ${WEBCORE_DIR}/accessibility/atk
 ${WEBCORE_DIR}/platform/cairo
 ${WEBCORE_DIR}/platform/graphics/cairo


Modified: trunk/Source/WebKit2/ChangeLog (160815 => 160816)

--- trunk/Source/WebKit2/ChangeLog	2013-12-19 02:21:33 UTC (rev 160815)
+++ trunk/Source/WebKit2/ChangeLog	2013-12-19 02:22:32 UTC (rev 160816)
@@ -1,3 +1,9 @@
+2013-12-18  Gustavo Noronha Silva  g...@gnome.org
+
+Unreviewed cmake build fix for GTK+.
+
+* PlatformGTK.cmake: fix paths for files that were moved.
+
 2013-12-18  Anders Carlsson  ander...@apple.com
 
 MessageReceiverMap::addMessageReceiver should assert that destinationID is not zero


Modified: trunk/Source/WebKit2/PlatformGTK.cmake (160815 => 160816)

--- trunk/Source/WebKit2/PlatformGTK.cmake	2013-12-19 02:21:33 UTC (rev 160815)
+++ trunk/Source/WebKit2/PlatformGTK.cmake	2013-12-19 02:22:32 UTC (rev 160816)
@@ -491,13 +491,13 @@
 Platform/CoreIPC/MessageDecoder.cpp
 Platform/CoreIPC/MessageEncoder.cpp
 Platform/CoreIPC/MessageReceiverMap.cpp
-Platform/CoreIPC/MessageSender.cpp
 
 Platform/CoreIPC/unix/AttachmentUnix.cpp
 Platform/CoreIPC/unix/ConnectionUnix.cpp
 
 Platform/IPC/DataReference.cpp
 Platform/IPC/StringReference.cpp
+Platform/IPC/MessageSender.cpp
 
 Platform/Logging.cpp
 Platform/Module.cpp
@@ -550,7 +550,6 @@
 Shared/gtk/ProcessExecutablePathGtk.cpp
 Shared/gtk/WebEventFactory.cpp
 
-Shared/soup/CertificateInfo.cpp
 Shared/soup/WebCoreArgumentCodersSoup.cpp
 
 UIProcess/Launcher/ProcessLauncher.cpp






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [160993] trunk

[gns]

Title: [160993] trunk








Revision 160993
Author g...@gnome.org
Date 2013-12-23 05:35:00 -0800 (Mon, 23 Dec 2013)


Log Message
[GTK] [CMake] Generate pkg-config files
https://bugs.webkit.org/show_bug.cgi?id=125685

Reviewed by Martin Robinson.

.:

* Source/cmake/OptionsGTK.cmake: set variables used for filling in the values in the
pkg-config files.

Source/_javascript_Core:

* PlatformGTK.cmake: Added. Generate _javascript_coregtk-3.0.pc.

Source/WebKit:

* PlatformGTK.cmake: generate webkitgtk-3.0.pc.

Source/WebKit2:

* PlatformGTK.cmake: generate webkit2gtk.pc.

Modified Paths

trunk/ChangeLog
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/PlatformGTK.cmake
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/PlatformGTK.cmake
trunk/Source/cmake/OptionsGTK.cmake


Added Paths

trunk/Source/_javascript_Core/PlatformGTK.cmake




Diff

Modified: trunk/ChangeLog (160992 => 160993)

--- trunk/ChangeLog	2013-12-23 13:15:07 UTC (rev 160992)
+++ trunk/ChangeLog	2013-12-23 13:35:00 UTC (rev 160993)
@@ -1,3 +1,13 @@
+2013-12-23  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK] [CMake] Generate pkg-config files
+https://bugs.webkit.org/show_bug.cgi?id=125685
+
+Reviewed by Martin Robinson.
+
+* Source/cmake/OptionsGTK.cmake: set variables used for filling in the values in the
+pkg-config files.
+
 2013-12-23  Carlos Garcia Campos  cgar...@igalia.com
 
 [GTK] Build with network process unconditionally


Modified: trunk/Source/_javascript_Core/ChangeLog (160992 => 160993)

--- trunk/Source/_javascript_Core/ChangeLog	2013-12-23 13:15:07 UTC (rev 160992)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-12-23 13:35:00 UTC (rev 160993)
@@ -1,3 +1,12 @@
+2013-12-23  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK] [CMake] Generate pkg-config files
+https://bugs.webkit.org/show_bug.cgi?id=125685
+
+Reviewed by Martin Robinson.
+
+* PlatformGTK.cmake: Added. Generate _javascript_coregtk-3.0.pc.
+
 2013-12-22  Benjamin Poulain  benja...@webkit.org
 
 Create a skeleton for CSS Selector code generation


Added: trunk/Source/_javascript_Core/PlatformGTK.cmake (0 => 160993)

--- trunk/Source/_javascript_Core/PlatformGTK.cmake	(rev 0)
+++ trunk/Source/_javascript_Core/PlatformGTK.cmake	2013-12-23 13:35:00 UTC (rev 160993)
@@ -0,0 +1,2 @@
+configure_file(_javascript_coregtk.pc.in ${CMAKE_BINARY_DIR}/Source/_javascript_Core/_javascript_coregtk-3.0.pc @ONLY)
+


Modified: trunk/Source/WebKit/ChangeLog (160992 => 160993)

--- trunk/Source/WebKit/ChangeLog	2013-12-23 13:15:07 UTC (rev 160992)
+++ trunk/Source/WebKit/ChangeLog	2013-12-23 13:35:00 UTC (rev 160993)
@@ -1,3 +1,12 @@
+2013-12-23  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK] [CMake] Generate pkg-config files
+https://bugs.webkit.org/show_bug.cgi?id=125685
+
+Reviewed by Martin Robinson.
+
+* PlatformGTK.cmake: generate webkitgtk-3.0.pc.
+
 2013-12-22  Martin Robinson  mrobin...@igalia.com
 
 Small build fix for GTK+ with the CMake build


Modified: trunk/Source/WebKit/PlatformGTK.cmake (160992 => 160993)

--- trunk/Source/WebKit/PlatformGTK.cmake	2013-12-23 13:15:07 UTC (rev 160992)
+++ trunk/Source/WebKit/PlatformGTK.cmake	2013-12-23 13:35:00 UTC (rev 160993)
@@ -1,6 +1,8 @@
 set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkit)
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITGTK_DIR})
 configure_file(gtk/webkit/webkitversion.h.in ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitversion.h)
+configure_file(gtk/webkit.pc.in ${CMAKE_BINARY_DIR}/Source/WebKit/gtk/webkitgtk-3.0.pc @ONLY)
+
 add_definitions(-DPACKAGE_LOCALE_DIR=${CMAKE_INSTALL_FULL_LOCALEDIR})
 
 list(APPEND WebKit_INCLUDE_DIRECTORIES


Modified: trunk/Source/WebKit2/ChangeLog (160992 => 160993)

--- trunk/Source/WebKit2/ChangeLog	2013-12-23 13:15:07 UTC (rev 160992)
+++ trunk/Source/WebKit2/ChangeLog	2013-12-23 13:35:00 UTC (rev 160993)
@@ -1,3 +1,12 @@
+2013-12-23  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK] [CMake] Generate pkg-config files
+https://bugs.webkit.org/show_bug.cgi?id=125685
+
+Reviewed by Martin Robinson.
+
+* PlatformGTK.cmake: generate webkit2gtk.pc.
+
 2013-12-23  Carlos Garcia Campos  cgar...@igalia.com
 
 [GTK] Build with network process unconditionally


Modified: trunk/Source/WebKit2/PlatformGTK.cmake (160992 => 160993)

--- trunk/Source/WebKit2/PlatformGTK.cmake	2013-12-23 13:15:07 UTC (rev 160992)
+++ trunk/Source/WebKit2/PlatformGTK.cmake	2013-12-23 13:35:00 UTC (rev 160993)
@@ -8,6 +8,7 @@
 file(MAKE_DIRECTORY ${WEBKIT2_FORWARDING_HEADERS_DIR})
 
 configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${WEBKIT2_BUILT_API_DIR}/WebKitVersion.h)
+configure_file(webkit2gtk.pc.in ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-3.0.pc @ONLY)
 
 add_definitions(-DWEBKIT2_COMPILATION)
 add_definitions(-DLIBEXECDIR=${CMAKE_INSTALL_FULL_LIBEXECDIR})


Modified: 

[webkit-changes] [161017] trunk

[gns]

Title: [161017] trunk








Revision 161017
Author g...@gnome.org
Date 2013-12-23 14:01:12 -0800 (Mon, 23 Dec 2013)


Log Message
[GTK] [CMake] Add support for generating gtkdoc
https://bugs.webkit.org/show_bug.cgi?id=116376

Reviewed by Martin Robinson.

.:

* Source/PlatformGTK.cmake: Added. New custom target that depends on a custom command
which calls our generate-gtkdoc script. It uses a docs-build.stamp for simplicity,
like the autotools build.

Source/WebKit2:

* PlatformGTK.cmake: make generated API files go to DerivedSources/WebKit2, to
match the autotools build and gtkdoc.py's expectation.

Tools:

* gtk/common.py: look for files in the directories used by the cmake build as well.

Modified Paths

trunk/ChangeLog
trunk/Source/PlatformGTK.cmake
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/PlatformGTK.cmake
trunk/Tools/ChangeLog
trunk/Tools/gtk/common.py
trunk/Tools/gtk/generate-gtkdoc




Diff

Modified: trunk/ChangeLog (161016 => 161017)

--- trunk/ChangeLog	2013-12-23 21:49:43 UTC (rev 161016)
+++ trunk/ChangeLog	2013-12-23 22:01:12 UTC (rev 161017)
@@ -1,3 +1,14 @@
+2013-12-23  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK] [CMake] Add support for generating gtkdoc
+https://bugs.webkit.org/show_bug.cgi?id=116376
+
+Reviewed by Martin Robinson.
+
+* Source/PlatformGTK.cmake: Added. New custom target that depends on a custom command
+which calls our generate-gtkdoc script. It uses a docs-build.stamp for simplicity,
+like the autotools build.
+
 2013-12-23  Martin Robinson  mrobin...@igalia.com
 
 [GTK] [CMake] Build the WebKit2 GObject API tests


Modified: trunk/Source/PlatformGTK.cmake (161016 => 161017)

--- trunk/Source/PlatformGTK.cmake	2013-12-23 21:49:43 UTC (rev 161016)
+++ trunk/Source/PlatformGTK.cmake	2013-12-23 22:01:12 UTC (rev 161017)
@@ -1,7 +1,40 @@
+set(DocumentationDependencies
+${CMAKE_SOURCE_DIR}/Source/WebKit/gtk/docs/webkitenvironment.xml
+)
+
 if (ENABLE_WEBKIT)
-add_subdirectory(${WEBKIT_DIR}/gtk/tests)
+list(APPEND DocumentationDependencies
+WebKit
+${CMAKE_SOURCE_DIR}/Source/WebKit/gtk/docs/webkitgtk-docs.sgml
+${CMAKE_SOURCE_DIR}/Source/WebKit/gtk/docs/webkitgtk-sections.txt
+)
 endif ()
 
 if (ENABLE_WEBKIT2)
-add_subdirectory(${WEBKIT2_DIR}/UIProcess/API/gtk/tests)
+list(APPEND DocumentationDependencies
+WebKit2
+${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml
+${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt
+)
 endif ()
+
+add_custom_command(
+OUTPUT docs-build.stamp
+DEPENDS ${DocumentationDependencies}
+COMMAND CC=${CMAKE_C_COMPILER} ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc
+COMMAND touch docs-build.stamp
+WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+)
+
+add_custom_target(fake-docs-target ALL
+DEPENDS docs-build.stamp
+)
+
+if (ENABLE_WEBKIT)
+add_dependencies(fake-docs-target WebKit)
+endif ()
+
+if (ENABLE_WEBKIT2)
+add_dependencies(fake-docs-target WebKit2)
+endif ()
+


Modified: trunk/Source/WebKit2/ChangeLog (161016 => 161017)

--- trunk/Source/WebKit2/ChangeLog	2013-12-23 21:49:43 UTC (rev 161016)
+++ trunk/Source/WebKit2/ChangeLog	2013-12-23 22:01:12 UTC (rev 161017)
@@ -1,3 +1,13 @@
+2013-12-23  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK] [CMake] Add support for generating gtkdoc
+https://bugs.webkit.org/show_bug.cgi?id=116376
+
+Reviewed by Martin Robinson.
+
+* PlatformGTK.cmake: make generated API files go to DerivedSources/WebKit2, to
+match the autotools build and gtkdoc.py's expectation.
+
 2013-12-23  Martin Robinson  mrobin...@igalia.com
 
 [GTK] [CMake] Build the WebKit2 GObject API tests


Modified: trunk/Source/WebKit2/PlatformGTK.cmake (161016 => 161017)

--- trunk/Source/WebKit2/PlatformGTK.cmake	2013-12-23 21:49:43 UTC (rev 161016)
+++ trunk/Source/WebKit2/PlatformGTK.cmake	2013-12-23 22:01:12 UTC (rev 161017)
@@ -1,5 +1,5 @@
 set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
-set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
+set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/WebKit2/webkit2gtk)
 set(WEBKIT2_BUILT_API_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/webkit2)
 set(WEBKIT2_FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders/webkit2gtk)
 


Modified: trunk/Tools/ChangeLog (161016 => 161017)

--- trunk/Tools/ChangeLog	2013-12-23 21:49:43 UTC (rev 161016)
+++ trunk/Tools/ChangeLog	2013-12-23 22:01:12 UTC (rev 161017)
@@ -1,3 +1,12 @@
+2013-12-23  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK] [CMake] Add support for generating gtkdoc
+https://bugs.webkit.org/show_bug.cgi?id=116376
+
+Reviewed by Martin Robinson.
+
+* gtk/common.py: look for files in the directories used by the cmake build as well.
+
 2013-12-23  Carlos Garcia Campos  cgar...@igalia.com
 

[webkit-changes] [161426] trunk

[gns]

Title: [161426] trunk








Revision 161426
Author g...@gnome.org
Date 2014-01-07 07:29:17 -0800 (Tue, 07 Jan 2014)


Log Message
Unreviewed GTK/CMake build fix: use the correct location for docs-build.stamp
in output and dependencies declarations, so docs are not built needlessly
every build.

Patch by Gustavo Noronha Silva gustavo.noro...@collabora.com on 2014-01-07

* Source/PlatformGTK.cmake:

Modified Paths

trunk/ChangeLog
trunk/Source/PlatformGTK.cmake




Diff

Modified: trunk/ChangeLog (161425 => 161426)

--- trunk/ChangeLog	2014-01-07 15:24:52 UTC (rev 161425)
+++ trunk/ChangeLog	2014-01-07 15:29:17 UTC (rev 161426)
@@ -1,3 +1,11 @@
+2014-01-07  Gustavo Noronha Silva  gustavo.noro...@collabora.com
+
+Unreviewed GTK/CMake build fix: use the correct location for docs-build.stamp
+in output and dependencies declarations, so docs are not built needlessly
+every build.
+
+* Source/PlatformGTK.cmake:
+
 2014-01-04  Carlos Garcia Campos  cgar...@igalia.com
 
 [GTK] Move all GTK/GObject unit tests to Tools/TestWebKitAPI


Modified: trunk/Source/PlatformGTK.cmake (161425 => 161426)

--- trunk/Source/PlatformGTK.cmake	2014-01-07 15:24:52 UTC (rev 161425)
+++ trunk/Source/PlatformGTK.cmake	2014-01-07 15:29:17 UTC (rev 161426)
@@ -30,7 +30,7 @@
 endif ()
 
 add_custom_command(
-OUTPUT docs-build.stamp
+OUTPUT ${CMAKE_BINARY_DIR}/docs-build.stamp
 DEPENDS ${DocumentationDependencies}
 COMMAND CC=${CMAKE_C_COMPILER} ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc
 COMMAND touch docs-build.stamp
@@ -38,7 +38,7 @@
 )
 
 add_custom_target(fake-docs-target ALL
-DEPENDS docs-build.stamp
+DEPENDS ${CMAKE_BINARY_DIR}/docs-build.stamp
 )
 
 if (ENABLE_WEBKIT)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [167669] trunk/Tools

[gns]

Title: [167669] trunk/Tools








Revision 167669
Author g...@gnome.org
Date 2014-04-22 11:12:56 -0700 (Tue, 22 Apr 2014)


Log Message
[GTK] Fails to build documentation when output is redirected
https://bugs.webkit.org/show_bug.cgi?id=131178

Reviewed by Martin Robinson.

* gtk/generate-gtkdoc: set the output for stdout and stderr to UTF-8
explicitly to avoid encoding issues when they are redirected.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/gtk/generate-gtkdoc




Diff

Modified: trunk/Tools/ChangeLog (167668 => 167669)

--- trunk/Tools/ChangeLog	2014-04-22 18:08:53 UTC (rev 167668)
+++ trunk/Tools/ChangeLog	2014-04-22 18:12:56 UTC (rev 167669)
@@ -1,3 +1,13 @@
+2014-04-22  Gustavo Noronha Silva  g...@gnome.org
+
+[GTK] Fails to build documentation when output is redirected
+https://bugs.webkit.org/show_bug.cgi?id=131178
+
+Reviewed by Martin Robinson.
+
+* gtk/generate-gtkdoc: set the output for stdout and stderr to UTF-8
+explicitly to avoid encoding issues when they are redirected.
+
 2014-04-22  ChangSeok Oh  changseok...@collabora.com
 
 [GTK] YCM choose a newer compile_commands.json in between Release or Debug


Modified: trunk/Tools/gtk/generate-gtkdoc (167668 => 167669)

--- trunk/Tools/gtk/generate-gtkdoc	2014-04-22 18:08:53 UTC (rev 167668)
+++ trunk/Tools/gtk/generate-gtkdoc	2014-04-22 18:12:56 UTC (rev 167669)
@@ -19,6 +19,7 @@
 from ConfigParser import SafeConfigParser
 
 import argparse
+import codecs
 import common
 import glob
 import gtkdoc
@@ -27,6 +28,9 @@
 import sys
 import webkitdom
 
+sys.stdout = codecs.getwriter(utf-8)(sys.stdout)
+sys.stderr = codecs.getwriter(utf-8)(sys.stderr)
+
 def configure_logging(verbose):
 level = logging.DEBUG if verbose else logging.INFO
 logger = logging.getLogger('gtkdoc')






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168692] releases/WebKitGTK/webkit-2.4/Source/WebKit2

[gns]

Title: [168692] releases/WebKitGTK/webkit-2.4/Source/WebKit2








Revision 168692
Author g...@gnome.org
Date 2014-05-13 12:25:09 -0700 (Tue, 13 May 2014)


Log Message
Merge 163032 - [GTK] [CMake] Fix the build after r162835
https://bugs.webkit.org/show_bug.cgi?id=127753

Reviewed by Gustavo Noronha Silva.

* CMakeLists.txt: Add support for using the prefix header (GCC / clang only for now)
when WebKit2_USE_PREFIX_HEADER is set to true.
* PlatformGTK.cmake: Set WebKit2_USE_PREFIX_HEADER support and no longer process some message.in files.
* WebKit2Prefix.h: Add support for the CMake GTK+ build.


Conflicts:
	Source/WebKit2/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/WebKit2/CMakeLists.txt
releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebKit2Prefix.h




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/CMakeLists.txt (168691 => 168692)

--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/CMakeLists.txt	2014-05-13 19:22:30 UTC (rev 168691)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/CMakeLists.txt	2014-05-13 19:25:09 UTC (rev 168692)
@@ -690,6 +690,16 @@
 list(APPEND WebKit2_LIBRARIES ${LIBRT_LIBRARIES})
 endif ()
 
+macro(ADD_WEBKIT2_PREFIX_HEADER _target)
+if (WebKit2_USE_PREFIX_HEADER)
+get_target_property(OLD_COMPILE_FLAGS ${_target} COMPILE_FLAGS)
+if (${OLD_COMPILE_FLAGS} STREQUAL OLD_COMPILE_FLAGS-NOTFOUND)
+set(OLD_COMPILE_FLAGS )
+endif ()
+set_target_properties(${_target} PROPERTIES COMPILE_FLAGS ${OLD_COMPILE_FLAGS} -include ${WEBKIT2_DIR}/WebKit2Prefix.h)
+endif ()
+endmacro()
+
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_SOURCES ${WebKit2_MESSAGES_IN_FILES})
@@ -700,6 +710,7 @@
 
 add_dependencies(WebKit2 WebCore)
 add_dependencies(WebKit2 ${WEBKIT2_EXTRA_DEPENDENCIES})
+add_webkit2_prefix_header(WebKit2)
 target_link_libraries(WebKit2 ${WebKit2_LIBRARIES})
 set_target_properties(WebKit2 PROPERTIES FOLDER WebKit)
 set_target_properties(WebKit2 PROPERTIES LINK_INTERFACE_LIBRARIES )
@@ -709,6 +720,7 @@
 endif ()
 
 add_executable(WebProcess ${WebProcess_SOURCES})
+add_webkit2_prefix_header(WebProcess)
 target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
 set_target_properties(WebProcess PROPERTIES FOLDER WebKit)
 
@@ -718,6 +730,7 @@
 
 if (ENABLE_NETWORK_PROCESS)
 add_executable(NetworkProcess ${NetworkProcess_SOURCES})
+add_webkit2_prefix_header(NetworkProcess)
 target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
 set_target_properties(NetworkProcess PROPERTIES FOLDER WebKit)
 install(TARGETS NetworkProcess DESTINATION ${LIBEXEC_INSTALL_DIR})


Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake (168691 => 168692)

--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake	2014-05-13 19:22:30 UTC (rev 168691)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake	2014-05-13 19:25:09 UTC (rev 168692)
@@ -11,6 +11,8 @@
 add_definitions(-DPACKAGE_LOCALE_DIR=${CMAKE_INSTALL_FULL_LOCALEDIR})
 add_definitions(-DLIBDIR=${CMAKE_INSTALL_FULL_LIBDIR})
 
+set(WebKit2_USE_PREFIX_HEADER ON)
+
 list(APPEND WebKit2_SOURCES
 ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
 ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
@@ -377,12 +379,6 @@
 ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.js
 )
 
-list(APPEND WebKit2_MESSAGES_IN_FILES
-UIProcess/soup/WebSoupRequestManagerProxy.messages.in
-
-WebProcess/soup/WebSoupRequestManager.messages.in
-)
-
 # This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
 list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
 ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
@@ -399,6 +395,7 @@
 ${WEBCORE_DIR}/platform/network/soup
 ${WEBCORE_DIR}/platform/text/enchant
 ${WEBKIT2_DIR}/Shared/API/c/gtk
+${WEBKIT2_DIR}/Shared/Network/CustomProtocols/soup
 ${WEBKIT2_DIR}/Shared/Downloads/soup
 ${WEBKIT2_DIR}/Shared/gtk
 ${WEBKIT2_DIR}/Shared/soup
@@ -628,6 +625,7 @@
 GENERATE_WEBKIT2_MESSAGE_SOURCES(PluginProcess_SOURCES ${PluginProcess_MESSAGES_IN_FILES})
 
 add_executable(WebKitPluginProcess ${PluginProcess_SOURCES})
+add_webkit2_prefix_header(WebKitPluginProcess)
 
 # We need ENABLE_PLUGIN_PROCESS for all targets in this directory, but
 # we only want GTK_API_VERSION_2 for the plugin process target.
@@ -672,10 +670,9 @@
 ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
 )
 
-add_library(webkit2gtkinjectedbundle MODULE
-${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp
-)
+add_library(webkit2gtkinjectedbundle MODULE ${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp)
 add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings)
+add_webkit2_prefix_header(webkit2gtkinjectedbundle)
 
 add_custom_command(
 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir

[webkit-changes] [168693] releases/WebKitGTK/webkit-2.4

[gns]

Title: [168693] releases/WebKitGTK/webkit-2.4








Revision 168693
Author g...@gnome.org
Date 2014-05-13 12:25:33 -0700 (Tue, 13 May 2014)


Log Message
Merge 163114 - [GTK] [CMake] Add a make dist target
https://bugs.webkit.org/show_bug.cgi?id=116378

Reviewed by Gustavo Noronha Silva.

.:

* Source/PlatformGTK.cmake: A CMake support for executing the make-dist
script and then turning the tarfile into a LZMA compressed file.

Source/WebCore:

* CMakeLists.txt: Don't build WebKitVersion.h for WebKitGTK+. We don't use it
and we don't want to distribute the dependency.

Tools:

Added a script that reads a manifest file an produces a tarball. Also add
the manifest.

* gtk/make-dist.py: Added.
* gtk/manifest.txt: Added.


Conflicts:
	ChangeLog
	Source/WebCore/ChangeLog
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt


Added Paths

releases/WebKitGTK/webkit-2.4/Tools/gtk/make-dist.py
releases/WebKitGTK/webkit-2.4/Tools/gtk/manifest.txt




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake (168692 => 168693)

--- releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake	2014-05-13 19:25:09 UTC (rev 168692)
+++ releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake	2014-05-13 19:25:33 UTC (rev 168693)
@@ -52,3 +52,29 @@
 add_custom_target(check
 COMMAND ${TOOLS_DIR}/Scripts/run-gtk-tests
 )
+
+if (ENABLE_WEBKIT AND ENABLE_WEBKIT2)
+add_custom_command(
+OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
+DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
+DEPENDS WebKit
+DEPENDS WebKit2
+COMMAND ${TOOLS_DIR}/gtk/make-dist.py
+--source-dir=${CMAKE_SOURCE_DIR}
+--build-dir=${CMAKE_BINARY_DIR}
+--tarball-root=/webkitgtk-${PROJECT_VERSION}
+-o ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+${TOOLS_DIR}/gtk/manifest.txt
+)
+
+add_custom_command(
+OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
+DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+)
+
+add_custom_target(dist
+DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
+)
+endif ()


Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt (168692 => 168693)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt	2014-05-13 19:25:09 UTC (rev 168692)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt	2014-05-13 19:25:33 UTC (rev 168693)
@@ -3232,13 +3232,15 @@
 GENERATE_DOM_NAMES(XML ${WEBCORE_DIR}/xml/xmlattrs.in)
 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNames.cpp)
 
-add_custom_command(
-OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h
-MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl
-DEPENDS ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig
-COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/scripts/generate-webkitversion.pl --config ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
-VERBATIM)
-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
+if (NOT PORT STREQUAL GTK)
+add_custom_command(
+OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h
+MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl
+DEPENDS ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig
+COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/scripts/generate-webkitversion.pl --config ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
+VERBATIM)
+list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
+endif ()
 
 WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
 WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})


Added: releases/WebKitGTK/webkit-2.4/Tools/gtk/make-dist.py (0 => 168693)

--- releases/WebKitGTK/webkit-2.4/Tools/gtk/make-dist.py	(rev 0)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/make-dist.py	2014-05-13 19:25:33 UTC (rev 168693)
@@ -0,0 +1,223 @@
+#!/usr/bin/env python
+# Copyright (C) 2014 Igalia S.L.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along 

[webkit-changes] [168696] releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake

[gns]

Title: [168696] releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake








Revision 168696
Author g...@gnome.org
Date 2014-05-13 12:26:09 -0700 (Tue, 13 May 2014)


Log Message
Merge 163240 - Unreviewed. Fixed GTK+ CMake build after r162922.

* PlatformGTK.cmake: Removed SoupURIUtils.cpp from the
compilation.


Conflicts:
	Source/WebCore/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake (168695 => 168696)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake	2014-05-13 19:25:58 UTC (rev 168695)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake	2014-05-13 19:26:09 UTC (rev 168696)
@@ -253,7 +253,6 @@
 platform/network/soup/ResourceRequestSoup.cpp
 platform/network/soup/ResourceResponseSoup.cpp
 platform/network/soup/SocketStreamHandleSoup.cpp
-platform/network/soup/SoupURIUtils.cpp
 platform/network/soup/SynchronousLoaderClientSoup.cpp
 
 platform/soup/SharedBufferSoup.cpp






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168695] releases/WebKitGTK/webkit-2.4

[gns]

Title: [168695] releases/WebKitGTK/webkit-2.4








Revision 168695
Author g...@gnome.org
Date 2014-05-13 12:25:58 -0700 (Tue, 13 May 2014)


Log Message
Merge 163155 - [GTK] [CMake] Add support for building against GTK+ 2
https://bugs.webkit.org/show_bug.cgi?id=127959

Reviewed by Anders Carlsson.

.:

* Source/cmake/OptionsGTK.cmake: Add a new option to use GTK 2 and make a variable holding the
library API version. When using GTK 2 do not build WebKit 2.

Source/_javascript_Core:

* PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.

Source/WebCore:

* PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.

Source/WebKit:

* PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.

Source/WebKit2:

* PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.

Tools:

* DumpRenderTree/PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.
* GtkLauncher/CMakeLists.txt: Ditto.
* ImageDiff/PlatformGTK.cmake: Ditto.
* TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt: Ditto.


Conflicts:
	ChangeLog
	Source/_javascript_Core/ChangeLog
	Source/WebCore/ChangeLog
	Source/WebKit/ChangeLog
	Source/WebKit2/ChangeLog
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake
releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Tools/GtkLauncher/CMakeLists.txt
releases/WebKitGTK/webkit-2.4/Tools/ImageDiff/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/PlatformGTK.cmake (168694 => 168695)

--- releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/PlatformGTK.cmake	2014-05-13 19:25:43 UTC (rev 168694)
+++ releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/PlatformGTK.cmake	2014-05-13 19:25:58 UTC (rev 168695)
@@ -1,15 +1,15 @@
-configure_file(_javascript_coregtk.pc.in ${CMAKE_BINARY_DIR}/Source/_javascript_Core/_javascript_coregtk-3.0.pc @ONLY)
-configure_file(_javascript_Core.gir.in ${CMAKE_BINARY_DIR}/_javascript_Core-3.0.gir @ONLY)
+configure_file(_javascript_coregtk.pc.in ${CMAKE_BINARY_DIR}/Source/_javascript_Core/_javascript_coregtk-${WEBKITGTK_API_VERSION}.pc @ONLY)
+configure_file(_javascript_Core.gir.in ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir @ONLY)
 
 add_custom_command(
-OUTPUT ${CMAKE_BINARY_DIR}/_javascript_Core-3.0.typelib
-DEPENDS ${CMAKE_BINARY_DIR}/_javascript_Core-3.0.gir
-COMMAND ${INTROSPECTION_COMPILER} ${CMAKE_BINARY_DIR}/_javascript_Core-3.0.gir -o ${CMAKE_BINARY_DIR}/_javascript_Core-3.0.typelib
+OUTPUT ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.typelib
+DEPENDS ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
+COMMAND ${INTROSPECTION_COMPILER} ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.typelib
 )
 
-ADD_TYPELIB(${CMAKE_BINARY_DIR}/_javascript_Core-3.0.typelib)
+ADD_TYPELIB(${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.typelib)
 
-install(FILES ${CMAKE_BINARY_DIR}/Source/_javascript_Core/_javascript_coregtk-3.0.pc
+install(FILES ${CMAKE_BINARY_DIR}/Source/_javascript_Core/_javascript_coregtk-${WEBKITGTK_API_VERSION}.pc
 DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
 )
 
@@ -23,9 +23,9 @@
 DESTINATION ${WEBKITGTK_HEADER_INSTALL_DIR}/_javascript_Core
 )
 
-install(FILES ${CMAKE_BINARY_DIR}/_javascript_Core-3.0.gir
+install(FILES ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
 DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
 )
-install(FILES ${CMAKE_BINARY_DIR}/_javascript_Core-3.0.typelib
+install(FILES ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.typelib
 DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
 )


Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake (168694 => 168695)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake	2014-05-13 19:25:43 UTC (rev 168694)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake	2014-05-13 19:25:58 UTC (rev 168695)
@@ -462,13 +462,13 @@
 APPEND
 PROPERTY INCLUDE_DIRECTORIES
 ${WebCore_INCLUDE_DIRECTORIES}
-${GTK3_INCLUDE_DIRS}
-${GDK3_INCLUDE_DIRS}
+${GTK_INCLUDE_DIRS}
+${GDK_INCLUDE_DIRS}
 )
 target_link_libraries(WebCorePlatformGTK
 ${WebCore_LIBRARIES}
-${GTK3_LIBRARIES}
-${GDK3_LIBRARIES}
+${GTK_LIBRARIES}
+${GDK_LIBRARIES}
 )
 
 if (ENABLE_WEBKIT2)


Modified: 

[webkit-changes] [168697] releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/FeatureDefines.h

[gns]

Title: [168697] releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/FeatureDefines.h








Revision 168697
Author g...@gnome.org
Date 2014-05-13 12:26:20 -0700 (Tue, 13 May 2014)


Log Message
Merge 163339 - [GTK][CMake] Enable SUBPIXEL_LAYOUT in FeatureDefines.h like EFL does
https://bugs.webkit.org/show_bug.cgi?id=128136

Reviewed by Martin Robinson.

* wtf/FeatureDefines.h: enable SUBPIXEL_LAYOUT if it's not set, for GTK+.


Conflicts:
	Source/WTF/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/FeatureDefines.h




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/FeatureDefines.h (168696 => 168697)

--- releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/FeatureDefines.h	2014-05-13 19:26:09 UTC (rev 168696)
+++ releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/FeatureDefines.h	2014-05-13 19:26:20 UTC (rev 168697)
@@ -327,6 +327,10 @@
 #endif
 #endif
 
+#if !defined(ENABLE_SUBPIXEL_LAYOUT)
+#define ENABLE_SUBPIXEL_LAYOUT 1
+#endif
+
 #if !defined(ENABLE_8BIT_TEXTRUN)
 #define ENABLE_8BIT_TEXTRUN 1
 #endif






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168699] releases/WebKitGTK/webkit-2.4

[gns]

Title: [168699] releases/WebKitGTK/webkit-2.4








Revision 168699
Author g...@gnome.org
Date 2014-05-13 12:26:49 -0700 (Tue, 13 May 2014)


Log Message
Merge 164076 - [GTK][CMake] Generate GObject DOM bindings .symbols files
https://bugs.webkit.org/show_bug.cgi?id=126210

Reviewed by Martin Robinson.

.:

* Source/PlatformGTK.cmake: add checking DOM bindings API as a dependency
for documentation generation.

Source/WebCore:

No new tests. Build change only.

* CMakeLists.txt: list Quota module files and IDLs even if the feature
is disabled, for GTK, since we rely on that for our DOM bindings.
* PlatformGTK.cmake: add a new target to check for DOM symbols API by
running the new python script.
* bindings/gobject/GNUmakefile.am: call the new python script instead
of using a custom rule.

Tools:

* gtk/check-gdom-symbols: Added. Checks symbols compatibility.
(should_update_symbols_file):


Conflicts:
	ChangeLog
	Source/WebCore/ChangeLog
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt
releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/gobject/GNUmakefile.am


Added Paths

releases/WebKitGTK/webkit-2.4/Tools/gtk/check-gdom-symbols




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake (168698 => 168699)

--- releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake	2014-05-13 19:26:30 UTC (rev 168698)
+++ releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake	2014-05-13 19:26:49 UTC (rev 168699)
@@ -4,6 +4,7 @@
 add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
 
 set(DocumentationDependencies
+generate-gdom-symbols-file
 ${CMAKE_SOURCE_DIR}/Source/WebKit/gtk/docs/webkitenvironment.xml
 )
 


Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt (168698 => 168699)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt	2014-05-13 19:26:30 UTC (rev 168698)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt	2014-05-13 19:26:49 UTC (rev 168699)
@@ -2736,7 +2736,10 @@
 )
 endif ()
 
-if (ENABLE_QUOTA)
+# On the GTK+ autotools build we used to add these files even if QUOTA is disabled, and
+# because of that we generate GObject bindings for some of the objects. We need to do
+# the same for the cmake build, for now.
+if (ENABLE_QUOTA OR PORT STREQUAL GTK)
 list(APPEND WebCore_SOURCES
 Modules/quota/DOMWindowQuota.cpp
 Modules/quota/NavigatorStorageQuota.cpp


Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake (168698 => 168699)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake	2014-05-13 19:26:30 UTC (rev 168698)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake	2014-05-13 19:26:49 UTC (rev 168699)
@@ -669,11 +669,15 @@
  ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
  ${WEBCORE_DIR}/bindings/gobject/WebKitDOMCustom.h
 )
+file(GLOB GObjectDOMBindingsSymbolsFiles
+${WEBCORE_DIR}/bindings/gobject/WebKitDOM*.symbols
+)
 
 foreach (file ${GObjectDOMBindings_IDL_FILES})
 get_filename_component(classname ${file} NAME_WE)
 list(APPEND GObjectDOMBindings_CLASS_LIST ${classname})
 list(APPEND GObjectDOMBindings_INSTALLED_HEADERS ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}.h)
+list(APPEND GObjectDOMBindingsSymbolsFiles ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}.symbols)
 endforeach ()
 
 # Propagate this variable to the parent scope, so that it can be used in other parts of the build.
@@ -696,7 +700,7 @@
 )
 
 add_custom_target(fake-installed-webkitdom-headers
-COMMAND ln -n -s -f ${WEBCORE_DIR}/bindings/gobject/* ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
+COMMAND ln -n -s -f ${WEBCORE_DIR}/bindings/gobject/*.h ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
 )
 
 GENERATE_BINDINGS(GObjectDOMBindings_SOURCES
@@ -730,5 +734,16 @@
   bindings/gobject/WebKitDOMObject.h
 DESTINATION ${WEBKITGTK_HEADER_INSTALL_DIR}/webkitdom
 )
+
+add_custom_command(
+OUTPUT ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.symbols
+DEPENDS ${GObjectDOMBindingsSymbolsFiles} ${CMAKE_SOURCE_DIR}/Tools/gtk/check-gdom-symbols
+COMMAND ln -n -s -f ${WEBCORE_DIR}/bindings/gobject/WebKitDOM*.symbols ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
+COMMAND ${CMAKE_SOURCE_DIR}/Tools/gtk/check-gdom-symbols
+)
+
+add_custom_target(generate-gdom-symbols-file
+DEPENDS GObjectDOMBindings ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.symbols
+)
 endif ()
 


Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/gobject/GNUmakefile.am (168698 => 168699)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/gobject/GNUmakefile.am	2014-05-13 19:26:30 UTC (rev 168698)

[webkit-changes] [168698] releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt

[gns]

Title: [168698] releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt








Revision 168698
Author g...@gnome.org
Date 2014-05-13 12:26:30 -0700 (Tue, 13 May 2014)


Log Message
Merge 163379 - [CMAKE] Remove workaround for GCC 4.6
https://bugs.webkit.org/show_bug.cgi?id=128176

Reviewed by Csaba Osztrogonác.

Since r162126, WebKit requires at least 4.7.

* CMakeLists.txt:


Conflicts:
	Source/WebCore/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt (168697 => 168698)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt	2014-05-13 19:26:20 UTC (rev 168697)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt	2014-05-13 19:26:30 UTC (rev 168698)
@@ -2556,20 +2556,6 @@
 xml/parser/XMLDocumentParserScope.cpp
 )
 
-# GCC 4.6.x crashes when building this file with -O3 and -DNDEBUG.
-# References: https://bugs.webkit.org/show_bug.cgi?id=97268
-# https://bugs.webkit.org/show_bug.cgi?id=114627
-if (CMAKE_COMPILER_IS_GNUCXX) # Can restrict based on the version.
-string(TOUPPER CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} _CXXFLAGS_VARNAME)
-
-string(FIND ${${_CXXFLAGS_VARNAME}} -O3 _CXXFLAGS_O3_INDEX)
-if (_CXXFLAGS_O3_INDEX GREATER -1)
-string(REPLACE -O3 -O2 _CXXFLAGS ${${_CXXFLAGS_VARNAME}})
-set_source_files_properties(Modules/websockets/WebSocketDeflater.cpp
-PROPERTIES COMPILE_FLAGS ${_CXXFLAGS})
-endif ()
-endif ()
-
 set(WebCore_CSS_PROPERTY_NAMES
 ${WEBCORE_DIR}/css/CSSPropertyNames.in
 )






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168700] releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake

[gns]

Title: [168700] releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake








Revision 168700
Author g...@gnome.org
Date 2014-05-13 12:27:00 -0700 (Tue, 13 May 2014)


Log Message
Merge 164090 - [GTK] [CMake] _javascript_Core crashes in JSC::eval
https://bugs.webkit.org/show_bug.cgi?id=128434

Extend a fix for EFL to all ports that use GCC. Also include further fixes
that were applied only to the autotools build.

Reviewed by Gyuyoung Kim.

* Source/cmake/OptionsCommon.cmake: Add -fno-omit-frame-pointer to all ports as well
as -fno-tree-dce, which is necessary for GTK+.
* Source/cmake/OptionsEfl.cmake: The GCC flag additions are now in the common options file.


Conflicts:
	ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake (168699 => 168700)

--- releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake	2014-05-13 19:26:49 UTC (rev 168699)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake	2014-05-13 19:27:00 UTC (rev 168700)
@@ -19,6 +19,12 @@
 set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS ${CMAKE_CXX_COMPILER} -E -x c++)
 endif ()
 
+# Push of rbp is needed after JSC JIT uses CStack. See http://wkbug.com/12.
+if (CMAKE_COMPILER_IS_GNUCC AND UNIX AND NOT APPLE)
+set(CMAKE_C_FLAGS_RELEASE -fno-omit-frame-pointer -fno-tree-dce ${CMAKE_C_FLAGS_RELEASE})
+set(CMAKE_CXX_FLAGS_RELEASE -fno-omit-frame-pointer -fno-tree-dce ${CMAKE_CXX_FLAGS_RELEASE})
+endif ()
+
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 if (CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168701] releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake

[gns]

Title: [168701] releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake








Revision 168701
Author g...@gnome.org
Date 2014-05-13 12:27:12 -0700 (Tue, 13 May 2014)


Log Message
Merge 164257 - [GTK] [CMake] _javascript_Core crashes in JSC::eval
https://bugs.webkit.org/show_bug.cgi?id=128434

Reviewed by Anders Carlsson.

* Source/cmake/OptionsGTK.cmake: Add -fno-omit-frame-pointer to the GTK+ CMake
port as well as -fno-tree-dce, like it is used in the autotools build.


Conflicts:
	ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake (168700 => 168701)

--- releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake	2014-05-13 19:27:00 UTC (rev 168700)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake	2014-05-13 19:27:12 UTC (rev 168701)
@@ -276,6 +276,12 @@
 set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-webextension)
 set(SHOULD_INSTALL_JS_SHELL ON)
 
+# Push of rbp is needed after JSC JIT uses CStack. See http://wkbug.com/12.
+if (CMAKE_COMPILER_IS_GNUCC AND UNIX AND NOT APPLE)
+set(CMAKE_C_FLAGS_RELEASE -fno-omit-frame-pointer -fno-tree-dce ${CMAKE_C_FLAGS_RELEASE})
+set(CMAKE_CXX_FLAGS_RELEASE -fno-omit-frame-pointer -fno-tree-dce ${CMAKE_CXX_FLAGS_RELEASE})
+endif ()
+
 # Add a typelib file to the list of all typelib dependencies. This makes it easy to
 # expose a 'gir' target with all gobject-introspection files.
 macro(ADD_TYPELIB typelib)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168702] releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/PlatformGTK. cmake

[gns]

Title: [168702] releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/PlatformGTK.cmake








Revision 168702
Author g...@gnome.org
Date 2014-05-13 12:27:22 -0700 (Tue, 13 May 2014)


Log Message
Merge 164559 - [GTK][CMake] Many plugin tests fail when running WebKit1 layout tests
https://bugs.webkit.org/show_bug.cgi?id=129191

Reviewed by Anders Carlsson.

* DumpRenderTree/PlatformGTK.cmake: Properly specify the library build directory
for the GTK+ DumpRenderTree build. We could manually construct this path, but the
name of the directory is lib and not libs. Instead we should use the CMake
variable specifically assigned to this task.


Conflicts:
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/PlatformGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/PlatformGTK.cmake (168701 => 168702)

--- releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/PlatformGTK.cmake	2014-05-13 19:27:12 UTC (rev 168701)
+++ releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/PlatformGTK.cmake	2014-05-13 19:27:22 UTC (rev 168702)
@@ -45,7 +45,7 @@
 )
 
 add_definitions(
--DTEST_PLUGIN_DIR=${CMAKE_BINARY_DIR}/libs
+-DTEST_PLUGIN_DIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
 -DFONTS_CONF_DIR=${TOOLS_DIR}/DumpRenderTree/gtk/fonts
 -DTOP_LEVEL_DIR=${CMAKE_SOURCE_DIR}
 )






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168704] releases/WebKitGTK/webkit-2.4/Source

[gns]

Title: [168704] releases/WebKitGTK/webkit-2.4/Source








Revision 168704
Author g...@gnome.org
Date 2014-05-13 12:27:45 -0700 (Tue, 13 May 2014)


Log Message
Merge 164979 - [cmake] *Names.cpp file should be regenerated after touching StaticString.pm
https://bugs.webkit.org/show_bug.cgi?id=129031

Patch by Jozsef Berta jberta.u-sze...@partner.samsung.com on 2014-03-03
Reviewed by Csaba Osztrogonác.

.:

* Source/cmake/WebKitMacros.cmake: Added a call for make_names.pm dependencies in GENERATE_FONT_NAMES and GENERATE_DOM_NAMES macros.

Source/WebCore:

* CMakeLists.txt: Added make_names.pl dependencies: bindings/scripts/Hasher.pm and bindings/scripts/StaticString.pm


Conflicts:
	ChangeLog
	Source/WebCore/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt
releases/WebKitGTK/webkit-2.4/Source/cmake/WebKitMacros.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt (168703 => 168704)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt	2014-05-13 19:27:32 UTC (rev 168703)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt	2014-05-13 19:27:45 UTC (rev 168704)
@@ -2975,6 +2975,11 @@
 ${WEBCORE_DIR}/bindings/scripts/InFilesParser.pm
 ${WEBCORE_DIR}/bindings/scripts/preprocessor.pm
 )
+
+set(MAKE_NAMES_DEPENDENCIES
+${WEBCORE_DIR}/bindings/scripts/Hasher.pm
+${WEBCORE_DIR}/bindings/scripts/StaticString.pm
+)
 set(IDL_FILES_TMP ${DERIVED_SOURCES_WEBCORE_DIR}/idl_files.tmp)
 set(SUPPLEMENTAL_DEPENDENCY_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/supplemental_dependency.tmp)
 set(WINDOW_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowConstructors.idl)


Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/WebKitMacros.cmake (168703 => 168704)

--- releases/WebKitGTK/webkit-2.4/Source/cmake/WebKitMacros.cmake	2014-05-13 19:27:32 UTC (rev 168703)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/WebKitMacros.cmake	2014-05-13 19:27:45 UTC (rev 168704)
@@ -73,7 +73,7 @@
 add_custom_command(
 OUTPUT  ${_outputfiles}
 MAIN_DEPENDENCY ${_infile}
-DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS}
+DEPENDS ${MAKE_NAMES_DEPENDENCIES} ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS}
 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments}
 VERBATIM)
 endmacro()
@@ -141,7 +141,7 @@
 
 add_custom_command(
 OUTPUT  ${_outputfiles}
-DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags}
+DEPENDS ${MAKE_NAMES_DEPENDENCIES} ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags}
 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor ${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
 VERBATIM)
 endmacro()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168706] releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm

[gns]

Title: [168706] releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm








Revision 168706
Author g...@gnome.org
Date 2014-05-13 12:28:06 -0700 (Tue, 13 May 2014)


Log Message
Merge 165111 - [GTK][CMake] build-webkit should rerun cmake if the Makefile is missing
https://bugs.webkit.org/show_bug.cgi?id=129380

Reviewed by Philippe Normand.

* Scripts/webkitdirs.pm:
(generateBuildSystemFromCMakeProject): Check for the existence of the Makefile before
skipping CMake execution.


Conflicts:
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm




Diff

Modified: releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm (168705 => 168706)

--- releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm	2014-05-13 19:27:55 UTC (rev 168705)
+++ releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm	2014-05-13 19:28:06 UTC (rev 168706)
@@ -1951,7 +1951,7 @@
 chdir($buildPath) or die;
 
 # For GTK+ we try to be smart about when to rerun cmake, so that we can have faster incremental builds.
-if (isGtk()  -e cmakeCachePath()) {
+if (isGtk()  -e cmakeCachePath()  -e File::Spec-catfile(baseProductDir(), configuration(), Makefile)) {
 return 0;
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168707] releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc

[gns]

Title: [168707] releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc








Revision 168707
Author g...@gnome.org
Date 2014-05-13 12:28:16 -0700 (Tue, 13 May 2014)


Log Message
Merge 164560 - [GTK] generate-gtkdoc should use argparse
https://bugs.webkit.org/show_bug.cgi?id=128418

Reviewed by Carlos Garcia Campos.

* gtk/generate-gtkdoc: Get all arguments from argparse, pass then as parameters
to all functions, and guard the main routine with a __name__ == __main__ check.


Conflicts:
	Tools/ChangeLog
	Tools/Scripts/webkitdirs.pm

Modified Paths

releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc




Diff

Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc (168706 => 168707)

--- releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc	2014-05-13 19:28:06 UTC (rev 168706)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc	2014-05-13 19:28:16 UTC (rev 168707)
@@ -15,6 +15,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+import argparse
 import common
 import glob
 import gtkdoc
@@ -22,8 +23,8 @@
 import os.path
 import sys
 
-def configure_logging():
-level = logging.DEBUG if '-v' in sys.argv else logging.INFO
+def configure_logging(verbose):
+level = logging.DEBUG if verbose else logging.INFO
 logger = logging.getLogger('gtkdoc')
 logger.setLevel(level)
 handler = logging.StreamHandler()
@@ -49,22 +50,6 @@
 return deps
 
 
-def get_common_options():
-# TODO: We should consider using an arguments parsing library if
-# we need more of these complex ones.
-virtual_root = ''
-for argument in sys.argv:
-if argument.startswith('--virtual-root='):
-virtual_root = argument.split('=')[1]
-break
-
-return {
-'decorator': 'WEBKIT_API|WEBKIT_DEPRECATED|WEBKIT_DEPRECATED_FOR\(.+\)',
-'deprecation_guard': 'WEBKIT_DISABLE_DEPRECATED',
-'library_path' : common.library_build_path(),
-'virtual_root' : virtual_root,
-}
-
 def get_common_xref_deps():
 return {
 'glib-2.0' : ['glib', 'gobject', 'gio'],
@@ -75,7 +60,7 @@
 def webkitdom_docs_html_path():
 return common.build_path('Documentation', 'webkitdomgtk', 'html')
 
-def get_webkit2_options():
+def get_webkit2_options(virtual_root):
 api_path = common.top_level_path('Source', 'WebKit2', 'UIProcess', 'API', 'gtk')
 injected_bundle_api_path = common.top_level_path('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'gtk')
 
@@ -92,8 +77,11 @@
 def src_path(*args):
 return os.path.join(api_path, *args)
 
-options = get_common_options().copy()
-options.update({
+options = {
+'decorator': 'WEBKIT_API|WEBKIT_DEPRECATED|WEBKIT_DEPRECATED_FOR\(.+\)',
+'deprecation_guard': 'WEBKIT_DISABLE_DEPRECATED',
+'library_path' : common.library_build_path(),
+'virtual_root' : virtual_root,
 'module_name' : 'webkit2gtk',
 'namespace' : 'webkit',
 'doc_dir' : src_path('docs'),
@@ -122,10 +110,10 @@
  glob.glob(os.path.join(generated_api_path, 'WebKitMarshal.*')) + \
  glob.glob(os.path.join(generated_api_path, 'WebKitEnumTypes.*')) + \
  glob.glob(src_path('tests/*.h'))
-})
+}
 return options
 
-def get_webkit1_options(gtk_version):
+def get_webkit1_options(gtk_version, virtual_root):
 def src_path(*args):
 return common.top_level_path(*(('Source', 'WebKit', 'gtk') + args))
 
@@ -145,8 +133,11 @@
 'gtk+-2.0' : ['gtk', 'gdk']
 })
 
-options = get_common_options().copy()
-options.update({
+options = {
+'decorator': 'WEBKIT_API|WEBKIT_DEPRECATED|WEBKIT_DEPRECATED_FOR\(.+\)',
+'deprecation_guard': 'WEBKIT_DISABLE_DEPRECATED',
+'library_path' : common.library_build_path(),
+'virtual_root' : virtual_root,
 'module_name' : 'webkitgtk',
 'namespace' : 'webkit',
 'doc_dir' : src_path('docs'),
@@ -161,10 +152,10 @@
 'ignored_files': glob.glob(src_path('webkit', '*private.*')) + \
  glob.glob(src_path('webkit', 'webkitauthenticationdialog.*')) + \
  glob.glob(src_path('webkit', 'webkitspellcheckerenchant.*'))
-})
+}
 return options
 
-def get_webkitdom_options():
+def get_webkitdom_options(virtual_root):
 def derived_sources_path(*args):
 return common.build_path(*(('DerivedSources', 'webkitdom') + args))
 def src_path(*args):
@@ -172,8 +163,11 @@
 
 xref_deps = { 'glib-2.0' : ['glib', 'gobject', 'gio'] }
 
-options = get_common_options().copy()
-options.update({
+options = {
+'decorator': 'WEBKIT_API|WEBKIT_DEPRECATED|WEBKIT_DEPRECATED_FOR\(.+\)',
+'deprecation_guard': 'WEBKIT_DISABLE_DEPRECATED',
+'library_path' : 

[webkit-changes] [168705] releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake

[gns]

Title: [168705] releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake








Revision 168705
Author g...@gnome.org
Date 2014-05-13 12:27:55 -0700 (Tue, 13 May 2014)


Log Message
Merge 165058 - [GTK][CMake] ENABLE_NAVIGATOR_CONTENT_UTILS is mistakenly enabled for the CMake build
https://bugs.webkit.org/show_bug.cgi?id=129502

Reviewed by Carlos Garcia Campos.

* Source/cmake/OptionsGTK.cmake: Disable the option for GTK+.


Conflicts:
	ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake (168704 => 168705)

--- releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake	2014-05-13 19:27:45 UTC (rev 168704)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake	2014-05-13 19:27:55 UTC (rev 168705)
@@ -54,7 +54,7 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_INFO ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAGE_VISIBILITY_API ON)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168708] releases/WebKitGTK/webkit-2.4/Tools

[gns]

Title: [168708] releases/WebKitGTK/webkit-2.4/Tools








Revision 168708
Author g...@gnome.org
Date 2014-05-13 12:28:38 -0700 (Tue, 13 May 2014)


Log Message
Merge 164585 - Extract common parts from jhbuildrc files.
https://bugs.webkit.org/show_bug.cgi?id=125986

Patch by Tibor Meszaros tmeszaros.u-sze...@partner.samsung.com on 2014-02-24
Reviewed by Csaba Osztrogonác.

Co-authored with Peter Szanka h868...@stud.u-szeged.hu.

* Scripts/run-gtk-tests:
(TestRunner._setup_testing_environment):
* efl/common.py: Removed.
* efl/jhbuildrc:
* gtk/check-gdom-symbols:
* gtk/common.py:
(binary_build_path):
(get_build_path):
* gtk/find-make-dist-errors:
(get_missing_headers):
* gtk/generate-gtkdoc:
(get_webkit2_options):
(get_webkit1_options.src_path):
(get_webkit1_options):
(get_webkitdom_options.src_path):
(get_webkitdom_options):
* gtk/generate-inspector-gresource-manifest.py:
* gtk/jhbuildrc:
* jhbuild/jhbuildrc_common.py: Added.
(script_path):
(top_level_path):
(init):


Conflicts:
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests
releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc
releases/WebKitGTK/webkit-2.4/Tools/gtk/check-gdom-symbols
releases/WebKitGTK/webkit-2.4/Tools/gtk/common.py
releases/WebKitGTK/webkit-2.4/Tools/gtk/find-make-dist-errors
releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc
releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-inspector-gresource-manifest.py
releases/WebKitGTK/webkit-2.4/Tools/gtk/jhbuildrc


Added Paths

releases/WebKitGTK/webkit-2.4/Tools/jhbuild/jhbuildrc_common.py


Removed Paths

releases/WebKitGTK/webkit-2.4/Tools/efl/common.py




Diff

Modified: releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests (168707 => 168708)

--- releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests	2014-05-13 19:28:16 UTC (rev 168707)
+++ releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests	2014-05-13 19:28:38 UTC (rev 168708)
@@ -31,6 +31,9 @@
 import common
 import jhbuildutils
 
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ../jhbuild))
+import jhbuildrc_common 
+
 class SkippedTest:
 ENTIRE_SUITE = None
 
@@ -195,7 +198,7 @@
 def _setup_testing_environment(self):
 self._test_env = os.environ
 self._test_env['GSETTINGS_BACKEND'] = 'memory'
-self._test_env[TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH] = common.top_level_path(Tools, TestWebKitAPI, Tests, WebKit2)
+self._test_env[TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH] = jhbuildrc_common.top_level_path(Tools, TestWebKitAPI, Tests, WebKit2)
 self._test_env[TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH] = common.tests_library_build_path()
 self._test_env[WEBKIT_EXEC_PATH] = self._programs_path
 


Deleted: releases/WebKitGTK/webkit-2.4/Tools/efl/common.py (168707 => 168708)

--- releases/WebKitGTK/webkit-2.4/Tools/efl/common.py	2014-05-13 19:28:16 UTC (rev 168707)
+++ releases/WebKitGTK/webkit-2.4/Tools/efl/common.py	2014-05-13 19:28:38 UTC (rev 168708)
@@ -1,31 +0,0 @@
-#!/usr/bin/env python
-# Copyright (C) 2011 Igalia S.L.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-import os
-
-script_dir = None
-
-
-def script_path(*args):
-global script_dir
-if not script_dir:
-script_dir = os.path.join(os.path.dirname(__file__), '..', 'Scripts')
-return os.path.join(*(script_dir,) + args)
-
-
-def top_level_path(*args):
-return os.path.join(*((script_path('..', '..'),) + args))


Modified: releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc (168707 => 168708)

--- releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc	2014-05-13 19:28:16 UTC (rev 168707)
+++ releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc	2014-05-13 19:28:38 UTC (rev 168708)
@@ -16,38 +16,12 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-import multiprocessing
 import sys
 
-__efl_tools_directory = os.path.abspath(os.path.dirname(__file__))
-sys.path = [__efl_tools_directory] + sys.path
-import common
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ../jhbuild) )
+import jhbuildrc_common
+jhbuildrc_common.init(globals(), efl) 
 
-build_policy = 'updated'
-
-# FIXME: move shared parts into ../jhbuild folder.
-
-__moduleset_file_uri = 

[webkit-changes] [168709] releases/WebKitGTK/webkit-2.4

[gns]

Title: [168709] releases/WebKitGTK/webkit-2.4








Revision 168709
Author g...@gnome.org
Date 2014-05-13 12:29:03 -0700 (Tue, 13 May 2014)


Log Message
Merge 164632 - [GTK] generate-gtkdoc should not generate documentation for source files for unbuilt source files
https://bugs.webkit.org/show_bug.cgi?id=128417

Reviewed by Carlos Garcia Campos.

.:

* Source/cmake/OptionsGTK.cmake: Define the paths to the pkgconfig files here, so that they
may one day be used in the webkitdom config file generation.

Source/WebCore:

* bindings/gobject/GNUmakefile.am: Generate a config file for webkitdom documentation generation.

Source/WebKit:

* PlatformGTK.cmake: Correct the definition of WebKitGTK_ENUM_GENERATION_HEADERS and generate
a gtkdoc-webkitgtk.cfg file to be used by generate-gtkdoc.

Source/WebKit/gtk:

* GNUmakefile.am: Generate a config file for generate-gtkdoc.

Source/WebKit2:

* GNUmakefile.am: Generate a config file for generate-gtkdoc.
* PlatformGTK.cmake: Ditto.

Tools:

* gtk/GNUmakefile.am: Make the documentation process depend on the configuration files.
* gtk/generate-gtkdoc: Switch from using hard-coded configurations to reading them from
a makefile. This allows accepting a header list from the build system, which can be used
to dynamically build a list of ignored files. We can ignore any source file that doesn't
have a corresponding header file on the header list.
* gtk/gtkdoc.py: Now accept a headers parameter, which can be used instead of passing just
source directories to gtkdoc-scan.


Conflicts:
	ChangeLog
	Source/WebCore/ChangeLog
	Source/WebKit/ChangeLog
	Source/WebKit/gtk/ChangeLog
	Source/WebKit2/ChangeLog
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/GNUmakefile.am
releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/gobject/GNUmakefile.am
releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/GNUmakefile.am
releases/WebKitGTK/webkit-2.4/Source/WebKit2/GNUmakefile.am
releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake
releases/WebKitGTK/webkit-2.4/Tools/gtk/GNUmakefile.am
releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc
releases/WebKitGTK/webkit-2.4/Tools/gtk/gtkdoc.py




Diff

Modified: releases/WebKitGTK/webkit-2.4/GNUmakefile.am (168708 => 168709)

--- releases/WebKitGTK/webkit-2.4/GNUmakefile.am	2014-05-13 19:28:38 UTC (rev 168708)
+++ releases/WebKitGTK/webkit-2.4/GNUmakefile.am	2014-05-13 19:29:03 UTC (rev 168709)
@@ -132,6 +132,15 @@
 typelibsdir := $(libdir)/girepository-1.0
 endif
 
+webkit1_pkg_config_file = Source/WebKit/gtk/webkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.pc
+webkit2_pkg_config_file = Source/WebKit2/webkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.pc
+
+if ENABLE_WEBKIT2
+webkitdom_pkgconfig_file = $(webkit2_pkg_config_file)
+else
+webkitdom_pkgconfig_file = $(webkit1_pkg_config_file)
+endif
+
 # We do not care at all about this implicit built-in make rules,
 # disable them to save some build time
 %: %.c
@@ -290,4 +299,4 @@
 	@mkdir -p $(distdir)/Documentation/webkitdomgtk/html
 	@mkdir -p $(distdir)/Documentation/webkitdomgtk/tmpl
 	@-cp ./Documentation/webkitdomgtk/tmpl/*.sgml $(distdir)/Documentation/webkitdomgtk/tmpl
-	@cp ./Documentation/webkitdomgtk/html/* $(distdir)/Documentation/webkitdomgtk/html
\ No newline at end of file
+	@cp ./Documentation/webkitdomgtk/html/* $(distdir)/Documentation/webkitdomgtk/html


Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/gobject/GNUmakefile.am (168708 => 168709)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/gobject/GNUmakefile.am	2014-05-13 19:28:38 UTC (rev 168708)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/gobject/GNUmakefile.am	2014-05-13 19:29:03 UTC (rev 168709)
@@ -578,12 +578,15 @@
 	-fvisibility=hidden \
 	$(global_cflags)
 
+webkitgtk_gdom_include_dirs = \
+	-I$(WebCore)/bindings \
+	-I$(WebCore)/bindings/gobject \
+	-I$(GENSOURCES_WEBKITDOM)
+
 libGObjectDOMBindings_la_CPPFLAGS = \
 	-DBUILDING_WebCore \
 	-DBUILDING_WEBKIT \
-	-I$(WebCore)/bindings \
-	-I$(WebCore)/bindings/gobject \
-	-I$(GENSOURCES_WEBKITDOM) \
+	$(webkitgtk_gdom_include_dirs) \
 	$(global_cppflags) \
 	$(platform_cppflags) \
 	$(platformgtk_cppflags) \
@@ -594,3 +597,13 @@
 	$(FREETYPE_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBSOUP_CFLAGS)
+
+gtkdoc-webkitdom.cfg: $(WebCore)/bindings/gobject/GNUmakefile.am $(srcdir)/Tools/gtk/GNUmakefile.am
+	$(AM_V_GEN)echo [webkitdomgtk]  $@  \
+	echo pkgconfig_file=$(webkitdom_pkgconfig_file)  $@  \
+	echo namespace=webkit_dom  $@  \
+	echo doc_dir=DerivedSources/webkitdom/docs  $@  \
+	echo -e cflags=-I$(srcdir)/Source $(webkitgtk_gdom_include_dirs)  $@  \
+	echo source_dirs=$(top_builddir)/DerivedSources/webkitdom $(srcdir)/Source/WebCore/bindings/gobject  $@  \
+	echo headers=$(webkitgtk_gdom_built_h_api) DerivedSources/webkitdom/WebKitDOMDeprecated.h  $@

[webkit-changes] [168711] releases/WebKitGTK/webkit-2.4/Tools

[gns]

Title: [168711] releases/WebKitGTK/webkit-2.4/Tools








Revision 168711
Author g...@gnome.org
Date 2014-05-13 12:29:34 -0700 (Tue, 13 May 2014)


Log Message
Merge 164739 - [GTK] Reduplicate common.top_level_path in scripts
https://bugs.webkit.org/show_bug.cgi?id=129291

Reviewed by Philippe Normand.

Duplicate common.top_level_path and avoid polluting many scripts with awkward system
path manipulation and weird dependencies on the jhbuild infrastructure.

* Scripts/run-gtk-tests: Use common again.
(TestRunner._setup_testing_environment): Ditto.
* gtk/check-gdom-symbols: Ditto.
* gtk/common.py:
(top_level_path): Re-add top_level_path..
(get_build_path): Use the builtin top_level_path again.
* gtk/find-make-dist-errors: Use common again.
(get_missing_headers): Ditto.
* gtk/generate-inspector-gresource-manifest.py: Ditto.


Conflicts:
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests
releases/WebKitGTK/webkit-2.4/Tools/gtk/check-gdom-symbols
releases/WebKitGTK/webkit-2.4/Tools/gtk/common.py
releases/WebKitGTK/webkit-2.4/Tools/gtk/find-make-dist-errors
releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-inspector-gresource-manifest.py




Diff

Modified: releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests (168710 => 168711)

--- releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests	2014-05-13 19:29:19 UTC (rev 168710)
+++ releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests	2014-05-13 19:29:34 UTC (rev 168711)
@@ -31,9 +31,6 @@
 import common
 import jhbuildutils
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), ../jhbuild))
-import jhbuildrc_common 
-
 class SkippedTest:
 ENTIRE_SUITE = None
 
@@ -198,7 +195,7 @@
 def _setup_testing_environment(self):
 self._test_env = os.environ
 self._test_env['GSETTINGS_BACKEND'] = 'memory'
-self._test_env[TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH] = jhbuildrc_common.top_level_path(Tools, TestWebKitAPI, Tests, WebKit2)
+self._test_env[TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH] = common.top_level_path(Tools, TestWebKitAPI, Tests, WebKit2)
 self._test_env[TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH] = common.tests_library_build_path()
 self._test_env[WEBKIT_EXEC_PATH] = self._programs_path
 


Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/check-gdom-symbols (168710 => 168711)

--- releases/WebKitGTK/webkit-2.4/Tools/gtk/check-gdom-symbols	2014-05-13 19:29:19 UTC (rev 168710)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/check-gdom-symbols	2014-05-13 19:29:34 UTC (rev 168711)
@@ -22,9 +22,6 @@
 import sys
 import tempfile
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), ../jhbuild))
-import jhbuildrc_common 
-
 def should_update_symbols_file(new, old):
 if not os.path.exists(old):
 return False
@@ -52,7 +49,7 @@
 tmp.write(file_handle.read())
 tmp.flush()
 
-gdom_source_path = jhbuildrc_common.top_level_path('Source', 'WebCore', 'bindings')
+gdom_source_path = common.top_level_path('Source', 'WebCore', 'bindings')
 api_break_test_path = os.path.join(gdom_source_path, 'scripts', 'gobject-run-api-break-test')
 subprocess.call([sys.executable, api_break_test_path, os.path.join(gdom_source_path, 'gobject',  'webkitdom.symbols'), tmp.name])
 


Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/common.py (168710 => 168711)

--- releases/WebKitGTK/webkit-2.4/Tools/gtk/common.py	2014-05-13 19:29:19 UTC (rev 168710)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/common.py	2014-05-13 19:29:34 UTC (rev 168711)
@@ -21,9 +21,7 @@
 import subprocess
 import sys
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), ../jhbuild))
-import jhbuildrc_common
-
+top_level_dir = None
 build_dir = None
 library_build_dir = None
 tests_library_build_dir = None
@@ -31,6 +29,13 @@
 build_types = ('Release', 'Debug')
 
 
+def top_level_path(*args):
+global top_level_dir
+if not top_level_dir:
+top_level_dir = os.path.join(os.path.dirname(__file__), '..', '..')
+return os.path.join(*(top_level_dir,) + args)
+
+
 def set_build_types(new_build_types):
 global build_types
 build_types = new_build_types
@@ -100,20 +105,20 @@
 
 global build_types
 for build_type in build_types:
-build_dir = jhbuildrc_common.top_level_path('WebKitBuild', build_type)
+build_dir = top_level_path('WebKitBuild', build_type)
 if is_valid_build_directory(build_dir):
 return build_dir
 
 # distcheck builds in a directory named _build in the top-level path.
-build_dir = jhbuildrc_common.top_level_path(_build)
+build_dir = top_level_path(_build)
 if is_valid_build_directory(build_dir):
 return build_dir
 
-build_dir = jhbuildrc_common.top_level_path()
+build_dir = top_level_path()
 if is_valid_build_directory(build_dir):
 return build_dir
 
-build_dir = jhbuildrc_common.top_level_path(WebKitBuild)
+

[webkit-changes] [168710] releases/WebKitGTK/webkit-2.4

[gns]

Title: [168710] releases/WebKitGTK/webkit-2.4








Revision 168710
Author g...@gnome.org
Date 2014-05-13 12:29:19 -0700 (Tue, 13 May 2014)


Log Message
Merge 164704 - [GTK] generate-gtkdoc can fail with WebKit1 or WebKit2 only builds
https://bugs.webkit.org/show_bug.cgi?id=129319

Patch by Martin Robinson mrobin...@igalia.com on 2014-02-26
Reviewed by Carlos Garcia Campos.

Source/WebKit/gtk:

* GNUmakefile.am: Do not generate the documentation configuration file if the port
is disabled.

Source/WebKit2:

* GNUmakefile.am: Do not generate the documentation configuration file if the port
is disabled.

Tools:

* gtk/generate-gtkdoc:
(get_generator_for_config): Properly handle the situation where the pkgconfig file is missing.


Conflicts:
	Source/WebKit/gtk/ChangeLog
	Source/WebKit2/ChangeLog
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/GNUmakefile.am
releases/WebKitGTK/webkit-2.4/Source/WebKit2/GNUmakefile.am
releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/GNUmakefile.am (168709 => 168710)

--- releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/GNUmakefile.am	2014-05-13 19:29:03 UTC (rev 168709)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/GNUmakefile.am	2014-05-13 19:29:19 UTC (rev 168710)
@@ -379,6 +379,7 @@
 	 cp xgen-gtc $@ \
 	 rm -f xgen-gtc
 
+if ENABLE_WEBKIT1
 gtkdoc-webkitgtk.cfg: $(WebKit)/GNUmakefile.am $(srcdir)/Tools/gtk/GNUmakefile.am
 	$(AM_V_GEN)echo [webkitgtk]  $@  \
 	echo pkgconfig_file=$(webkit1_pkg_config_file)  $@  \
@@ -389,6 +390,7 @@
Source/WebKit/gtk/webkit  $@  \
 	echo -e headers=$(webkitgtk_static_h_api) Source/WebKit/gtk/webkit/webkitversion.h  $@
 BUILT_SOURCES += gtkdoc-webkitgtk.cfg
+endif
 
 EXTRA_DIST += \
 	$(WebKit)/ChangeLog \


Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/GNUmakefile.am (168709 => 168710)

--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/GNUmakefile.am	2014-05-13 19:29:03 UTC (rev 168709)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/GNUmakefile.am	2014-05-13 19:29:19 UTC (rev 168710)
@@ -809,6 +809,7 @@
 	-fvisibility-inlines-hidden \
 	$(global_cxxflags)
 
+if ENABLE_WEBKIT2
 # It would be nice to use the CPPFLAGS from the WebKit2 library here, but the prefix
 # header doesn't seem to play nicely with the gtkdoc tools.
 gtkdoc-webkit2gtk.cfg: $(WebKit2)/GNUmakefile.am $(WebKit2)/GNUmakefile.list.am
@@ -827,6 +828,7 @@
  $(webkit2gtk_web_extension_h_api)\n \
  DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h  $@
 BUILT_SOURCES += gtkdoc-webkit2gtk.cfg
+endif
 
 EXTRA_DIST += \
 	$(WebKit2)/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml \


Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc (168709 => 168710)

--- releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc	2014-05-13 19:29:03 UTC (rev 168709)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc	2014-05-13 19:29:19 UTC (rev 168710)
@@ -106,6 +106,9 @@
 pkgconfig_file = config.get(module_name, 'pkgconfig_file')
 gtk_version = common.gtk_version_of_pkg_config_file(pkgconfig_file)
 
+if not os.path.isfile(pkgconfig_file):
+return None
+
 source_dirs = config.get(module_name, 'source_dirs').replace(';', ' ').split()
 headers = [os.path.abspath(f) for f in config.get(module_name, 'headers').replace(';', ' ').split()]
 return gtkdoc.PkgConfigGTKDoc(pkgconfig_file, {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168712] releases/WebKitGTK/webkit-2.4

[gns]

Title: [168712] releases/WebKitGTK/webkit-2.4








Revision 168712
Author g...@gnome.org
Date 2014-05-13 12:29:57 -0700 (Tue, 13 May 2014)


Log Message
Merge 165060 - [GTK] Simplify the GObject DOM bindings API break check into one step
https://bugs.webkit.org/show_bug.cgi?id=129571

Reviewed by Carlos Garcia Campos.

.:

* Source/PlatformGTK.cmake: We don't need to run the API break check before gtkdoc generation.
Add the check to 'make check.'

Source/WebCore:

* bindings/gobject/GNUmakefile.am: We no longer generate the webkitdom.symbols file in the
DerivedSources directory. All the logic is handled internally in the script now.
* bindings/scripts/gobject-run-api-break-test: Removed.

Tools:

* GNUmakefile.am: Add the API break check to 'make check.'
* gtk/check-for-webkitdom-api-breaks: Added. A combination of the two removed scripts.
* gtk/check-gdom-symbols: Removed.
* gtk/webkitdom.py: Added.
(header_name_list_from_gtkdoc_config_file): Gets the names of all headers from the gtkdoc config file.
(get_all_webkitdom_symbol_files): Find the symbol files from the names.


Conflicts:
	ChangeLog
	Source/WebCore/ChangeLog
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.am
releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/gobject/GNUmakefile.am
releases/WebKitGTK/webkit-2.4/Tools/GNUmakefile.am
releases/WebKitGTK/webkit-2.4/Tools/gtk/GNUmakefile.am


Added Paths

releases/WebKitGTK/webkit-2.4/Tools/gtk/check-for-webkitdom-api-breaks
releases/WebKitGTK/webkit-2.4/Tools/gtk/webkitdom.py


Removed Paths

releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/scripts/gobject-run-api-break-test
releases/WebKitGTK/webkit-2.4/Tools/gtk/check-gdom-symbols




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake (168711 => 168712)

--- releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake	2014-05-13 19:29:34 UTC (rev 168711)
+++ releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake	2014-05-13 19:29:57 UTC (rev 168712)
@@ -4,7 +4,6 @@
 add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
 
 set(DocumentationDependencies
-generate-gdom-symbols-file
 ${CMAKE_SOURCE_DIR}/Source/WebKit/gtk/docs/webkitenvironment.xml
 )
 
@@ -51,7 +50,8 @@
 endif ()
 
 add_custom_target(check
-COMMAND ${TOOLS_DIR}/Scripts/run-gtk-tests
+COMMAND ${TOOLS_DIR}/Scripts/run-gtk-tests
+COMMAND ${TOOLS_DIR}/gtk/check-for-webkitdom-api-breaks
 )
 
 if (ENABLE_WEBKIT AND ENABLE_WEBKIT2)


Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.am (168711 => 168712)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.am	2014-05-13 19:29:34 UTC (rev 168711)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.am	2014-05-13 19:29:57 UTC (rev 168712)
@@ -682,7 +682,6 @@
 	Source/WebCore/bindings/scripts/StaticString.pm \
 	Source/WebCore/bindings/scripts/generate-bindings.pl \
 	Source/WebCore/bindings/scripts/gobject-generate-headers.pl \
-	Source/WebCore/bindings/scripts/gobject-run-api-break-test \
 	Source/WebCore/bindings/scripts/preprocessor.pm \
 	Source/WebCore/bindings/scripts/preprocess-idls.pl \
 	Source/WebCore/ChangeLog \


Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake (168711 => 168712)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake	2014-05-13 19:29:34 UTC (rev 168711)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake	2014-05-13 19:29:57 UTC (rev 168712)
@@ -734,16 +734,5 @@
   bindings/gobject/WebKitDOMObject.h
 DESTINATION ${WEBKITGTK_HEADER_INSTALL_DIR}/webkitdom
 )
-
-add_custom_command(
-OUTPUT ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.symbols
-DEPENDS ${GObjectDOMBindingsSymbolsFiles} ${CMAKE_SOURCE_DIR}/Tools/gtk/check-gdom-symbols
-COMMAND ln -n -s -f ${WEBCORE_DIR}/bindings/gobject/WebKitDOM*.symbols ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
-COMMAND ${CMAKE_SOURCE_DIR}/Tools/gtk/check-gdom-symbols
-)
-
-add_custom_target(generate-gdom-symbols-file
-DEPENDS GObjectDOMBindings ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.symbols
-)
 endif ()
 


Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/gobject/GNUmakefile.am (168711 => 168712)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/gobject/GNUmakefile.am	2014-05-13 19:29:34 UTC (rev 168711)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/gobject/GNUmakefile.am	2014-05-13 19:29:57 UTC (rev 168712)
@@ -483,7 +483,6 @@
 DerivedSources/webkitdom/webkitdomdefines.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/bindings/gobject/GNUmakefile.am
 	$(AM_V_GEN)echo $(gdom_class_list) | $(PERL) $ defines  $@
 
-noinst_DATA += DerivedSources/webkitdom/webkitdom.symbols
 gdom_symbol_files += $(patsubst %.h,%.symbols, 

[webkit-changes] [168715] releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake

[gns]

Title: [168715] releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake








Revision 168715
Author g...@gnome.org
Date 2014-05-13 12:30:41 -0700 (Tue, 13 May 2014)


Log Message
Merge 165166 - [GTK][CMake] The GObject DOM bindings should always be built
https://bugs.webkit.org/show_bug.cgi?id=127963

Reviewed by Ryosuke Niwa.

* PlatformGTK.cmake: Make compilation of the WebKitGTK+ GObject DOM bindings
unconditional, instead of conditional on the WebKit2 build.


Conflicts:
	Source/WebCore/ChangeLog
	Source/WebCore/PlatformGTK.cmake

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake (168714 => 168715)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake	2014-05-13 19:30:31 UTC (rev 168714)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake	2014-05-13 19:30:41 UTC (rev 168715)
@@ -470,292 +470,289 @@
 ${GDK_LIBRARIES}
 )
 
-if (ENABLE_WEBKIT2)
-include_directories(
-${WebCore_INCLUDE_DIRECTORIES}
-${DERIVED_SOURCES_DIR}
-${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
-)
+include_directories(
+${WebCore_INCLUDE_DIRECTORIES}
+${DERIVED_SOURCES_DIR}
+${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
+)
 
-list(APPEND GObjectDOMBindings_SOURCES
-bindings/gobject/ConvertToUTF8String.cpp
-bindings/gobject/DOMObjectCache.cpp
-bindings/gobject/GObjectEventListener.cpp
-bindings/gobject/WebKitDOMCustom.cpp
-bindings/gobject/WebKitDOMDeprecated.cpp
-bindings/gobject/WebKitDOMEventTarget.cpp
-bindings/gobject/WebKitDOMHTMLPrivate.cpp
-bindings/gobject/WebKitDOMObject.cpp
-bindings/gobject/WebKitDOMPrivate.cpp
-${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
-${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
-)
+list(APPEND GObjectDOMBindings_SOURCES
+bindings/gobject/ConvertToUTF8String.cpp
+bindings/gobject/DOMObjectCache.cpp
+bindings/gobject/GObjectEventListener.cpp
+bindings/gobject/WebKitDOMCustom.cpp
+bindings/gobject/WebKitDOMDeprecated.cpp
+bindings/gobject/WebKitDOMEventTarget.cpp
+bindings/gobject/WebKitDOMHTMLPrivate.cpp
+bindings/gobject/WebKitDOMObject.cpp
+bindings/gobject/WebKitDOMPrivate.cpp
+${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
+${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
+)
 
-list(APPEND GObjectDOMBindings_IDL_FILES
-Modules/battery/BatteryManager.idl
-Modules/gamepad/Gamepad.idl
-Modules/gamepad/GamepadList.idl
-Modules/geolocation/Geolocation.idl
-Modules/mediasource/VideoPlaybackQuality.idl
-Modules/quota/StorageInfo.idl
-Modules/quota/StorageQuota.idl
-Modules/webdatabase/Database.idl
+list(APPEND GObjectDOMBindings_IDL_FILES
+Modules/battery/BatteryManager.idl
+Modules/gamepad/Gamepad.idl
+Modules/gamepad/GamepadList.idl
+Modules/geolocation/Geolocation.idl
+Modules/mediasource/VideoPlaybackQuality.idl
+Modules/quota/StorageInfo.idl
+Modules/quota/StorageQuota.idl
+Modules/webdatabase/Database.idl
 
-css/CSSRule.idl
-css/CSSRuleList.idl
-css/CSSStyleDeclaration.idl
-css/CSSStyleSheet.idl
-css/CSSValue.idl
-css/DOMWindowCSS.idl
-css/MediaList.idl
-css/MediaQueryList.idl
-css/StyleMedia.idl
-css/StyleSheet.idl
-css/StyleSheetList.idl
+css/CSSRule.idl
+css/CSSRuleList.idl
+css/CSSStyleDeclaration.idl
+css/CSSStyleSheet.idl
+css/CSSValue.idl
+css/DOMWindowCSS.idl
+css/MediaList.idl
+css/MediaQueryList.idl
+css/StyleMedia.idl
+css/StyleSheet.idl
+css/StyleSheetList.idl
 
-dom/Attr.idl
-dom/CDATASection.idl
-dom/CharacterData.idl
-dom/Comment.idl
-dom/DOMImplementation.idl
-dom/DOMNamedFlowCollection.idl
-dom/DOMStringList.idl
-dom/DOMStringMap.idl
-dom/Document.idl
-dom/DocumentFragment.idl
-dom/DocumentType.idl
-dom/Element.idl
-dom/EntityReference.idl
-dom/Event.idl
-dom/KeyboardEvent.idl
-dom/MessagePort.idl
-dom/MouseEvent.idl
-dom/NamedNodeMap.idl
-dom/Node.idl
-dom/NodeFilter.idl
-dom/NodeIterator.idl
-dom/NodeList.idl
-dom/ProcessingInstruction.idl
-dom/Range.idl
-dom/ShadowRoot.idl
-dom/Text.idl
-dom/Touch.idl
-dom/TreeWalker.idl
-dom/UIEvent.idl
-dom/WebKitNamedFlow.idl
-dom/WheelEvent.idl
+dom/Attr.idl
+dom/CDATASection.idl
+dom/CharacterData.idl
+dom/Comment.idl
+dom/DOMImplementation.idl
+dom/DOMNamedFlowCollection.idl
+dom/DOMStringList.idl
+dom/DOMStringMap.idl
+dom/Document.idl
+

[webkit-changes] [168716] releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake

[gns]

Title: [168716] releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake








Revision 168716
Author g...@gnome.org
Date 2014-05-13 12:30:52 -0700 (Tue, 13 May 2014)


Log Message
Merge 165173 - [CMake] Ninja generator builds fail with Argument list too long
https://bugs.webkit.org/show_bug.cgi?id=129771

Reviewed by Daniel Bates.

* Source/cmake/OptionsCommon.cmake: Work around a bug in the Ninja CMake generator,
by forcing the use of response files.


Conflicts:
	ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake (168715 => 168716)

--- releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake	2014-05-13 19:30:41 UTC (rev 168715)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake	2014-05-13 19:30:52 UTC (rev 168716)
@@ -50,3 +50,8 @@
 set(EXEC_INSTALL_DIR bin CACHE PATH Where to install executables)
 set(LIBEXEC_INSTALL_DIR bin CACHE PATH Where to install executables executed by the library)
 endif ()
+
+# The Ninja generator does not yet know how to build archives in pieces, and so response
+# files must be used to deal with very long linker command lines.
+# See https://bugs.webkit.org/show_bug.cgi?id=129771
+set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168714] releases/WebKitGTK/webkit-2.4/Source/cmake

[gns]

Title: [168714] releases/WebKitGTK/webkit-2.4/Source/cmake








Revision 168714
Author g...@gnome.org
Date 2014-05-13 12:30:31 -0700 (Tue, 13 May 2014)


Log Message
Merge 165149 - [CMake] Use thin archives if building on Linux for non-shared-core debug builds
https://bugs.webkit.org/show_bug.cgi?id=108330

Reviewed by Martin Robinson.

In order to get non-shared debug builds, this patch applied T option for
thin archives to the flags passed to ar when cmake based ports build on linux.
In addition, applied u option which avoids adding a file twice.

* Source/cmake/OptionsCommon.cmake: Moved archive options from OptionsGTK.cmake.
* Source/cmake/OptionsEfl.cmake:
Removed error messages for non-shared-core debug builds.
* Source/cmake/OptionsGTK.cmake: Moved archive options to OptionsCommon.cmake.


Conflicts:
	ChangeLog
	Source/cmake/OptionsCommon.cmake

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake
releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsEfl.cmake
releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake (168713 => 168714)

--- releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake	2014-05-13 19:30:17 UTC (rev 168713)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake	2014-05-13 19:30:31 UTC (rev 168714)
@@ -19,10 +19,11 @@
 set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS ${CMAKE_CXX_COMPILER} -E -x c++)
 endif ()
 
-# Push of rbp is needed after JSC JIT uses CStack. See http://wkbug.com/12.
-if (CMAKE_COMPILER_IS_GNUCC AND UNIX AND NOT APPLE)
-set(CMAKE_C_FLAGS_RELEASE -fno-omit-frame-pointer -fno-tree-dce ${CMAKE_C_FLAGS_RELEASE})
-set(CMAKE_CXX_FLAGS_RELEASE -fno-omit-frame-pointer -fno-tree-dce ${CMAKE_CXX_FLAGS_RELEASE})
+if (${CMAKE_SYSTEM_NAME} STREQUAL Linux)
+set(CMAKE_CXX_ARCHIVE_CREATE CMAKE_AR cruT TARGET LINK_FLAGS OBJECTS)
+set(CMAKE_C_ARCHIVE_CREATE CMAKE_AR cruT TARGET LINK_FLAGS OBJECTS)
+set(CMAKE_CXX_ARCHIVE_APPEND CMAKE_AR ruT TARGET LINK_FLAGS OBJECTS)
+set(CMAKE_C_ARCHIVE_APPEND CMAKE_AR ruT TARGET LINK_FLAGS OBJECTS)
 endif ()
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)


Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsEfl.cmake (168713 => 168714)

--- releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsEfl.cmake	2014-05-13 19:30:17 UTC (rev 168713)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsEfl.cmake	2014-05-13 19:30:31 UTC (rev 168714)
@@ -9,11 +9,6 @@
 set(ENABLE_WEBKIT2 ON)
 endif ()
 
-string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_CMAKE_BUILD_TYPE)
-if (LOWERCASE_CMAKE_BUILD_TYPE STREQUAL debug AND NOT SHARED_CORE)
-message(FATAL_ERROR Turn on the SHARED_CORE flag to make a debug build - e.g.\n build-webkit --efl --debug --cmakeargs=\-DSHARED_CORE=ON\.\n)
-endif ()
-
 find_package(Cairo 1.10.2 REQUIRED)
 find_package(Fontconfig 2.8.0 REQUIRED)
 find_package(Sqlite REQUIRED)


Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake (168713 => 168714)

--- releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake	2014-05-13 19:30:17 UTC (rev 168713)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake	2014-05-13 19:30:31 UTC (rev 168714)
@@ -155,13 +155,6 @@
 add_definitions(-DWTF_PLATFORM_X11=1)
 add_definitions(-DMOZ_X11)
 
-if (${CMAKE_SYSTEM_NAME} STREQUAL Linux)
-set(CMAKE_CXX_ARCHIVE_CREATE CMAKE_AR cruT TARGET LINK_FLAGS OBJECTS)
-set(CMAKE_C_ARCHIVE_CREATE CMAKE_AR cruT TARGET LINK_FLAGS OBJECTS)
-set(CMAKE_CXX_ARCHIVE_APPEND CMAKE_AR ruT TARGET LINK_FLAGS OBJECTS)
-set(CMAKE_C_ARCHIVE_APPEND CMAKE_AR ruT TARGET LINK_FLAGS OBJECTS)
-endif ()
-
 find_package(Cairo 1.10.2 REQUIRED)
 find_package(Fontconfig 2.8.0 REQUIRED)
 find_package(Freetype 2.4.2 REQUIRED)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168713] releases/WebKitGTK/webkit-2.4

[gns]

Title: [168713] releases/WebKitGTK/webkit-2.4








Revision 168713
Author g...@gnome.org
Date 2014-05-13 12:30:17 -0700 (Tue, 13 May 2014)


Log Message
Merge 165114 - [GTK][CMake] Generate documentation for the DOM bindings
https://bugs.webkit.org/show_bug.cgi?id=126211

Reviewed by Carlos Garcia Campos.

Source/WebCore:

* PlatformGTK.cmake: Add some files to the GObjectDOMBindings build, so that the
doc generation succeeds. Have the GObjectDOMBindings_INSTALLED_HEADERS variable contain
all installed headers and use another variable for GIR generation. Create the configuration
file for the gtkdoc generation.

Source/WebKit:

* PlatformGTK.cmake: The list of headers for GIR generation has a better name
now.

Source/WebKit2:

* PlatformGTK.cmake: The list of headers for GIR generation has a better name now.

Tools:

* gtk/GNUmakefile.am: No longer generation sections and SGML files in the makefile.
* gtk/generate-gtkdoc: Call the code from webkitdom.py to generate sections and SGML files.
* gtk/generate-webkitdom-doc-files: Removed.
* gtk/webkitdom.py: Moved WebKit GObject DOM bindings doc generation code here, so
that it can be called by generate-gtkdoc.


Conflicts:
	Source/WebCore/ChangeLog
	Source/WebKit/ChangeLog
	Source/WebKit2/ChangeLog
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Tools/gtk/GNUmakefile.am
releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc
releases/WebKitGTK/webkit-2.4/Tools/gtk/webkitdom.py


Removed Paths

releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-webkitdom-doc-files




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake (168712 => 168713)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake	2014-05-13 19:29:57 UTC (rev 168712)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake	2014-05-13 19:30:17 UTC (rev 168713)
@@ -482,6 +482,7 @@
 bindings/gobject/DOMObjectCache.cpp
 bindings/gobject/GObjectEventListener.cpp
 bindings/gobject/WebKitDOMCustom.cpp
+bindings/gobject/WebKitDOMDeprecated.cpp
 bindings/gobject/WebKitDOMEventTarget.cpp
 bindings/gobject/WebKitDOMHTMLPrivate.cpp
 bindings/gobject/WebKitDOMObject.cpp
@@ -668,6 +669,9 @@
  ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
  ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
  ${WEBCORE_DIR}/bindings/gobject/WebKitDOMCustom.h
+ ${WEBCORE_DIR}/bindings/gobject/WebKitDOMDeprecated.h
+ ${WEBCORE_DIR}/bindings/gobject/WebKitDOMEventTarget.h
+ ${WEBCORE_DIR}/bindings/gobject/WebKitDOMObject.h
 )
 file(GLOB GObjectDOMBindingsSymbolsFiles
 ${WEBCORE_DIR}/bindings/gobject/WebKitDOM*.symbols
@@ -680,9 +684,6 @@
 list(APPEND GObjectDOMBindingsSymbolsFiles ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}.symbols)
 endforeach ()
 
-# Propagate this variable to the parent scope, so that it can be used in other parts of the build.
-set(GObjectDOMBindings_INSTALLED_HEADERS ${GObjectDOMBindings_INSTALLED_HEADERS} PARENT_SCOPE)
-
 set(GOBJECT_DOM_BINDINGS_FEATURES_DEFINES LANGUAGE_GOBJECT=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR})
 string(REPLACE ENABLE_INDEXED_DATABASE=1  GOBJECT_DOM_BINDINGS_FEATURES_DEFINES ${GOBJECT_DOM_BINDINGS_FEATURES_DEFINES})
 string(REPLACE REGEX ENABLE_SVG[A-Z_]+=1  GOBJECT_DOM_BINDINGS_FEATURES_DEFINES ${GOBJECT_DOM_BINDINGS_FEATURES_DEFINES})
@@ -728,11 +729,33 @@
 fake-installed-webkitdom-headers
 )
 
+file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-webkitdom.cfg
+[webkitdomgtk]\n
+pkgconfig_file=${WebKit2_PKGCONFIG_FILE}\n
+namespace=webkit_dom\n
+cflags=-I${CMAKE_SOURCE_DIR}/Source\n
+   -I${WEBCORE_DIR}/bindings\n
+   -I${WEBCORE_DIR}/bindings/gobject\n
+   -I${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}\n
+doc_dir=${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/docs\n
+source_dirs=${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}\n
+${WEBCORE_DIR}/bindings/gobject\n
+headers=${GObjectDOMBindings_INSTALLED_HEADERS}\n
+)
+
 install(FILES ${GObjectDOMBindings_INSTALLED_HEADERS}
-  bindings/gobject/WebKitDOMEventTarget.h
-  bindings/gobject/WebKitDOMDeprecated.h
-  bindings/gobject/WebKitDOMObject.h
 DESTINATION ${WEBKITGTK_HEADER_INSTALL_DIR}/webkitdom
 )
+
+# Some installed headers are not on the list of headers used for gir generation.
+set(GObjectDOMBindings_GIR_HEADERS ${GObjectDOMBindings_INSTALLED_HEADERS})
+list(REMOVE_ITEM GObjectDOMBindings_GIR_HEADERS
+ bindings/gobject/WebKitDOMEventTarget.h
+ bindings/gobject/WebKitDOMDeprecated.h
+  

[webkit-changes] [168717] releases/WebKitGTK/webkit-2.4/Tools/gtk/make-dist.py

[gns]

Title: [168717] releases/WebKitGTK/webkit-2.4/Tools/gtk/make-dist.py








Revision 168717
Author g...@gnome.org
Date 2014-05-13 12:31:02 -0700 (Tue, 13 May 2014)


Log Message
Merge 165174 - [GTK][CMake] Tarball is created with wrong tarball paths
https://bugs.webkit.org/show_bug.cgi?id=129496

Reviewed by Daniel Bates.

* gtk/make-dist.py:
(Manifest.__init__): I inadvertently inverted the logic of these checks when
landing the original patch with some suggestions from the reviewer. With the
checks corrected, the tarball path is constructed properly.


Conflicts:
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Tools/gtk/make-dist.py




Diff

Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/make-dist.py (168716 => 168717)

--- releases/WebKitGTK/webkit-2.4/Tools/gtk/make-dist.py	2014-05-13 19:30:52 UTC (rev 168716)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/make-dist.py	2014-05-13 19:31:02 UTC (rev 168717)
@@ -120,9 +120,9 @@
 self.build_root = os.path.abspath(build_root)
 
 # Normalize the tarball root so that it starts and ends with a slash.
-if self.tarball_root.endswith('/'):
+if not self.tarball_root.endswith('/'):
 self.tarball_root = self.tarball_root + '/'
-if self.tarball_root.startswith('/'):
+if not self.tarball_root.startswith('/'):
 self.tarball_root = '/' + self.tarball_root
 
 with open(manifest_filename, 'r') as file:






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168718] releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt

[gns]

Title: [168718] releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt








Revision 168718
Author g...@gnome.org
Date 2014-05-13 12:31:12 -0700 (Tue, 13 May 2014)


Log Message
Merge 165192 - [GTK][CMake] Fix the GTK+ CMake build
https://bugs.webkit.org/show_bug.cgi?id=129801

Patch by Lorenzo Tilve lti...@igalia.com on 2014-03-06
Reviewed by Martin Robinson.

Include missing files for CMake build

* CMakeLists.txt: Add a missing references to DOMURLMediaStream


Conflicts:
	Source/WebCore/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt (168717 => 168718)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt	2014-05-13 19:31:02 UTC (rev 168717)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt	2014-05-13 19:31:12 UTC (rev 168718)
@@ -195,6 +195,7 @@
 Modules/mediastream/AllVideoCapabilities.idl
 Modules/mediastream/AudioStreamTrack.idl
 Modules/mediastream/CapabilityRange.idl
+Modules/mediastream/DOMURLMediaStream.idl
 Modules/mediastream/HTMLMediaElementMediaStream.idl
 Modules/mediastream/MediaSourceStates.idl
 Modules/mediastream/MediaStream.idl
@@ -833,6 +834,7 @@
 
 Modules/mediastream/AudioStreamTrack.cpp
 Modules/mediastream/CapabilityRange.cpp
+Modules/mediastream/DOMURLMediaStream.cpp
 Modules/mediastream/HTMLMediaElementMediaStream.cpp
 Modules/mediastream/MediaConstraintsImpl.cpp
 Modules/mediastream/MediaSourceStates.cpp






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168720] releases/WebKitGTK/webkit-2.4/Source

[gns]

Title: [168720] releases/WebKitGTK/webkit-2.4/Source








Revision 168720
Author g...@gnome.org
Date 2014-05-13 12:31:42 -0700 (Tue, 13 May 2014)


Log Message
Merge 165378 - [GTK] [CMake] Clean up library linking
https://bugs.webkit.org/show_bug.cgi?id=129782

Reviewed by Philippe Normand.

.:

* Source/cmake/OptionsGTK.cmake: Add a macro to wrap all libraries in a list with --whole-archive
so that unused symbols are not dropped. This is useful when building up shared libraries
from convenience libraries.

Source/WebCore:

* PlatformGTK.cmake: Some files are duplicated on the source list of two convenience
libraries. Ensure that they are all compiled into WebCore instead of WebCorePlatformGTK.
Some simply need to be moved to WebCore from WebCorePlatformGTK. Don't try to link
WebCorePlatformGTK against WebCore -- convenience libraries should be able to save
their symbol resolution for the final linking step.

Source/WebKit:

* PlatformGTK.cmake: Use the new macro.

Source/WebKit2:

* PlatformGTK.cmake: Use the new macro.


Conflicts:
	ChangeLog
	Source/WebCore/ChangeLog
	Source/WebKit/ChangeLog
	Source/WebKit2/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake (168719 => 168720)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake	2014-05-13 19:31:22 UTC (rev 168719)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake	2014-05-13 19:31:42 UTC (rev 168720)
@@ -112,6 +112,7 @@
 platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp
 
 platform/network/soup/AuthenticationChallengeSoup.cpp
+platform/network/soup/CertificateInfo.cpp
 platform/network/soup/CookieJarSoup.cpp
 platform/network/soup/CookieStorageSoup.cpp
 platform/network/soup/CredentialStorageSoup.cpp
@@ -138,6 +139,10 @@
 platform/text/TextEncodingDetectorICU.cpp
 
 platform/text/enchant/TextCheckerEnchant.cpp
+
+platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp
+
+platform/network/gtk/CredentialBackingStore.cpp
 )
 
 list(APPEND WebCorePlatformGTK_SOURCES
@@ -236,37 +241,6 @@
 platform/gtk/WidgetBackingStoreGtkX11.cpp
 platform/gtk/WidgetGtk.cpp
 platform/gtk/WidgetRenderingContext.cpp
-
-platform/network/gtk/CredentialBackingStore.cpp
-
-platform/network/soup/AuthenticationChallengeSoup.cpp
-platform/network/soup/CertificateInfo.cpp
-platform/network/soup/CookieJarSoup.cpp
-platform/network/soup/CookieStorageSoup.cpp
-platform/network/soup/CredentialStorageSoup.cpp
-platform/network/soup/DNSSoup.cpp
-platform/network/soup/NetworkStorageSessionSoup.cpp
-platform/network/soup/ProxyResolverSoup.cpp
-platform/network/soup/ProxyServerSoup.cpp
-platform/network/soup/ResourceErrorSoup.cpp
-platform/network/soup/ResourceHandleSoup.cpp
-platform/network/soup/ResourceRequestSoup.cpp
-platform/network/soup/ResourceResponseSoup.cpp
-platform/network/soup/SocketStreamHandleSoup.cpp
-platform/network/soup/SynchronousLoaderClientSoup.cpp
-
-platform/soup/SharedBufferSoup.cpp
-
-platform/text/icu/UTextProvider.cpp
-platform/text/icu/UTextProviderLatin1.cpp
-platform/text/icu/UTextProviderUTF16.cpp
-platform/text/LocaleICU.cpp
-platform/text/TextCodecICU.cpp
-platform/text/TextEncodingDetectorICU.cpp
-
-platform/text/enchant/TextCheckerEnchant.cpp
-
-platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp
 )
 
 if (WTF_USE_GEOCLUE2)


Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake (168719 => 168720)

--- releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake	2014-05-13 19:31:22 UTC (rev 168719)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake	2014-05-13 19:31:42 UTC (rev 168720)
@@ -135,9 +135,10 @@
 # Since the GObjectDOMBindings convenience library exports API that is unused except
 # in embedding applications we need to instruct the linker to link all symbols explicitly.
 list(APPEND WebKit_LIBRARIES
--Wl,--whole-archive GObjectDOMBindings -Wl,--no-whole-archive
+GObjectDOMBindings
 WebCorePlatformGTK
 )
+ADD_WHOLE_ARCHIVE_TO_LIBRARIES(WebKit_LIBRARIES)
 
 set(WebKit_MARSHAL_LIST ${WEBKIT_DIR}/gtk/webkitmarshal.list)
 


Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake (168719 => 168720)

--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake	2014-05-13 19:31:22 UTC (rev 168719)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake	2014-05-13 19:31:42 UTC (rev 168720)
@@ -447,9 +447,10 @@
 # Since the GObjectDOMBindings convenience library exports API that is unused except
 # in embedding applications we need to instruct the linker to link all symbols 

[webkit-changes] [168719] releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm

[gns]

Title: [168719] releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm








Revision 168719
Author g...@gnome.org
Date 2014-05-13 12:31:22 -0700 (Tue, 13 May 2014)


Log Message
Merge 165263 - [CMake] [GTK] Build with ninja when it is available
https://bugs.webkit.org/show_bug.cgi?id=129805

Reviewed by Philippe Normand.

* Scripts/webkitdirs.pm:
(canUseNinja): Added this helper which tries to execute Ninja, in an effort to determine
if it's available on the system.
(cmakeGeneratedBuildfile): Return the path to the generated build file. Only Unix support ATM.
(generateBuildSystemFromCMakeProject): For GTK+ compile with Ninja when possible.


Conflicts:
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm




Diff

Modified: releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm (168718 => 168719)

--- releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm	2014-05-13 19:31:12 UTC (rev 168718)
+++ releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm	2014-05-13 19:31:22 UTC (rev 168719)
@@ -1941,6 +1941,22 @@
 }
 }
 
+sub canUseNinja(@)
+{
+system('ninja --version  /dev/null');
+return $? == 0;
+}
+
+sub cmakeGeneratedBuildfile(@)
+{
+my ($willUseNinja) = @_;
+if ($willUseNinja) {
+return File::Spec-catfile(baseProductDir(), configuration(), build.ninja)
+} else {
+return File::Spec-catfile(baseProductDir(), configuration(), Makefile)
+}
+}
+
 sub generateBuildSystemFromCMakeProject
 {
 my ($port, $prefixPath, @cmakeArgs, $additionalCMakeArgs) = @_;
@@ -1951,7 +1967,8 @@
 chdir($buildPath) or die;
 
 # For GTK+ we try to be smart about when to rerun cmake, so that we can have faster incremental builds.
-if (isGtk()  -e cmakeCachePath()  -e File::Spec-catfile(baseProductDir(), configuration(), Makefile)) {
+my $willUseNinja = isGtk()  canUseNinja();
+if (isGtk()  -e cmakeCachePath()  -e cmakeGeneratedBuildfile($willUseNinja)) {
 return 0;
 }
 
@@ -1964,6 +1981,12 @@
 } elsif ($config =~ /debug/i) {
 push @args, -DCMAKE_BUILD_TYPE=Debug;
 }
+
+if ($willUseNinja) {
+push @args, -G;
+push @args, Ninja;
+}
+
 # Don't warn variables which aren't used by cmake ports.
 push @args, --no-warn-unused-cli;
 push @args, @cmakeArgs if @cmakeArgs;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168722] releases/WebKitGTK/webkit-2.4/Source

[gns]

Title: [168722] releases/WebKitGTK/webkit-2.4/Source








Revision 168722
Author g...@gnome.org
Date 2014-05-13 12:32:04 -0700 (Tue, 13 May 2014)


Log Message
Merge 165437 - [GTK][CMake] Add HARFBUZZ_INCLUDE_DIRS to WebKit and WebKit2
https://bugs.webkit.org/show_bug.cgi?id=130070

Reviewed by Martin Robinson.

Source/WebKit:

* PlatformGTK.cmake:

Source/WebKit2:

* PlatformGTK.cmake:


Conflicts:
	Source/WebKit/ChangeLog
	Source/WebKit2/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake (168721 => 168722)

--- releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake	2014-05-13 19:31:52 UTC (rev 168721)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake	2014-05-13 19:32:04 UTC (rev 168722)
@@ -32,6 +32,7 @@
 ${ENCHANT_INCLUDE_DIRS}
 ${GEOCLUE_INCLUDE_DIRS}
 ${GTK_INCLUDE_DIRS}
+${HARFBUZZ_INCLUDE_DIRS}
 ${LIBSOUP_INCLUDE_DIRS}
 )
 


Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake (168721 => 168722)

--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake	2014-05-13 19:31:52 UTC (rev 168721)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake	2014-05-13 19:32:04 UTC (rev 168722)
@@ -422,6 +422,7 @@
 ${CAIRO_INCLUDE_DIRS}
 ${ENCHANT_INCLUDE_DIRS}
 ${GEOCLUE_INCLUDE_DIRS}
+${HARFBUZZ_INCLUDE_DIRS}
 ${LIBSOUP_INCLUDE_DIRS}
 )
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168723] releases/WebKitGTK/webkit-2.4/Tools

[gns]

Title: [168723] releases/WebKitGTK/webkit-2.4/Tools








Revision 168723
Author g...@gnome.org
Date 2014-05-13 12:32:18 -0700 (Tue, 13 May 2014)


Log Message
Merge 165452 - [GTK] The jhbuild environment should set CMAKE_PREFIX_PATH and CMAKE_LIBRARY_PATH
https://bugs.webkit.org/show_bug.cgi?id=130064

Reviewed by Philippe Normand.

* efl/jhbuildrc: Remove duplicated code.
* gtk/jhbuildrc: Remove duplicated code.
* jhbuild/jhbuildrc_common.py:
(init): Move duplicated code from jhbuildrc's and extend setting CMake environment variables to
GTK+. We always set the CMAKE_LIBRARY_PATH, which should be harmless for EFL 32-bit systems.
and is apparently necessary for GTK+.


Conflicts:
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc
releases/WebKitGTK/webkit-2.4/Tools/gtk/jhbuildrc
releases/WebKitGTK/webkit-2.4/Tools/jhbuild/jhbuildrc_common.py




Diff

Modified: releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc (168722 => 168723)

--- releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc	2014-05-13 19:32:04 UTC (rev 168722)
+++ releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc	2014-05-13 19:32:18 UTC (rev 168723)
@@ -22,33 +22,7 @@
 import jhbuildrc_common
 jhbuildrc_common.init(globals(), efl) 
 
-if 'NUMBER_OF_PROCESSORS' in os.environ:
-jobs = os.environ['NUMBER_OF_PROCESSORS']
-
-# Use system libraries while building.
-if use_lib64:
-_libdir = 'lib64'
-else:
-_libdir = 'lib'
-addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', _libdir, 'pkgconfig'))
-addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'share', 'pkgconfig'))
-
 addpath('XDG_DATA_DIRS', '/usr/share')
 addpath('XDG_CONFIG_DIRS', '/etc/xdg')
 
-addpath('CMAKE_PREFIX_PATH', prefix)
-
-# jhbuild installs libraries into lib64/ by default when building on
-# 64-bit Linux installations, while CMake does not look for libraries
-# in lib64/ if /etc/debian_version exists. For now we just pass the
-# lib64/ directory to the CMAKE_LIBRARY_PATH environment variable to
-# make sure the libraries installed by jhbuild are found by CMake on
-# Debian-based systems as well.
-if use_lib64:
-addpath('CMAKE_LIBRARY_PATH', os.path.join(prefix, _libdir))
-
 partial_build = False
-
-# Avoid runtime conflicts with GStreamer system-wide plugins. We want
-# to use only the plugins we build in JHBuild.
-os.environ['GST_PLUGIN_SYSTEM_PATH'] = ''


Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/jhbuildrc (168722 => 168723)

--- releases/WebKitGTK/webkit-2.4/Tools/gtk/jhbuildrc	2014-05-13 19:32:04 UTC (rev 168722)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/jhbuildrc	2014-05-13 19:32:18 UTC (rev 168723)
@@ -25,16 +25,9 @@
 sys.path = [__gtk_tools_directory] + sys.path
 import common
 
-if 'NUMBER_OF_PROCESSORS' in os.environ:
-jobs = os.environ['NUMBER_OF_PROCESSORS']
-
 # GTK+ 3.0.12 misses the -lm flag when linking the tests.
 module_makeargs['gtk+'] = 'LDFLAGS=-lm ' + makeargs
 
-# Avoid runtime conflicts with GStreamer system-wide plugins. We want
-# to use only the plugins we build in JHBuild.
-os.environ['GST_PLUGIN_SYSTEM_PATH'] = ''
-
 # We always enable introspection so that we can sniff out problems with our
 # annotations sooner rather than later.
 autogenargs='--enable-introspection'


Modified: releases/WebKitGTK/webkit-2.4/Tools/jhbuild/jhbuildrc_common.py (168722 => 168723)

--- releases/WebKitGTK/webkit-2.4/Tools/jhbuild/jhbuildrc_common.py	2014-05-13 19:32:04 UTC (rev 168722)
+++ releases/WebKitGTK/webkit-2.4/Tools/jhbuild/jhbuildrc_common.py	2014-05-13 19:32:18 UTC (rev 168723)
@@ -62,3 +62,23 @@
 
 jhbuildrc_globals[nonotify] = True
 jhbuildrc_globals[notrayicon] = True
+
+if 'NUMBER_OF_PROCESSORS' in os.environ:
+jhbuildrc_globals['jobs'] = os.environ['NUMBER_OF_PROCESSORS']
+
+# Avoid runtime conflicts with GStreamer system-wide plugins. We want
+# to use only the plugins we build in JHBuild.
+os.environ['GST_PLUGIN_SYSTEM_PATH'] = ''
+
+# Use system libraries while building.
+if jhbuildrc_globals['use_lib64']:
+_library_dir = 'lib64'
+else:
+_library_dir = 'lib'
+addpath = jhbuildrc_globals['addpath']
+addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', _library_dir, 'pkgconfig'))
+addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'share', 'pkgconfig'))
+
+prefix = jhbuildrc_globals['prefix']
+addpath('CMAKE_PREFIX_PATH', prefix)
+addpath('CMAKE_LIBRARY_PATH', os.path.join(prefix, _library_dir))






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168721] releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake

[gns]

Title: [168721] releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake








Revision 168721
Author g...@gnome.org
Date 2014-05-13 12:31:52 -0700 (Tue, 13 May 2014)


Log Message
Merge 165386 - [GTK][CMAKE] gtk-doc HTML documentation is generated by default when building with CMake
https://bugs.webkit.org/show_bug.cgi?id=130016

Reviewed by Carlos Garcia Campos.

* Source/PlatformGTK.cmake: Add two gtkdoc targets, one which builds HTML and one which
doesn't. Add the non-HTML version to the default target, but not the HTML version. The
HTML version will still run when building the distribution tarball.


Conflicts:
	ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake (168720 => 168721)

--- releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake	2014-05-13 19:31:42 UTC (rev 168720)
+++ releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake	2014-05-13 19:31:52 UTC (rev 168721)
@@ -29,26 +29,26 @@
 )
 endif ()
 
-add_custom_command(
-OUTPUT ${CMAKE_BINARY_DIR}/docs-build.stamp
-DEPENDS ${DocumentationDependencies}
-COMMAND CC=${CMAKE_C_COMPILER} ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc
-COMMAND touch docs-build.stamp
-WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
+add_custom_command(
+OUTPUT ${CMAKE_BINARY_DIR}/${_stamp_name}
+DEPENDS ${DocumentationDependencies}
+COMMAND CC=${CMAKE_C_COMPILER} ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args}
+COMMAND touch ${_stamp_name}
+WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+)
+endmacro()
+
+add_gtkdoc_generator(docs-build-no-html.stamp --skip-html)
+add_custom_target(gtkdoc-no-html ALL
+DEPENDS ${CMAKE_BINARY_DIR}/docs-build-no-html.stamp
 )
 
-add_custom_target(fake-docs-target ALL
+add_gtkdoc_generator(docs-build.stamp )
+add_custom_target(gtkdoc
 DEPENDS ${CMAKE_BINARY_DIR}/docs-build.stamp
 )
 
-if (ENABLE_WEBKIT)
-add_dependencies(fake-docs-target WebKit)
-endif ()
-
-if (ENABLE_WEBKIT2)
-add_dependencies(fake-docs-target WebKit2)
-endif ()
-
 add_custom_target(check
 COMMAND ${TOOLS_DIR}/Scripts/run-gtk-tests
 COMMAND ${TOOLS_DIR}/gtk/check-for-webkitdom-api-breaks
@@ -61,6 +61,7 @@
 DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
 DEPENDS WebKit
 DEPENDS WebKit2
+DEPENDS gtkdoc
 COMMAND ${TOOLS_DIR}/gtk/make-dist.py
 --source-dir=${CMAKE_SOURCE_DIR}
 --build-dir=${CMAKE_BINARY_DIR}






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168725] releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm

[gns]

Title: [168725] releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm








Revision 168725
Author g...@gnome.org
Date 2014-05-13 12:32:29 -0700 (Tue, 13 May 2014)


Log Message
Merge 165457 - [GTK][CMake] --update-gtk has no effect
https://bugs.webkit.org/show_bug.cgi?id=130088

Patch by Gustavo Noronha Silva gustavo.noro...@collabora.com on 2014-03-11
Reviewed by Philippe Normand.

* Scripts/webkitdirs.pm:
(buildCMakeProjectOrExit): call update-webkitgtk-libs if --update-gtk has been passed
as an argument.


Conflicts:
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm




Diff

Modified: releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm (168724 => 168725)

--- releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm	2014-05-13 19:32:26 UTC (rev 168724)
+++ releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm	2014-05-13 19:32:29 UTC (rev 168725)
@@ -2048,6 +2048,10 @@
 system(perl, $sourceDir/Tools/Scripts/update-webkitefl-libs) == 0 or die $!;
 }
 
+if (isGtk()  checkForArgumentAndRemoveFromARGV(--update-gtk)) {
+system(perl, $sourceDir/Tools/Scripts/update-webkitgtk-libs) == 0 or die $!;
+}
+
 $returnCode = exitStatus(generateBuildSystemFromCMakeProject($port, $prefixPath, @cmakeArgs));
 exit($returnCode) if $returnCode;
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168727] releases/WebKitGTK/webkit-2.4

[gns]

Title: [168727] releases/WebKitGTK/webkit-2.4








Revision 168727
Author g...@gnome.org
Date 2014-05-13 12:32:43 -0700 (Tue, 13 May 2014)


Log Message
Merge 165473 - [GTK][CMAKE] Too verbose build output
https://bugs.webkit.org/show_bug.cgi?id=130076

Reviewed by Carlos Garcia Campos.

.:

* Source/cmake/OptionsGTK.cmake: Generate a script which does the actual build. This
works around an issue where cmake --build doesn't support ninja's pretty printing.

Tools:

Instead of building with cmake --build which isn't smart about pretty printing and
colors, we build with a script which calls the proper build command.

* Scripts/webkitdirs.pm:
(buildCMakeGeneratedProject): For GTK+ call the script that we generate during
the CMake configuration pass.


Conflicts:
	ChangeLog
	Tools/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake
releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake (168726 => 168727)

--- releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake	2014-05-13 19:32:37 UTC (rev 168726)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake	2014-05-13 19:32:43 UTC (rev 168727)
@@ -298,3 +298,13 @@
 endforeach ()
 set(${_list_name} ${${_list_name}_TMP})
 endmacro()
+
+build_command(COMMAND_LINE_TO_BUILD)
+file(WRITE
+${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build.sh
+#!/bin/sh\n
+${COMMAND_LINE_TO_BUILD} $@
+)
+file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build.sh
+  DESTINATION ${CMAKE_BINARY_DIR}
+  FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE)


Modified: releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm (168726 => 168727)

--- releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm	2014-05-13 19:32:37 UTC (rev 168726)
+++ releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm	2014-05-13 19:32:43 UTC (rev 168727)
@@ -2018,13 +2018,23 @@
 if (! -d $buildPath) {
 die Must call generateBuildSystemFromCMakeProject() before building CMake project.;
 }
+
+my $command = cmake;
 my @args = (--build, $buildPath, --config, $config);
 push @args, (--, $makeArgs) if $makeArgs;
 
+# GTK uses a build script to preserve colors and pretty-printing.
+if (isGtk()) {
+chdir $buildPath or die;
+$command = $buildPath/build.sh;
+@args = ($makeArgs);
+}
+
 # We call system(cmake @args) instead of system(cmake, @args) so that @args is
 # parsed for shell metacharacters. In particular, $makeArgs may contain such metacharacters.
 my $wrapper = join( , jhbuildWrapperPrefixIfNeeded()) .  ;
-return system($wrapper . cmake @args);
+return system($wrapper . $command @args);
+
 }
 
 sub cleanCMakeGeneratedProject()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168703] releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt

[gns]

Title: [168703] releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt








Revision 168703
Author g...@gnome.org
Date 2014-05-13 12:27:32 -0700 (Tue, 13 May 2014)


Log Message
Merge 164586 - [CMake] Get rid of FIXME: The Blackberry port ... from WebCore/CmakeLists.txt
https://bugs.webkit.org/show_bug.cgi?id=129152

Patch by Tibor Meszaros tmeszaros.u-sze...@partner.samsung.com on 2014-02-24
Reviewed by Gyuyoung Kim.

* CMakeLists.txt:


Conflicts:
	Source/WebCore/ChangeLog

Modified Paths

releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt




Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt (168702 => 168703)

--- releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt	2014-05-13 19:27:22 UTC (rev 168702)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt	2014-05-13 19:27:32 UTC (rev 168703)
@@ -573,32 +573,6 @@
 storage/Storage.idl
 storage/StorageEvent.idl
 
-workers/AbstractWorker.idl
-workers/DedicatedWorkerGlobalScope.idl
-workers/SharedWorker.idl
-workers/SharedWorkerGlobalScope.idl
-workers/Worker.idl
-workers/WorkerGlobalScope.idl
-workers/WorkerLocation.idl
-
-xml/DOMParser.idl
-xml/XMLHttpRequest.idl
-xml/XMLHttpRequestException.idl
-xml/XMLHttpRequestProgressEvent.idl
-xml/XMLHttpRequestUpload.idl
-xml/XMLSerializer.idl
-xml/XPathEvaluator.idl
-xml/XPathException.idl
-xml/XPathExpression.idl
-xml/XPathNSResolver.idl
-xml/XPathResult.idl
-xml/XSLTProcessor.idl
-)
-
-# FIXME: The BlackBerry port doesn't support generating DOM bindings from the SVG IDL files.
-# For now, we explicitly demarcate the SVG IDL files so that the BlackBerry port can skip them
-# during DOM binding generation. See https://bugs.webkit.org/show_bug.cgi?id=72773.
-set(WebCore_SVG_IDL_FILES
 svg/SVGAElement.idl
 svg/SVGAltGlyphDefElement.idl
 svg/SVGAltGlyphElement.idl
@@ -748,10 +722,27 @@
 svg/SVGViewSpec.idl
 svg/SVGZoomAndPan.idl
 svg/SVGZoomEvent.idl
-)
 
-list(APPEND WebCore_IDL_FILES
-${WebCore_SVG_IDL_FILES}
+workers/AbstractWorker.idl
+workers/DedicatedWorkerGlobalScope.idl
+workers/SharedWorker.idl
+workers/SharedWorkerGlobalScope.idl
+workers/Worker.idl
+workers/WorkerGlobalScope.idl
+workers/WorkerLocation.idl
+
+xml/DOMParser.idl
+xml/XMLHttpRequest.idl
+xml/XMLHttpRequestException.idl
+xml/XMLHttpRequestProgressEvent.idl
+xml/XMLHttpRequestUpload.idl
+xml/XMLSerializer.idl
+xml/XPathEvaluator.idl
+xml/XPathException.idl
+xml/XPathExpression.idl
+xml/XPathNSResolver.idl
+xml/XPathResult.idl
+xml/XSLTProcessor.idl
 )
 
 set(WebCore_INSPECTOR_SCRIPTS_DIR ${_javascript_CORE_DIR}/inspector/scripts)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [169157] trunk

[gns]

Title: [169157] trunk








Revision 169157
Author g...@gnome.org
Date 2014-05-21 06:08:35 -0700 (Wed, 21 May 2014)


Log Message
[CMake] Support building with Debug Fission
https://bugs.webkit.org/show_bug.cgi?id=131177

Reviewed by Philippe Normand.

* Source/cmake/OptionsCommon.cmake: add a DEBUG_FISSION option to enable usage
of http://gcc.gnu.org/wiki/DebugFission.

Modified Paths

trunk/ChangeLog
trunk/Source/cmake/OptionsCommon.cmake




Diff

Modified: trunk/ChangeLog (169156 => 169157)

--- trunk/ChangeLog	2014-05-21 12:01:42 UTC (rev 169156)
+++ trunk/ChangeLog	2014-05-21 13:08:35 UTC (rev 169157)
@@ -1,3 +1,13 @@
+2014-05-20  Gustavo Noronha Silva  g...@gnome.org
+
+[CMake] Support building with Debug Fission
+https://bugs.webkit.org/show_bug.cgi?id=131177
+
+Reviewed by Philippe Normand.
+
+* Source/cmake/OptionsCommon.cmake: add a DEBUG_FISSION option to enable usage
+of http://gcc.gnu.org/wiki/DebugFission.
+
 2014-05-20  Carlos Garcia Campos  cgar...@igalia.com
 
 [GTK] Rename translation domain as WebKit2GTK-3.0


Modified: trunk/Source/cmake/OptionsCommon.cmake (169156 => 169157)

--- trunk/Source/cmake/OptionsCommon.cmake	2014-05-21 12:01:42 UTC (rev 169156)
+++ trunk/Source/cmake/OptionsCommon.cmake	2014-05-21 13:08:35 UTC (rev 169157)
@@ -31,7 +31,18 @@
 if (CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
 set(CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing)
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -std=c++11 -fno-exceptions -fno-strict-aliasing -fno-rtti)
+endif ()
 
+option(DEBUG_FISSION Use Debug Fission support)
+if (DEBUG_FISSION)
+execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+if (NOT ${LD_VERSION} MATCHES GNU gold)
+message(FATAL_ERROR Need GNU gold linker for Debug Fission support)
+endif ()
+set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -gsplit-dwarf -fuse-ld=gold)
+set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -gsplit-dwarf -fuse-ld=gold)
+set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index)
+set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index)
 endif ()
 
 if (${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [177073] trunk

[gns]

Title: [177073] trunk








Revision 177073
Author g...@gnome.org
Date 2014-12-10 09:36:40 -0800 (Wed, 10 Dec 2014)


Log Message
[GTK][WK2] Add HTML5 Notifications support
https://bugs.webkit.org/show_bug.cgi?id=61140

.:

Patch by Gustavo Noronha Silva gustavo.noro...@collabora.com on 2014-12-09
Reviewed by Carlos Garcia Campos.

* Source/cmake/FindLibNotify.cmake: Added.
* Source/cmake/OptionsGTK.cmake: add option to enable notifications, look for
libnotify and use it for a default implementation when found.

Source/WebKit2:

Patch by Claudio Saavedra  csaave...@igalia.com and Gustavo Noronha Silva gustavo.noro...@collabora.com on 2014-12-09
Reviewed by Carlos Garcia Campos.

* PlatformGTK.cmake: add new files to the build.
* UIProcess/API/gtk/WebKitForwardDeclarations.h:
* UIProcess/API/gtk/WebKitNotification.cpp: Added. New GObject used to expose information about
the notification to the API.
(webkitNotificationGetProperty):
(webkit_notification_class_init):
(webkitNotificationCreate):
(webkit_notification_get_id):
(webkit_notification_get_title):
(webkit_notification_get_body):
* UIProcess/API/gtk/WebKitNotification.h: Added.
* UIProcess/API/gtk/WebKitNotificationPermissionRequest.cpp: Added. Permission request object
for notifications.
(webkitNotificationPermissionRequestAllow):
(webkitNotificationPermissionRequestDeny):
(webkit_permission_request_interface_init):
(webkitNotificationPermissionRequestDispose):
(webkit_notification_permission_request_class_init):
(webkitNotificationPermissionRequestCreate):
* UIProcess/API/gtk/WebKitNotificationPermissionRequest.h: Added.
* UIProcess/API/gtk/WebKitNotificationPermissionRequestPrivate.h: Added.
* UIProcess/API/gtk/WebKitNotificationPrivate.h: Added.
* UIProcess/API/gtk/WebKitNotificationProvider.cpp: Added. Notification provider that emits signals.
The C API allows overriding the notification providers and managers for customizing the handling of
notifications. We decided to go for a single manager and a single provider which provide more idiomatic
GObject API - signals.
(toNotificationProvider):
(showCallback):
(cancelCallback):
(WebKitNotificationProvider::~WebKitNotificationProvider):
(WebKitNotificationProvider::create):
(WebKitNotificationProvider::WebKitNotificationProvider):
(WebKitNotificationProvider::show):
(WebKitNotificationProvider::cancel):
* UIProcess/API/gtk/WebKitNotificationProvider.h: Added.
* UIProcess/API/gtk/WebKitUIClient.cpp: implemented decidePolicyForNotificationPermissionRequest.
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkitWebContextConstructed): initialize the notification provider.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewShowNotification): default implementation for showing the notification, currently
using GNotification, about to be ported to libnotify.
(webkit_web_view_class_init): set the default implementation for the show-notification signal.
(webkitWebViewEmitCloseNotification): emit the close-notification signal.
(webkitWebViewEmitShowNotification): emit the show-notification signal.
* UIProcess/API/gtk/WebKitWebView.h:
* UIProcess/API/gtk/WebKitWebViewPrivate.h:
* UIProcess/API/gtk/docs/webkit2gtk-sections.txt: list new objects and methods.
* UIProcess/API/gtk/webkit2.h: include new headers.

Tools:

Patch by Gustavo Noronha Silva gustavo.noro...@collabora.com on 2014-12-09
Reviewed by Carlos Garcia Campos.

* Scripts/webkitperl/FeatureList.pm: enable notifications for GTK+.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp:
(testWebViewNotification):
(beforeAll):
* MiniBrowser/gtk/BrowserWindow.c: also handle notification permission requests.
(permissionRequestDialogCallback):
(webViewDecidePermissionRequest):
(geolocationRequestDialogCallback): Deleted.

LayoutTests:

Patch by Gustavo Noronha Silva gustavo.noro...@collabora.com on 2014-12-09
Reviewed by Carlos Garcia Campos.

* platform/gtk/TestExpectations: unskip the HTTP tests for new-style notifications.

Modified Paths

trunk/ChangeLog
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/gtk/TestExpectations
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/PlatformGTK.cmake
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitForwardDeclarations.h
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h
trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt
trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h
trunk/Source/cmake/OptionsGTK.cmake
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/gtk/BrowserWindow.c
trunk/Tools/Scripts/webkitperl/FeatureList.pm
trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp


Added Paths

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotification.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotification.h

[webkit-changes] [188685] trunk

[gns]

Title: [188685] trunk








Revision 188685
Author g...@gnome.org
Date 2015-08-20 06:55:06 -0700 (Thu, 20 Aug 2015)


Log Message
[GTK] Auto-detection of cairo-gl fails
https://bugs.webkit.org/show_bug.cgi?id=148189

Patch by Gustavo Noronha Silva gustavo.noro...@collabora.co.uk on 2015-08-20
Reviewed by Žan Doberšek.

* Source/cmake/FindCairoGL.cmake: only check for components if the main package has
been found. Otherwise, if either GLX or EGL are available, cairo-gl will also be
deemed available, which might not be the case.
* Source/cmake/OptionsGTK.cmake: fix the usage of the CAIROGL_FOUND variable.

Modified Paths

trunk/ChangeLog
trunk/Source/cmake/FindCairoGL.cmake
trunk/Source/cmake/OptionsGTK.cmake




Diff

Modified: trunk/ChangeLog (188684 => 188685)

--- trunk/ChangeLog	2015-08-20 08:00:43 UTC (rev 188684)
+++ trunk/ChangeLog	2015-08-20 13:55:06 UTC (rev 188685)
@@ -1,3 +1,15 @@
+2015-08-20  Gustavo Noronha Silva  gustavo.noro...@collabora.co.uk
+
+[GTK] Auto-detection of cairo-gl fails
+https://bugs.webkit.org/show_bug.cgi?id=148189
+
+Reviewed by Žan Doberšek.
+
+* Source/cmake/FindCairoGL.cmake: only check for components if the main package has
+been found. Otherwise, if either GLX or EGL are available, cairo-gl will also be
+deemed available, which might not be the case.
+* Source/cmake/OptionsGTK.cmake: fix the usage of the CAIROGL_FOUND variable.
+
 2015-08-19  Alex Christensen  achristen...@webkit.org
 
 CMake Windows build should not include files directly from other Source directories


Modified: trunk/Source/cmake/FindCairoGL.cmake (188684 => 188685)

--- trunk/Source/cmake/FindCairoGL.cmake	2015-08-20 08:00:43 UTC (rev 188684)
+++ trunk/Source/cmake/FindCairoGL.cmake	2015-08-20 13:55:06 UTC (rev 188685)
@@ -31,6 +31,7 @@
 find_package(PkgConfig)
 pkg_check_modules(CAIROGL cairo-gl)
 
+if (CAIROGL_FOUND)
 # At the moment CairoGL does not add any extra cflags and libraries, so we can
 # safely ignore CAIROGL_LIBRARIES and CAIROGL_INCLUDE_DIRS for the moment.
 foreach (_component ${CairoGL_FIND_COMPONENTS})
@@ -47,4 +48,4 @@
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(CairoGL DEFAULT_MSG CAIROGL_INCLUDE_DIRS CAIROGL_LIBRARIES)
-
+endif ()


Modified: trunk/Source/cmake/OptionsGTK.cmake (188684 => 188685)

--- trunk/Source/cmake/OptionsGTK.cmake	2015-08-20 08:00:43 UTC (rev 188684)
+++ trunk/Source/cmake/OptionsGTK.cmake	2015-08-20 13:55:06 UTC (rev 188685)
@@ -128,7 +128,7 @@
 # EGL is not, and ENABLE_X11_TARGET is OFF, this guess is wrong and the user must override it. We
 # can't check ENABLE_X11_TARGET at this point because we don't know whether it's enabled until
 # WEBKIT_OPTION_END has been called, and at that point it's too late to change default values.
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC ${CAIROGL_FOUND})
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC CAIROGL_FOUND)
 
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CREDENTIAL_STORAGE PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193721] trunk

[gns]

Title: [193721] trunk








Revision 193721
Author g...@gnome.org
Date 2015-12-08 00:26:16 -0800 (Tue, 08 Dec 2015)


Log Message
[GTK] Notify WebCore when notification is clicked
https://bugs.webkit.org/show_bug.cgi?id=151951

Reviewed by Carlos Garcia Campos.

Source/WebKit2:

* UIProcess/API/gtk/WebKitNotification.cpp:
(webkit_notification_class_init): new clicked signal.
(webkit_notification_clicked): method to emit the clicked signal.
* UIProcess/API/gtk/WebKitNotification.h:
* UIProcess/API/gtk/WebKitNotificationProvider.cpp:
(WebKitNotificationProvider::notificationClickedCallback): handle the clicked signal and tell WebProcess about the click.
(WebKitNotificationProvider::show): connect to the clicked signal in addition to closed.
* UIProcess/API/gtk/WebKitNotificationProvider.h:
* UIProcess/API/gtk/WebKitWebView.cpp:
(notifyNotificationClicked): handle the click on our libnotify notification.
(webkitWebViewShowNotification): add the "default" action to our libnotify notification to be notified of the click.
* UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt:

Tools:

* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp:
(testWebViewNotification): test the new API.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotification.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotification.h
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationProvider.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationProvider.h
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (193720 => 193721)

--- trunk/Source/WebKit2/ChangeLog	2015-12-08 08:17:53 UTC (rev 193720)
+++ trunk/Source/WebKit2/ChangeLog	2015-12-08 08:26:16 UTC (rev 193721)
@@ -1,3 +1,23 @@
+2015-12-07  Gustavo Noronha Silva  
+
+[GTK] Notify WebCore when notification is clicked
+https://bugs.webkit.org/show_bug.cgi?id=151951
+
+Reviewed by Carlos Garcia Campos.
+
+* UIProcess/API/gtk/WebKitNotification.cpp:
+(webkit_notification_class_init): new clicked signal.
+(webkit_notification_clicked): method to emit the clicked signal.
+* UIProcess/API/gtk/WebKitNotification.h:
+* UIProcess/API/gtk/WebKitNotificationProvider.cpp:
+(WebKitNotificationProvider::notificationClickedCallback): handle the clicked signal and tell WebProcess about the click.
+(WebKitNotificationProvider::show): connect to the clicked signal in addition to closed.
+* UIProcess/API/gtk/WebKitNotificationProvider.h:
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(notifyNotificationClicked): handle the click on our libnotify notification.
+(webkitWebViewShowNotification): add the "default" action to our libnotify notification to be notified of the click.
+* UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt:
+
 2015-12-07  Commit Queue  
 
 Unreviewed, rolling out r193655.


Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotification.cpp (193720 => 193721)

--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotification.cpp	2015-12-08 08:17:53 UTC (rev 193720)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotification.cpp	2015-12-08 08:26:16 UTC (rev 193721)
@@ -44,6 +44,7 @@
 
 enum {
 CLOSED,
+CLICKED,
 
 LAST_SIGNAL
 };
@@ -149,6 +150,24 @@
 nullptr,
 g_cclosure_marshal_VOID__VOID,
 G_TYPE_NONE, 0);
+
+/**
+ * WebKitNotification::clicked:
+ * @notification: the #WebKitNotification on which the signal is emitted
+ *
+ * Emitted when a notification has been clicked. See webkit_notification_clicked().
+ *
+ * Since: 2.12
+ */
+signals[CLICKED] =
+g_signal_new(
+"clicked",
+G_TYPE_FROM_CLASS(notificationClass),
+G_SIGNAL_RUN_LAST,
+0, 0,
+nullptr,
+g_cclosure_marshal_VOID__VOID,
+G_TYPE_NONE, 0);
 }
 
 WebKitNotification* webkitNotificationCreate(WebKitWebView* webView, const WebKit::WebNotification& webNotification)
@@ -231,3 +250,19 @@
 
 g_signal_emit(notification, signals[CLOSED], 0);
 }
+
+/**
+ * webkit_notification_clicked:
+ * @notification: a #WebKitNotification
+ *
+ * Tells WebKit the notification has been clicked. This will emit the
+ * #WebKitNotification::clicked signal.
+ *
+ * Since: 2.12
+ */
+void webkit_notification_clicked(WebKitNotification* notification)
+{
+g_return_if_fail(WEBKIT_IS_NOTIFICATION(notification));
+
+g_signal_emit(notification, signals[CLICKED], 0);
+}


Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotification.h (193720 => 193721)

--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotification.h	2015-12-08 

[webkit-changes] [196027] trunk/LayoutTests

[gns]

Title: [196027] trunk/LayoutTests








Revision 196027
Author g...@gnome.org
Date 2016-02-02 13:16:02 -0800 (Tue, 02 Feb 2016)


Log Message
[GTK] Layout Test fast/images/animated-gif-no-layout.html is failing
https://bugs.webkit.org/show_bug.cgi?id=153798

Unreviewed gardening.

Patch by Gustavo Noronha Silva  on 2016-02-02

* platform/gtk/TestExpectations: mark a couple tests as failing. The
green frame of the gif is being rendered in a slightly lighter green.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/gtk/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (196026 => 196027)

--- trunk/LayoutTests/ChangeLog	2016-02-02 21:11:28 UTC (rev 196026)
+++ trunk/LayoutTests/ChangeLog	2016-02-02 21:16:02 UTC (rev 196027)
@@ -1,3 +1,13 @@
+2016-02-02  Gustavo Noronha Silva  
+
+[GTK] Layout Test fast/images/animated-gif-no-layout.html is failing
+https://bugs.webkit.org/show_bug.cgi?id=153798
+
+Unreviewed gardening.
+
+* platform/gtk/TestExpectations: mark a couple tests as failing. The
+green frame of the gif is being rendered in a slightly lighter green.
+
 2016-02-02  Zalan Bujtas  
 
 [Win] gardening after r195740.


Modified: trunk/LayoutTests/platform/gtk/TestExpectations (196026 => 196027)

--- trunk/LayoutTests/platform/gtk/TestExpectations	2016-02-02 21:11:28 UTC (rev 196026)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2016-02-02 21:16:02 UTC (rev 196027)
@@ -116,6 +116,10 @@
 # a caret in editable document even when none was requested programatically.
 editing/selection/designmode-no-caret.html [ Skip ]
 
+# Slightly lighter green second frame
+webkit.org/b/153798 fast/images/animated-gif-no-layout.html [ ImageOnlyFailure ]
+webkit.org/b/153798 fast/images/gif-loop-count.html [ ImageOnlyFailure ]
+
 # These tests require loading a PDF as an image, which we do not support (via Chromium).
 fast/images/pdf-as-image-landscape.html [ WontFix Failure ]
 fast/replaced/pdf-as-image.html [ WontFix Failure ]






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [211038] trunk/Source/WebKit2

[gns]

Title: [211038] trunk/Source/WebKit2








Revision 211038
Author g...@gnome.org
Date 2017-01-23 03:28:08 -0800 (Mon, 23 Jan 2017)


Log Message
urlParserEnabled parameter is only encoded for COCOA ports
https://bugs.webkit.org/show_bug.cgi?id=167238

Reviewed by Alex Christensen.

This leads to URLParser being enabled on the UI process, since it is
the default, but disabled on the WebProcess, which is the default for
WebProcessCreationParameters, casuing asserts like on tests such as these
due to differences in parsing:

- fast/loader/redirect-to-invalid-url-using-_javascript_-calls-policy-delegate.html
- fast/loader/window-open-to-invalid-url-calls-policy-delegate.html
- http/tests/inspector/network/copy-as-curl.html

* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode): encode urlParserEnabled
(WebKit::WebProcessCreationParameters::decode): decode urlParserEnabled

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (211037 => 211038)

--- trunk/Source/WebKit2/ChangeLog	2017-01-23 10:41:42 UTC (rev 211037)
+++ trunk/Source/WebKit2/ChangeLog	2017-01-23 11:28:08 UTC (rev 211038)
@@ -1,3 +1,23 @@
+2017-01-20  Gustavo Noronha Silva  
+
+urlParserEnabled parameter is only encoded for COCOA ports
+https://bugs.webkit.org/show_bug.cgi?id=167238
+
+Reviewed by Alex Christensen.
+
+This leads to URLParser being enabled on the UI process, since it is
+the default, but disabled on the WebProcess, which is the default for
+WebProcessCreationParameters, casuing asserts like on tests such as these
+due to differences in parsing:
+
+- fast/loader/redirect-to-invalid-url-using-_javascript_-calls-policy-delegate.html
+- fast/loader/window-open-to-invalid-url-calls-policy-delegate.html
+- http/tests/inspector/network/copy-as-curl.html
+
+* Shared/WebProcessCreationParameters.cpp:
+(WebKit::WebProcessCreationParameters::encode): encode urlParserEnabled
+(WebKit::WebProcessCreationParameters::decode): decode urlParserEnabled
+
 2017-01-20  Darin Adler  
 
 Remove PassRefPtr from "page" directory of WebCore, also deploy references


Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (211037 => 211038)

--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp	2017-01-23 10:41:42 UTC (rev 211037)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp	2017-01-23 11:28:08 UTC (rev 211038)
@@ -97,6 +97,7 @@
 encoder << shouldSuppressMemoryPressureHandler;
 encoder << shouldUseFontSmoothing;
 encoder << resourceLoadStatisticsEnabled;
+encoder << urlParserEnabled;
 encoder << fontWhitelist;
 encoder << iconDatabaseEnabled;
 encoder << terminationTimeout;
@@ -115,7 +116,6 @@
 encoder << uiProcessBundleResourcePathExtensionHandle;
 encoder << shouldEnableJIT;
 encoder << shouldEnableFTLJIT;
-encoder << urlParserEnabled;
 encoder << !!bundleParameterData;
 if (bundleParameterData)
 encoder << bundleParameterData->dataReference();
@@ -230,6 +230,8 @@
 return false;
 if (!decoder.decode(parameters.resourceLoadStatisticsEnabled))
 return false;
+if (!decoder.decode(parameters.urlParserEnabled))
+return false;
 if (!decoder.decode(parameters.fontWhitelist))
 return false;
 if (!decoder.decode(parameters.iconDatabaseEnabled))
@@ -264,8 +266,6 @@
 return false;
 if (!decoder.decode(parameters.shouldEnableFTLJIT))
 return false;
-if (!decoder.decode(parameters.urlParserEnabled))
-return false;
 
 bool hasBundleParameterData;
 if (!decoder.decode(hasBundleParameterData))






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [211040] trunk/Source/WebCore

[gns]

Title: [211040] trunk/Source/WebCore








Revision 211040
Author g...@gnome.org
Date 2017-01-23 10:20:10 -0800 (Mon, 23 Jan 2017)


Log Message
[GTK] asserting on unknown locale for hyphenation is wrong
https://bugs.webkit.org/show_bug.cgi?id=167312

Reviewed by Carlos Garcia Campos.

The fact that we hit the assert on a test called 'hyphenation-unknown-locale' is already
a strong indication we should not have it. In addition to that, Carlos Lopez pointed out
a similar assert was removed from the Mac codepaths when the test was introduced.

* platform/text/hyphen/HyphenationLibHyphen.cpp:
(WebCore::lastHyphenLocation): early return when a locale that is not available is provided
for hyphenation, instead of asserting.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (211039 => 211040)

--- trunk/Source/WebCore/ChangeLog	2017-01-23 17:40:30 UTC (rev 211039)
+++ trunk/Source/WebCore/ChangeLog	2017-01-23 18:20:10 UTC (rev 211040)
@@ -1,3 +1,18 @@
+2017-01-23  Gustavo Noronha Silva  
+
+[GTK] asserting on unknown locale for hyphenation is wrong
+https://bugs.webkit.org/show_bug.cgi?id=167312
+
+Reviewed by Carlos Garcia Campos.
+
+The fact that we hit the assert on a test called 'hyphenation-unknown-locale' is already
+a strong indication we should not have it. In addition to that, Carlos Lopez pointed out
+a similar assert was removed from the Mac codepaths when the test was introduced.
+
+* platform/text/hyphen/HyphenationLibHyphen.cpp:
+(WebCore::lastHyphenLocation): early return when a locale that is not available is provided
+for hyphenation, instead of asserting.
+
 2017-01-23  Chris Dumez  
 
 Unreviewed attempt to fix the iOS build after r211033.


Modified: trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp (211039 => 211040)

--- trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp	2017-01-23 17:40:30 UTC (rev 211039)
+++ trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp	2017-01-23 18:20:10 UTC (rev 211040)
@@ -249,7 +249,11 @@
 char* hyphenArrayData = hyphenArray.data();
 
 String lowercaseLocaleIdentifier = AtomicString(localeIdentifier.string().convertToASCIILowercase());
-ASSERT(availableLocales().contains(lowercaseLocaleIdentifier));
+
+// Web content may specify strings for locales which do not exist or that we do not have.
+if (!availableLocales().contains(lowercaseLocaleIdentifier))
+return 0;
+
 for (const auto& dictionaryPath : availableLocales().get(lowercaseLocaleIdentifier)) {
 RefPtr dictionary = WTF::TinyLRUCachePolicy::cache().get(AtomicString(dictionaryPath));
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [210851] trunk/Source/WebCore

[gns]

Title: [210851] trunk/Source/WebCore








Revision 210851
Author g...@gnome.org
Date 2017-01-18 08:42:46 -0800 (Wed, 18 Jan 2017)


Log Message
[GStreamer] media source tests crashing
https://bugs.webkit.org/show_bug.cgi?id=167158

Reviewed by Carlos Garcia Campos.

This fixes several media source tests which are asserting on debug builds,
such as:

- fast/history/page-cache-removed-source-buffer.html
- imported/w3c/web-platform-tests/media-source/

* platform/graphics/gstreamer/mse/AppendPipeline.cpp:
(WebCore::AppendPipeline::AppendPipeline): do not adopt the GStPipeline
upon creation. A regular assignment will do the right thing, sinking the
floating ref.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (210850 => 210851)

--- trunk/Source/WebCore/ChangeLog	2017-01-18 13:00:51 UTC (rev 210850)
+++ trunk/Source/WebCore/ChangeLog	2017-01-18 16:42:46 UTC (rev 210851)
@@ -1,3 +1,21 @@
+2017-01-18  Gustavo Noronha Silva  
+
+[GStreamer] media source tests crashing
+https://bugs.webkit.org/show_bug.cgi?id=167158
+
+Reviewed by Carlos Garcia Campos.
+
+This fixes several media source tests which are asserting on debug builds,
+such as:
+
+- fast/history/page-cache-removed-source-buffer.html
+- imported/w3c/web-platform-tests/media-source/
+
+* platform/graphics/gstreamer/mse/AppendPipeline.cpp:
+(WebCore::AppendPipeline::AppendPipeline): do not adopt the GStPipeline
+upon creation. A regular assignment will do the right thing, sinking the
+floating ref.
+
 2017-01-18  Antoine Quint  
 
 [Modern Media Controls] Turn modern media controls on by default


Modified: trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp (210850 => 210851)

--- trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp	2017-01-18 13:00:51 UTC (rev 210850)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp	2017-01-18 16:42:46 UTC (rev 210851)
@@ -107,7 +107,7 @@
 
 // FIXME: give a name to the pipeline, maybe related with the track it's managing.
 // The track name is still unknown at this time, though.
-m_pipeline = adoptGRef(gst_pipeline_new(nullptr));
+m_pipeline = gst_pipeline_new(nullptr);
 
 m_bus = adoptGRef(gst_pipeline_get_bus(GST_PIPELINE(m_pipeline.get(;
 gst_bus_add_signal_watch(m_bus.get());






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [205452] trunk/Source/WebKit2

[gns]

Title: [205452] trunk/Source/WebKit2








Revision 205452
Author g...@gnome.org
Date 2016-09-05 07:22:07 -0700 (Mon, 05 Sep 2016)


Log Message
[GTK] GL_PACK_ROW_LENGTH is not available in GLES2
https://bugs.webkit.org/show_bug.cgi?id=161484

Reviewed by Carlos Garcia Campos.

* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
(WebKit::AcceleratedBackingStoreWayland::paint): when under GLES2 we cannot rely on
GL_PACK_ROW_LENGTH; use glReadPixel directly when stride matches width, read line
by line manually otherwise. Colour conversion is also required to get the data out
correctly.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (205451 => 205452)

--- trunk/Source/WebKit2/ChangeLog	2016-09-05 13:54:25 UTC (rev 205451)
+++ trunk/Source/WebKit2/ChangeLog	2016-09-05 14:22:07 UTC (rev 205452)
@@ -1,3 +1,16 @@
+2016-09-05  Gustavo Noronha Silva  
+
+[GTK] GL_PACK_ROW_LENGTH is not available in GLES2
+https://bugs.webkit.org/show_bug.cgi?id=161484
+
+Reviewed by Carlos Garcia Campos.
+
+* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+(WebKit::AcceleratedBackingStoreWayland::paint): when under GLES2 we cannot rely on
+GL_PACK_ROW_LENGTH; use glReadPixel directly when stride matches width, read line
+by line manually otherwise. Colour conversion is also required to get the data out
+correctly.
+
 2016-09-05  Carlos Garcia Campos  
 
 [GTK] SetNativeSurfaceHandleForCompositing should not be compiled in for wayland build


Modified: trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (205451 => 205452)

--- trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp	2016-09-05 13:54:25 UTC (rev 205451)
+++ trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp	2016-09-05 14:22:07 UTC (rev 205452)
@@ -89,13 +89,28 @@
 glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
 
 glPixelStorei(GL_PACK_ALIGNMENT, 4);
-glPixelStorei(GL_PACK_ROW_LENGTH, cairo_image_surface_get_stride(m_surface.get()) / 4);
+
 #if USE(OPENGL_ES_2)
-glReadPixels(0, 0, textureSize.width(), textureSize.height(), GL_RGBA, GL_UNSIGNED_BYTE, cairo_image_surface_get_data(m_surface.get()));
+unsigned char* data = ""
+if (cairo_image_surface_get_stride(m_surface.get()) == textureSize.width() * 4)
+glReadPixels(0, 0, textureSize.width(), textureSize.height(), GL_RGBA, GL_UNSIGNED_BYTE, data);
+else {
+int strideBytes = cairo_image_surface_get_stride(m_surface.get());
+for (int i = 0; i < textureSize.height(); i++) {
+unsigned char* dataOffset = data + i * strideBytes;
+glReadPixels(0, i, textureSize.width(), 1, GL_RGBA, GL_UNSIGNED_BYTE, dataOffset);
+}
+}
+
+// Convert to BGRA.
+int totalBytes = size.width() * size.height() * 4;
+for (int i = 0; i < totalBytes; i += 4)
+std::swap(data[i], data[i + 2]);
 #else
+glPixelStorei(GL_PACK_ROW_LENGTH, cairo_image_surface_get_stride(m_surface.get()) / 4);
 glReadPixels(0, 0, textureSize.width(), textureSize.height(), GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, cairo_image_surface_get_data(m_surface.get()));
+glPixelStorei(GL_PACK_ROW_LENGTH, 0);
 #endif
-glPixelStorei(GL_PACK_ROW_LENGTH, 0);
 
 glBindFramebuffer(GL_FRAMEBUFFER, 0);
 glDeleteFramebuffers(1, );






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [206216] trunk/Source/WebKit2

[gns]

Title: [206216] trunk/Source/WebKit2








Revision 206216
Author g...@gnome.org
Date 2016-09-21 10:35:54 -0700 (Wed, 21 Sep 2016)


Log Message
Unreviewed, build fix.

* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
(WebKit::AcceleratedBackingStoreWayland::paint): fix usage of deviceScaleFactor variable which was
removed.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (206215 => 206216)

--- trunk/Source/WebKit2/ChangeLog	2016-09-21 17:20:44 UTC (rev 206215)
+++ trunk/Source/WebKit2/ChangeLog	2016-09-21 17:35:54 UTC (rev 206216)
@@ -1,3 +1,11 @@
+2016-09-21  Gustavo Noronha Silva  
+
+Unreviewed, build fix.
+
+* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+(WebKit::AcceleratedBackingStoreWayland::paint): fix usage of deviceScaleFactor variable which was
+removed.
+
 2016-09-20  Carlos Garcia Campos  
 
 [GTK] Clean up DataObjectGtk handling


Modified: trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (206215 => 206216)

--- trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp	2016-09-21 17:20:44 UTC (rev 206215)
+++ trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp	2016-09-21 17:35:54 UTC (rev 206216)
@@ -117,7 +117,7 @@
 
 // The compositor renders the texture flipped for gdk_cairo_draw_from_gl, fix that here.
 cairo_matrix_t transform;
-cairo_matrix_init(, 1, 0, 0, -1, 0, textureSize.height() / deviceScaleFactor);
+cairo_matrix_init(, 1, 0, 0, -1, 0, textureSize.height() / m_webPage.deviceScaleFactor());
 cairo_transform(cr, );
 
 cairo_rectangle(cr, clipRect.x(), clipRect.y(), clipRect.width(), clipRect.height());






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [206225] releases/WebKitGTK/webkit-2.14/Source/WebKit2

[gns]

Title: [206225] releases/WebKitGTK/webkit-2.14/Source/WebKit2








Revision 206225
Author g...@gnome.org
Date 2016-09-21 11:42:21 -0700 (Wed, 21 Sep 2016)


Log Message
Merge 206216 - Unreviewed, build fix.

* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
(WebKit::AcceleratedBackingStoreWayland::paint): fix usage of deviceScaleFactor variable which was
removed.

Modified Paths

releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog
releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (206224 => 206225)

--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog	2016-09-21 18:41:07 UTC (rev 206224)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog	2016-09-21 18:42:21 UTC (rev 206225)
@@ -1,3 +1,11 @@
+2016-09-21  Gustavo Noronha Silva  
+
+Unreviewed, build fix.
+
+* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+(WebKit::AcceleratedBackingStoreWayland::paint): fix usage of deviceScaleFactor variable which was
+removed.
+
 2016-09-20  Carlos Garcia Campos  
 
 Unreviewed. Update OptionsGTK.cmake and NEWS for 2.14.0 release.


Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (206224 => 206225)

--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp	2016-09-21 18:41:07 UTC (rev 206224)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp	2016-09-21 18:42:21 UTC (rev 206225)
@@ -117,7 +117,7 @@
 
 // The compositor renders the texture flipped for gdk_cairo_draw_from_gl, fix that here.
 cairo_matrix_t transform;
-cairo_matrix_init(, 1, 0, 0, -1, 0, textureSize.height() / deviceScaleFactor);
+cairo_matrix_init(, 1, 0, 0, -1, 0, textureSize.height() / m_webPage.deviceScaleFactor());
 cairo_transform(cr, );
 
 cairo_rectangle(cr, clipRect.x(), clipRect.y(), clipRect.width(), clipRect.height());






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [206045] trunk/Source/WebKit2

[gns]

Title: [206045] trunk/Source/WebKit2








Revision 206045
Author g...@gnome.org
Date 2016-09-16 13:46:58 -0700 (Fri, 16 Sep 2016)


Log Message
[GTK] Surface created for glReadPixels path on Wayland is bigger than needed
https://bugs.webkit.org/show_bug.cgi?id=162025

Reviewed by Carlos Garcia Campos.

* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
(WebKit::AcceleratedBackingStoreWayland::paint): the texture created by the Wayland
compositor is already scaled, so scaling its size when creating the surface causes it
to end up bigger than necessary.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (206044 => 206045)

--- trunk/Source/WebKit2/ChangeLog	2016-09-16 20:35:16 UTC (rev 206044)
+++ trunk/Source/WebKit2/ChangeLog	2016-09-16 20:46:58 UTC (rev 206045)
@@ -1,3 +1,15 @@
+2016-09-15  Gustavo Noronha Silva  
+
+[GTK] Surface created for glReadPixels path on Wayland is bigger than needed
+https://bugs.webkit.org/show_bug.cgi?id=162025
+
+Reviewed by Carlos Garcia Campos.
+
+* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+(WebKit::AcceleratedBackingStoreWayland::paint): the texture created by the Wayland
+compositor is already scaled, so scaling its size when creating the surface causes it
+to end up bigger than necessary.
+
 2016-09-16  David Kilzer  
 
 ASSERT accidentally commented out in r204916


Modified: trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (206044 => 206045)

--- trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp	2016-09-16 20:35:16 UTC (rev 206044)
+++ trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp	2016-09-16 20:46:58 UTC (rev 206045)
@@ -75,13 +75,10 @@
 // FIXME: Use this when GTK+ >= 3.16. GTK+ expects the Y axis to be inverted to what we get, so we need to flip it somehow.
 gdk_cairo_draw_from_gl(cr, gtk_widget_get_window(m_webPage.viewWidget()), texture, GL_TEXTURE, 1, clipRect.x(), clipRect.y(), clipRect.width(), clipRect.height());
 #else
-IntSize size = textureSize;
-float deviceScaleFactor = m_webPage.deviceScaleFactor();
-size.scale(deviceScaleFactor);
+if (!m_surface || cairo_image_surface_get_width(m_surface.get()) != textureSize.width() || cairo_image_surface_get_height(m_surface.get()) != textureSize.height())
+m_surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, textureSize.width(), textureSize.height()));
 
-if (!m_surface || cairo_image_surface_get_width(m_surface.get()) != size.width() || cairo_image_surface_get_height(m_surface.get()) != size.height())
-m_surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, size.width(), size.height()));
-cairoSurfaceSetDeviceScale(m_surface.get(), deviceScaleFactor, deviceScaleFactor);
+cairoSurfaceSetDeviceScale(m_surface.get(), m_webPage.deviceScaleFactor(), m_webPage.deviceScaleFactor());
 
 GLuint fb;
 glGenFramebuffers(1, );
@@ -103,7 +100,7 @@
 }
 
 // Convert to BGRA.
-int totalBytes = size.width() * size.height() * 4;
+int totalBytes = textureSize.width() * textureSize.height() * 4;
 for (int i = 0; i < totalBytes; i += 4)
 std::swap(data[i], data[i + 2]);
 #else






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [206080] trunk/Source/WebKit2

[gns]

Title: [206080] trunk/Source/WebKit2








Revision 206080
Author g...@gnome.org
Date 2016-09-18 08:10:39 -0700 (Sun, 18 Sep 2016)


Log Message
[GTK] Stop using glReadPixels() to blit AC surfaces in the UIProcess under Wayland
https://bugs.webkit.org/show_bug.cgi?id=161530

Reviewed by Carlos Garcia Campos.

Use gdk_cairo_draw_from_gl when all necessary conditions exist.

* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
(WebKit::ThreadedCompositor::create): take TextureMapper::PaintFlags as optional argument.
(WebKit::ThreadedCompositor::ThreadedCompositor): ditto.
(WebKit::ThreadedCompositor::renderLayerTree): relay paint flags to TextureMapper::beginPaint.
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
(WebKit::AcceleratedBackingStoreWayland::paint): use the faster gdk_cairo_draw_from_gl when a new
enough GTK+ is in use.
* WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:
(WebKit::ThreadedCoordinatedLayerTreeHost::ThreadedCoordinatedLayerTreeHost): create compositor
with PaintingMirrored flag if we have recent GTK+ and are running under Wayland.
* WebProcess/WebPage/gtk/AcceleratedSurfaceX11.h: implement shouldPaintMirrored by always
returning false.
* WebProcess/WebPage/gtk/AcceleratedSurfaceWayland.h: implement shouldPaintMirrored by always
returning true.
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
(WebKit::LayerTreeHostGtk::compositeLayersToContext): pass PaintingMirror flag to TextureMapper
when under a recent enough GTK+ and Wayland.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h
trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp
trunk/Source/WebKit2/WebProcess/WebPage/gtk/AcceleratedSurface.h
trunk/Source/WebKit2/WebProcess/WebPage/gtk/AcceleratedSurfaceWayland.h
trunk/Source/WebKit2/WebProcess/WebPage/gtk/AcceleratedSurfaceX11.h
trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (206079 => 206080)

--- trunk/Source/WebKit2/ChangeLog	2016-09-18 14:03:13 UTC (rev 206079)
+++ trunk/Source/WebKit2/ChangeLog	2016-09-18 15:10:39 UTC (rev 206080)
@@ -1,3 +1,31 @@
+2016-09-18  Gustavo Noronha Silva  
+
+[GTK] Stop using glReadPixels() to blit AC surfaces in the UIProcess under Wayland
+https://bugs.webkit.org/show_bug.cgi?id=161530
+
+Reviewed by Carlos Garcia Campos.
+
+Use gdk_cairo_draw_from_gl when all necessary conditions exist.
+
+* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+(WebKit::ThreadedCompositor::create): take TextureMapper::PaintFlags as optional argument.
+(WebKit::ThreadedCompositor::ThreadedCompositor): ditto.
+(WebKit::ThreadedCompositor::renderLayerTree): relay paint flags to TextureMapper::beginPaint.
+* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
+* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+(WebKit::AcceleratedBackingStoreWayland::paint): use the faster gdk_cairo_draw_from_gl when a new
+enough GTK+ is in use.
+* WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:
+(WebKit::ThreadedCoordinatedLayerTreeHost::ThreadedCoordinatedLayerTreeHost): create compositor
+with PaintingMirrored flag if we have recent GTK+ and are running under Wayland.
+* WebProcess/WebPage/gtk/AcceleratedSurfaceX11.h: implement shouldPaintMirrored by always
+returning false.
+* WebProcess/WebPage/gtk/AcceleratedSurfaceWayland.h: implement shouldPaintMirrored by always
+returning true.
+* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+(WebKit::LayerTreeHostGtk::compositeLayersToContext): pass PaintingMirror flag to TextureMapper
+when under a recent enough GTK+ and Wayland.
+
 2016-09-17  Carlos Garcia Campos  
 
 [GTK] Move the rendering of auth dialog shadow to the auth dialog widget


Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (206079 => 206080)

--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp	2016-09-18 14:03:13 UTC (rev 206079)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp	2016-09-18 15:10:39 UTC (rev 206080)
@@ -42,15 +42,16 @@
 
 namespace WebKit {
 
-Ref ThreadedCompositor::create(Client& client, uint64_t nativeSurfaceHandle, ShouldDoFrameSync doFrameSync)
+Ref ThreadedCompositor::create(Client& client, uint64_t nativeSurfaceHandle, ShouldDoFrameSync 

[webkit-changes] [206424] trunk/Source/WebKit2

[gns]

Title: [206424] trunk/Source/WebKit2








Revision 206424
Author g...@gnome.org
Date 2016-09-27 02:06:41 -0700 (Tue, 27 Sep 2016)


Log Message
[GTK] Should check whether GDK can use GL before asking it to
https://bugs.webkit.org/show_bug.cgi?id=162598

Reviewed by Michael Catanzaro.

gdk_cairo_draw_from_gl can fail even when WebKit itself has been able to use GL (its
context creation code might be buggy, GL may have been disabled using GDK_GL=disable, …).
Unfortunately it does not have any error reporting other than a warning printed to
stderr, so we cannot fallback from it. We have to first check if GL can be used by GDK
by trying to create a context.

See https://bugzilla.redhat.com/show_bug.cgi?id=1378987

* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
(WebKit::AcceleratedBackingStoreWayland::canGdkUseGL): decide whether GDK can use GL by
trying to create a context for a GdkWindow.
(WebKit::AcceleratedBackingStoreWayland::paint): fallback to glReadPixels if GDK cannot
use GL.
* UIProcess/gtk/AcceleratedBackingStoreWayland.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (206423 => 206424)

--- trunk/Source/WebKit2/ChangeLog	2016-09-27 08:47:43 UTC (rev 206423)
+++ trunk/Source/WebKit2/ChangeLog	2016-09-27 09:06:41 UTC (rev 206424)
@@ -1,3 +1,25 @@
+2016-09-27  Gustavo Noronha Silva  
+
+[GTK] Should check whether GDK can use GL before asking it to
+https://bugs.webkit.org/show_bug.cgi?id=162598
+
+Reviewed by Michael Catanzaro.
+
+gdk_cairo_draw_from_gl can fail even when WebKit itself has been able to use GL (its
+context creation code might be buggy, GL may have been disabled using GDK_GL=disable, …).
+Unfortunately it does not have any error reporting other than a warning printed to
+stderr, so we cannot fallback from it. We have to first check if GL can be used by GDK
+by trying to create a context.
+
+See https://bugzilla.redhat.com/show_bug.cgi?id=1378987
+
+* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+(WebKit::AcceleratedBackingStoreWayland::canGdkUseGL): decide whether GDK can use GL by
+trying to create a context for a GdkWindow.
+(WebKit::AcceleratedBackingStoreWayland::paint): fallback to glReadPixels if GDK cannot
+use GL.
+* UIProcess/gtk/AcceleratedBackingStoreWayland.h:
+
 2016-09-26  Tim Horton  
 
 Delete some unused code from r202695


Modified: trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (206423 => 206424)

--- trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp	2016-09-27 08:47:43 UTC (rev 206423)
+++ trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp	2016-09-27 09:06:41 UTC (rev 206424)
@@ -61,6 +61,31 @@
 WaylandCompositor::singleton().unregisterWebPage(m_webPage);
 }
 
+#if GTK_CHECK_VERSION(3, 16, 0)
+bool AcceleratedBackingStoreWayland::canGdkUseGL() const
+{
+static bool initialized = false;
+static bool canCreateGLContext = false;
+
+if (initialized)
+return canCreateGLContext;
+
+initialized = true;
+
+GUniqueOutPtr error;
+GdkWindow* gdkWindow = gtk_widget_get_window(m_webPage.viewWidget());
+GRefPtr gdkContext(gdk_window_create_gl_context(gdkWindow, ()));
+if (!gdkContext) {
+g_warning("GDK is not able to create a GL context, falling back to glReadPixels (slow!): %s", error->message);
+return false;
+}
+
+canCreateGLContext = true;
+
+return true;
+}
+#endif
+
 bool AcceleratedBackingStoreWayland::paint(cairo_t* cr, const IntRect& clipRect)
 {
 GLuint texture;
@@ -72,8 +97,13 @@
 AcceleratedBackingStore::paint(cr, clipRect);
 
 #if GTK_CHECK_VERSION(3, 16, 0)
-gdk_cairo_draw_from_gl(cr, gtk_widget_get_window(m_webPage.viewWidget()), texture, GL_TEXTURE, m_webPage.deviceScaleFactor(), 0, 0, textureSize.width(), textureSize.height());
-#else
+if (canGdkUseGL()) {
+gdk_cairo_draw_from_gl(cr, gtk_widget_get_window(m_webPage.viewWidget()), texture, GL_TEXTURE, m_webPage.deviceScaleFactor(), 0, 0, textureSize.width(), textureSize.height());
+cairo_restore(cr);
+return true;
+}
+#endif
+
 if (!m_surface || cairo_image_surface_get_width(m_surface.get()) != textureSize.width() || cairo_image_surface_get_height(m_surface.get()) != textureSize.height())
 m_surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, textureSize.width(), textureSize.height()));
 
@@ -124,7 +154,6 @@
 cairo_set_source_surface(cr, m_surface.get(), 0, 0);
 cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
 cairo_fill(cr);
-#endif
 
 cairo_restore(cr);
 


Modified: 

[webkit-changes] [206425] releases/WebKitGTK/webkit-2.14/Source/WebKit2

[gns]

Title: [206425] releases/WebKitGTK/webkit-2.14/Source/WebKit2








Revision 206425
Author g...@gnome.org
Date 2016-09-27 02:10:30 -0700 (Tue, 27 Sep 2016)


Log Message
Merge 206424 - [GTK] Should check whether GDK can use GL before asking it to
https://bugs.webkit.org/show_bug.cgi?id=162598

Reviewed by Michael Catanzaro.

gdk_cairo_draw_from_gl can fail even when WebKit itself has been able to use GL (its
context creation code might be buggy, GL may have been disabled using GDK_GL=disable, …).
Unfortunately it does not have any error reporting other than a warning printed to
stderr, so we cannot fallback from it. We have to first check if GL can be used by GDK
by trying to create a context.

See https://bugzilla.redhat.com/show_bug.cgi?id=1378987

* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
(WebKit::AcceleratedBackingStoreWayland::canGdkUseGL): decide whether GDK can use GL by
trying to create a context for a GdkWindow.
(WebKit::AcceleratedBackingStoreWayland::paint): fallback to glReadPixels if GDK cannot
use GL.
* UIProcess/gtk/AcceleratedBackingStoreWayland.h:

Modified Paths

releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog
releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.h




Diff

Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (206424 => 206425)

--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog	2016-09-27 09:06:41 UTC (rev 206424)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog	2016-09-27 09:10:30 UTC (rev 206425)
@@ -1,3 +1,25 @@
+2016-09-27  Gustavo Noronha Silva  
+
+[GTK] Should check whether GDK can use GL before asking it to
+https://bugs.webkit.org/show_bug.cgi?id=162598
+
+Reviewed by Michael Catanzaro.
+
+gdk_cairo_draw_from_gl can fail even when WebKit itself has been able to use GL (its
+context creation code might be buggy, GL may have been disabled using GDK_GL=disable, …).
+Unfortunately it does not have any error reporting other than a warning printed to
+stderr, so we cannot fallback from it. We have to first check if GL can be used by GDK
+by trying to create a context.
+
+See https://bugzilla.redhat.com/show_bug.cgi?id=1378987
+
+* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+(WebKit::AcceleratedBackingStoreWayland::canGdkUseGL): decide whether GDK can use GL by
+trying to create a context for a GdkWindow.
+(WebKit::AcceleratedBackingStoreWayland::paint): fallback to glReadPixels if GDK cannot
+use GL.
+* UIProcess/gtk/AcceleratedBackingStoreWayland.h:
+
 2016-09-21  Gustavo Noronha Silva  
 
 Unreviewed, build fix.


Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (206424 => 206425)

--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp	2016-09-27 09:06:41 UTC (rev 206424)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp	2016-09-27 09:10:30 UTC (rev 206425)
@@ -61,6 +61,31 @@
 WaylandCompositor::singleton().unregisterWebPage(m_webPage);
 }
 
+#if GTK_CHECK_VERSION(3, 16, 0)
+bool AcceleratedBackingStoreWayland::canGdkUseGL() const
+{
+static bool initialized = false;
+static bool canCreateGLContext = false;
+
+if (initialized)
+return canCreateGLContext;
+
+initialized = true;
+
+GUniqueOutPtr error;
+GdkWindow* gdkWindow = gtk_widget_get_window(m_webPage.viewWidget());
+GRefPtr gdkContext(gdk_window_create_gl_context(gdkWindow, ()));
+if (!gdkContext) {
+g_warning("GDK is not able to create a GL context, falling back to glReadPixels (slow!): %s", error->message);
+return false;
+}
+
+canCreateGLContext = true;
+
+return true;
+}
+#endif
+
 bool AcceleratedBackingStoreWayland::paint(cairo_t* cr, const IntRect& clipRect)
 {
 GLuint texture;
@@ -72,8 +97,13 @@
 AcceleratedBackingStore::paint(cr, clipRect);
 
 #if GTK_CHECK_VERSION(3, 16, 0)
-gdk_cairo_draw_from_gl(cr, gtk_widget_get_window(m_webPage.viewWidget()), texture, GL_TEXTURE, m_webPage.deviceScaleFactor(), 0, 0, textureSize.width(), textureSize.height());
-#else
+if (canGdkUseGL()) {
+gdk_cairo_draw_from_gl(cr, gtk_widget_get_window(m_webPage.viewWidget()), texture, GL_TEXTURE, m_webPage.deviceScaleFactor(), 0, 0, textureSize.width(), textureSize.height());
+cairo_restore(cr);
+return true;
+}
+#endif
+
 if (!m_surface || cairo_image_surface_get_width(m_surface.get()) != textureSize.width() || cairo_image_surface_get_height(m_surface.get()) != textureSize.height())
 m_surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, textureSize.width(), 

[webkit-changes] [206446] trunk/Source/WebCore

[gns]

Title: [206446] trunk/Source/WebCore








Revision 206446
Author g...@gnome.org
Date 2016-09-27 11:03:59 -0700 (Tue, 27 Sep 2016)


Log Message
[GTK] Handle Wayland & X11 correctly for GST_GL
https://bugs.webkit.org/show_bug.cgi?id=162619

Reviewed by Carlos Garcia Campos.

The checks for GST_GL consider X11 and Wayland are exclusive alternatives, but it
turns out we can enable both! We need to check them independently and also include
a runtime check.

* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::ensureGstGLContext): fix checks for X11 and
Wayland to handle the case where both are enabled. Includes a runtime check.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (206445 => 206446)

--- trunk/Source/WebCore/ChangeLog	2016-09-27 17:58:44 UTC (rev 206445)
+++ trunk/Source/WebCore/ChangeLog	2016-09-27 18:03:59 UTC (rev 206446)
@@ -1,3 +1,18 @@
+2016-09-27  Gustavo Noronha Silva  
+
+[GTK] Handle Wayland & X11 correctly for GST_GL
+https://bugs.webkit.org/show_bug.cgi?id=162619
+
+Reviewed by Carlos Garcia Campos.
+
+The checks for GST_GL consider X11 and Wayland are exclusive alternatives, but it
+turns out we can enable both! We need to check them independently and also include
+a runtime check.
+
+* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+(WebCore::MediaPlayerPrivateGStreamerBase::ensureGstGLContext): fix checks for X11 and
+Wayland to handle the case where both are enabled. Includes a runtime check.
+
 2016-09-27  Eric Carlson  
 
 [MediaStream] Restructure MediaConstraints classes


Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (206445 => 206446)

--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2016-09-27 17:58:44 UTC (rev 206445)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2016-09-27 18:03:59 UTC (rev 206446)
@@ -61,7 +61,9 @@
 
 #if PLATFORM(X11)
 #include "PlatformDisplayX11.h"
-#elif PLATFORM(WAYLAND)
+#endif
+
+#if PLATFORM(WAYLAND)
 #include "PlatformDisplayWayland.h"
 #endif
 
@@ -256,13 +258,20 @@
 if (!m_glDisplay) {
 #if PLATFORM(X11)
 #if USE(GLX)
-m_glDisplay = GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast(sharedDisplay).native()));
+if (is(sharedDisplay))
+m_glDisplay = GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast(sharedDisplay).native()));
 #elif USE(EGL)
-m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast(sharedDisplay).native()));
+if (is(sharedDisplay))
+m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast(sharedDisplay).native()));
 #endif
-#elif PLATFORM(WAYLAND)
-m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast(sharedDisplay).native()));
 #endif
+
+#if PLATFORM(WAYLAND)
+if (is(sharedDisplay))
+m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast(sharedDisplay).native()));
+#endif
+
+ASSERT(m_glDisplay);
 }
 
 GLContext* webkitContext = sharedDisplay.sharingGLContext();






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [209604] trunk/Source/WebKit2

[gns]

Title: [209604] trunk/Source/WebKit2








Revision 209604
Author g...@gnome.org
Date 2016-12-09 06:05:03 -0800 (Fri, 09 Dec 2016)


Log Message
[GTK] Fix build after r209558
https://bugs.webkit.org/show_bug.cgi?id=165653

Unreviewed build fix.

* UIProcess/API/APIPolicyClient.h: include WebsitePolicies.h.
* UIProcess/API/gtk/WebKitPolicyClient.cpp: ditto.
* UIProcess/API/gtk/WebKitPolicyDecision.cpp:
(webkit_policy_decision_use):  pass empty structure to new required argument.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/APIPolicyClient.h
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecision.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (209603 => 209604)

--- trunk/Source/WebKit2/ChangeLog	2016-12-09 11:13:32 UTC (rev 209603)
+++ trunk/Source/WebKit2/ChangeLog	2016-12-09 14:05:03 UTC (rev 209604)
@@ -1,3 +1,15 @@
+2016-12-09  Gustavo Noronha Silva  
+
+[GTK] Fix build after r209558
+https://bugs.webkit.org/show_bug.cgi?id=165653
+
+Unreviewed build fix.
+
+* UIProcess/API/APIPolicyClient.h: include WebsitePolicies.h.
+* UIProcess/API/gtk/WebKitPolicyClient.cpp: ditto.
+* UIProcess/API/gtk/WebKitPolicyDecision.cpp:
+(webkit_policy_decision_use):  pass empty structure to new required argument.
+
 2016-12-09  Gavin Barraclough  
 
 Revert - Add _WKIconLoadingDelegate SPI


Modified: trunk/Source/WebKit2/UIProcess/API/APIPolicyClient.h (209603 => 209604)

--- trunk/Source/WebKit2/UIProcess/API/APIPolicyClient.h	2016-12-09 11:13:32 UTC (rev 209603)
+++ trunk/Source/WebKit2/UIProcess/API/APIPolicyClient.h	2016-12-09 14:05:03 UTC (rev 209604)
@@ -28,6 +28,7 @@
 
 #include "WebEvent.h"
 #include "WebFramePolicyListenerProxy.h"
+#include "WebsitePolicies.h"
 #include 
 #include 
 


Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp (209603 => 209604)

--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp	2016-12-09 11:13:32 UTC (rev 209603)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp	2016-12-09 14:05:03 UTC (rev 209604)
@@ -25,6 +25,7 @@
 #include "WebKitResponsePolicyDecisionPrivate.h"
 #include "WebKitWebViewBasePrivate.h"
 #include "WebKitWebViewPrivate.h"
+#include "WebsitePolicies.h"
 #include 
 #include 
 


Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecision.cpp (209603 => 209604)

--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecision.cpp	2016-12-09 11:13:32 UTC (rev 209603)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecision.cpp	2016-12-09 14:05:03 UTC (rev 209604)
@@ -22,6 +22,7 @@
 
 #include "WebFramePolicyListenerProxy.h"
 #include "WebKitPolicyDecisionPrivate.h"
+#include "WebsitePolicies.h"
 
 using namespace WebKit;
 
@@ -79,7 +80,7 @@
 if (decision->priv->madePolicyDecision)
 return;
 
-decision->priv->listener->use();
+decision->priv->listener->use({ });
 decision->priv->madePolicyDecision = true;
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [209605] trunk/Source/WebKit2

[gns]

Title: [209605] trunk/Source/WebKit2








Revision 209605
Author g...@gnome.org
Date 2016-12-09 07:23:14 -0800 (Fri, 09 Dec 2016)


Log Message
Unreviewed build fix. Thanks to Konstantin Tokarev and Csaba Osztrogonác
for pointing out the fix.

* CMakeLists.txt: add WebCore/html/canvas to include paths.

Modified Paths

trunk/Source/WebKit2/CMakeLists.txt
trunk/Source/WebKit2/ChangeLog




Diff

Modified: trunk/Source/WebKit2/CMakeLists.txt (209604 => 209605)

--- trunk/Source/WebKit2/CMakeLists.txt	2016-12-09 14:05:03 UTC (rev 209604)
+++ trunk/Source/WebKit2/CMakeLists.txt	2016-12-09 15:23:14 UTC (rev 209605)
@@ -105,6 +105,7 @@
 "${WEBCORE_DIR}/fileapi"
 "${WEBCORE_DIR}/history"
 "${WEBCORE_DIR}/html"
+"${WEBCORE_DIR}/html/canvas"
 "${WEBCORE_DIR}/html/shadow"
 "${WEBCORE_DIR}/html/track"
 "${WEBCORE_DIR}/inspector"


Modified: trunk/Source/WebKit2/ChangeLog (209604 => 209605)

--- trunk/Source/WebKit2/ChangeLog	2016-12-09 14:05:03 UTC (rev 209604)
+++ trunk/Source/WebKit2/ChangeLog	2016-12-09 15:23:14 UTC (rev 209605)
@@ -1,5 +1,12 @@
 2016-12-09  Gustavo Noronha Silva  
 
+Unreviewed build fix. Thanks to Konstantin Tokarev and Csaba Osztrogonác
+for pointing out the fix.
+
+* CMakeLists.txt: add WebCore/html/canvas to include paths.
+
+2016-12-09  Gustavo Noronha Silva  
+
 [GTK] Fix build after r209558
 https://bugs.webkit.org/show_bug.cgi?id=165653
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [209606] trunk/Tools

[gns]

Title: [209606] trunk/Tools








Revision 209606
Author g...@gnome.org
Date 2016-12-09 07:30:34 -0800 (Fri, 09 Dec 2016)


Log Message
[GTK] Force GDK backend to x11 when running with XvfbDriver
https://bugs.webkit.org/show_bug.cgi?id=165612

Reviewed by Michael Catanzaro.

When the developer is running a Wayland session, GDK may get confused
and try to use its Wayland backend (which is higher priority) instead.
This ensures it will use the appropriate backend when running under
Xvfb.

* Scripts/webkitpy/port/gtk.py:
(GtkPort.setup_environ_for_server): when running with XvfbDriver,
force GDK_BACKEND to x11.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/port/gtk.py




Diff

Modified: trunk/Tools/ChangeLog (209605 => 209606)

--- trunk/Tools/ChangeLog	2016-12-09 15:23:14 UTC (rev 209605)
+++ trunk/Tools/ChangeLog	2016-12-09 15:30:34 UTC (rev 209606)
@@ -1,3 +1,19 @@
+2016-12-09  Gustavo Noronha Silva  
+
+[GTK] Force GDK backend to x11 when running with XvfbDriver
+https://bugs.webkit.org/show_bug.cgi?id=165612
+
+Reviewed by Michael Catanzaro.
+
+When the developer is running a Wayland session, GDK may get confused
+and try to use its Wayland backend (which is higher priority) instead.
+This ensures it will use the appropriate backend when running under
+Xvfb.
+
+* Scripts/webkitpy/port/gtk.py:
+(GtkPort.setup_environ_for_server): when running with XvfbDriver,
+force GDK_BACKEND to x11.
+
 2016-12-08  Keith Miller  
 
 Add 64-bit signed LEB decode method


Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (209605 => 209606)

--- trunk/Tools/Scripts/webkitpy/port/gtk.py	2016-12-09 15:23:14 UTC (rev 209605)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py	2016-12-09 15:30:34 UTC (rev 209606)
@@ -119,6 +119,11 @@
 environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('lib', 'plugins')
 environment['OWR_USE_TEST_SOURCES'] = '1'
 self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR')
+
+if self._driver_class() is XvfbDriver:
+# Make sure to use the correct GDK backend - we might have a Wayland session
+environment['GDK_BACKEND'] = 'x11'
+
 # Configure the software libgl renderer if jhbuild ready and we test inside a virtualized window system
 if self._driver_class() in [XvfbDriver, WestonDriver] and self._should_use_jhbuild():
 llvmpipe_libgl_path = self.host.executive.run_command(self._jhbuild_wrapper + ['printenv', 'LLVMPIPE_LIBGL_PATH'],






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [210504] trunk

[gns]

Title: [210504] trunk








Revision 210504
Author g...@gnome.org
Date 2017-01-09 06:14:57 -0800 (Mon, 09 Jan 2017)


Log Message
[GTK] Should support key and code properties on keyboard events
https://bugs.webkit.org/show_bug.cgi?id=166759

Reviewed by Carlos Garcia Campos.

Source/WebCore:

This change fixes a bunch of tests which are currently failing, such as:
- fast/events/arrow-keys-on-body.html
- fast/events/constructors/keyboard-event-constructor.html
- fast/events/key-events-in-input-button.html
- fast/events/key-events-in-input-text.html
- fast/events/keyboardevent-code.html
- fast/events/keyboardevent-key.html

* platform/PlatformKeyboardEvent.h:
* platform/gtk/PlatformKeyboardEventGtk.cpp:
(WebCore::PlatformKeyboardEvent::keyValueForGdkKeyCode): match web key value
to GDK key symbol.
(WebCore::PlatformKeyboardEvent::keyCodeForHardwareKeyCode): match web key code
to hardware code as reported by GDK.
(WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent): add web key value and
code to the keyboard event upon creation.

Source/WebKit2:

* Shared/WebEvent.h:
* Shared/WebKeyboardEvent.cpp:
(WebKit::WebKeyboardEvent::WebKeyboardEvent): accept web key value and code on construction.
* Shared/gtk/WebEventFactory.cpp:
(WebKit::WebEventFactory::createWebKeyboardEvent): pass web key value and code on construction.

Source/WTF:

* wtf/FeatureDefines.h: enable key and code properties support for GTK.

Tools:

* WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
(WTR::getGDKKeySymForKeyRef): add missing modifier keys which were being reported as 'l' and 'r' only
on tests.

LayoutTests:

* platform/gtk/fast/events/keyboardevent-code-expected.txt: Added. Hardware
codes are different for Mac and Linux for a couple of keys, so we need
platform-specific results.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/FeatureDefines.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/PlatformKeyboardEvent.h
trunk/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/WebEvent.h
trunk/Source/WebKit2/Shared/WebKeyboardEvent.cpp
trunk/Source/WebKit2/Shared/gtk/WebEventFactory.cpp
trunk/Tools/ChangeLog
trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp


Added Paths

trunk/LayoutTests/platform/gtk/fast/events/keyboardevent-code-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (210503 => 210504)

--- trunk/LayoutTests/ChangeLog	2017-01-09 12:46:34 UTC (rev 210503)
+++ trunk/LayoutTests/ChangeLog	2017-01-09 14:14:57 UTC (rev 210504)
@@ -1,3 +1,14 @@
+2017-01-06  Gustavo Noronha Silva  
+
+[GTK] Should support key and code properties on keyboard events
+https://bugs.webkit.org/show_bug.cgi?id=166759
+
+Reviewed by Carlos Garcia Campos.
+
+* platform/gtk/fast/events/keyboardevent-code-expected.txt: Added. Hardware
+codes are different for Mac and Linux for a couple of keys, so we need
+platform-specific results.
+
 2017-01-09  Alejandro G. Castro  
 
 [OWR] Unskip fast/mediastream/MediaStream-video-element-track-stop.html


Added: trunk/LayoutTests/platform/gtk/fast/events/keyboardevent-code-expected.txt (0 => 210504)

--- trunk/LayoutTests/platform/gtk/fast/events/keyboardevent-code-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/gtk/fast/events/keyboardevent-code-expected.txt	2017-01-09 14:14:57 UTC (rev 210504)
@@ -0,0 +1,190 @@
+Test the code attribute on KeyboardEvent.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+
+* keydown
+PASS keyboardEvent.code is "Space"
+* keyup
+PASS keyboardEvent.code is "Space"
+
+* keydown
+PASS keyboardEvent.code is "KeyA"
+* keyup
+PASS keyboardEvent.code is "KeyA"
+
+* keydown
+PASS keyboardEvent.code is "Backspace"
+* keyup
+PASS keyboardEvent.code is "Backspace"
+
+* keydown
+FAIL keyboardEvent.code should be Minus. Was Escape.
+* keyup
+FAIL keyboardEvent.code should be Minus. Was Escape.
+
+* keydown
+PASS keyboardEvent.code is "ArrowLeft"
+* keyup
+PASS keyboardEvent.code is "ArrowLeft"
+
+* keydown
+PASS keyboardEvent.code is "ArrowRight"
+* keyup
+PASS keyboardEvent.code is "ArrowRight"
+
+* keydown
+PASS keyboardEvent.code is "ArrowUp"
+* keyup
+PASS keyboardEvent.code is "ArrowUp"
+
+* keydown
+PASS keyboardEvent.code is "ArrowDown"
+* keyup
+PASS keyboardEvent.code is "ArrowDown"
+
+* keydown
+PASS keyboardEvent.code is "PageUp"
+* keyup
+PASS keyboardEvent.code is "PageUp"
+
+* keydown
+PASS keyboardEvent.code is "PageDown"
+* keyup
+PASS keyboardEvent.code is "PageDown"
+
+* keydown
+PASS keyboardEvent.code is "Home"
+* keyup
+PASS keyboardEvent.code is "Home"
+
+* keydown
+PASS keyboardEvent.code is "End"
+* keyup
+PASS keyboardEvent.code is "End"
+
+* keydown
+PASS keyboardEvent.code is "Delete"
+* keyup
+PASS keyboardEvent.code is "Delete"
+
+* keydown
+PASS 

[webkit-changes] [222834] trunk

[gns]

Title: [222834] trunk








Revision 222834
Author g...@gnome.org
Date 2017-10-04 00:46:25 -0700 (Wed, 04 Oct 2017)


Log Message
[GLib] Let WebCore know of low power situations
https://bugs.webkit.org/show_bug.cgi?id=177810

Reviewed by Carlos Garcia Campos.

.:

WebCore can use knowledge of low power situations to throttle timers and avoid expensive
checks, lowering power usage. We can use upower's warning level to let WebCore know we are
in such a situation.

* Source/cmake/OptionsGTK.cmake: depend on upower-glib.
* Source/cmake/FindUPowerGLib.cmake: Added.

Source/WebCore:

WebCore can use knowledge of low power situations to throttle timers and avoid expensive
checks, lowering power usage. We can use upower's warning level to let WebCore know we are
in such a situation.

No tests as there is no way to mock upower.

* PlatformGTK.cmake: add new file.
* PlatformWPE.cmake: add new file.
* platform/LowPowerModeNotifier.cpp: use upower-glib to know about low power situations.
* platform/LowPowerModeNotifier.h: includes upower header as UpClient and UpDevice are not forward
declaration-friendly.
* platform/glib/LowPowerModeNotifierGLib.cpp: Added.
(WebCore::LowPowerModeNotifier::LowPowerModeNotifier):
(WebCore::LowPowerModeNotifier::updateState): update low power mode from warning-level.
(WebCore::LowPowerModeNotifier::warningLevelCallback): track upower's warning-level to know when
a low power situation occurs.
(WebCore::LowPowerModeNotifier::~LowPowerModeNotifier): stop tracking the warning-level signal.
(WebCore::LowPowerModeNotifier::isLowPowerModeEnabled const):

Tools:

* gtk/install-dependencies: add upower-glib dev packages for Debian, Arch and Fedora.

Modified Paths

trunk/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/PlatformGTK.cmake
trunk/Source/WebCore/PlatformWPE.cmake
trunk/Source/WebCore/platform/LowPowerModeNotifier.cpp
trunk/Source/WebCore/platform/LowPowerModeNotifier.h
trunk/Source/cmake/OptionsGTK.cmake
trunk/Tools/ChangeLog
trunk/Tools/gtk/install-dependencies


Added Paths

trunk/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp
trunk/Source/cmake/FindUPowerGLib.cmake




Diff

Modified: trunk/ChangeLog (222833 => 222834)

--- trunk/ChangeLog	2017-10-04 07:33:08 UTC (rev 222833)
+++ trunk/ChangeLog	2017-10-04 07:46:25 UTC (rev 222834)
@@ -1,3 +1,17 @@
+2017-10-03  Gustavo Noronha Silva  
+
+[GLib] Let WebCore know of low power situations
+https://bugs.webkit.org/show_bug.cgi?id=177810
+
+Reviewed by Carlos Garcia Campos.
+
+WebCore can use knowledge of low power situations to throttle timers and avoid expensive
+checks, lowering power usage. We can use upower's warning level to let WebCore know we are
+in such a situation.
+
+* Source/cmake/OptionsGTK.cmake: depend on upower-glib.
+* Source/cmake/FindUPowerGLib.cmake: Added.
+
 2017-10-03  Youenn Fablet  
 
 Build libwebrtc unit tests executables


Modified: trunk/Source/WebCore/ChangeLog (222833 => 222834)

--- trunk/Source/WebCore/ChangeLog	2017-10-04 07:33:08 UTC (rev 222833)
+++ trunk/Source/WebCore/ChangeLog	2017-10-04 07:46:25 UTC (rev 222834)
@@ -1,3 +1,29 @@
+2017-10-03  Gustavo Noronha Silva  
+
+[GLib] Let WebCore know of low power situations
+https://bugs.webkit.org/show_bug.cgi?id=177810
+
+Reviewed by Carlos Garcia Campos.
+
+WebCore can use knowledge of low power situations to throttle timers and avoid expensive
+checks, lowering power usage. We can use upower's warning level to let WebCore know we are
+in such a situation.
+
+No tests as there is no way to mock upower.
+
+* PlatformGTK.cmake: add new file.
+* PlatformWPE.cmake: add new file.
+* platform/LowPowerModeNotifier.cpp: use upower-glib to know about low power situations.
+* platform/LowPowerModeNotifier.h: includes upower header as UpClient and UpDevice are not forward
+declaration-friendly.
+* platform/glib/LowPowerModeNotifierGLib.cpp: Added.
+(WebCore::LowPowerModeNotifier::LowPowerModeNotifier):
+(WebCore::LowPowerModeNotifier::updateState): update low power mode from warning-level.
+(WebCore::LowPowerModeNotifier::warningLevelCallback): track upower's warning-level to know when
+a low power situation occurs.
+(WebCore::LowPowerModeNotifier::~LowPowerModeNotifier): stop tracking the warning-level signal.
+(WebCore::LowPowerModeNotifier::isLowPowerModeEnabled const):
+
 2017-10-04  Joanmarie Diggs  
 
 AX: [ATK] aria-pressed="mixed" should be exposed via ATK_STATE_INDETERMINATE


Modified: trunk/Source/WebCore/PlatformGTK.cmake (222833 => 222834)

--- trunk/Source/WebCore/PlatformGTK.cmake	2017-10-04 07:33:08 UTC (rev 222833)
+++ trunk/Source/WebCore/PlatformGTK.cmake	2017-10-04 07:46:25 UTC (rev 

[webkit-changes] [222835] trunk/Source/WebCore

[gns]

Title: [222835] trunk/Source/WebCore








Revision 222835
Author g...@gnome.org
Date 2017-10-04 01:38:23 -0700 (Wed, 04 Oct 2017)


Log Message
Unreviewed build fix.

Use different enum value for the check. UP_DEVICE_LEVEL_NORMAL is only available on newer
upower.

* platform/glib/LowPowerModeNotifierGLib.cpp:
(WebCore::LowPowerModeNotifier::updateState):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (222834 => 222835)

--- trunk/Source/WebCore/ChangeLog	2017-10-04 07:46:25 UTC (rev 222834)
+++ trunk/Source/WebCore/ChangeLog	2017-10-04 08:38:23 UTC (rev 222835)
@@ -1,3 +1,13 @@
+2017-10-04  Gustavo Noronha Silva  
+
+Unreviewed build fix.
+
+Use different enum value for the check. UP_DEVICE_LEVEL_NORMAL is only available on newer
+upower.
+
+* platform/glib/LowPowerModeNotifierGLib.cpp:
+(WebCore::LowPowerModeNotifier::updateState):
+
 2017-10-03  Gustavo Noronha Silva  
 
 [GLib] Let WebCore know of low power situations


Modified: trunk/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp (222834 => 222835)

--- trunk/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp	2017-10-04 07:46:25 UTC (rev 222834)
+++ trunk/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp	2017-10-04 08:38:23 UTC (rev 222835)
@@ -36,7 +36,7 @@
 {
 UpDeviceLevel warningLevel;
 g_object_get(G_OBJECT(m_device.get()), "warning-level", , nullptr);
-m_lowPowerModeEnabled = warningLevel > UP_DEVICE_LEVEL_DISCHARGING && warningLevel < UP_DEVICE_LEVEL_NORMAL;
+m_lowPowerModeEnabled = warningLevel > UP_DEVICE_LEVEL_DISCHARGING && warningLevel <= UP_DEVICE_LEVEL_ACTION;
 }
 
 void LowPowerModeNotifier::warningLevelCallback(LowPowerModeNotifier* notifier)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [223282] trunk

[gns]

Title: [223282] trunk








Revision 223282
Author g...@gnome.org
Date 2017-10-13 10:07:32 -0700 (Fri, 13 Oct 2017)


Log Message
[GLib] WebKitNavigationAction should tell whether it is a redirect
https://bugs.webkit.org/show_bug.cgi?id=178178

Source/WebKit:

There is no good way to know whether a given navigation action has been caused
by a redirect through the glib API. This is necessary to implement some app mode
heuristics for Epiphany.

Reviewed by Carlos Garcia Campos.

* UIProcess/API/glib/WebKitNavigationAction.cpp:
(webkit_navigation_action_is_redirect): returns whether the navigation action is a redirect.
* UIProcess/API/glib/WebKitNavigationActionPrivate.h: add isRedirect to the wrapper object.
(_WebKitNavigationAction::_WebKitNavigationAction):
* UIProcess/API/gtk/WebKitNavigationAction.h: add the new API.
* UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt: ditto.
* UIProcess/API/wpe/WebKitNavigationAction.h: ditto.

Tools:

Test that WebKitNavigationAction properly reports being a redirect.

Reviewed by Carlos Garcia Campos.

* TestWebKitAPI/Tests/WebKitGLib/TestWebKitPolicyClient.cpp:
(testNavigationPolicy): test that loading /redirect leads to a redirect WebKitNavigationAction.
(serverCallback): add a /redirect path to the server, which causes a redirect.

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/API/glib/WebKitNavigationAction.cpp
trunk/Source/WebKit/UIProcess/API/glib/WebKitNavigationActionPrivate.h
trunk/Source/WebKit/UIProcess/API/gtk/WebKitNavigationAction.h
trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt
trunk/Source/WebKit/UIProcess/API/wpe/WebKitNavigationAction.h
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitPolicyClient.cpp




Diff

Modified: trunk/Source/WebKit/ChangeLog (223281 => 223282)

--- trunk/Source/WebKit/ChangeLog	2017-10-13 17:05:38 UTC (rev 223281)
+++ trunk/Source/WebKit/ChangeLog	2017-10-13 17:07:32 UTC (rev 223282)
@@ -1,3 +1,22 @@
+2017-10-11  Gustavo Noronha Silva  
+
+[GLib] WebKitNavigationAction should tell whether it is a redirect
+https://bugs.webkit.org/show_bug.cgi?id=178178
+
+There is no good way to know whether a given navigation action has been caused
+by a redirect through the glib API. This is necessary to implement some app mode
+heuristics for Epiphany.
+
+Reviewed by Carlos Garcia Campos.
+
+* UIProcess/API/glib/WebKitNavigationAction.cpp:
+(webkit_navigation_action_is_redirect): returns whether the navigation action is a redirect.
+* UIProcess/API/glib/WebKitNavigationActionPrivate.h: add isRedirect to the wrapper object.
+(_WebKitNavigationAction::_WebKitNavigationAction):
+* UIProcess/API/gtk/WebKitNavigationAction.h: add the new API.
+* UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt: ditto.
+* UIProcess/API/wpe/WebKitNavigationAction.h: ditto.
+
 2017-10-12  Brady Eidson  
 
 SW "Hello world".


Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitNavigationAction.cpp (223281 => 223282)

--- trunk/Source/WebKit/UIProcess/API/glib/WebKitNavigationAction.cpp	2017-10-13 17:05:38 UTC (rev 223281)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitNavigationAction.cpp	2017-10-13 17:07:32 UTC (rev 223282)
@@ -150,3 +150,19 @@
 g_return_val_if_fail(navigation, FALSE);
 return navigation->isUserGesture;
 }
+
+/**
+ * webkit_navigation_action_is_redirect:
+ * @navigation: a #WebKitNavigationAction
+ *
+ * Returns whether the @navigation was redirected.
+ *
+ * Returns: %TRUE if the original navigation was redirected, %FALSE otherwise.
+ *
+ * Since: 2.20
+ */
+gboolean webkit_navigation_action_is_redirect(WebKitNavigationAction* navigation)
+{
+g_return_val_if_fail(navigation, FALSE);
+return navigation->isRedirect;
+}


Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitNavigationActionPrivate.h (223281 => 223282)

--- trunk/Source/WebKit/UIProcess/API/glib/WebKitNavigationActionPrivate.h	2017-10-13 17:05:38 UTC (rev 223281)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitNavigationActionPrivate.h	2017-10-13 17:07:32 UTC (rev 223282)
@@ -30,6 +30,7 @@
 , mouseButton(toWebKitMouseButton(navigationActionData.mouseButton))
 , modifiers(toPlatformModifiers(navigationActionData.modifiers))
 , isUserGesture(navigationActionData.userGestureTokenIdentifier)
+, isRedirect(navigationActionData.isRedirect)
 , request(uriRequest)
 {
 }
@@ -47,6 +48,7 @@
 unsigned mouseButton;
 unsigned modifiers;
 bool isUserGesture : 1;
+bool isRedirect : 1;
 GRefPtr request;
 };
 


Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitNavigationAction.h (223281 => 223282)

--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitNavigationAction.h	2017-10-13 17:05:38 UTC (rev 223281)
+++ 

[webkit-changes] [223954] trunk/Source/WebCore

[gns]

Title: [223954] trunk/Source/WebCore








Revision 223954
Author g...@gnome.org
Date 2017-10-25 08:11:07 -0700 (Wed, 25 Oct 2017)


Log Message
Unreviewed follow up changing one more enum value as discussed in the bug
https://bugs.webkit.org/show_bug.cgi?id=177810

* platform/glib/LowPowerModeNotifierGLib.cpp:
(WebCore::LowPowerModeNotifier::updateState): use NONE instead of DISCHARGING, to ensure
it will build even with older upower.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (223953 => 223954)

--- trunk/Source/WebCore/ChangeLog	2017-10-25 08:34:13 UTC (rev 223953)
+++ trunk/Source/WebCore/ChangeLog	2017-10-25 15:11:07 UTC (rev 223954)
@@ -1,3 +1,12 @@
+2017-10-25  Gustavo Noronha Silva  
+
+Unreviewed follow up changing one more enum value as discussed in the bug
+https://bugs.webkit.org/show_bug.cgi?id=177810
+
+* platform/glib/LowPowerModeNotifierGLib.cpp:
+(WebCore::LowPowerModeNotifier::updateState): use NONE instead of DISCHARGING, to ensure
+it will build even with older upower.
+
 2017-10-25  Zan Dobersek  
 
 Make SERVICE_WORKER feature buildable on GTK, WPE


Modified: trunk/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp (223953 => 223954)

--- trunk/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp	2017-10-25 08:34:13 UTC (rev 223953)
+++ trunk/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp	2017-10-25 15:11:07 UTC (rev 223954)
@@ -36,7 +36,7 @@
 {
 UpDeviceLevel warningLevel;
 g_object_get(G_OBJECT(m_device.get()), "warning-level", , nullptr);
-m_lowPowerModeEnabled = warningLevel > UP_DEVICE_LEVEL_DISCHARGING && warningLevel <= UP_DEVICE_LEVEL_ACTION;
+m_lowPowerModeEnabled = warningLevel > UP_DEVICE_LEVEL_NONE && warningLevel <= UP_DEVICE_LEVEL_ACTION;
 }
 
 void LowPowerModeNotifier::warningLevelCallback(LowPowerModeNotifier* notifier)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes