[webkit-changes] [95283] trunk
Title: [95283] trunk
Revision 95283
Author carlo...@webkit.org
Date 2011-09-16 04:43:16 -0700 (Fri, 16 Sep 2011)
Log Message
[GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit
https://bugs.webkit.org/show_bug.cgi?id=68178
Patch by Martin Robinson mrobin...@igalia.com on 2011-09-16
Reviewed by Xan Lopez.
.:
* configure.ac: Do not build WebKit2 by default. Re-add pkgconfig support
for WebKit2.
Source/WebKit2:
* GNUmakefile.am: Do not build WebKit2 by default. Re-add pkgconfig support
for WebKit2.
Tools:
Add a work-around to enable WebKit2 when using build-webkit.
* Scripts/webkitdirs.pm:
(buildAutotoolsProject):
Modified Paths
trunk/ChangeLog
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/GNUmakefile.am
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitdirs.pm
trunk/configure.ac
Diff
Modified: trunk/ChangeLog (95282 => 95283)
--- trunk/ChangeLog 2011-09-16 09:29:14 UTC (rev 95282)
+++ trunk/ChangeLog 2011-09-16 11:43:16 UTC (rev 95283)
@@ -1,3 +1,13 @@
+2011-09-16 Martin Robinson mrobin...@igalia.com
+
+[GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit
+https://bugs.webkit.org/show_bug.cgi?id=68178
+
+Reviewed by Xan Lopez.
+
+* configure.ac: Do not build WebKit2 by default. Re-add pkgconfig support
+for WebKit2.
+
2011-09-15 Adam Barth aba...@webkit.org
Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
Modified: trunk/Source/WebKit2/ChangeLog (95282 => 95283)
--- trunk/Source/WebKit2/ChangeLog 2011-09-16 09:29:14 UTC (rev 95282)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-16 11:43:16 UTC (rev 95283)
@@ -1,3 +1,13 @@
+2011-09-16 Martin Robinson mrobin...@igalia.com
+
+[GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit
+https://bugs.webkit.org/show_bug.cgi?id=68178
+
+Reviewed by Xan Lopez.
+
+* GNUmakefile.am: Do not build WebKit2 by default. Re-add pkgconfig support
+for WebKit2.
+
2011-09-15 Adam Barth aba...@webkit.org
Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
Modified: trunk/Source/WebKit2/GNUmakefile.am (95282 => 95283)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-09-16 09:29:14 UTC (rev 95282)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-09-16 11:43:16 UTC (rev 95283)
@@ -913,6 +913,8 @@
$(XRENDER_LIBS) \
$(XT_LIBS)
+pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
+
# WebKit2 specific variables
forwarding_headers := $(GENSOURCES_WEBKIT2)/include
generate-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(libWebKit2_la_SOURCES)
@@ -960,6 +962,9 @@
$(BUILT_SOURCES) \
$(top_builddir)/Programs/WebKitWebProcess
+DISTCLEANFILES += \
+ $(top_builddir)/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
+
# WebKitWebProcess
libexec_PROGRAMS += \
Programs/WebKitWebProcess
Modified: trunk/Tools/ChangeLog (95282 => 95283)
--- trunk/Tools/ChangeLog 2011-09-16 09:29:14 UTC (rev 95282)
+++ trunk/Tools/ChangeLog 2011-09-16 11:43:16 UTC (rev 95283)
@@ -1,3 +1,15 @@
+2011-09-16 Martin Robinson mrobin...@igalia.com
+
+[GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit
+https://bugs.webkit.org/show_bug.cgi?id=68178
+
+Reviewed by Xan Lopez.
+
+Add a work-around to enable WebKit2 when using build-webkit.
+
+* Scripts/webkitdirs.pm:
+(buildAutotoolsProject):
+
2011-09-15 James Robinson jam...@chromium.org
Add Antoine Labour and Shawn Singh to the contributors-but-not-committers list.
Modified: trunk/Tools/Scripts/webkitdirs.pm (95282 => 95283)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-09-16 09:29:14 UTC (rev 95282)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-09-16 11:43:16 UTC (rev 95283)
@@ -1521,6 +1521,12 @@
$makeArgs .= jsc;
}
+# This is a temporary work-around to enable building WebKit2 on the bots,
+# but ensuring that it does not ship until the API is stable.
+if ($project eq WebKit and isGtk()) {
+push @buildArgs, --enable-webkit2;
+}
+
$prefix = $ENV{WebKitInstallationPrefix} if !defined($prefix);
push @buildArgs, --prefix= . $prefix if defined($prefix);
Modified: trunk/configure.ac (95282 => 95283)
--- trunk/configure.ac 2011-09-16 09:29:14 UTC (rev 95282)
+++ trunk/configure.ac 2011-09-16 11:43:16 UTC (rev 95283)
@@ -1063,8 +1063,8 @@
# WebKit2
AC_MSG_CHECKING([whether to build Webkit2])
AC_ARG_ENABLE(webkit2,
-AC_HELP_STRING([--enable-webkit2], [build webkit2 [default=yes]]),
-[], [enable_webkit2=yes])
+AC_HELP_STRING([--enable-webkit2], [build webkit2 [default=no]]),
+[], [enable_webkit2=no])
AC_MSG_RESULT([$enable_webkit2])
if test $enable_webkit2 = yes; then
if test $GTK_API_VERSION = 2.0; then
@@ -1204,6 +1204,15 @@
,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
)
+
+if test
[webkit-changes] [95403] trunk/Source
Title: [95403] trunk/Source Revision 95403 Author carlo...@webkit.org Date 2011-09-19 00:31:19 -0700 (Mon, 19 Sep 2011) Log Message [GTK] Fix distcheck build https://bugs.webkit.org/show_bug.cgi?id=68241 Reviewed by Martin Robinson. Source/_javascript_Core: * GNUmakefile.list.am: Source/WebCore: * GNUmakefile.list.am: Source/WebKit2: * GNUmakefile.am: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/GNUmakefile.list.am trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/GNUmakefile.list.am trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am Diff Modified: trunk/Source/_javascript_Core/ChangeLog (95402 => 95403) --- trunk/Source/_javascript_Core/ChangeLog 2011-09-19 06:50:06 UTC (rev 95402) +++ trunk/Source/_javascript_Core/ChangeLog 2011-09-19 07:31:19 UTC (rev 95403) @@ -1,3 +1,12 @@ +2011-09-19 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Fix distcheck build +https://bugs.webkit.org/show_bug.cgi?id=68241 + +Reviewed by Martin Robinson. + +* GNUmakefile.list.am: + 2011-09-18 Dan Bernstein m...@apple.com Removed ProfilerServer. Modified: trunk/Source/_javascript_Core/GNUmakefile.list.am (95402 => 95403) --- trunk/Source/_javascript_Core/GNUmakefile.list.am 2011-09-19 06:50:06 UTC (rev 95402) +++ trunk/Source/_javascript_Core/GNUmakefile.list.am 2011-09-19 07:31:19 UTC (rev 95403) @@ -91,6 +91,7 @@ Source/_javascript_Core/bytecode/Opcode.h \ Source/_javascript_Core/bytecode/PredictedType.cpp \ Source/_javascript_Core/bytecode/PredictedType.h \ + Source/_javascript_Core/bytecode/PredictionTracker.h \ Source/_javascript_Core/bytecode/SamplingTool.cpp \ Source/_javascript_Core/bytecode/SamplingTool.h \ Source/_javascript_Core/bytecode/StructureStubInfo.cpp \ @@ -106,6 +107,8 @@ Source/_javascript_Core/dfg/DFGAliasTracker.h \ Source/_javascript_Core/dfg/DFGByteCodeParser.cpp \ Source/_javascript_Core/dfg/DFGByteCodeParser.h \ + Source/_javascript_Core/dfg/DFGCapabilities.cpp \ + Source/_javascript_Core/dfg/DFGCapabilities.h \ Source/_javascript_Core/dfg/DFGDriver.cpp \ Source/_javascript_Core/dfg/DFGDriver.h \ Source/_javascript_Core/dfg/DFGFPRInfo.h \ @@ -120,6 +123,8 @@ Source/_javascript_Core/dfg/DFGNode.h \ Source/_javascript_Core/dfg/DFGOperations.cpp \ Source/_javascript_Core/dfg/DFGOperations.h \ + Source/_javascript_Core/dfg/DFGOSREntry.cpp \ + Source/_javascript_Core/dfg/DFGOSREntry.h \ Source/_javascript_Core/dfg/DFGPropagator.cpp \ Source/_javascript_Core/dfg/DFGPropagator.h \ Source/_javascript_Core/dfg/DFGRegisterBank.h \ @@ -156,6 +161,7 @@ Source/_javascript_Core/heap/VTableSpectrum.cpp \ Source/_javascript_Core/heap/VTableSpectrum.h \ Source/_javascript_Core/heap/Weak.h \ + Source/_javascript_Core/heap/WeakReferenceHarvester.h \ Source/_javascript_Core/heap/WriteBarrierSupport.cpp \ Source/_javascript_Core/heap/WriteBarrierSupport.h \ Source/_javascript_Core/config.h \ @@ -210,6 +216,7 @@ Source/_javascript_Core/interpreter/RegisterFile.h \ Source/_javascript_Core/interpreter/Register.h \ Source/_javascript_Core/_javascript_CorePrefix.h \ + Source/_javascript_Core/jit/CompactJITCodeMap.h \ Source/_javascript_Core/jit/ExecutableAllocator.cpp \ Source/_javascript_Core/jit/ExecutableAllocator.h \ Source/_javascript_Core/jit/JITArithmetic32_64.cpp \ Modified: trunk/Source/WebCore/ChangeLog (95402 => 95403) --- trunk/Source/WebCore/ChangeLog 2011-09-19 06:50:06 UTC (rev 95402) +++ trunk/Source/WebCore/ChangeLog 2011-09-19 07:31:19 UTC (rev 95403) @@ -1,3 +1,12 @@ +2011-09-19 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Fix distcheck build +https://bugs.webkit.org/show_bug.cgi?id=68241 + +Reviewed by Martin Robinson. + +* GNUmakefile.list.am: + 2011-09-18 Ilya Tikhonovsky loi...@chromium.org Web Inspector: chromium-win: Save timeline data does nothing. Modified: trunk/Source/WebCore/GNUmakefile.list.am (95402 => 95403) --- trunk/Source/WebCore/GNUmakefile.list.am 2011-09-19 06:50:06 UTC (rev 95402) +++ trunk/Source/WebCore/GNUmakefile.list.am 2011-09-19 07:31:19 UTC (rev 95403) @@ -898,15 +898,12 @@ Source/WebCore/bridge/jni/jsc/JavaMethodJSC.h \ Source/WebCore/bridge/jsc/BridgeJSC.cpp \ Source/WebCore/bridge/jsc/BridgeJSC.h \ - Source/WebCore/bridge/npapi.h \ Source/WebCore/bridge/NP_jsobject.cpp \ Source/WebCore/bridge/NP_jsobject.h \ Source/WebCore/bridge/npruntime.cpp \ - Source/WebCore/bridge/npruntime.h \ Source/WebCore/bridge/npruntime_impl.h \ Source/WebCore/bridge/npruntime_internal.h \ Source/WebCore/bridge/npruntime_priv.h \ - Source/WebCore/bridge/nptypes.h \ Source/WebCore/bridge/runtime_array.cpp \ Source/WebCore/bridge/runtime_array.h \ Source/WebCore/bridge/runtime_method.cpp \ @@ -2892,6 +2889,9 @@ Source/WebCore/platform/Widget.cpp \ Source/WebCore/platform/Widget.h \
[webkit-changes] [95518] trunk
Title: [95518] trunk Revision 95518 Author carlo...@webkit.org Date 2011-09-20 00:57:52 -0700 (Tue, 20 Sep 2011) Log Message 2011-09-20 Carlos Garcia Campos cgar...@igalia.com [GTK] Update NEWS and configure.ac for 1.5.90 release Reviewed by Martin Robinson. * configure.ac: 2011-09-20 Philippe Normand pnorm...@igalia.com [GTK] Update NEWS and configure.ac for 1.5.90 release Reviewed by Martin Robinson. * NEWS: Modified Paths trunk/ChangeLog trunk/Source/WebKit/gtk/ChangeLog trunk/Source/WebKit/gtk/NEWS trunk/configure.ac Diff Modified: trunk/ChangeLog (95517 => 95518) --- trunk/ChangeLog 2011-09-20 06:33:57 UTC (rev 95517) +++ trunk/ChangeLog 2011-09-20 07:57:52 UTC (rev 95518) @@ -1,3 +1,11 @@ +2011-09-20 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Update NEWS and configure.ac for 1.5.90 release + +Reviewed by Martin Robinson. + +* configure.ac: + 2011-09-19 Adam Barth aba...@webkit.org Always enable ENABLE(EVENTSOURCE) Modified: trunk/Source/WebKit/gtk/ChangeLog (95517 => 95518) --- trunk/Source/WebKit/gtk/ChangeLog 2011-09-20 06:33:57 UTC (rev 95517) +++ trunk/Source/WebKit/gtk/ChangeLog 2011-09-20 07:57:52 UTC (rev 95518) @@ -1,3 +1,11 @@ +2011-09-20 Philippe Normand pnorm...@igalia.com + +[GTK] Update NEWS and configure.ac for 1.5.90 release + +Reviewed by Martin Robinson. + +* NEWS: + 2011-09-19 Leandro Pereira lean...@profusion.mobi GTK DRT leaks memory while comparing history items Modified: trunk/Source/WebKit/gtk/NEWS (95517 => 95518) --- trunk/Source/WebKit/gtk/NEWS 2011-09-20 06:33:57 UTC (rev 95517) +++ trunk/Source/WebKit/gtk/NEWS 2011-09-20 07:57:52 UTC (rev 95518) @@ -1,3 +1,16 @@ += +WebKitGTK+ 1.5.90 += + +What's new in WebKitGTK+ 1.5.90? + + - Bumped GStreamer requirement to 0.10.30. + - Switch to GTK+3 by default. GTK+2 is still required for the +WebKit2 plugin process though. + - Create pot files in builddir. + - Improvements in the WebKit2GTK+ port. + - Lots of bugfixes. + WebKitGTK+ 1.5.2 Modified: trunk/configure.ac (95517 => 95518) --- trunk/configure.ac 2011-09-20 06:33:57 UTC (rev 95517) +++ trunk/configure.ac 2011-09-20 07:57:52 UTC (rev 95518) @@ -2,14 +2,14 @@ m4_define([webkit_major_version], [1]) m4_define([webkit_minor_version], [5]) -m4_define([webkit_micro_version], [2]) +m4_define([webkit_micro_version], [90]) # This is the version we'll be using as part of our User-Agent string # e.g., AppleWebKit/$(webkit_user_agent_version) ... # # Sourced from Source/WebCore/Configurations/Version.xcconfig -m4_define([webkit_user_agent_major_version], [534]) -m4_define([webkit_user_agent_minor_version], [26]) +m4_define([webkit_user_agent_major_version], [535]) +m4_define([webkit_user_agent_minor_version], [4]) AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/]) @@ -35,7 +35,7 @@ dnl # Libtool library version, not to confuse with API version dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html -LIBWEBKITGTK_VERSION=9:0:9 +LIBWEBKITGTK_VERSION=9:1:9 AC_SUBST([LIBWEBKITGTK_VERSION]) AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar]) ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95521] trunk/Source
Title: [95521] trunk/Source Revision 95521 Author carlo...@webkit.org Date 2011-09-20 01:58:54 -0700 (Tue, 20 Sep 2011) Log Message [GTK] WebProcess shouldn't use the GTK+ API https://bugs.webkit.org/show_bug.cgi?id=68062 Reviewed by Martin Robinson. Source/WebCore: Move errors code that is common between webki1 and webkit2 to WebCore so that it can be shared. * GNUmakefile.list.am: Add new files to compilation. * platform/gtk/ErrorsGtk.cpp: Added. (WebCore::cancelledError): (WebCore::blockedError): (WebCore::cannotShowURLError): (WebCore::interruptedForPolicyChangeError): (WebCore::cannotShowMIMETypeError): (WebCore::fileDoesNotExistError): (WebCore::pluginWillHandleLoadError): * platform/gtk/ErrorsGtk.h: Added. Source/WebKit/gtk: Use WebCore API to create errors in frame loader. * WebCoreSupport/AssertMatchingEnums.cpp: * WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::FrameLoaderClient::cancelledError): (WebKit::FrameLoaderClient::blockedError): (WebKit::FrameLoaderClient::cannotShowURLError): (WebKit::FrameLoaderClient::interruptedForPolicyChangeError): (WebKit::FrameLoaderClient::cannotShowMIMETypeError): (WebKit::FrameLoaderClient::fileDoesNotExistError): (WebKit::FrameLoaderClient::pluginWillHandleLoadError): * webkit/webkiterror.cpp: (webkit_network_error_quark): (webkit_policy_error_quark): (webkit_plugin_error_quark): Source/WebKit/gtk/po: * POTFILES: Remove FrameLoaderGtk.cpp and add ErrorsGtk.cpp. Source/WebKit2: Use WebCore API to create errors in WebProcess. * GNUmakefile.am: Don't use webkit/webkierror.h. * WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp: (WebKit::cancelledError): (WebKit::blockedError): (WebKit::cannotShowURLError): (WebKit::interruptedForPolicyChangeError): (WebKit::cannotShowMIMETypeError): (WebKit::fileDoesNotExistError): (WebKit::pluginWillHandleLoadError): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/GNUmakefile.list.am trunk/Source/WebKit/gtk/ChangeLog trunk/Source/WebKit/gtk/WebCoreSupport/AssertMatchingEnums.cpp trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp trunk/Source/WebKit/gtk/po/ChangeLog trunk/Source/WebKit/gtk/po/POTFILES trunk/Source/WebKit/gtk/webkit/webkiterror.cpp trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp Added Paths trunk/Source/WebCore/platform/gtk/ErrorsGtk.cpp trunk/Source/WebCore/platform/gtk/ErrorsGtk.h Diff Modified: trunk/Source/WebCore/ChangeLog (95520 => 95521) --- trunk/Source/WebCore/ChangeLog 2011-09-20 08:36:05 UTC (rev 95520) +++ trunk/Source/WebCore/ChangeLog 2011-09-20 08:58:54 UTC (rev 95521) @@ -1,3 +1,24 @@ +2011-09-20 Carlos Garcia Campos cgar...@igalia.com + +[GTK] WebProcess shouldn't use the GTK+ API +https://bugs.webkit.org/show_bug.cgi?id=68062 + +Reviewed by Martin Robinson. + +Move errors code that is common between webki1 and webkit2 to +WebCore so that it can be shared. + +* GNUmakefile.list.am: Add new files to compilation. +* platform/gtk/ErrorsGtk.cpp: Added. +(WebCore::cancelledError): +(WebCore::blockedError): +(WebCore::cannotShowURLError): +(WebCore::interruptedForPolicyChangeError): +(WebCore::cannotShowMIMETypeError): +(WebCore::fileDoesNotExistError): +(WebCore::pluginWillHandleLoadError): +* platform/gtk/ErrorsGtk.h: Added. + 2011-09-19 Mark Rowe mr...@apple.com Attempt to fix the Leopard build. Modified: trunk/Source/WebCore/GNUmakefile.list.am (95520 => 95521) --- trunk/Source/WebCore/GNUmakefile.list.am 2011-09-20 08:36:05 UTC (rev 95520) +++ trunk/Source/WebCore/GNUmakefile.list.am 2011-09-20 08:58:54 UTC (rev 95521) @@ -2619,6 +2619,8 @@ Source/WebCore/platform/graphics/WindRule.h \ Source/WebCore/platform/graphics/WOFFFileFormat.cpp \ Source/WebCore/platform/graphics/WOFFFileFormat.h \ + Source/WebCore/platform/gtk/ErrorsGtk.cpp \ + Source/WebCore/platform/gtk/ErrorsGtk.h \ Source/WebCore/platform/gtk/KURLGtk.cpp \ Source/WebCore/platform/gtk/LanguageGtk.cpp \ Source/WebCore/platform/gtk/LoggingGtk.cpp \ Added: trunk/Source/WebCore/platform/gtk/ErrorsGtk.cpp (0 => 95521) --- trunk/Source/WebCore/platform/gtk/ErrorsGtk.cpp (rev 0) +++ trunk/Source/WebCore/platform/gtk/ErrorsGtk.cpp 2011-09-20 08:58:54 UTC (rev 95521) @@ -0,0 +1,72 @@ +/* + * 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 Library 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 + * Library General Public
[webkit-changes] [96087] trunk
Title: [96087] trunk
Revision 96087
Author carlo...@webkit.org
Date 2011-09-27 02:35:55 -0700 (Tue, 27 Sep 2011)
Log Message
[GTK] Reorganize header files
https://bugs.webkit.org/show_bug.cgi?id=65616
Reviewed by Martin Robinson.
.:
* GNUmakefile.am: Initialize $libwebkitgtkincludedir to
$(prefix)/include/webkitgtk-api-version
Source/_javascript_Core:
Install header files under $libwebkitgtkincludedir/_javascript_Core.
* GNUmakefile.am: Use $libwebkitgtkincludedir.
* _javascript_coregtk.pc.in: Use webkitgtk-api-version as include dir.
Source/WebKit/gtk:
Install header files under $libwebkitgtkincludedir/webkit.
* GNUmakefile.am: Use $libwebkitgtkincludedir.
* webkit.pc.in: Use webkitgtk-api-version as include dir.
Modified Paths
trunk/ChangeLog
trunk/GNUmakefile.am
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/GNUmakefile.am
trunk/Source/_javascript_Core/_javascript_coregtk.pc.in
trunk/Source/WebKit/gtk/ChangeLog
trunk/Source/WebKit/gtk/GNUmakefile.am
trunk/Source/WebKit/gtk/webkit.pc.in
Diff
Modified: trunk/ChangeLog (96086 => 96087)
--- trunk/ChangeLog 2011-09-27 09:31:07 UTC (rev 96086)
+++ trunk/ChangeLog 2011-09-27 09:35:55 UTC (rev 96087)
@@ -1,3 +1,13 @@
+2011-09-27 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Reorganize header files
+https://bugs.webkit.org/show_bug.cgi?id=65616
+
+Reviewed by Martin Robinson.
+
+* GNUmakefile.am: Initialize $libwebkitgtkincludedir to
+$(prefix)/include/webkitgtk-api-version
+
2011-09-26 Raphael Kubo da Costa k...@profusion.mobi
[CMake] Remove FindFreetype.cmake
Modified: trunk/GNUmakefile.am (96086 => 96087)
--- trunk/GNUmakefile.am 2011-09-27 09:31:07 UTC (rev 96086)
+++ trunk/GNUmakefile.am 2011-09-27 09:35:55 UTC (rev 96087)
@@ -41,6 +41,7 @@
WebKit := $(srcdir)/Source/WebKit/gtk
WebKit2 := $(srcdir)/Source/WebKit2
pkgconfigdir := $(libdir)/pkgconfig
+libwebkitgtkincludedir := $(prefix)/include/webkitgtk-@WEBKITGTK_API_VERSION@
# Libraries and support components
bin_PROGRAMS :=
Modified: trunk/Source/_javascript_Core/ChangeLog (96086 => 96087)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-27 09:31:07 UTC (rev 96086)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-27 09:35:55 UTC (rev 96087)
@@ -1,3 +1,15 @@
+2011-09-27 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Reorganize header files
+https://bugs.webkit.org/show_bug.cgi?id=65616
+
+Reviewed by Martin Robinson.
+
+Install header files under $libwebkitgtkincludedir/_javascript_Core.
+
+* GNUmakefile.am: Use $libwebkitgtkincludedir.
+* _javascript_coregtk.pc.in: Use webkitgtk-api-version as include dir.
+
2011-09-26 Geoffrey Garen gga...@apple.com
REGRESSION (r95912): Conservative marking doesn't filter out pointers to
Modified: trunk/Source/_javascript_Core/GNUmakefile.am (96086 => 96087)
--- trunk/Source/_javascript_Core/GNUmakefile.am 2011-09-27 09:31:07 UTC (rev 96086)
+++ trunk/Source/_javascript_Core/GNUmakefile.am 2011-09-27 09:35:55 UTC (rev 96087)
@@ -16,7 +16,7 @@
nodist_libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
$(_javascript_core_built_sources)
-libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/_javascript_Core
+libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(libwebkitgtkincludedir)/_javascript_Core
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = $(_javascript_core_h_api)
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
Modified: trunk/Source/_javascript_Core/_javascript_coregtk.pc.in (96086 => 96087)
--- trunk/Source/_javascript_Core/_javascript_coregtk.pc.in 2011-09-27 09:31:07 UTC (rev 96086)
+++ trunk/Source/_javascript_Core/_javascript_coregtk.pc.in 2011-09-27 09:35:55 UTC (rev 96087)
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: glib-2.0
Libs: -L${libdir} -ljavascriptcoregtk-@WEBKITGTK_API_VERSION@
-Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@
+Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@
Modified: trunk/Source/WebKit/gtk/ChangeLog (96086 => 96087)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-09-27 09:31:07 UTC (rev 96086)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-09-27 09:35:55 UTC (rev 96087)
@@ -1,3 +1,15 @@
+2011-09-27 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Reorganize header files
+https://bugs.webkit.org/show_bug.cgi?id=65616
+
+Reviewed by Martin Robinson.
+
+Install header files under $libwebkitgtkincludedir/webkit.
+
+* GNUmakefile.am: Use $libwebkitgtkincludedir.
+* webkit.pc.in: Use webkitgtk-api-version as include dir.
+
2011-09-26 Gustavo Noronha Silva gustavo.noro...@collabora.com
Fix
[webkit-changes] [96121] trunk
Title: [96121] trunk
Revision 96121
Author carlo...@webkit.org
Date 2011-09-27 09:40:03 -0700 (Tue, 27 Sep 2011)
Log Message
[GTK] Rename WebKit2 GTK+ API main header as webkit2.h
https://bugs.webkit.org/show_bug.cgi?id=65178
Reviewed by Martin Robinson.
Source/WebKit2:
* GNUmakefile.am: Add webkit2.h.
* UIProcess/API/gtk/WebKitWebView.h:
* UIProcess/API/gtk/webkit2.h: Renamed from Source/WebKit2/UIProcess/API/gtk/webkit/webkit.h.
* webkit2gtk.pc.in: Use webkitgtk-api-version as include dir.
Tools:
* GNUmakefile.am:
* GtkLauncher/main.c: Include webkit2/webkit2.h.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/GNUmakefile.am
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
trunk/Source/WebKit2/webkit2gtk.pc.in
trunk/Tools/ChangeLog
trunk/Tools/GNUmakefile.am
trunk/Tools/GtkLauncher/main.c
Added Paths
trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h
Removed Paths
trunk/Source/WebKit2/UIProcess/API/gtk/webkit/webkit.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (96120 => 96121)
--- trunk/Source/WebKit2/ChangeLog 2011-09-27 16:38:19 UTC (rev 96120)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-27 16:40:03 UTC (rev 96121)
@@ -1,3 +1,15 @@
+2011-09-27 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Rename WebKit2 GTK+ API main header as webkit2.h
+https://bugs.webkit.org/show_bug.cgi?id=65178
+
+Reviewed by Martin Robinson.
+
+* GNUmakefile.am: Add webkit2.h.
+* UIProcess/API/gtk/WebKitWebView.h:
+* UIProcess/API/gtk/webkit2.h: Renamed from Source/WebKit2/UIProcess/API/gtk/webkit/webkit.h.
+* webkit2gtk.pc.in: Use webkitgtk-api-version as include dir.
+
2011-09-27 Tor Arne Vestbø tor.arne.ves...@nokia.com
[Qt] Fix build of WebKit2 unit-tests after r96108
Modified: trunk/Source/WebKit2/GNUmakefile.am (96120 => 96121)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-09-27 16:38:19 UTC (rev 96120)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-09-27 16:40:03 UTC (rev 96121)
@@ -65,10 +65,13 @@
$(WebKit2)/UIProcess/API/C/WKProtectionSpace.h \
$(WebKit2)/UIProcess/API/C/WKProtectionSpaceTypes.h \
$(WebKit2)/UIProcess/API/C/WKResourceCacheManager.h \
- $(WebKit2)/UIProcess/API/cpp/WKRetainPtr.h \
+ $(WebKit2)/UIProcess/API/cpp/WKRetainPtr.h
+
+libwebkit2gtkincludedir = $(libwebkitgtkincludedir)/webkit2
+libwebkit2gtkinclude_HEADERS = \
$(WebKit2)/UIProcess/API/gtk/WebKitWebView.h \
$(WebKit2)/UIProcess/API/gtk/WebKitWebViewBase.h \
- $(WebKit2)/UIProcess/API/gtk/webkit/webkit.h
+ $(WebKit2)/UIProcess/API/gtk/webkit2.h
webkit2_built_sources += \
DerivedSources/WebKit2/AuthenticationManagerMessageReceiver.cpp \
@@ -454,7 +457,7 @@
Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp \
Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h \
- Source/WebKit2/UIProcess/API/gtk/webkit/webkit.h \
+ Source/WebKit2/UIProcess/API/gtk/webkit2.h \
Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp \
Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h \
Source/WebKit2/UIProcess/Authentication/AuthenticationDecisionListener.cpp \
@@ -849,6 +852,7 @@
-I$(srcdir)/Source/WebKit2/WebProcess/WebPage/gtk \
-I$(top_builddir)/DerivedSources/WebKit2 \
-I$(top_builddir)/DerivedSources/WebKit2/include \
+ -I$(top_builddir)/DerivedSources/WebKit2/include/webkit2gtk \
-I$(top_builddir)/DerivedSources/WebKit2/include/_javascript_Core \
-I$(top_builddir)/DerivedSources/WebKit2/include/WebCore \
-I$(top_builddir)/DerivedSources/WebKit2/include/WebKit2 \
@@ -874,7 +878,7 @@
libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = \
- $(prefix)/include/webkit2-@WEBKITGTK_API_VERSION@/WebKit2
+ $(libwebkit2gtkincludedir)/WebKit2
# For the Gtk port we want to use XP_UNIX both in X11 and Mac
if !TARGET_WIN32
@@ -923,9 +927,16 @@
forwarding_headers := $(GENSOURCES_WEBKIT2)/include
generate-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(libWebKit2_la_SOURCES)
$(AM_V_GEN)$(PERL) $ $(WebKit2) $(forwarding_headers) gtk
- $(AM_V_GEN)$(PERL) $ $(WebKit2) $(forwarding_headers) soup
+ $(AM_V_GEN)$(PERL) $ $(WebKit2) $(forwarding_headers) soup
+
BUILT_SOURCES += generate-webkit2-forwarding-headers
+$(GENSOURCES_WEBKIT2)/include/webkit2gtk/webkit2: $(libwebkit2gtkinclude_HEADERS)
+ $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/include/webkit2gtk \
+ ln -s -f ${shell pwd}/$(WebKit2)/UIProcess/API/gtk $@
+
+BUILT_SOURCES += $(GENSOURCES_WEBKIT2)/include/webkit2gtk/webkit2
+
vpath %.messages.in = \
$(WebKit2)/PluginProcess \
$(WebKit2)/Shared/Plugins \
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (96120 => 96121)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-09-27 16:38:19 UTC (rev 96120)
+++
[webkit-changes] [96133] trunk/Source/WebKit2
Title: [96133] trunk/Source/WebKit2 Revision 96133 Author carlo...@webkit.org Date 2011-09-27 11:06:06 -0700 (Tue, 27 Sep 2011) Log Message [GTK] Add WebKitWebContext to GTK API https://bugs.webkit.org/show_bug.cgi?id=67931 Reviewed by Philippe Normand. Initial implementation of WebKitWebContext for WebKit2 GTK API. * GNUmakefile.am: Add new files to compilation. * UIProcess/API/gtk/WebKitWebContext.cpp: Added. (webkitWebContextFinalize): (webkit_web_context_init): (webkit_web_context_class_init): (createDefaultWebContext): (webkit_web_context_get_default): * UIProcess/API/gtk/WebKitWebContext.h: Added. * UIProcess/API/gtk/tests/testwebcontext.c: (testWebContextDefault): (main): * UIProcess/API/gtk/webkit2.h: Add webkit2/WebKitWebContext.h. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h Added Paths trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h trunk/Source/WebKit2/UIProcess/API/gtk/tests/ trunk/Source/WebKit2/UIProcess/API/gtk/tests/testwebcontext.c Diff Modified: trunk/Source/WebKit2/ChangeLog (96132 => 96133) --- trunk/Source/WebKit2/ChangeLog 2011-09-27 18:04:01 UTC (rev 96132) +++ trunk/Source/WebKit2/ChangeLog 2011-09-27 18:06:06 UTC (rev 96133) @@ -1,3 +1,26 @@ +2011-09-27 Carlos Garcia Campos cgar...@igalia.com + + +[GTK] Add WebKitWebContext to GTK API +https://bugs.webkit.org/show_bug.cgi?id=67931 + +Reviewed by Philippe Normand. + +Initial implementation of WebKitWebContext for WebKit2 GTK API. + +* GNUmakefile.am: Add new files to compilation. +* UIProcess/API/gtk/WebKitWebContext.cpp: Added. +(webkitWebContextFinalize): +(webkit_web_context_init): +(webkit_web_context_class_init): +(createDefaultWebContext): +(webkit_web_context_get_default): +* UIProcess/API/gtk/WebKitWebContext.h: Added. +* UIProcess/API/gtk/tests/testwebcontext.c: +(testWebContextDefault): +(main): +* UIProcess/API/gtk/webkit2.h: Add webkit2/WebKitWebContext.h. + 2011-09-27 Sheriff Bot webkit.review@gmail.com Unreviewed, rolling out r96108, r96111, r96113, and r96116. Modified: trunk/Source/WebKit2/GNUmakefile.am (96132 => 96133) --- trunk/Source/WebKit2/GNUmakefile.am 2011-09-27 18:04:01 UTC (rev 96132) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-09-27 18:06:06 UTC (rev 96133) @@ -69,6 +69,7 @@ libwebkit2gtkincludedir = $(libwebkitgtkincludedir)/webkit2 libwebkit2gtkinclude_HEADERS = \ + $(WebKit2)/UIProcess/API/gtk/WebKitWebContext.h \ $(WebKit2)/UIProcess/API/gtk/WebKitWebView.h \ $(WebKit2)/UIProcess/API/gtk/WebKitWebViewBase.h \ $(WebKit2)/UIProcess/API/gtk/webkit2.h @@ -452,6 +453,8 @@ Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h \ Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h \ Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp \ + Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h \ + Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp \ Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h \ Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp \ Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.h \ @@ -982,6 +985,39 @@ DISTCLEANFILES += \ $(top_builddir)/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc +# Unit tests +TEST_PROGS += \ + Programs/unittests/webkit2/testwebcontext + +noinst_PROGRAMS += $(TEST_PROGS) +webkit2_tests_cflags = \ + -I$(srcdir)/Source \ + -I$(srcdir)/Source/WebKit2 \ + -I$(top_builddir)/DerivedSources/WebKit2/include \ + -I$(top_builddir)/DerivedSources/WebKit2/include/webkit2gtk \ + -I$(srcdir)/Source/WebKit2/UIProcess/API/gtk \ + $(global_cflags) \ + $(global_cppflags) \ + $(GLIB_CFLAGS) \ + $(GTK_CFLAGS) \ + $(LIBSOUP_CFLAGS) + +webkit2_tests_ldadd = \ + libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ + libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ + $(GLIB_LIBS) \ + $(GTK_LIBS) \ + $(LIBSOUP_LIBS) + +webkit2_tests_ldflags = \ + -no-install \ + -no-fast-install + +Programs_unittests_webkit2_testwebcontext_SOURCES = Source/WebKit2/UIProcess/API/gtk/tests/testwebcontext.c +Programs_unittests_webkit2_testwebcontext_CFLAGS = $(webkit2_tests_cflags) +Programs_unittests_webkit2_testwebcontext_LDADD = $(webkit2_tests_ldadd) +Programs_unittests_webkit2_testwebcontext_LDFLAGS = $(webkit2_tests_ldflags) + # WebKitWebProcess libexec_PROGRAMS += \ Programs/WebKitWebProcess Added: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (0 => 96133) --- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (rev 0) +++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2011-09-27 18:06:06 UTC (rev 96133) @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2011 Igalia S.L. + * + * This library is free software; you can redistribute it and/or + *
[webkit-changes] [96136] trunk/Source/WebKit2
Title: [96136] trunk/Source/WebKit2 Revision 96136 Author carlo...@webkit.org Date 2011-09-27 11:32:55 -0700 (Tue, 27 Sep 2011) Log Message [GTK] Use WebKitWebContext in WebKitWebView https://bugs.webkit.org/show_bug.cgi?id=67990 Reviewed by Martin Robinson. Use webkit_web_context_get_default() instead of WKContextGetSharedProcessContext() and add API to create a view with a given web context and to return the current context associated to the view. * GNUmakefile.am: Add new files to compilation. * UIProcess/API/gtk/WebKitPrivate.h: Added. * UIProcess/API/gtk/WebKitWebContext.cpp: (webkitWebContextGetWKContext): Private API to get the WKContext wrapped by the WebKitWebContext. * UIProcess/API/gtk/WebKitWebContextPrivate.h: Added. * UIProcess/API/gtk/WebKitWebView.cpp: (webkitWebViewConstructed): Create the webpage using the web context of the view. (webkitWebViewSetProperty): (webkitWebViewGetProperty): (webkit_web_view_init): (webkit_web_view_class_init): (webkit_web_view_new): Create a new view with the default context. (webkit_web_view_new_with_context): Create a new view with the given context. (webkit_web_view_get_context): Return the context. * UIProcess/API/gtk/WebKitWebView.h: * UIProcess/API/gtk/tests/testwebview.c: Added. (testWebViewDefaultContext): (main): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h Added Paths trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h trunk/Source/WebKit2/UIProcess/API/gtk/tests/testwebview.c Diff Modified: trunk/Source/WebKit2/ChangeLog (96135 => 96136) --- trunk/Source/WebKit2/ChangeLog 2011-09-27 18:19:01 UTC (rev 96135) +++ trunk/Source/WebKit2/ChangeLog 2011-09-27 18:32:55 UTC (rev 96136) @@ -1,6 +1,40 @@ 2011-09-27 Carlos Garcia Campos cgar...@igalia.com +[GTK] Use WebKitWebContext in WebKitWebView +https://bugs.webkit.org/show_bug.cgi?id=67990 +Reviewed by Martin Robinson. + +Use webkit_web_context_get_default() instead of +WKContextGetSharedProcessContext() and add API to create a view +with a given web context and to return the current context +associated to the view. + +* GNUmakefile.am: Add new files to compilation. +* UIProcess/API/gtk/WebKitPrivate.h: Added. +* UIProcess/API/gtk/WebKitWebContext.cpp: +(webkitWebContextGetWKContext): Private API to get the WKContext +wrapped by the WebKitWebContext. +* UIProcess/API/gtk/WebKitWebContextPrivate.h: Added. +* UIProcess/API/gtk/WebKitWebView.cpp: +(webkitWebViewConstructed): Create the webpage using the web +context of the view. +(webkitWebViewSetProperty): +(webkitWebViewGetProperty): +(webkit_web_view_init): +(webkit_web_view_class_init): +(webkit_web_view_new): Create a new view with the default context. +(webkit_web_view_new_with_context): Create a new view with the +given context. +(webkit_web_view_get_context): Return the context. +* UIProcess/API/gtk/WebKitWebView.h: +* UIProcess/API/gtk/tests/testwebview.c: Added. +(testWebViewDefaultContext): +(main): + +2011-09-27 Carlos Garcia Campos cgar...@igalia.com + + [GTK] Add WebKitWebContext to GTK API https://bugs.webkit.org/show_bug.cgi?id=67931 Modified: trunk/Source/WebKit2/GNUmakefile.am (96135 => 96136) --- trunk/Source/WebKit2/GNUmakefile.am 2011-09-27 18:19:01 UTC (rev 96135) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-09-27 18:32:55 UTC (rev 96136) @@ -453,8 +453,10 @@ Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h \ Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h \ Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp \ + Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h \ Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h \ Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp \ + Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h \ Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h \ Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp \ Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.h \ @@ -987,7 +989,8 @@ # Unit tests TEST_PROGS += \ - Programs/unittests/webkit2/testwebcontext + Programs/unittests/webkit2/testwebcontext \ + Programs/unittests/webkit2/testwebview noinst_PROGRAMS += $(TEST_PROGS) webkit2_tests_cflags = \ @@ -1018,6 +1021,11 @@ Programs_unittests_webkit2_testwebcontext_LDADD = $(webkit2_tests_ldadd) Programs_unittests_webkit2_testwebcontext_LDFLAGS = $(webkit2_tests_ldflags) +Programs_unittests_webkit2_testwebview_SOURCES = Source/WebKit2/UIProcess/API/gtk/tests/testwebview.c +Programs_unittests_webkit2_testwebview_CFLAGS =
[webkit-changes] [96225] trunk
Title: [96225] trunk
Revision 96225
Author carlo...@webkit.org
Date 2011-09-28 09:20:57 -0700 (Wed, 28 Sep 2011)
Log Message
[GTK] Add WebKitError to GTK+ WebKit2 API
https://bugs.webkit.org/show_bug.cgi?id=68508
Reviewed by Martin Robinson.
Source/WebKit2:
Add WebKitNetworkError enum to define network errors.
* GNUmakefile.am: Add new files to compilation.
* UIProcess/API/gtk/WebKitError.cpp: Added.
(webkit_network_error_quark):
* UIProcess/API/gtk/WebKitError.h:
* UIProcess/API/gtk/WebKitPrivate.h: Add
COMPILE_ASSERT_MATCHING_ENUM macro.
* UIProcess/API/gtk/webkit2.h: Add WebKitError.h and
WebKitEnumTypes.h
Tools:
* GNUmakefile.am: Add path to webkitgtk derived sources to the
include path.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/GNUmakefile.am
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h
trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h
trunk/Tools/ChangeLog
trunk/Tools/GNUmakefile.am
Added Paths
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (96224 => 96225)
--- trunk/Source/WebKit2/ChangeLog 2011-09-28 15:52:19 UTC (rev 96224)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-28 16:20:57 UTC (rev 96225)
@@ -1,5 +1,23 @@
2011-09-28 Carlos Garcia Campos cgar...@igalia.com
+[GTK] Add WebKitError to GTK+ WebKit2 API
+https://bugs.webkit.org/show_bug.cgi?id=68508
+
+Reviewed by Martin Robinson.
+
+Add WebKitNetworkError enum to define network errors.
+
+* GNUmakefile.am: Add new files to compilation.
+* UIProcess/API/gtk/WebKitError.cpp: Added.
+(webkit_network_error_quark):
+* UIProcess/API/gtk/WebKitError.h:
+* UIProcess/API/gtk/WebKitPrivate.h: Add
+COMPILE_ASSERT_MATCHING_ENUM macro.
+* UIProcess/API/gtk/webkit2.h: Add WebKitError.h and
+WebKitEnumTypes.h
+
+2011-09-28 Carlos Garcia Campos cgar...@igalia.com
+
[GTK] Fix Programs/unittests/webkit2/testwebview
https://bugs.webkit.org/show_bug.cgi?id=68993
Modified: trunk/Source/WebKit2/GNUmakefile.am (96224 => 96225)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-09-28 15:52:19 UTC (rev 96224)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-09-28 16:20:57 UTC (rev 96225)
@@ -68,7 +68,8 @@
$(WebKit2)/UIProcess/API/cpp/WKRetainPtr.h
libwebkit2gtkincludedir = $(libwebkitgtkincludedir)/webkit2
-libwebkit2gtkinclude_HEADERS = \
+webkit2gtk_headers = \
+ $(WebKit2)/UIProcess/API/gtk/WebKitError.h \
$(WebKit2)/UIProcess/API/gtk/WebKitWebContext.h \
$(WebKit2)/UIProcess/API/gtk/WebKitWebView.h \
$(WebKit2)/UIProcess/API/gtk/WebKitWebViewBase.h \
@@ -453,6 +454,8 @@
Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h \
Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h \
Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp \
+ Source/WebKit2/UIProcess/API/gtk/WebKitError.h \
+ Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp \
Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp \
@@ -857,7 +860,8 @@
-I$(srcdir)/Source/WebKit2/WebProcess/WebPage/gtk \
-I$(top_builddir)/DerivedSources/WebKit2 \
-I$(top_builddir)/DerivedSources/WebKit2/include \
- -I$(top_builddir)/DerivedSources/WebKit2/include/webkit2gtk \
+ -I$(top_builddir)/DerivedSources/WebKit2/webkit2gtk \
+ -I$(top_builddir)/DerivedSources/WebKit2/webkit2gtk/include \
-I$(top_builddir)/DerivedSources/WebKit2/include/_javascript_Core \
-I$(top_builddir)/DerivedSources/WebKit2/include/WebCore \
-I$(top_builddir)/DerivedSources/WebKit2/include/WebKit2 \
@@ -936,11 +940,11 @@
BUILT_SOURCES += generate-webkit2-forwarding-headers
-$(GENSOURCES_WEBKIT2)/include/webkit2gtk/webkit2: $(libwebkit2gtkinclude_HEADERS)
- $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/include/webkit2gtk \
+$(GENSOURCES_WEBKIT2)/webkit2gtk/include/webkit2: $(webkit2gtk_headers)
+ $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/include \
ln -s -f ${shell pwd}/$(WebKit2)/UIProcess/API/gtk $@
-BUILT_SOURCES += $(GENSOURCES_WEBKIT2)/include/webkit2gtk/webkit2
+BUILT_SOURCES += $(GENSOURCES_WEBKIT2)/webkit2gtk/include/webkit2
vpath %.messages.in = \
$(WebKit2)/PluginProcess \
@@ -980,8 +984,62 @@
DerivedSources/WebKit2/%Messages.h: %.messages.in $(message_gen_scripts)
$(AM_V_GEN)$(PYTHON) $(WebKit2)/Scripts/generate-messages-header.py $ $@
+webkit2gtk_built_headers_dir := $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2
+$(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.h: stamp-webkit2enumtypes
+ @true
+
+stamp-webkit2enumtypes: $(webkit2gtk_headers) $(WebKit2)/GNUmakefile.am
+ $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2 \
+ glib-mkenums \
+ --fhead #ifndef WEBKIT_ENUM_TYPES_H\n \
+ --fhead #define WEBKIT_ENUM_TYPES_H\n\n \
+ --fhead #include glib-object.h\n\n \
+ --fhead #include
[webkit-changes] [96226] trunk/Source/WebKit2
Title: [96226] trunk/Source/WebKit2 Revision 96226 Author carlo...@webkit.org Date 2011-09-28 09:24:23 -0700 (Wed, 28 Sep 2011) Log Message [GTK] Loader client implementation for WebKit2 GTK+ API https://bugs.webkit.org/show_bug.cgi?id=68085 Reviewed by Martin Robinson. Adds a new object, WebKitWebLoaderClient, that emits signals for every page loader callback. * GNUmakefile.am: Add new files to compilation. * UIProcess/API/gtk/WebKitWebLoaderClient.cpp: Added. (didStartProvisionalLoadForFrame): (didReceiveServerRedirectForProvisionalLoadForFrame): (didFailProvisionalLoadWithErrorForFrame): (didCommitLoadForFrame): (didFinishLoadForFrame): (didFailLoadWithErrorForFrame): (webkitWebLoaderClientConstructed): (webkitWebLoaderClientSetProperty): (webkitWebLoaderClientGetProperty): (webkit_web_loader_client_init): (webkit_web_loader_client_class_init): * UIProcess/API/gtk/WebKitWebLoaderClient.h: Added. * UIProcess/API/gtk/WebKitWebView.cpp: (webkitWebViewConstructed): Create the loader client for the view. (webkit_web_view_init): (webkit_web_view_get_loader_client): Get the current loader client. (webkit_web_view_set_loader_client): Set a new loader client. * UIProcess/API/gtk/WebKitWebView.h: * UIProcess/API/gtk/tests/testloading.c: Added. (serverCallback): (webLoadingFixtureSetup): (webLoadingFixtureTeardown): (getURIForPath): (loadStatusProvisionalLoadStarted): (loadStatusProvisionalLoadReceivedServerRedirect): (loadStatusProvisionalLoadFailed): (loadStatusLoadCommitted): (loadStatusLoadFinished): (loadStatusLoadFailed): (testLoadingStatus): (loadErrorProvisionalLoadStarted): (loadErrorProvisionalLoadFailed): (loadErrorLoadFinished): (testLoadingError): (main): * UIProcess/API/gtk/webkit2marshal.list: Added. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h Added Paths trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h trunk/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list Diff Modified: trunk/Source/WebKit2/ChangeLog (96225 => 96226) --- trunk/Source/WebKit2/ChangeLog 2011-09-28 16:20:57 UTC (rev 96225) +++ trunk/Source/WebKit2/ChangeLog 2011-09-28 16:24:23 UTC (rev 96226) @@ -1,5 +1,54 @@ 2011-09-28 Carlos Garcia Campos cgar...@igalia.com +[GTK] Loader client implementation for WebKit2 GTK+ API +https://bugs.webkit.org/show_bug.cgi?id=68085 + +Reviewed by Martin Robinson. + +Adds a new object, WebKitWebLoaderClient, that emits signals for +every page loader callback. + +* GNUmakefile.am: Add new files to compilation. +* UIProcess/API/gtk/WebKitWebLoaderClient.cpp: Added. +(didStartProvisionalLoadForFrame): +(didReceiveServerRedirectForProvisionalLoadForFrame): +(didFailProvisionalLoadWithErrorForFrame): +(didCommitLoadForFrame): +(didFinishLoadForFrame): +(didFailLoadWithErrorForFrame): +(webkitWebLoaderClientConstructed): +(webkitWebLoaderClientSetProperty): +(webkitWebLoaderClientGetProperty): +(webkit_web_loader_client_init): +(webkit_web_loader_client_class_init): +* UIProcess/API/gtk/WebKitWebLoaderClient.h: Added. +* UIProcess/API/gtk/WebKitWebView.cpp: +(webkitWebViewConstructed): Create the loader client for the view. +(webkit_web_view_init): +(webkit_web_view_get_loader_client): Get the current loader client. +(webkit_web_view_set_loader_client): Set a new loader client. +* UIProcess/API/gtk/WebKitWebView.h: +* UIProcess/API/gtk/tests/testloading.c: Added. +(serverCallback): +(webLoadingFixtureSetup): +(webLoadingFixtureTeardown): +(getURIForPath): +(loadStatusProvisionalLoadStarted): +(loadStatusProvisionalLoadReceivedServerRedirect): +(loadStatusProvisionalLoadFailed): +(loadStatusLoadCommitted): +(loadStatusLoadFinished): +(loadStatusLoadFailed): +(testLoadingStatus): +(loadErrorProvisionalLoadStarted): +(loadErrorProvisionalLoadFailed): +(loadErrorLoadFinished): +(testLoadingError): +(main): +* UIProcess/API/gtk/webkit2marshal.list: Added. + +2011-09-28 Carlos Garcia Campos cgar...@igalia.com + [GTK] Add WebKitError to GTK+ WebKit2 API https://bugs.webkit.org/show_bug.cgi?id=68508 Modified: trunk/Source/WebKit2/GNUmakefile.am (96225 => 96226) --- trunk/Source/WebKit2/GNUmakefile.am 2011-09-28 16:20:57 UTC (rev 96225) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-09-28 16:24:23 UTC (rev 96226) @@ -71,6 +71,7 @@ webkit2gtk_headers = \ $(WebKit2)/UIProcess/API/gtk/WebKitError.h \
[webkit-changes] [96317] trunk/Source/WebKit2
Title: [96317] trunk/Source/WebKit2
Revision 96317
Author carlo...@webkit.org
Date 2011-09-29 04:00:04 -0700 (Thu, 29 Sep 2011)
Log Message
[GTK] Explicitly call destructors for objects initialized with placement new syntax
https://bugs.webkit.org/show_bug.cgi?id=69079
Reviewed by Xan Lopez.
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkitWebContextFinalize): Call ~WebKitWebContextPrivate().
* UIProcess/API/gtk/WebKitWebLoaderClient.cpp:
(webkitWebLoaderClientFinalize): Call ~WebKitWebLoaderClient().
(webkit_web_loader_client_class_init):
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewFinalize): Call ~WebKitWebViewPrivate().
(webkit_web_view_class_init):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (96316 => 96317)
--- trunk/Source/WebKit2/ChangeLog 2011-09-29 10:33:03 UTC (rev 96316)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-29 11:00:04 UTC (rev 96317)
@@ -1,3 +1,19 @@
+2011-09-29 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Explicitly call destructors for objects initialized with placement new syntax
+https://bugs.webkit.org/show_bug.cgi?id=69079
+
+Reviewed by Xan Lopez.
+
+* UIProcess/API/gtk/WebKitWebContext.cpp:
+(webkitWebContextFinalize): Call ~WebKitWebContextPrivate().
+* UIProcess/API/gtk/WebKitWebLoaderClient.cpp:
+(webkitWebLoaderClientFinalize): Call ~WebKitWebLoaderClient().
+(webkit_web_loader_client_class_init):
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkitWebViewFinalize): Call ~WebKitWebViewPrivate().
+(webkit_web_view_class_init):
+
2011-09-28 Martin Robinson mrobin...@igalia.com
Fix the WebGL build on WebKit2 GTK+.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (96316 => 96317)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2011-09-29 10:33:03 UTC (rev 96316)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2011-09-29 11:00:04 UTC (rev 96317)
@@ -36,6 +36,10 @@
WKRelease(context-priv-context);
context-priv-context = 0;
+
+context-priv-~WebKitWebContextPrivate();
+
+G_OBJECT_CLASS(webkit_web_context_parent_class)-finalize(object);
}
static void webkit_web_context_init(WebKitWebContext* webContext)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp (96316 => 96317)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp 2011-09-29 10:33:03 UTC (rev 96316)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp 2011-09-29 11:00:04 UTC (rev 96317)
@@ -182,6 +182,12 @@
}
}
+static void webkitWebLoaderClientFinalize(GObject* object)
+{
+WEBKIT_WEB_LOADER_CLIENT(object)-priv-~WebKitWebLoaderClientPrivate();
+G_OBJECT_CLASS(webkit_web_loader_client_parent_class)-finalize(object);
+}
+
static void webkit_web_loader_client_init(WebKitWebLoaderClient* client)
{
WebKitWebLoaderClientPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(client, WEBKIT_TYPE_WEB_LOADER_CLIENT, WebKitWebLoaderClientPrivate);
@@ -196,6 +202,7 @@
objectClass-set_property = webkitWebLoaderClientSetProperty;
objectClass-get_property = webkitWebLoaderClientGetProperty;
objectClass-constructed = webkitWebLoaderClientConstructed;
+objectClass-finalize = webkitWebLoaderClientFinalize;
/**
* WebKitWebView:web-view:
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (96316 => 96317)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-09-29 10:33:03 UTC (rev 96316)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-09-29 11:00:04 UTC (rev 96317)
@@ -83,6 +83,12 @@
}
}
+static void webkitWebViewFinalize(GObject* object)
+{
+WEBKIT_WEB_VIEW(object)-priv-~WebKitWebViewPrivate();
+G_OBJECT_CLASS(webkit_web_view_parent_class)-finalize(object);
+}
+
static void webkit_web_view_init(WebKitWebView* webView)
{
WebKitWebViewPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(webView, WEBKIT_TYPE_WEB_VIEW, WebKitWebViewPrivate);
@@ -97,6 +103,7 @@
gObjectClass-constructed = webkitWebViewConstructed;
gObjectClass-set_property = webkitWebViewSetProperty;
gObjectClass-get_property = webkitWebViewGetProperty;
+gObjectClass-finalize = webkitWebViewFinalize;
g_type_class_add_private(webViewClass, sizeof(WebKitWebViewPrivate));
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [96324] trunk/Source/WebKit2
Title: [96324] trunk/Source/WebKit2 Revision 96324 Author carlo...@webkit.org Date 2011-09-29 06:53:53 -0700 (Thu, 29 Sep 2011) Log Message [GTK] Force single header include in WebKit2 GTK+ API https://bugs.webkit.org/show_bug.cgi?id=69084 Reviewed by Martin Robinson. Only webkit2/webkit2.h will be allowed for API users. * GNUmakefile.am: * UIProcess/API/gtk/WebKitError.h: * UIProcess/API/gtk/WebKitWebContext.h: * UIProcess/API/gtk/WebKitWebLoaderClient.h: * UIProcess/API/gtk/WebKitWebView.h: * UIProcess/API/gtk/WebKitWebViewBase.h: * UIProcess/API/gtk/webkit2.h: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.h trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.h trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h Diff Modified: trunk/Source/WebKit2/ChangeLog (96323 => 96324) --- trunk/Source/WebKit2/ChangeLog 2011-09-29 12:59:17 UTC (rev 96323) +++ trunk/Source/WebKit2/ChangeLog 2011-09-29 13:53:53 UTC (rev 96324) @@ -1,5 +1,22 @@ 2011-09-29 Carlos Garcia Campos cgar...@igalia.com +[GTK] Force single header include in WebKit2 GTK+ API +https://bugs.webkit.org/show_bug.cgi?id=69084 + +Reviewed by Martin Robinson. + +Only webkit2/webkit2.h will be allowed for API users. + +* GNUmakefile.am: +* UIProcess/API/gtk/WebKitError.h: +* UIProcess/API/gtk/WebKitWebContext.h: +* UIProcess/API/gtk/WebKitWebLoaderClient.h: +* UIProcess/API/gtk/WebKitWebView.h: +* UIProcess/API/gtk/WebKitWebViewBase.h: +* UIProcess/API/gtk/webkit2.h: + +2011-09-29 Carlos Garcia Campos cgar...@igalia.com + [GTK] Explicitly call destructors for objects initialized with placement new syntax https://bugs.webkit.org/show_bug.cgi?id=69079 Modified: trunk/Source/WebKit2/GNUmakefile.am (96323 => 96324) --- trunk/Source/WebKit2/GNUmakefile.am 2011-09-29 12:59:17 UTC (rev 96323) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-09-29 13:53:53 UTC (rev 96324) @@ -879,6 +879,7 @@ -I$(top_builddir)/DerivedSources/WebKit2/include/WebCore \ -I$(top_builddir)/DerivedSources/WebKit2/include/WebKit2 \ -DLIBEXECDIR=\$(libexecdir)\ \ + -DWEBKIT2_COMPILATION \ $(webcore_cppflags) \ $(webcoregtk_cppflags) \ $(_javascript_core_cppflags) \ @@ -1005,6 +1006,9 @@ stamp-webkit2enumtypes: $(webkit2gtk_headers) $(WebKit2)/GNUmakefile.am $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2 \ glib-mkenums \ + --fhead #if !defined(__WEBKIT2_H_INSIDE__) !defined(WEBKIT2_COMPILATION)\n \ + --fhead #error \Only webkit2/webkit2.h can be included directly.\\n \ + --fhead #endif\n\n \ --fhead #ifndef WEBKIT_ENUM_TYPES_H\n \ --fhead #define WEBKIT_ENUM_TYPES_H\n\n \ --fhead #include glib-object.h\n\n \ Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.h (96323 => 96324) --- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.h 2011-09-29 12:59:17 UTC (rev 96323) +++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.h 2011-09-29 13:53:53 UTC (rev 96324) @@ -18,6 +18,10 @@ * Boston, MA 02110-1301, USA. */ +#if !defined(__WEBKIT2_H_INSIDE__) !defined(WEBKIT2_COMPILATION) +#error Only webkit2/webkit2.h can be included directly. +#endif + #ifndef WebKitError_h #define WebKitError_h Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h (96323 => 96324) --- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h 2011-09-29 12:59:17 UTC (rev 96323) +++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h 2011-09-29 13:53:53 UTC (rev 96324) @@ -17,6 +17,10 @@ * Boston, MA 02110-1301, USA. */ +#if !defined(__WEBKIT2_H_INSIDE__) !defined(WEBKIT2_COMPILATION) +#error Only webkit2/webkit2.h can be included directly. +#endif + #ifndef WebKitWebContext_h #define WebKitWebContext_h Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h (96323 => 96324) --- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h 2011-09-29 12:59:17 UTC (rev 96323) +++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h 2011-09-29 13:53:53 UTC (rev 96324) @@ -17,6 +17,10 @@ * Boston, MA 02110-1301, USA. */ +#if !defined(__WEBKIT2_H_INSIDE__) !defined(WEBKIT2_COMPILATION) +#error Only webkit2/webkit2.h can be included directly. +#endif + #ifndef WebKitWebLoaderClient_h #define WebKitWebLoaderClient_h Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (96323 => 96324) --- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-09-29 12:59:17 UTC (rev 96323) +++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-09-29 13:53:53 UTC (rev 96324) @@ -20,6 +20,10 @@ * Boston, MA 02110-1301, USA. */ +#if !defined(__WEBKIT2_H_INSIDE__)
[webkit-changes] [96400] trunk/Source/WebKit2
Title: [96400] trunk/Source/WebKit2
Revision 96400
Author carlo...@webkit.org
Date 2011-09-30 07:23:43 -0700 (Fri, 30 Sep 2011)
Log Message
[UNIX] Add a method to get information for an already loaded plugin module
https://bugs.webkit.org/show_bug.cgi?id=69139
Reviewed by Martin Robinson.
* Shared/Plugins/Netscape/NetscapePluginModule.h: Add pluginInfo().
* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
(WebKit::NetscapePluginModule::pluginInfo): Private method to get
the plugin information from the module, it must be called when the
module has been already initialized.
(WebKit::NetscapePluginModule::getPluginInfo): Use pluginInfo() to
get information of the plugin module for the given path.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h
trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (96399 => 96400)
--- trunk/Source/WebKit2/ChangeLog 2011-09-30 11:58:30 UTC (rev 96399)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-30 14:23:43 UTC (rev 96400)
@@ -1,3 +1,18 @@
+2011-09-30 Carlos Garcia Campos cgar...@igalia.com
+
+[UNIX] Add a method to get information for an already loaded plugin module
+https://bugs.webkit.org/show_bug.cgi?id=69139
+
+Reviewed by Martin Robinson.
+
+* Shared/Plugins/Netscape/NetscapePluginModule.h: Add pluginInfo().
+* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
+(WebKit::NetscapePluginModule::pluginInfo): Private method to get
+the plugin information from the module, it must be called when the
+module has been already initialized.
+(WebKit::NetscapePluginModule::getPluginInfo): Use pluginInfo() to
+get information of the plugin module for the given path.
+
2011-09-30 Zeno Albisser zeno.albis...@nokia.com
[Qt][WK2] Event delivery in QDesktopWebView is broken after merge of Qt5 refactor
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h (96399 => 96400)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h 2011-09-30 11:58:30 UTC (rev 96399)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h 2011-09-30 14:23:43 UTC (rev 96400)
@@ -69,6 +69,7 @@
#if PLUGIN_ARCHITECTURE(X11)
void applyX11QuirksBeforeLoad();
static void setMIMEDescription(const String mimeDescription, PluginModuleInfo);
+bool pluginInfo(PluginModuleInfo);
#endif
bool tryGetSitesWithData(VectorString);
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (96399 => 96400)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2011-09-30 11:58:30 UTC (rev 96399)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2011-09-30 14:23:43 UTC (rev 96400)
@@ -118,35 +118,21 @@
}
}
-bool NetscapePluginModule::getPluginInfo(const String pluginPath, PluginModuleInfo plugin)
+bool NetscapePluginModule::pluginInfo(PluginModuleInfo plugin)
{
-// Tempararily suppress stdout in this function as plugins will be loaded and shutdown and debug info
-// is leaked to layout test output.
-StdoutDevNullRedirector stdoutDevNullRedirector;
+ASSERT(m_isInitialized);
-// We are loading the plugin here since it does not seem to be a standardized way to
-// get the needed informations from a UNIX plugin without loading it.
-RefPtrNetscapePluginModule pluginModule = NetscapePluginModule::getOrCreate(pluginPath);
-if (!pluginModule)
-return false;
+plugin.path = m_pluginPath;
+plugin.info.file = pathGetFileName(m_pluginPath);
-pluginModule-incrementLoadCount();
-
-plugin.path = pluginPath;
-plugin.info.file = pathGetFileName(pluginPath);
-
-Module* module = pluginModule-module();
+Module* module = m_module.get();
NPP_GetValueProcPtr NPP_GetValue = module-functionPointerNPP_GetValueProcPtr(NP_GetValue);
-if (!NPP_GetValue) {
-pluginModule-decrementLoadCount();
+if (!NPP_GetValue)
return false;
-}
NP_GetMIMEDescriptionFuncPtr NP_GetMIMEDescription = module-functionPointerNP_GetMIMEDescriptionFuncPtr(NP_GetMIMEDescription);
-if (!NP_GetMIMEDescription) {
-pluginModule-decrementLoadCount();
+if (!NP_GetMIMEDescription)
return false;
-}
char* buffer;
NPError error = NPP_GetValue(0, NPPVpluginNameString, buffer);
@@ -158,16 +144,30 @@
plugin.info.desc = buffer;
const char* mimeDescription = NP_GetMIMEDescription();
-if (!mimeDescription) {
-pluginModule-decrementLoadCount();
+if (!mimeDescription)
return false;
-}
setMIMEDescription(mimeDescription, plugin);
+return true;
+}
+bool NetscapePluginModule::getPluginInfo(const String pluginPath, PluginModuleInfo plugin)
+{
+// Tempararily
[webkit-changes] [96505] trunk/Source
Title: [96505] trunk/Source Revision 96505 Author carlo...@webkit.org Date 2011-10-03 09:11:48 -0700 (Mon, 03 Oct 2011) Log Message [GTK] Fix make distcheck build https://bugs.webkit.org/show_bug.cgi?id=69243 Reviewed by Martin Robinson. Source/_javascript_Core: * GNUmakefile.list.am: Source/WebCore: * GNUmakefile.am: * GNUmakefile.list.am: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/GNUmakefile.list.am trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/GNUmakefile.am trunk/Source/WebCore/GNUmakefile.list.am Diff Modified: trunk/Source/_javascript_Core/ChangeLog (96504 => 96505) --- trunk/Source/_javascript_Core/ChangeLog 2011-10-03 16:02:19 UTC (rev 96504) +++ trunk/Source/_javascript_Core/ChangeLog 2011-10-03 16:11:48 UTC (rev 96505) @@ -1,3 +1,12 @@ +2011-10-03 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Fix make distcheck build +https://bugs.webkit.org/show_bug.cgi?id=69243 + +Reviewed by Martin Robinson. + +* GNUmakefile.list.am: + 2011-10-03 Pierre Rossi pierre.ro...@gmail.com [Qt] Build fix: Qt::escape is deprecated in Qt5 Modified: trunk/Source/_javascript_Core/GNUmakefile.list.am (96504 => 96505) --- trunk/Source/_javascript_Core/GNUmakefile.list.am 2011-10-03 16:02:19 UTC (rev 96504) +++ trunk/Source/_javascript_Core/GNUmakefile.list.am 2011-10-03 16:11:48 UTC (rev 96505) @@ -81,6 +81,7 @@ Source/_javascript_Core/assembler/RepatchBuffer.h \ Source/_javascript_Core/assembler/SH4Assembler.h \ Source/_javascript_Core/assembler/X86Assembler.h \ + Source/_javascript_Core/bytecode/ActionablePrediction.h \ Source/_javascript_Core/bytecode/CodeBlock.cpp \ Source/_javascript_Core/bytecode/CodeBlock.h \ Source/_javascript_Core/bytecode/EvalCodeCache.h \ @@ -135,6 +136,7 @@ Source/_javascript_Core/dfg/DFGSpeculativeJIT.h \ Source/_javascript_Core/heap/AllocationSpace.cpp \ Source/_javascript_Core/heap/AllocationSpace.h \ + Source/_javascript_Core/heap/CardSet.h \ Source/_javascript_Core/heap/ConservativeRoots.cpp \ Source/_javascript_Core/heap/ConservativeRoots.h \ Source/_javascript_Core/heap/Handle.h \ @@ -564,6 +566,7 @@ Source/_javascript_Core/wtf/OwnFastMallocPtr.h \ Source/_javascript_Core/wtf/OwnPtrCommon.h \ Source/_javascript_Core/wtf/OwnPtr.h \ + Source/_javascript_Core/wtf/PackedIntVector.h \ Source/_javascript_Core/wtf/PageAllocation.h \ Source/_javascript_Core/wtf/PageAllocationAligned.cpp \ Source/_javascript_Core/wtf/PageAllocationAligned.h \ @@ -639,6 +642,7 @@ Source/_javascript_Core/wtf/ThreadSpecific.h \ Source/_javascript_Core/wtf/TypeTraits.cpp \ Source/_javascript_Core/wtf/TypeTraits.h \ + Source/_javascript_Core/wtf/UnionFind.h \ Source/_javascript_Core/wtf/unicode/CharacterNames.h \ Source/_javascript_Core/wtf/unicode/CollatorDefault.cpp \ Source/_javascript_Core/wtf/unicode/Collator.h \ Modified: trunk/Source/WebCore/ChangeLog (96504 => 96505) --- trunk/Source/WebCore/ChangeLog 2011-10-03 16:02:19 UTC (rev 96504) +++ trunk/Source/WebCore/ChangeLog 2011-10-03 16:11:48 UTC (rev 96505) @@ -1,3 +1,13 @@ +2011-10-03 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Fix make distcheck build +https://bugs.webkit.org/show_bug.cgi?id=69243 + +Reviewed by Martin Robinson. + +* GNUmakefile.am: +* GNUmakefile.list.am: + 2011-10-03 Pierre Rossi pierre.ro...@gmail.com [Qt] Build fix: Qt::escape is deprecated in Qt5 Modified: trunk/Source/WebCore/GNUmakefile.am (96504 => 96505) --- trunk/Source/WebCore/GNUmakefile.am 2011-10-03 16:02:19 UTC (rev 96504) +++ trunk/Source/WebCore/GNUmakefile.am 2011-10-03 16:11:48 UTC (rev 96505) @@ -891,7 +891,9 @@ Source/WebCore/inspector/CodeGeneratorInspector.pm \ Source/WebCore/inspector/InjectedScriptSource.js \ Source/WebCore/inspector/Inspector.json \ + Source/WebCore/inspector/Inspector-0.1.json \ Source/WebCore/inspector/generate-inspector-idl \ + Source/WebCore/inspector/generate-inspector-protocol-version \ Source/WebCore/inspector/xxd.pl \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2 \ Modified: trunk/Source/WebCore/GNUmakefile.list.am (96504 => 96505) --- trunk/Source/WebCore/GNUmakefile.list.am 2011-10-03 16:02:19 UTC (rev 96504) +++ trunk/Source/WebCore/GNUmakefile.list.am 2011-10-03 16:11:48 UTC (rev 96505) @@ -2977,6 +2977,7 @@ Source/WebCore/rendering/RenderBlockLineLayout.cpp \ Source/WebCore/rendering/RenderBox.cpp \ Source/WebCore/rendering/RenderBox.h \ + Source/WebCore/rendering/RenderBoxRegionInfo.h \ Source/WebCore/rendering/RenderBoxModelObject.cpp \ Source/WebCore/rendering/RenderBoxModelObject.h \ Source/WebCore/rendering/RenderBR.cpp \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [96508] trunk
Title: [96508] trunk
Revision 96508
Author carlo...@webkit.org
Date 2011-10-03 09:17:49 -0700 (Mon, 03 Oct 2011)
Log Message
[GTK] Fix memory leak when loading url
https://bugs.webkit.org/show_bug.cgi?id=69247
Reviewed by Martin Robinson.
Release URL created with WKURLCreateWithUTF8CString().
Source/WebKit2:
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_load_uri):
Tools:
* MiniBrowser/gtk/BrowserWindow.c:
(activateUriEntryCallback):
* MiniBrowser/gtk/main.c:
(loadURI):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/gtk/BrowserWindow.c
trunk/Tools/MiniBrowser/gtk/main.c
Diff
Modified: trunk/Source/WebKit2/ChangeLog (96507 => 96508)
--- trunk/Source/WebKit2/ChangeLog 2011-10-03 16:16:21 UTC (rev 96507)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-03 16:17:49 UTC (rev 96508)
@@ -1,5 +1,17 @@
2011-10-03 Carlos Garcia Campos cgar...@igalia.com
+[GTK] Fix memory leak when loading url
+https://bugs.webkit.org/show_bug.cgi?id=69247
+
+Reviewed by Martin Robinson.
+
+Release URL created with WKURLCreateWithUTF8CString().
+
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkit_web_view_load_uri):
+
+2011-10-03 Carlos Garcia Campos cgar...@igalia.com
+
[UNIX] Rename NetscapePluginModule::pluginInfo to NetscapePluginModule::getPluginInfoForLoadedPlugin()
https://bugs.webkit.org/show_bug.cgi?id=69147
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (96507 => 96508)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-03 16:16:21 UTC (rev 96507)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-03 16:17:49 UTC (rev 96508)
@@ -216,8 +216,10 @@
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
g_return_if_fail(uri);
+WKURLRef url = ""
WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
-WKPageLoadURL(toAPI(page), WKURLCreateWithUTF8CString(uri));
+WKPageLoadURL(toAPI(page), url);
+WKRelease(url);
}
/**
Modified: trunk/Tools/ChangeLog (96507 => 96508)
--- trunk/Tools/ChangeLog 2011-10-03 16:16:21 UTC (rev 96507)
+++ trunk/Tools/ChangeLog 2011-10-03 16:17:49 UTC (rev 96508)
@@ -1,3 +1,17 @@
+2011-10-03 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Fix memory leak when loading url
+https://bugs.webkit.org/show_bug.cgi?id=69247
+
+Reviewed by Martin Robinson.
+
+Release URL created with WKURLCreateWithUTF8CString().
+
+* MiniBrowser/gtk/BrowserWindow.c:
+(activateUriEntryCallback):
+* MiniBrowser/gtk/main.c:
+(loadURI):
+
2011-10-03 Csaba Osztrogonác o...@webkit.org
Unreviewed. Add Zoltán Árvai as contributor.
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (96507 => 96508)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-10-03 16:16:21 UTC (rev 96507)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-10-03 16:17:49 UTC (rev 96508)
@@ -64,8 +64,9 @@
static void activateUriEntryCallback(BrowserWindow* window)
{
-const gchar *uri = gtk_entry_get_text(GTK_ENTRY(window-uriEntry));
-WKPageLoadURL(WKViewGetPage(window-webView), WKURLCreateWithUTF8CString(uri));
+WKURLRef url = ""
+WKPageLoadURL(WKViewGetPage(window-webView), url);
+WKRelease(url);
}
static void goBackCallback(BrowserWindow* window)
Modified: trunk/Tools/MiniBrowser/gtk/main.c (96507 => 96508)
--- trunk/Tools/MiniBrowser/gtk/main.c 2011-10-03 16:16:21 UTC (rev 96507)
+++ trunk/Tools/MiniBrowser/gtk/main.c 2011-10-03 16:17:49 UTC (rev 96508)
@@ -61,8 +61,10 @@
WKViewRef webView = WKViewCreate(processContext, 0);
GtkWidget *mainWindow = browser_window_new(webView);
gchar *url = ""
-WKPageLoadURL(WKViewGetPage(webView), WKURLCreateWithUTF8CString(url));
+WKURLRef wkURL = WKURLCreateWithUTF8CString(url);
g_free(url);
+WKPageLoadURL(WKViewGetPage(webView), wkURL);
+WKRelease(wkURL);
gtk_widget_grab_focus(GTK_WIDGET(webView));
gtk_widget_show(mainWindow);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [96511] trunk/Source/WebKit2
Title: [96511] trunk/Source/WebKit2 Revision 96511 Author carlo...@webkit.org Date 2011-10-03 09:36:46 -0700 (Mon, 03 Oct 2011) Log Message [GTK] Add failing uri parameter to provisional-load-failed and load-failed signals https://bugs.webkit.org/show_bug.cgi?id=69252 Reviewed by Martin Robinson. * UIProcess/API/gtk/WebKitWebLoaderClient.cpp: (didFailProvisionalLoadWithErrorForFrame): Pass failing URL to signal handler. (didFailLoadWithErrorForFrame): Ditto. (webkit_web_loader_client_class_init): Add failing URL parameter to provisional-load-failed and load-failed signals. * UIProcess/API/gtk/WebKitWebLoaderClient.h: * UIProcess/API/gtk/tests/testloading.c: (loadStatusProvisionalLoadFailed): Update to API changes. (loadStatusLoadFailed): Ditto. (loadErrorProvisionalLoadFailed): Ditto. * UIProcess/API/gtk/webkit2marshal.list: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h trunk/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list Diff Modified: trunk/Source/WebKit2/ChangeLog (96510 => 96511) --- trunk/Source/WebKit2/ChangeLog 2011-10-03 16:19:59 UTC (rev 96510) +++ trunk/Source/WebKit2/ChangeLog 2011-10-03 16:36:46 UTC (rev 96511) @@ -1,5 +1,25 @@ 2011-10-03 Carlos Garcia Campos cgar...@igalia.com +[GTK] Add failing uri parameter to provisional-load-failed and load-failed signals +https://bugs.webkit.org/show_bug.cgi?id=69252 + +Reviewed by Martin Robinson. + +* UIProcess/API/gtk/WebKitWebLoaderClient.cpp: +(didFailProvisionalLoadWithErrorForFrame): Pass failing URL to +signal handler. +(didFailLoadWithErrorForFrame): Ditto. +(webkit_web_loader_client_class_init): Add failing URL parameter +to provisional-load-failed and load-failed signals. +* UIProcess/API/gtk/WebKitWebLoaderClient.h: +* UIProcess/API/gtk/tests/testloading.c: +(loadStatusProvisionalLoadFailed): Update to API changes. +(loadStatusLoadFailed): Ditto. +(loadErrorProvisionalLoadFailed): Ditto. +* UIProcess/API/gtk/webkit2marshal.list: + +2011-10-03 Carlos Garcia Campos cgar...@igalia.com + [GTK] Fix memory leak when loading url https://bugs.webkit.org/show_bug.cgi?id=69247 Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp (96510 => 96511) --- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp 2011-10-03 16:19:59 UTC (rev 96510) +++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp 2011-10-03 16:36:46 UTC (rev 96511) @@ -84,7 +84,8 @@ resourceError.errorCode(), resourceError.localizedDescription().utf8().data())); gboolean returnValue; -g_signal_emit(WEBKIT_WEB_LOADER_CLIENT(clientInfo), signals[PROVISIONAL_LOAD_FAILED], 0, webError.get(), returnValue); +g_signal_emit(WEBKIT_WEB_LOADER_CLIENT(clientInfo), signals[PROVISIONAL_LOAD_FAILED], 0, resourceError.failingURL().utf8().data(), + webError.get(), returnValue); } static void didCommitLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo) @@ -115,7 +116,8 @@ resourceError.errorCode(), resourceError.localizedDescription().utf8().data())); gboolean returnValue; -g_signal_emit(WEBKIT_WEB_LOADER_CLIENT(clientInfo), signals[LOAD_FAILED], 0, webError.get(), returnValue); +g_signal_emit(WEBKIT_WEB_LOADER_CLIENT(clientInfo), signals[LOAD_FAILED], 0, resourceError.failingURL().utf8().data(), + webError.get(), returnValue); } static void webkitWebLoaderClientConstructed(GObject* object) @@ -284,8 +286,9 @@ G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(WebKitWebLoaderClientClass, provisional_load_failed), g_signal_accumulator_true_handled, NULL, - webkit_marshal_BOOLEAN__POINTER, - G_TYPE_BOOLEAN, 1, + webkit_marshal_BOOLEAN__STRING_POINTER, + G_TYPE_BOOLEAN, 2, + G_TYPE_STRING, G_TYPE_POINTER); /** @@ -356,8 +359,9 @@ G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(WebKitWebLoaderClientClass, load_failed), g_signal_accumulator_true_handled, NULL, - webkit_marshal_BOOLEAN__POINTER, - G_TYPE_BOOLEAN, 1, + webkit_marshal_BOOLEAN__STRING_POINTER, + G_TYPE_BOOLEAN, 2, + G_TYPE_STRING, G_TYPE_POINTER); g_type_class_add_private(clientClass,
[webkit-changes] [96614] trunk/Source/WebKit2
Title: [96614] trunk/Source/WebKit2
Revision 96614
Author carlo...@webkit.org
Date 2011-10-04 11:11:55 -0700 (Tue, 04 Oct 2011)
Log Message
[GTK] Add webkit_web_view_load_alternate_html() to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=69254
Reviewed by Martin Robinson.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_load_alternate_html):
* UIProcess/API/gtk/WebKitWebView.h:
* UIProcess/API/gtk/tests/testloading.c:
(loadAlternateContentLoadFinished):
(loadAlternateContentLoadFailed):
(testLoadAlternateContent):
(main):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
trunk/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c
Diff
Modified: trunk/Source/WebKit2/ChangeLog (96613 => 96614)
--- trunk/Source/WebKit2/ChangeLog 2011-10-04 18:06:44 UTC (rev 96613)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-04 18:11:55 UTC (rev 96614)
@@ -1,3 +1,19 @@
+2011-10-04 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Add webkit_web_view_load_alternate_html() to WebKit2 GTK+ API
+https://bugs.webkit.org/show_bug.cgi?id=69254
+
+Reviewed by Martin Robinson.
+
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkit_web_view_load_alternate_html):
+* UIProcess/API/gtk/WebKitWebView.h:
+* UIProcess/API/gtk/tests/testloading.c:
+(loadAlternateContentLoadFinished):
+(loadAlternateContentLoadFailed):
+(testLoadAlternateContent):
+(main):
+
2011-10-03 Jon Lee jon...@apple.com
Extend DOM WheelEvent to differentiate between physical and logical scroll directions
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (96613 => 96614)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-04 18:06:44 UTC (rev 96613)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-04 18:11:55 UTC (rev 96614)
@@ -223,6 +223,39 @@
}
/**
+ * webkit_web_view_load_alternate_html:
+ * @web_view: a #WebKitWebView
+ * @content: the alternate content to display as the main page of the @web_view
+ * @base_uri: the base URI for relative locations
+ * @unreachable_uri: the URI for the alternate page content
+ *
+ * Request loading of an alternate content for a URI that is unreachable. This allows clients
+ * to display page-loading errors in the #WebKitWebView itself. This is typically called from
+ * #WebKitWebLoaderClient::provisional-load-failed or #WebKitWebLoaderClient::load-failed
+ * signals.
+ * When called from those signals this method will preserve the back-forward list. The URI passed in
+ * @base_uri has to be an absolute URI.
+ * You can monitor the status of the load operation using the
+ * #WebKitWebLoaderClient of @web_view. See webkit_web_view_get_loader_client().
+ */
+void webkit_web_view_load_alternate_html(WebKitWebView* webView, const gchar* content, const gchar* baseURI, const gchar* unreachableURI)
+{
+g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
+g_return_if_fail(content);
+
+WKStringRef htmlString = WKStringCreateWithUTF8CString(content);
+WKURLRef baseURL = baseURI ? WKURLCreateWithUTF8CString(baseURI) : 0;
+WKURLRef unreachableURL = unreachableURI ? WKURLCreateWithUTF8CString(unreachableURI) : 0;
+WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
+WKPageLoadAlternateHTMLString(toAPI(page), htmlString, baseURL, unreachableURL);
+WKRelease(htmlString);
+if (baseURL)
+WKRelease(baseURL);
+if (unreachableURL)
+WKRelease(unreachableURL);
+}
+
+/**
* webkit_web_view_go_back:
* @web_view: a #WebKitWebView
*
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (96613 => 96614)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-04 18:06:44 UTC (rev 96613)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-04 18:11:55 UTC (rev 96614)
@@ -66,34 +66,40 @@
};
WK_EXPORT GType
-webkit_web_view_get_type (void);
+webkit_web_view_get_type(void);
WK_EXPORT GtkWidget *
-webkit_web_view_new (void);
+webkit_web_view_new (void);
WK_EXPORT GtkWidget *
-webkit_web_view_new_with_context (WebKitWebContext *context);
+webkit_web_view_new_with_context(WebKitWebContext *context);
WK_EXPORT WebKitWebContext *
-webkit_web_view_get_context (WebKitWebView *web_view);
+webkit_web_view_get_context (WebKitWebView *web_view);
WK_EXPORT WebKitWebLoaderClient *
-webkit_web_view_get_loader_client (WebKitWebView *web_view);
+webkit_web_view_get_loader_client (WebKitWebView *web_view);
WK_EXPORT void
-webkit_web_view_set_loader_client (WebKitWebView *web_view,
- WebKitWebLoaderClient *loader_client);
+webkit_web_view_set_loader_client (WebKitWebView *web_view,
+
[webkit-changes] [96616] trunk/Source/WebKit2
Title: [96616] trunk/Source/WebKit2
Revision 96616
Author carlo...@webkit.org
Date 2011-10-04 11:14:19 -0700 (Tue, 04 Oct 2011)
Log Message
[GTK] Implement default error pages in WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=69255
Reviewed by Martin Robinson.
* UIProcess/API/gtk/WebKitError.cpp:
(webkit_policy_error_quark): Add quark for policy errors.
(webkit_plugin_error_quark): Add quark for plugin errors.
* UIProcess/API/gtk/WebKitError.h: Add policy and plugin errors.
* UIProcess/API/gtk/WebKitWebLoaderClient.cpp:
(webkitWebLoaderClientLoadFailed): Load a custom error page when
load failed and signal has not been handled.
(webkit_web_loader_client_class_init): Add default implementation
for provisional_load_failed and load_failed virtual methods.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.h
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (96615 => 96616)
--- trunk/Source/WebKit2/ChangeLog 2011-10-04 18:12:58 UTC (rev 96615)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-04 18:14:19 UTC (rev 96616)
@@ -1,5 +1,22 @@
2011-10-04 Carlos Garcia Campos cgar...@igalia.com
+[GTK] Implement default error pages in WebKit2 GTK+ API
+https://bugs.webkit.org/show_bug.cgi?id=69255
+
+Reviewed by Martin Robinson.
+
+* UIProcess/API/gtk/WebKitError.cpp:
+(webkit_policy_error_quark): Add quark for policy errors.
+(webkit_plugin_error_quark): Add quark for plugin errors.
+* UIProcess/API/gtk/WebKitError.h: Add policy and plugin errors.
+* UIProcess/API/gtk/WebKitWebLoaderClient.cpp:
+(webkitWebLoaderClientLoadFailed): Load a custom error page when
+load failed and signal has not been handled.
+(webkit_web_loader_client_class_init): Add default implementation
+for provisional_load_failed and load_failed virtual methods.
+
+2011-10-04 Carlos Garcia Campos cgar...@igalia.com
+
[GTK] Add webkit_web_view_load_alternate_html() to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=69254
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp (96615 => 96616)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp 2011-10-04 18:12:58 UTC (rev 96615)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp 2011-10-04 18:14:19 UTC (rev 96616)
@@ -24,7 +24,7 @@
#include WebKitPrivate.h
#include WebCore/ErrorsGtk.h
-GQuark webkit_network_error_quark(void)
+GQuark webkit_network_error_quark()
{
return g_quark_from_static_string(WebCore::errorDomainNetwork);
}
@@ -34,3 +34,26 @@
COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL, NetworkErrorUnknownProtocol);
COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_CANCELLED, NetworkErrorCancelled);
COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST, NetworkErrorFileDoesNotExist);
+
+GQuark webkit_policy_error_quark()
+{
+return g_quark_from_static_string(WebCore::errorDomainPolicy);
+}
+
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_FAILED, PolicyErrorFailed);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE, PolicyErrorCannotShowMimeType);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL, PolicyErrorCannotShowURL);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE, PolicyErrorFrameLoadInterruptedByPolicyChange);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT, PolicyErrorCannotUseRestrictedPort);
+
+GQuark webkit_plugin_error_quark()
+{
+return g_quark_from_static_string(WebCore::errorDomainPlugin);
+}
+
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_FAILED, PluginErrorFailed);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN, PluginErrorCannotFindPlugin);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN, PluginErrorCannotLoadPlugin);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE, PluginErrorJavaUnavailable);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED, PluginErrorConnectionCancelled);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD, PluginErrorWillHandleLoad);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.h (96615 => 96616)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.h 2011-10-04 18:12:58 UTC (rev 96615)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.h 2011-10-04 18:14:19 UTC (rev 96616)
@@ -31,6 +31,8 @@
G_BEGIN_DECLS
#define WEBKIT_NETWORK_ERROR webkit_network_error_quark ()
+#define WEBKIT_POLICY_ERROR webkit_policy_error_quark ()
+#define WEBKIT_PLUGIN_ERROR webkit_plugin_error_quark ()
/**
* WebKitNetworkError:
@@ -51,9 +53,32 @@
WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST = 303
} WebKitNetworkError;
+typedef enum {
[webkit-changes] [96680] trunk/Source/WebKit2
Title: [96680] trunk/Source/WebKit2
Revision 96680
Author carlo...@webkit.org
Date 2011-10-05 01:03:01 -0700 (Wed, 05 Oct 2011)
Log Message
[GTK] Use WKRetainPtr for WK types in WebKit2 GTK+
https://bugs.webkit.org/show_bug.cgi?id=69404
Reviewed by Martin Robinson.
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkitWebContextFinalize):
(createDefaultWebContext):
(webkitWebContextGetWKContext):
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_load_uri):
(webkit_web_view_load_alternate_html):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (96679 => 96680)
--- trunk/Source/WebKit2/ChangeLog 2011-10-05 06:07:51 UTC (rev 96679)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-05 08:03:01 UTC (rev 96680)
@@ -1,3 +1,18 @@
+2011-10-05 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Use WKRetainPtr for WK types in WebKit2 GTK+
+https://bugs.webkit.org/show_bug.cgi?id=69404
+
+Reviewed by Martin Robinson.
+
+* UIProcess/API/gtk/WebKitWebContext.cpp:
+(webkitWebContextFinalize):
+(createDefaultWebContext):
+(webkitWebContextGetWKContext):
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkit_web_view_load_uri):
+(webkit_web_view_load_alternate_html):
+
2011-10-04 Kent Tamura tk...@chromium.org
Introduce feature flags for incomplete input types
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (96679 => 96680)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2011-10-05 06:07:51 UTC (rev 96679)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2011-10-05 08:03:01 UTC (rev 96680)
@@ -22,23 +22,18 @@
#include WebKitWebContextPrivate.h
#include WebKit2/WKContext.h
+#include WebKit2/WKRetainPtr.h
#include WebKit2/WKType.h
struct _WebKitWebContextPrivate {
-WKContextRef context;
+WKRetainPtrWKContextRef context;
};
G_DEFINE_TYPE(WebKitWebContext, webkit_web_context, G_TYPE_OBJECT)
static void webkitWebContextFinalize(GObject* object)
{
-WebKitWebContext* context = WEBKIT_WEB_CONTEXT(object);
-
-WKRelease(context-priv-context);
-context-priv-context = 0;
-
-context-priv-~WebKitWebContextPrivate();
-
+WEBKIT_WEB_CONTEXT(object)-priv-~WebKitWebContextPrivate();
G_OBJECT_CLASS(webkit_web_context_parent_class)-finalize(object);
}
@@ -62,7 +57,7 @@
{
WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(g_object_new(WEBKIT_TYPE_WEB_CONTEXT, NULL));
webContext-priv-context = WKContextGetSharedProcessContext();
-WKContextSetCacheModel(webContext-priv-context, kWKCacheModelPrimaryWebBrowser);
+WKContextSetCacheModel(webContext-priv-context.get(), kWKCacheModelPrimaryWebBrowser);
return webContext;
}
@@ -83,6 +78,6 @@
{
g_assert(WEBKIT_IS_WEB_CONTEXT(context));
-return context-priv-context;
+return context-priv-context.get();
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (96679 => 96680)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-05 06:07:51 UTC (rev 96679)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-05 08:03:01 UTC (rev 96680)
@@ -26,6 +26,7 @@
#include WebKitPrivate.h
#include WebPageProxy.h
#include WebKit2/WKBase.h
+#include WebKit2/WKRetainPtr.h
#include WebKit2/WKURL.h
#include wtf/gobject/GRefPtr.h
#include wtf/text/CString.h
@@ -216,10 +217,9 @@
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
g_return_if_fail(uri);
-WKURLRef url = ""
+WKRetainPtrWKURLRef url(AdoptWK, WKURLCreateWithUTF8CString(uri));
WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
-WKPageLoadURL(toAPI(page), url);
-WKRelease(url);
+WKPageLoadURL(toAPI(page), url.get());
}
/**
@@ -243,16 +243,11 @@
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
g_return_if_fail(content);
-WKStringRef htmlString = WKStringCreateWithUTF8CString(content);
-WKURLRef baseURL = baseURI ? WKURLCreateWithUTF8CString(baseURI) : 0;
-WKURLRef unreachableURL = unreachableURI ? WKURLCreateWithUTF8CString(unreachableURI) : 0;
+WKRetainPtrWKStringRef htmlString(AdoptWK, WKStringCreateWithUTF8CString(content));
+WKRetainPtrWKURLRef baseURL = baseURI ? adoptWK(WKURLCreateWithUTF8CString(baseURI)) : 0;
+WKRetainPtrWKURLRef unreachableURL = unreachableURI ? adoptWK(WKURLCreateWithUTF8CString(unreachableURI)) : 0;
WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
-WKPageLoadAlternateHTMLString(toAPI(page), htmlString, baseURL, unreachableURL);
-WKRelease(htmlString);
-if (baseURL)
-WKRelease(baseURL);
-if (unreachableURL)
-WKRelease(unreachableURL);
+WKPageLoadAlternateHTMLString(toAPI(page), htmlString.get(), baseURL.get(),
[webkit-changes] [96829] trunk/Source
Title: [96829] trunk/Source
Revision 96829
Author carlo...@webkit.org
Date 2011-10-06 10:39:21 -0700 (Thu, 06 Oct 2011)
Log Message
[GTK] Implement cache model for WebKit2
https://bugs.webkit.org/show_bug.cgi?id=68434
Reviewed by Martin Robinson.
Source/WebCore:
Add a function to FileSystem to get the free space of the file
system where the given path is on.
* platform/FileSystem.h:
* platform/gtk/FileSystemGtk.cpp:
(WebCore::getVolumeFreeSizeForPath):
Source/WebKit2:
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkit_web_context_set_cache_model):
(webkit_web_context_get_cache_model):
* UIProcess/API/gtk/WebKitWebContext.h:
* UIProcess/API/gtk/tests/testwebcontext.c:
(testWebContextCacheModel):
(main):
* WebProcess/gtk/WebProcessGtk.cpp:
(WebKit::getCacheDiskFreeSize): Helper function to get free space
of the file system where the cache directory is on.
(WebKit::getMemorySize): Helper function to get the total memory
of the system in MB.
(WebKit::WebProcess::platformSetCacheModel): Implement
platformSetCacheModel for Gtk port using calculateCacheSizes().
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/FileSystem.h
trunk/Source/WebCore/platform/gtk/FileSystemGtk.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h
trunk/Source/WebKit2/UIProcess/API/gtk/tests/testwebcontext.c
trunk/Source/WebKit2/WebProcess/gtk/WebProcessGtk.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (96828 => 96829)
--- trunk/Source/WebCore/ChangeLog 2011-10-06 17:34:42 UTC (rev 96828)
+++ trunk/Source/WebCore/ChangeLog 2011-10-06 17:39:21 UTC (rev 96829)
@@ -1,3 +1,17 @@
+2011-10-06 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Implement cache model for WebKit2
+https://bugs.webkit.org/show_bug.cgi?id=68434
+
+Reviewed by Martin Robinson.
+
+Add a function to FileSystem to get the free space of the file
+system where the given path is on.
+
+* platform/FileSystem.h:
+* platform/gtk/FileSystemGtk.cpp:
+(WebCore::getVolumeFreeSizeForPath):
+
2011-10-06 Sergey Glazunov serg.glazu...@gmail.com
Add check for _javascript_ URLs in HTMLPlugInImageElement::allowedToLoadFrameURL
Modified: trunk/Source/WebCore/platform/FileSystem.h (96828 => 96829)
--- trunk/Source/WebCore/platform/FileSystem.h 2011-10-06 17:34:42 UTC (rev 96828)
+++ trunk/Source/WebCore/platform/FileSystem.h 2011-10-06 17:39:21 UTC (rev 96829)
@@ -198,6 +198,7 @@
String filenameToString(const char*);
String filenameForDisplay(const String);
CString applicationDirectoryPath();
+uint64_t getVolumeFreeSizeForPath(const char*);
#endif
#if PLATFORM(WIN) !OS(WINCE)
Modified: trunk/Source/WebCore/platform/gtk/FileSystemGtk.cpp (96828 => 96829)
--- trunk/Source/WebCore/platform/gtk/FileSystemGtk.cpp 2011-10-06 17:34:42 UTC (rev 96828)
+++ trunk/Source/WebCore/platform/gtk/FileSystemGtk.cpp 2011-10-06 17:39:21 UTC (rev 96829)
@@ -197,6 +197,16 @@
#endif
}
+uint64_t getVolumeFreeSizeForPath(const char* path)
+{
+GRefPtrGFile file = adoptGRef(g_file_new_for_path(path));
+GRefPtrGFileInfo fileInfo = adoptGRef(g_file_query_filesystem_info(file.get(), G_FILE_ATTRIBUTE_FILESYSTEM_FREE, 0, 0));
+if (!fileInfo)
+return 0;
+
+return g_file_info_get_attribute_uint64(fileInfo.get(), G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
+}
+
String directoryName(const String path)
{
/* No null checking needed */
Modified: trunk/Source/WebKit2/ChangeLog (96828 => 96829)
--- trunk/Source/WebKit2/ChangeLog 2011-10-06 17:34:42 UTC (rev 96828)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-06 17:39:21 UTC (rev 96829)
@@ -1,3 +1,25 @@
+2011-10-06 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Implement cache model for WebKit2
+https://bugs.webkit.org/show_bug.cgi?id=68434
+
+Reviewed by Martin Robinson.
+
+* UIProcess/API/gtk/WebKitWebContext.cpp:
+(webkit_web_context_set_cache_model):
+(webkit_web_context_get_cache_model):
+* UIProcess/API/gtk/WebKitWebContext.h:
+* UIProcess/API/gtk/tests/testwebcontext.c:
+(testWebContextCacheModel):
+(main):
+* WebProcess/gtk/WebProcessGtk.cpp:
+(WebKit::getCacheDiskFreeSize): Helper function to get free space
+of the file system where the cache directory is on.
+(WebKit::getMemorySize): Helper function to get the total memory
+of the system in MB.
+(WebKit::WebProcess::platformSetCacheModel): Implement
+platformSetCacheModel for Gtk port using calculateCacheSizes().
+
2011-10-05 Alexey Proskuryakov a...@apple.com
https://bugs.webkit.org/show_bug.cgi?id=69492
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (96828 => 96829)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2011-10-06 17:34:42 UTC (rev 96828)
+++
[webkit-changes] [96833] trunk/Source/WebKit2
Title: [96833] trunk/Source/WebKit2
Revision 96833
Author carlo...@webkit.org
Date 2011-10-06 11:03:11 -0700 (Thu, 06 Oct 2011)
Log Message
[GTK] Add estimated-progress property to WebKitWebLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=69509
Reviewed by Martin Robinson.
It allows to monitor the estimated progress of a lof operation by
connecting to the notify signal.
* UIProcess/API/gtk/WebKitWebLoaderClient.cpp:
(didChangeProgress): Update estimated-progress property and notify when
it changes.
(webkitWebLoaderClientConstructed): Add implementations for
didStartProgress, didChangeProgress and didFinishProgress.
(webkitWebLoaderClientGetProperty):
(webkit_web_loader_client_class_init): Add estimated-progress property.
(webkit_web_loader_client_get_estimated_progress): Returns the
value of estimated-progress property.
* UIProcess/API/gtk/WebKitWebLoaderClient.h:
* UIProcess/API/gtk/tests/testloading.c:
(webLoadingFixtureSetup):
(loadProgressEstimatedProgressChanged):
(loadProgressLoadFinished):
(testLoadProgress):
(main):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h
trunk/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c
Diff
Modified: trunk/Source/WebKit2/ChangeLog (96832 => 96833)
--- trunk/Source/WebKit2/ChangeLog 2011-10-06 17:53:18 UTC (rev 96832)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-06 18:03:11 UTC (rev 96833)
@@ -1,5 +1,32 @@
2011-10-06 Carlos Garcia Campos cgar...@igalia.com
+[GTK] Add estimated-progress property to WebKitWebLoaderClient
+https://bugs.webkit.org/show_bug.cgi?id=69509
+
+Reviewed by Martin Robinson.
+
+It allows to monitor the estimated progress of a lof operation by
+connecting to the notify signal.
+
+* UIProcess/API/gtk/WebKitWebLoaderClient.cpp:
+(didChangeProgress): Update estimated-progress property and notify when
+it changes.
+(webkitWebLoaderClientConstructed): Add implementations for
+didStartProgress, didChangeProgress and didFinishProgress.
+(webkitWebLoaderClientGetProperty):
+(webkit_web_loader_client_class_init): Add estimated-progress property.
+(webkit_web_loader_client_get_estimated_progress): Returns the
+value of estimated-progress property.
+* UIProcess/API/gtk/WebKitWebLoaderClient.h:
+* UIProcess/API/gtk/tests/testloading.c:
+(webLoadingFixtureSetup):
+(loadProgressEstimatedProgressChanged):
+(loadProgressLoadFinished):
+(testLoadProgress):
+(main):
+
+2011-10-06 Carlos Garcia Campos cgar...@igalia.com
+
[GTK] Implement cache model for WebKit2
https://bugs.webkit.org/show_bug.cgi?id=68434
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp (96832 => 96833)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp 2011-10-06 17:53:18 UTC (rev 96832)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp 2011-10-06 18:03:11 UTC (rev 96833)
@@ -46,11 +46,14 @@
enum {
PROP_0,
-PROP_WEB_VIEW
+PROP_WEB_VIEW,
+PROP_ESTIMATED_PROGRESS
};
struct _WebKitWebLoaderClientPrivate {
GRefPtrWebKitWebView view;
+
+gdouble estimatedProgress;
};
static guint signals[LAST_SIGNAL] = { 0, };
@@ -121,6 +124,18 @@
webError.get(), returnValue);
}
+static void didChangeProgress(WKPageRef page, const void* clientInfo)
+{
+WebKitWebLoaderClient* client = WEBKIT_WEB_LOADER_CLIENT(clientInfo);
+gdouble estimatedProgress = WKPageGetEstimatedProgress(page);
+
+if (client-priv-estimatedProgress == estimatedProgress)
+return;
+
+client-priv-estimatedProgress = estimatedProgress;
+g_object_notify(G_OBJECT(clientInfo), estimated-progress);
+}
+
static void webkitWebLoaderClientConstructed(GObject* object)
{
WebKitWebLoaderClient* client = WEBKIT_WEB_LOADER_CLIENT(object);
@@ -145,9 +160,9 @@
0, // didRunInsecureContentForFrame
0, // canAuthenticateAgainstProtectionSpaceInFrame
0, // didReceiveAuthenticationChallengeInFrame
-0, // didStartProgress
-0, // didChangeProgress
-0, // didFinishProgress
+didChangeProgress, // didStartProgress
+didChangeProgress,
+didChangeProgress, // didFinishProgress
0, // didBecomeUnresponsive
0, // didBecomeResponsive
0, // processDidCrash
@@ -193,6 +208,9 @@
case PROP_WEB_VIEW:
g_value_set_object(value, client-priv-view.get());
break;
+case PROP_ESTIMATED_PROGRESS:
+g_value_set_double(value, webkit_web_loader_client_get_estimated_progress(client));
+break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
}
@@ -224,7 +242,7 @@
[webkit-changes] [97047] trunk/Source/WebKit2
Title: [97047] trunk/Source/WebKit2
Revision 97047
Author carlo...@webkit.org
Date 2011-10-10 02:20:19 -0700 (Mon, 10 Oct 2011)
Log Message
[GTK] Add methods to reload the view to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=69613
Reviewed by Martin Robinson.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_reload):
(webkit_web_view_reload_bypass_cache):
* UIProcess/API/gtk/WebKitWebView.h:
* UIProcess/API/gtk/tests/testloading.c:
(loadReloadProvisionalLoadStarted):
(loadReloadLoadFinished):
(testLoadTimeoutFinishLoop):
(testLoadReload):
(main):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
trunk/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c
Diff
Modified: trunk/Source/WebKit2/ChangeLog (97046 => 97047)
--- trunk/Source/WebKit2/ChangeLog 2011-10-10 09:03:28 UTC (rev 97046)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-10 09:20:19 UTC (rev 97047)
@@ -1,3 +1,21 @@
+2011-10-10 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Add methods to reload the view to WebKit2 GTK+ API
+https://bugs.webkit.org/show_bug.cgi?id=69613
+
+Reviewed by Martin Robinson.
+
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkit_web_view_reload):
+(webkit_web_view_reload_bypass_cache):
+* UIProcess/API/gtk/WebKitWebView.h:
+* UIProcess/API/gtk/tests/testloading.c:
+(loadReloadProvisionalLoadStarted):
+(loadReloadLoadFinished):
+(testLoadTimeoutFinishLoop):
+(testLoadReload):
+(main):
+
2011-10-09 Luke Macpherson macpher...@chromium.org
Fix Lion, Leopard and Snow Leopard builds after changeset 97034 http://trac.webkit.org/changeset/97034
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (97046 => 97047)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-10 09:03:28 UTC (rev 97046)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-10 09:20:19 UTC (rev 97047)
@@ -252,6 +252,34 @@
}
/**
+ * webkit_web_view_reload:
+ * @web_view: a #WebKitWebView
+ *
+ * Reloads the current contents of @web_view.
+ * See also webkit_web_view_reload_bypass_cache().
+ */
+void webkit_web_view_reload(WebKitWebView* webView)
+{
+g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
+
+WKPageReload(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView;
+}
+
+/**
+ * webkit_web_view_reload_bypass_cache:
+ * @webView: a #WebKitWebView
+ *
+ * Reloads the current contents of @web_view without
+ * using any cached data.
+ */
+void webkit_web_view_reload_bypass_cache(WebKitWebView* webView)
+{
+g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
+
+WKPageReloadFromOrigin(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView;
+}
+
+/**
* webkit_web_view_go_back:
* @web_view: a #WebKitWebView
*
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (97046 => 97047)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-10 09:03:28 UTC (rev 97046)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-10 09:20:19 UTC (rev 97047)
@@ -96,6 +96,12 @@
const gchar *unreachable_uri);
WEBKIT_API void
+webkit_web_view_reload (WebKitWebView *web_view);
+
+WEBKIT_API void
+webkit_web_view_reload_bypass_cache (WebKitWebView *web_view);
+
+WEBKIT_API void
webkit_web_view_go_back (WebKitWebView *web_view);
WEBKIT_API void
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c (97046 => 97047)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c 2011-10-10 09:03:28 UTC (rev 97046)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c 2011-10-10 09:20:19 UTC (rev 97047)
@@ -285,6 +285,65 @@
g_main_loop_run(fixture-loop);
}
+static gboolean loadReloadProvisionalLoadStarted(WebKitWebLoaderClient *client, WebLoadingFixture *fixture)
+{
+g_assert(!fixture-hasBeenProvisional);
+fixture-hasBeenProvisional = TRUE;
+
+return TRUE;
+}
+
+static gboolean loadReloadLoadFinished(WebKitWebLoaderClient *client, WebLoadingFixture *fixture)
+{
+g_assert(!fixture-hasBeenFinished);
+fixture-hasBeenFinished = TRUE;
+g_main_loop_quit(fixture-loop);
+
+return TRUE;
+}
+
+static gboolean testLoadTimeoutFinishLoop(WebLoadingFixture *fixture)
+{
+g_main_loop_quit(fixture-loop);
+
+return FALSE;
+}
+
+static void testLoadReload(WebLoadingFixture *fixture, gconstpointer data)
+{
+char *uriString;
+WebKitWebLoaderClient *client = webkit_web_view_get_loader_client(fixture-webView);
+
+g_signal_connect(client, provisional-load-started, G_CALLBACK(loadReloadProvisionalLoadStarted), fixture);
+g_signal_connect(client, load-finished, G_CALLBACK(loadReloadLoadFinished), fixture);
+
+/* Check nothing happens when there's
[webkit-changes] [97366] trunk/Source/WebKit2
Title: [97366] trunk/Source/WebKit2
Revision 97366
Author carlo...@webkit.org
Date 2011-10-13 08:28:38 -0700 (Thu, 13 Oct 2011)
Log Message
[GTK] Add WebKitTestServer class to WebKit2 GTK+ unit tests library
https://bugs.webkit.org/show_bug.cgi?id=70010
Reviewed by Martin Robinson.
With this class tests using a soup server only need to implement
the soup server callback.
* UIProcess/API/gtk/tests/GNUmakefile.am: Add new files to compilation.
* UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp: Use WebKitTestServer.
(testLoadingStatus):
(testLoadingError):
(testLoadAlternateContent):
(testWebViewReload):
(testLoadProgress):
(beforeAll):
(afterAll):
* UIProcess/API/gtk/tests/WebKitTestServer.cpp: Added.
(WebKitTestServer::WebKitTestServer):
(WebKitTestServer::~WebKitTestServer):
(WebKitTestServer::run): Run the soup server and adds the given
soup server callback to handle requests.
(WebKitTestServer::getURIForPath): Returns the server absolute URI
for the given relative path.
* UIProcess/API/gtk/tests/WebKitTestServer.h: Added.
(WebKitTestServer::baseURI):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp
Added Paths
trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (97365 => 97366)
--- trunk/Source/WebKit2/ChangeLog 2011-10-13 14:31:38 UTC (rev 97365)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-13 15:28:38 UTC (rev 97366)
@@ -1,3 +1,32 @@
+2011-10-13 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Add WebKitTestServer class to WebKit2 GTK+ unit tests library
+https://bugs.webkit.org/show_bug.cgi?id=70010
+
+Reviewed by Martin Robinson.
+
+With this class tests using a soup server only need to implement
+the soup server callback.
+
+* UIProcess/API/gtk/tests/GNUmakefile.am: Add new files to compilation.
+* UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp: Use WebKitTestServer.
+(testLoadingStatus):
+(testLoadingError):
+(testLoadAlternateContent):
+(testWebViewReload):
+(testLoadProgress):
+(beforeAll):
+(afterAll):
+* UIProcess/API/gtk/tests/WebKitTestServer.cpp: Added.
+(WebKitTestServer::WebKitTestServer):
+(WebKitTestServer::~WebKitTestServer):
+(WebKitTestServer::run): Run the soup server and adds the given
+soup server callback to handle requests.
+(WebKitTestServer::getURIForPath): Returns the server absolute URI
+for the given relative path.
+* UIProcess/API/gtk/tests/WebKitTestServer.h: Added.
+(WebKitTestServer::baseURI):
+
2011-10-13 Nayan Kumar K naya...@motorola.com
[WebKit2][gtk] Fix warnings while generating WebKit2-GTK+ documentation.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am (97365 => 97366)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am 2011-10-13 14:31:38 UTC (rev 97365)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am 2011-10-13 15:28:38 UTC (rev 97366)
@@ -36,6 +36,8 @@
Libraries_libWebKit2APITestCore_la_SOURCES = \
Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp \
Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.h \
+ Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.cpp \
+ Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.h \
Source/WebKit2/UIProcess/API/gtk/tests/TestMain.cpp \
Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h \
Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp \
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp (97365 => 97366)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp 2011-10-13 14:31:38 UTC (rev 97365)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp 2011-10-13 15:28:38 UTC (rev 97366)
@@ -21,24 +21,16 @@
#include config.h
#include LoadTrackingTest.h
+#include WebKitTestServer.h
#include gtk/gtk.h
#include libsoup/soup.h
#include wtf/text/CString.h
-static SoupURI* kBaseURI = 0;
-static SoupServer* kSoupServer = 0;
+static WebKitTestServer* kServer;
-static CString getURIForPath(const char* path)
-{
-SoupURI* uri = soup_uri_new_with_base(kBaseURI, path);
-GOwnPtrgchar uriString(soup_uri_to_string(uri, FALSE));
-soup_uri_free(uri);
-return uriString.get();
-}
-
static void testLoadingStatus(LoadTrackingTest* test, gconstpointer data)
{
-webkit_web_view_load_uri(test-m_webView, getURIForPath(/redirect).data());
+webkit_web_view_load_uri(test-m_webView, kServer-getURIForPath(/redirect).data());
test-waitUntilLoadFinished();
VectorLoadTrackingTest::LoadEvents events = test-m_loadEvents;
@@ -51,7 +43,7 @@
static void
[webkit-changes] [97458] trunk/Source/WebKit2
Title: [97458] trunk/Source/WebKit2 Revision 97458 Author carlo...@webkit.org Date 2011-10-14 03:15:47 -0700 (Fri, 14 Oct 2011) Log Message [GTK] Build is broken with new ld https://bugs.webkit.org/show_bug.cgi?id=70097 Reviewed by Philippe Normand. * UIProcess/API/gtk/tests/GNUmakefile.am: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am Diff Modified: trunk/Source/WebKit2/ChangeLog (97457 => 97458) --- trunk/Source/WebKit2/ChangeLog 2011-10-14 10:14:15 UTC (rev 97457) +++ trunk/Source/WebKit2/ChangeLog 2011-10-14 10:15:47 UTC (rev 97458) @@ -1,3 +1,12 @@ +2011-10-14 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Build is broken with new ld +https://bugs.webkit.org/show_bug.cgi?id=70097 + +Reviewed by Philippe Normand. + +* UIProcess/API/gtk/tests/GNUmakefile.am: + 2011-10-12 Simon Hausmann simon.hausm...@nokia.com [Qt][WK2] Fix build after QSGItem API changes Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am (97457 => 97458) --- trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am 2011-10-14 10:14:15 UTC (rev 97457) +++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am 2011-10-14 10:15:47 UTC (rev 97458) @@ -21,9 +21,9 @@ $(LIBSOUP_CFLAGS) webkit2_tests_ldadd = \ + Libraries/libWebKit2APITestCore.la \ libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ - Libraries/libWebKit2APITestCore.la \ $(GEOCLUE_LIBS) \ $(GLIB_LIBS) \ $(GTK_LIBS) \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [97624] trunk/Source/WebKit2
Title: [97624] trunk/Source/WebKit2
Revision 97624
Author carlo...@webkit.org
Date 2011-10-17 09:23:51 -0700 (Mon, 17 Oct 2011)
Log Message
[GTK] Add methods to get/set a custom text enconding to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=69524
Reviewed by Martin Robinson.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_get_custom_charset):
(webkit_web_view_set_custom_charset):
* UIProcess/API/gtk/WebKitWebView.h:
* UIProcess/API/gtk/tests/TestWebKitWebView.cpp:
(testWebViewCustomCharset):
(beforeAll):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (97623 => 97624)
--- trunk/Source/WebKit2/ChangeLog 2011-10-17 15:28:56 UTC (rev 97623)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-17 16:23:51 UTC (rev 97624)
@@ -1,3 +1,18 @@
+2011-10-17 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Add methods to get/set a custom text enconding to WebKit2 GTK+ API
+https://bugs.webkit.org/show_bug.cgi?id=69524
+
+Reviewed by Martin Robinson.
+
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkit_web_view_get_custom_charset):
+(webkit_web_view_set_custom_charset):
+* UIProcess/API/gtk/WebKitWebView.h:
+* UIProcess/API/gtk/tests/TestWebKitWebView.cpp:
+(testWebViewCustomCharset):
+(beforeAll):
+
2011-10-14 Jesus Sanchez-Palencia jesus.palen...@openbossa.org
[Qt][WK2] Implement decidePolicyForResponse in our PolicyClient
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (97623 => 97624)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-17 15:28:56 UTC (rev 97623)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-17 16:23:51 UTC (rev 97624)
@@ -43,6 +43,7 @@
struct _WebKitWebViewPrivate {
WebKitWebContext* context;
+CString customTextEncoding;
GRefPtrWebKitWebLoaderClient loaderClient;
};
@@ -310,3 +311,45 @@
WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
WKPageGoForward(toAPI(page));
}
+
+/**
+ * webkit_web_view_get_custom_charset:
+ * @web_view: a #WebKitWebView
+ *
+ * Returns the current custom character encoding name of @web_view.
+ *
+ * Returns: the current custom character encoding name or %NULL if no
+ *custom character encoding has been set.
+ */
+const gchar* webkit_web_view_get_custom_charset(WebKitWebView* webView)
+{
+g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0);
+
+WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
+WKRetainPtrWKStringRef wkCustomEncoding(AdoptWK, WKPageCopyCustomTextEncodingName(toAPI(page)));
+if (WKStringIsEmpty(wkCustomEncoding.get()))
+return 0;
+
+webView-priv-customTextEncoding = toImpl(wkCustomEncoding.get())-string().utf8();
+return webView-priv-customTextEncoding.data();
+}
+
+/**
+ * webkit_web_view_set_custom_charset:
+ * @web_view: a #WebKitWebView
+ * @charset: (allow-none): a character encoding name or %NULL
+ *
+ * Sets the current custom character encoding override of @web_view. The custom
+ * character encoding will override any text encoding detected via HTTP headers or
+ * META tags. Calling this method will stop any current load operation and reload the
+ * current page. Setting the custom character encoding to %NULL removes the character
+ * encoding override.
+ */
+void webkit_web_view_set_custom_charset(WebKitWebView* webView, const gchar* charset)
+{
+g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
+
+WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
+WKRetainPtrWKStringRef wkEncodingName = charset ? adoptWK(WKStringCreateWithUTF8CString(charset)) : 0;
+WKPageSetCustomTextEncodingName(toAPI(page), wkEncodingName.get());
+}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (97623 => 97624)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-17 15:28:56 UTC (rev 97623)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-17 16:23:51 UTC (rev 97624)
@@ -107,6 +107,13 @@
WEBKIT_API void
webkit_web_view_go_forward (WebKitWebView *web_view);
+WEBKIT_API const gchar *
+webkit_web_view_get_custom_charset (WebKitWebView *web_view);
+
+WEBKIT_API void
+webkit_web_view_set_custom_charset (WebKitWebView *web_view,
+ const gchar *charset);
+
G_END_DECLS
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp (97623 => 97624)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp 2011-10-17 15:28:56 UTC (rev 97623)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp 2011-10-17 16:23:51 UTC (rev 97624)
@@
[webkit-changes] [97728] trunk/Source/WebKit2
Title: [97728] trunk/Source/WebKit2
Revision 97728
Author carlo...@webkit.org
Date 2011-10-18 01:48:17 -0700 (Tue, 18 Oct 2011)
Log Message
[UNIX] Use SOCK_SEQPACKET when available
https://bugs.webkit.org/show_bug.cgi?id=61287
Reviewed by Darin Adler.
Sockets of type SEQPACKET are actually DGRAM sockets but that
notifies the other end when the connection is closed. When
SEQPACKET sockets are not available GTK+ port uses STREAM sockets
while Qt port uses DGRAM sockets.
* PluginProcess/PluginProcess.cpp: Use SOCK_SEQPACKET if possible.
* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
(WebKit::ProcessLauncher::launchProcess): Ditto.
* UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
(WebKit::ProcessLauncher::launchProcess): Ditto.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp
trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (97727 => 97728)
--- trunk/Source/WebKit2/ChangeLog 2011-10-18 08:39:18 UTC (rev 97727)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-18 08:48:17 UTC (rev 97728)
@@ -1,3 +1,21 @@
+2011-10-18 Carlos Garcia Campos cgar...@igalia.com
+
+[UNIX] Use SOCK_SEQPACKET when available
+https://bugs.webkit.org/show_bug.cgi?id=61287
+
+Reviewed by Darin Adler.
+
+Sockets of type SEQPACKET are actually DGRAM sockets but that
+notifies the other end when the connection is closed. When
+SEQPACKET sockets are not available GTK+ port uses STREAM sockets
+while Qt port uses DGRAM sockets.
+
+* PluginProcess/PluginProcess.cpp: Use SOCK_SEQPACKET if possible.
+* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+(WebKit::ProcessLauncher::launchProcess): Ditto.
+* UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+(WebKit::ProcessLauncher::launchProcess): Ditto.
+
2011-10-17 Jon Lee jon...@apple.com
Filtering of URLs when serializing back forward list saves bad current index value
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (97727 => 97728)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2011-10-18 08:39:18 UTC (rev 97727)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2011-10-18 08:48:17 UTC (rev 97728)
@@ -44,12 +44,16 @@
#include sys/socket.h
#include unistd.h
+#ifdef SOCK_SEQPACKET
+#define SOCKET_TYPE SOCK_SEQPACKET
+#else
#if PLATFORM(GTK)
#define SOCKET_TYPE SOCK_STREAM
#else
#define SOCKET_TYPE SOCK_DGRAM
#endif
-#endif
+#endif // SOCK_SEQPACKET
+#endif // USE(UNIX_DOMAIN_SOCKETS)
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (97727 => 97728)
--- trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2011-10-18 08:39:18 UTC (rev 97727)
+++ trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2011-10-18 08:48:17 UTC (rev 97728)
@@ -39,6 +39,12 @@
#include wtf/text/WTFString.h
#include wtf/gobject/GOwnPtr.h
+#ifdef SOCK_SEQPACKET
+#define SOCKET_TYPE SOCK_SEQPACKET
+#else
+#define SOCKET_TYPE SOCK_STREAM
+#endif
+
using namespace WebCore;
namespace WebKit {
@@ -70,7 +76,7 @@
GPid pid = 0;
int sockets[2];
-if (socketpair(AF_UNIX, SOCK_STREAM, 0, sockets) 0) {
+if (socketpair(AF_UNIX, SOCKET_TYPE, 0, sockets) 0) {
g_printerr(Creation of socket failed: %s.\n, g_strerror(errno));
ASSERT_NOT_REACHED();
return;
Modified: trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp (97727 => 97728)
--- trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp 2011-10-18 08:39:18 UTC (rev 97727)
+++ trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp 2011-10-18 08:48:17 UTC (rev 97728)
@@ -55,6 +55,12 @@
#include signal.h
#endif
+#ifdef SOCK_SEQPACKET
+#define SOCKET_TYPE SOCK_SEQPACKET
+#else
+#define SOCKET_TYPE SOCK_DGRAM
+#endif
+
using namespace WebCore;
namespace WebKit {
@@ -97,7 +103,7 @@
}
int sockets[2];
-if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sockets) == -1) {
+if (socketpair(AF_UNIX, SOCKET_TYPE, 0, sockets) == -1) {
qDebug() Creation of socket failed with errno: errno;
ASSERT_NOT_REACHED();
return;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [97960] trunk/Source/WebKit2
Title: [97960] trunk/Source/WebKit2
Revision 97960
Author carlo...@webkit.org
Date 2011-10-20 04:16:37 -0700 (Thu, 20 Oct 2011)
Log Message
[GTK] Remove WebKitWebLoaderClientPrivate
https://bugs.webkit.org/show_bug.cgi?id=70488
Reviewed by Philippe Normand.
It's unused since r97920.
* GNUmakefile.am: Add WebKitWebLoaderClientPrivate.h.
* UIProcess/API/gtk/WebKitWebLoaderClient.cpp:
(webkitWebLoaderClientAttachLoaderClientToPage): Renamed to make
it clear it's a private method of WebKitWebLoaderClient.
(webkit_web_loader_client_init): Remove
WebKitWebLoaderClientPrivate initialization.
(webkit_web_loader_client_class_init): Removed adding
WebKitWebLoaderClientPrivate struct as private data.
* UIProcess/API/gtk/WebKitWebLoaderClient.h: Remove
WebKitWebLoaderClientPrivate definition.
* UIProcess/API/gtk/WebKitWebLoaderClientPrivate.h: Move
webkitWebLoaderClientAttachLoaderClientToPage method here since
it's a private method implemented in WebKitWebLoaderClient, not in
WebKitWebView.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_set_loader_client): Use
webkitWebLoaderClientAttachLoaderClientToPage.
* UIProcess/API/gtk/WebKitWebViewPrivate.h: Remove
webkitWebLoaderClientAttachLoaderClientToPage prototype.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/GNUmakefile.am
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h
Added Paths
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClientPrivate.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (97959 => 97960)
--- trunk/Source/WebKit2/ChangeLog 2011-10-20 11:03:02 UTC (rev 97959)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-20 11:16:37 UTC (rev 97960)
@@ -1,3 +1,32 @@
+2011-10-20 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Remove WebKitWebLoaderClientPrivate
+https://bugs.webkit.org/show_bug.cgi?id=70488
+
+Reviewed by Philippe Normand.
+
+It's unused since r97920.
+
+* GNUmakefile.am: Add WebKitWebLoaderClientPrivate.h.
+* UIProcess/API/gtk/WebKitWebLoaderClient.cpp:
+(webkitWebLoaderClientAttachLoaderClientToPage): Renamed to make
+it clear it's a private method of WebKitWebLoaderClient.
+(webkit_web_loader_client_init): Remove
+WebKitWebLoaderClientPrivate initialization.
+(webkit_web_loader_client_class_init): Removed adding
+WebKitWebLoaderClientPrivate struct as private data.
+* UIProcess/API/gtk/WebKitWebLoaderClient.h: Remove
+WebKitWebLoaderClientPrivate definition.
+* UIProcess/API/gtk/WebKitWebLoaderClientPrivate.h: Move
+webkitWebLoaderClientAttachLoaderClientToPage method here since
+it's a private method implemented in WebKitWebLoaderClient, not in
+WebKitWebView.
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkit_web_view_set_loader_client): Use
+webkitWebLoaderClientAttachLoaderClientToPage.
+* UIProcess/API/gtk/WebKitWebViewPrivate.h: Remove
+webkitWebLoaderClientAttachLoaderClientToPage prototype.
+
2011-10-10 Martin Robinson mrobin...@igalia.com
[GTK] [WebKit2] Allow sharing page clients between WebViews
Modified: trunk/Source/WebKit2/GNUmakefile.am (97959 => 97960)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-10-20 11:03:02 UTC (rev 97959)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-10-20 11:16:37 UTC (rev 97960)
@@ -485,6 +485,7 @@
Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp \
+ Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClientPrivate.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp \
Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h \
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp (97959 => 97960)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp 2011-10-20 11:03:02 UTC (rev 97959)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp 2011-10-20 11:16:37 UTC (rev 97960)
@@ -23,6 +23,7 @@
#include WebKitError.h
#include WebKitMarshal.h
#include WebKitPrivate.h
+#include WebKitWebLoaderClientPrivate.h
#include WebKitWebView.h
#include WebKitWebViewPrivate.h
#include WebKitWebViewBasePrivate.h
@@ -44,10 +45,6 @@
LAST_SIGNAL
};
-struct _WebKitWebLoaderClientPrivate {
-GRefPtrWebKitWebView view;
-};
-
static guint signals[LAST_SIGNAL] = { 0, };
G_DEFINE_TYPE(WebKitWebLoaderClient, webkit_web_loader_client, G_TYPE_OBJECT)
@@ -128,11 +125,11 @@
webkitWebViewSetEstimatedLoadProgress(webView, WKPageGetEstimatedProgress(page));
}
-void attachLoaderClientToPage(WKPageRef page, WebKitWebLoaderClient* client)
[webkit-changes] [98080] trunk/Source/WebKit2
Title: [98080] trunk/Source/WebKit2
Revision 98080
Author carlo...@webkit.org
Date 2011-10-21 01:09:05 -0700 (Fri, 21 Oct 2011)
Log Message
[GTK] Add webkit_web_view_stop_loading() to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=69610
Reviewed by Martin Robinson.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_stop_loading):
* UIProcess/API/gtk/WebKitWebView.h:
* UIProcess/API/gtk/tests/LoadTrackingTest.cpp:
(provisionalLoadFailedCallback):
(loadFailedCallback):
* UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp:
(LoadStopTrackingTest::loadCommitted):
(LoadStopTrackingTest::loadFailed):
(LoadStopTrackingTest::loadFinished):
(testLoadCancelled):
(serverCallback):
(beforeAll):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98079 => 98080)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 07:51:42 UTC (rev 98079)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 08:09:05 UTC (rev 98080)
@@ -1,3 +1,24 @@
+2011-10-21 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Add webkit_web_view_stop_loading() to WebKit2 GTK+ API
+https://bugs.webkit.org/show_bug.cgi?id=69610
+
+Reviewed by Martin Robinson.
+
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkit_web_view_stop_loading):
+* UIProcess/API/gtk/WebKitWebView.h:
+* UIProcess/API/gtk/tests/LoadTrackingTest.cpp:
+(provisionalLoadFailedCallback):
+(loadFailedCallback):
+* UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp:
+(LoadStopTrackingTest::loadCommitted):
+(LoadStopTrackingTest::loadFailed):
+(LoadStopTrackingTest::loadFinished):
+(testLoadCancelled):
+(serverCallback):
+(beforeAll):
+
2011-10-20 Jesus Sanchez-Palencia jesus.palen...@openbossa.org
[Qt][WK2] qweberror* should follow the new file and class naming rules
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (98079 => 98080)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-21 07:51:42 UTC (rev 98079)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-21 08:09:05 UTC (rev 98080)
@@ -315,6 +315,25 @@
}
/**
+ * webkit_web_view_stop_loading:
+ * @web_view: a #WebKitWebView
+ *
+ * Stops any ongoing loading operation in @web_view.
+ * This method does nothing if no content is being loaded.
+ * If there is a loading operation in progress, it will be cancelled and
+ * #WebKitWebLoaderClient::provisional-load-failed or
+ * #WebKitWebLoaderClient::load-failed will be emitted on the current
+ * #WebKitWebLoaderClient with %WEBKIT_NETWORK_ERROR_CANCELLED error.
+ * See also webkit_web_view_get_loader_client().
+ */
+void webkit_web_view_stop_loading(WebKitWebView* webView)
+{
+g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
+
+WKPageStopLoading(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView;
+}
+
+/**
* webkit_web_view_go_back:
* @web_view: a #WebKitWebView
*
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (98079 => 98080)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-21 07:51:42 UTC (rev 98079)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-21 08:09:05 UTC (rev 98080)
@@ -94,6 +94,9 @@
const gchar *unreachable_uri);
WEBKIT_API void
+webkit_web_view_stop_loading(WebKitWebView *web_view);
+
+WEBKIT_API void
webkit_web_view_reload (WebKitWebView *web_view);
WEBKIT_API void
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp (98079 => 98080)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp 2011-10-21 07:51:42 UTC (rev 98079)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp 2011-10-21 08:09:05 UTC (rev 98080)
@@ -36,6 +36,7 @@
static gboolean provisionalLoadFailedCallback(WebKitWebLoaderClient* client, WebKitWebView*, const gchar* failingURI, GError* error, LoadTrackingTest* test)
{
+g_assert(error);
test-provisionalLoadFailed(client, failingURI, error);
return TRUE;
}
@@ -54,6 +55,7 @@
static gboolean loadFailedCallback(WebKitWebLoaderClient* client, WebKitWebView*, const gchar* failingURI, GError* error, LoadTrackingTest* test)
{
+g_assert(error);
test-loadFailed(client, failingURI, error);
return TRUE;
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp (98079 => 98080)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp 2011-10-21 07:51:42 UTC (rev 98079)
+++
[webkit-changes] [98081] trunk/Source/WebKit2
Title: [98081] trunk/Source/WebKit2
Revision 98081
Author carlo...@webkit.org
Date 2011-10-21 01:17:03 -0700 (Fri, 21 Oct 2011)
Log Message
[GTK] Add can_go_back/forward methods to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=69823
Reviewed by Martin Robinson.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_go_back):
(webkit_web_view_can_go_back):
(webkit_web_view_go_forward):
(webkit_web_view_can_go_forward):
* UIProcess/API/gtk/WebKitWebView.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98080 => 98081)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 08:09:05 UTC (rev 98080)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 08:17:03 UTC (rev 98081)
@@ -1,5 +1,19 @@
2011-10-21 Carlos Garcia Campos cgar...@igalia.com
+[GTK] Add can_go_back/forward methods to WebKit2 GTK+ API
+https://bugs.webkit.org/show_bug.cgi?id=69823
+
+Reviewed by Martin Robinson.
+
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkit_web_view_go_back):
+(webkit_web_view_can_go_back):
+(webkit_web_view_go_forward):
+(webkit_web_view_can_go_forward):
+* UIProcess/API/gtk/WebKitWebView.h:
+
+2011-10-21 Carlos Garcia Campos cgar...@igalia.com
+
[GTK] Add webkit_web_view_stop_loading() to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=69610
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (98080 => 98081)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-21 08:09:05 UTC (rev 98080)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-21 08:17:03 UTC (rev 98081)
@@ -345,11 +345,25 @@
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
-WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
-WKPageGoBack(toAPI(page));
+WKPageGoBack(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView;
}
/**
+ * webkit_web_view_can_go_back:
+ * @web_view: a #WebKitWebView
+ *
+ * Determines whether @web_view has a previous history item.
+ *
+ * Returns: %TRUE if able to move back or %FALSE otherwise.
+ */
+gboolean webkit_web_view_can_go_back(WebKitWebView* webView)
+{
+g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
+
+return WKPageCanGoBack(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView;
+}
+
+/**
* webkit_web_view_go_forward:
* @web_view: a #WebKitWebView
*
@@ -361,11 +375,25 @@
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
-WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
-WKPageGoForward(toAPI(page));
+WKPageGoForward(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView;
}
/**
+ * webkit_web_view_can_go_forward:
+ * @web_view: a #WebKitWebView
+ *
+ * Determines whether @web_view has a next history item.
+ *
+ * Returns: %TRUE if able to move forward or %FALSE otherwise.
+ */
+gboolean webkit_web_view_can_go_forward(WebKitWebView* webView)
+{
+g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
+
+return WKPageCanGoForward(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView;
+}
+
+/**
* webkit_web_view_get_custom_charset:
* @web_view: a #WebKitWebView
*
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (98080 => 98081)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-21 08:09:05 UTC (rev 98080)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-21 08:17:03 UTC (rev 98081)
@@ -105,9 +105,15 @@
WEBKIT_API void
webkit_web_view_go_back (WebKitWebView *web_view);
+WEBKIT_API gboolean
+webkit_web_view_can_go_back (WebKitWebView *web_view)
+
WEBKIT_API void
webkit_web_view_go_forward (WebKitWebView *web_view);
+WEBKIT_API gboolean
+webkit_web_view_can_go_forward (WebKitWebView *web_view);
+
WEBKIT_API const gchar *
webkit_web_view_get_custom_charset (WebKitWebView *web_view);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98086] trunk/Source/WebKit2
Title: [98086] trunk/Source/WebKit2 Revision 98086 Author carlo...@webkit.org Date 2011-10-21 01:44:49 -0700 (Fri, 21 Oct 2011) Log Message [GTK] Fix API documentation comment for webkit_web_view_get_estimated_load_progress() https://bugs.webkit.org/show_bug.cgi?id=70587 Reviewed by Philippe Normand. It's should start with /** to be recognized as API documentation. * UIProcess/API/gtk/WebKitWebView.cpp: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (98085 => 98086) --- trunk/Source/WebKit2/ChangeLog 2011-10-21 08:40:06 UTC (rev 98085) +++ trunk/Source/WebKit2/ChangeLog 2011-10-21 08:44:49 UTC (rev 98086) @@ -1,3 +1,14 @@ +2011-10-21 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Fix API documentation comment for webkit_web_view_get_estimated_load_progress() +https://bugs.webkit.org/show_bug.cgi?id=70587 + +Reviewed by Philippe Normand. + +It's should start with /** to be recognized as API documentation. + +* UIProcess/API/gtk/WebKitWebView.cpp: + 2011-10-21 Csaba Osztrogonác o...@webkit.org [Qt][WK2] Unreviewed buildfix for newer Qt5. Remove duplicated defines. Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (98085 => 98086) --- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-21 08:40:06 UTC (rev 98085) +++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-21 08:44:49 UTC (rev 98086) @@ -435,7 +435,7 @@ WKPageSetCustomTextEncodingName(toAPI(page), wkEncodingName.get()); } -/* +/** * webkit_web_view_get_estimated_load_progress: * @web_view: a #WebKitWebView * ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98089] trunk/Source/WebKit2
Title: [98089] trunk/Source/WebKit2 Revision 98089 Author carlo...@webkit.org Date 2011-10-21 02:00:56 -0700 (Fri, 21 Oct 2011) Log Message 2011-10-21 Carlos Garcia Campos cgar...@igalia.com Unreviewed. Fix WebKit2 GTK+ build after r98081. * UIProcess/API/gtk/WebKitWebView.h: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h Diff Modified: trunk/Source/WebKit2/ChangeLog (98088 => 98089) --- trunk/Source/WebKit2/ChangeLog 2011-10-21 08:55:00 UTC (rev 98088) +++ trunk/Source/WebKit2/ChangeLog 2011-10-21 09:00:56 UTC (rev 98089) @@ -1,3 +1,9 @@ +2011-10-21 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix WebKit2 GTK+ build after r98081. + +* UIProcess/API/gtk/WebKitWebView.h: + 2011-10-21 Sheriff Bot webkit.review@gmail.com Unreviewed, rolling out r98085. Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (98088 => 98089) --- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-21 08:55:00 UTC (rev 98088) +++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-21 09:00:56 UTC (rev 98089) @@ -106,7 +106,7 @@ webkit_web_view_go_back (WebKitWebView *web_view); WEBKIT_API gboolean -webkit_web_view_can_go_back (WebKitWebView *web_view) +webkit_web_view_can_go_back (WebKitWebView *web_view); WEBKIT_API void webkit_web_view_go_forward (WebKitWebView *web_view); ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98098] trunk/Tools
Title: [98098] trunk/Tools
Revision 98098
Author carlo...@webkit.org
Date 2011-10-21 06:47:58 -0700 (Fri, 21 Oct 2011)
Log Message
watchlist: Add a new entry for WebKit2 GTK+ public API
https://bugs.webkit.org/show_bug.cgi?id=70601
Reviewed by Philippe Normand.
Subscribe myself to WebKit2 GTK+ API patches. Also add a message
for patches that might include new API that points to the WebKit2
GTK+ API guidelines.
* Scripts/webkitpy/common/config/watchlist:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/watchlist
Diff
Modified: trunk/Tools/ChangeLog (98097 => 98098)
--- trunk/Tools/ChangeLog 2011-10-21 13:36:22 UTC (rev 98097)
+++ trunk/Tools/ChangeLog 2011-10-21 13:47:58 UTC (rev 98098)
@@ -1,3 +1,16 @@
+2011-10-21 Carlos Garcia Campos cgar...@igalia.com
+
+watchlist: Add a new entry for WebKit2 GTK+ public API
+https://bugs.webkit.org/show_bug.cgi?id=70601
+
+Reviewed by Philippe Normand.
+
+Subscribe myself to WebKit2 GTK+ API patches. Also add a message
+for patches that might include new API that points to the WebKit2
+GTK+ API guidelines.
+
+* Scripts/webkitpy/common/config/watchlist:
+
2011-10-21 Simon Hausmann simon.hausm...@nokia.com
Remove QtScript source code from WebKit.
Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (98097 => 98098)
--- trunk/Tools/Scripts/webkitpy/common/config/watchlist 2011-10-21 13:36:22 UTC (rev 98097)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist 2011-10-21 13:47:58 UTC (rev 98098)
@@ -78,6 +78,9 @@
StyleChecker: {
filename: rTools/Scripts/webkitpy/style/,
},
+GtkWebKit2PublicAPI: {
+filename: rSource/WebKit2/UIProcess/API/gtk/,
+},
},
CC_RULES: {
# Note: All email addresses listed must be registered with bugzilla.
@@ -98,9 +101,13 @@
SecurityCritical: [ aba...@webkit.org ],
webkitpy: [ aba...@webkit.org, o...@chromium.org ],
TestFailures: [ aba...@webkit.org, dglaz...@chromium.org ],
+GtkWebKit2PublicAPI: [ cgar...@igalia.com, ],
},
MESSAGE_RULES: {
ChromiumPublicApi: [ Please wait for approval from fi...@chromium.org before submitting
because this patch contains changes to the Chromium public API., ],
+GtkWebKit2PublicAPI: [ Thanks for the patch. If this patch contains new public API
+ please make sure it follows the guidelines for new WebKit2 GTK+ API.
+ See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API, ],
},
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98239] trunk
Title: [98239] trunk Revision 98239 Author carlo...@webkit.org Date 2011-10-24 07:56:39 -0700 (Mon, 24 Oct 2011) Log Message [GTK] Remove g_thread_init() calls https://bugs.webkit.org/show_bug.cgi?id=70717 Reviewed by Xan Lopez. With newer glib it's not needed anymore and with previous versions it was already called by g_type_init(). Source/WebKit/gtk: * tests/testapplicationcache.c: (main): * tests/testatk.c: (main): * tests/testatkroles.c: (main): * tests/testcopyandpaste.c: (main): * tests/testdomdocument.c: (main): * tests/testdomdomwindow.c: (main): * tests/testdomnode.c: (main): * tests/testdownload.c: (main): * tests/testglobals.c: (main): * tests/testhittestresult.c: (main): * tests/testhttpbackend.c: (main): * tests/testkeyevents.c: (main): * tests/testloading.c: (main): * tests/testmimehandling.c: (main): * tests/testnetworkrequest.c: (main): * tests/testnetworkresponse.c: (main): * tests/testwebbackforwardlist.c: (main): * tests/testwebdatasource.c: (main): * tests/testwebframe.c: (main): * tests/testwebhistoryitem.c: (main): * tests/testwebplugindatabase.c: (main): * tests/testwebresource.c: (main): * tests/testwebsettings.c: (main): * tests/testwebview.c: * tests/testwindow.c: (main): Source/WebKit2: * UIProcess/API/gtk/tests/TestMain.cpp: (main): Tools: * DumpRenderTree/gtk/DumpRenderTree.cpp: (main): * GtkLauncher/main.c: (main): * MiniBrowser/gtk/main.c: (main): Modified Paths trunk/Source/WebKit/gtk/ChangeLog trunk/Source/WebKit/gtk/tests/testapplicationcache.c trunk/Source/WebKit/gtk/tests/testatk.c trunk/Source/WebKit/gtk/tests/testatkroles.c trunk/Source/WebKit/gtk/tests/testcopyandpaste.c trunk/Source/WebKit/gtk/tests/testdomdocument.c trunk/Source/WebKit/gtk/tests/testdomdomwindow.c trunk/Source/WebKit/gtk/tests/testdomnode.c trunk/Source/WebKit/gtk/tests/testdownload.c trunk/Source/WebKit/gtk/tests/testglobals.c trunk/Source/WebKit/gtk/tests/testhittestresult.c trunk/Source/WebKit/gtk/tests/testhttpbackend.c trunk/Source/WebKit/gtk/tests/testkeyevents.c trunk/Source/WebKit/gtk/tests/testloading.c trunk/Source/WebKit/gtk/tests/testmimehandling.c trunk/Source/WebKit/gtk/tests/testnetworkrequest.c trunk/Source/WebKit/gtk/tests/testnetworkresponse.c trunk/Source/WebKit/gtk/tests/testwebbackforwardlist.c trunk/Source/WebKit/gtk/tests/testwebdatasource.c trunk/Source/WebKit/gtk/tests/testwebframe.c trunk/Source/WebKit/gtk/tests/testwebhistoryitem.c trunk/Source/WebKit/gtk/tests/testwebplugindatabase.c trunk/Source/WebKit/gtk/tests/testwebresource.c trunk/Source/WebKit/gtk/tests/testwebsettings.c trunk/Source/WebKit/gtk/tests/testwebview.c trunk/Source/WebKit/gtk/tests/testwindow.c trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestMain.cpp trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp trunk/Tools/GtkLauncher/main.c trunk/Tools/MiniBrowser/gtk/main.c Diff Modified: trunk/Source/WebKit/gtk/ChangeLog (98238 => 98239) --- trunk/Source/WebKit/gtk/ChangeLog 2011-10-24 14:41:26 UTC (rev 98238) +++ trunk/Source/WebKit/gtk/ChangeLog 2011-10-24 14:56:39 UTC (rev 98239) @@ -1,3 +1,63 @@ +2011-10-24 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Remove g_thread_init() calls +https://bugs.webkit.org/show_bug.cgi?id=70717 + +Reviewed by Xan Lopez. + +With newer glib it's not needed anymore and with previous versions +it was already called by g_type_init(). + +* tests/testapplicationcache.c: +(main): +* tests/testatk.c: +(main): +* tests/testatkroles.c: +(main): +* tests/testcopyandpaste.c: +(main): +* tests/testdomdocument.c: +(main): +* tests/testdomdomwindow.c: +(main): +* tests/testdomnode.c: +(main): +* tests/testdownload.c: +(main): +* tests/testglobals.c: +(main): +* tests/testhittestresult.c: +(main): +* tests/testhttpbackend.c: +(main): +* tests/testkeyevents.c: +(main): +* tests/testloading.c: +(main): +* tests/testmimehandling.c: +(main): +* tests/testnetworkrequest.c: +(main): +* tests/testnetworkresponse.c: +(main): +* tests/testwebbackforwardlist.c: +(main): +* tests/testwebdatasource.c: +(main): +* tests/testwebframe.c: +(main): +* tests/testwebhistoryitem.c: +(main): +* tests/testwebplugindatabase.c: +(main): +* tests/testwebresource.c: +(main): +* tests/testwebsettings.c: +(main): +* tests/testwebview.c: +* tests/testwindow.c: +(main): + 2011-10-20 Gustavo Noronha Silva g...@gnome.org [GTK] webkitgtk's pkgconfig file needs to require _javascript_coregtk Modified: trunk/Source/WebKit/gtk/tests/testapplicationcache.c (98238 => 98239) ---
[webkit-changes] [98241] trunk/Source/WebKit2
Title: [98241] trunk/Source/WebKit2
Revision 98241
Author carlo...@webkit.org
Date 2011-10-24 08:17:25 -0700 (Mon, 24 Oct 2011)
Log Message
[GTK] Add helper function to set the loader client in WebKitWebView
https://bugs.webkit.org/show_bug.cgi?id=70594
Reviewed by Martin Robinson.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewSetLoaderClient): Helper function to set the loader
client.
(webkitWebViewConstructed): Use webkitWebViewSetLoaderClient() to
avoid unnecessary checks.
(webkit_web_view_set_loader_client): Use
webkitWebViewSetLoaderClient().
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98240 => 98241)
--- trunk/Source/WebKit2/ChangeLog 2011-10-24 15:14:46 UTC (rev 98240)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-24 15:17:25 UTC (rev 98241)
@@ -1,5 +1,20 @@
2011-10-24 Carlos Garcia Campos cgar...@igalia.com
+[GTK] Add helper function to set the loader client in WebKitWebView
+https://bugs.webkit.org/show_bug.cgi?id=70594
+
+Reviewed by Martin Robinson.
+
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkitWebViewSetLoaderClient): Helper function to set the loader
+client.
+(webkitWebViewConstructed): Use webkitWebViewSetLoaderClient() to
+avoid unnecessary checks.
+(webkit_web_view_set_loader_client): Use
+webkitWebViewSetLoaderClient().
+
+2011-10-24 Carlos Garcia Campos cgar...@igalia.com
+
[GTK] Remove g_thread_init() calls
https://bugs.webkit.org/show_bug.cgi?id=70717
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (98240 => 98241)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-24 15:14:46 UTC (rev 98240)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-24 15:17:25 UTC (rev 98241)
@@ -54,15 +54,27 @@
G_DEFINE_TYPE(WebKitWebView, webkit_web_view, WEBKIT_TYPE_WEB_VIEW_BASE)
+static void webkitWebViewSetLoaderClient(WebKitWebView* webView, WebKitWebLoaderClient* loaderClient, WKPageRef wkPage)
+{
+webView-priv-loaderClient = loaderClient;
+webkitWebLoaderClientAttachLoaderClientToPage(loaderClient, wkPage);
+}
+
static void webkitWebViewConstructed(GObject* object)
{
+if (G_OBJECT_CLASS(webkit_web_view_parent_class)-constructed)
+G_OBJECT_CLASS(webkit_web_view_parent_class)-constructed(object);
+
WebKitWebView* webView = WEBKIT_WEB_VIEW(object);
WebKitWebViewPrivate* priv = webView-priv;
+WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(webView);
-webkitWebViewBaseCreateWebPage(WEBKIT_WEB_VIEW_BASE(webView), webkitWebContextGetWKContext(priv-context), 0);
+webkitWebViewBaseCreateWebPage(webViewBase, webkitWebContextGetWKContext(priv-context), 0);
+WebPageProxy* page = webkitWebViewBaseGetPage(webViewBase);
+
static GRefPtrWebKitWebLoaderClient defaultLoaderClient = adoptGRef(WEBKIT_WEB_LOADER_CLIENT(g_object_new(WEBKIT_TYPE_WEB_LOADER_CLIENT, NULL)));
-webkit_web_view_set_loader_client(webView, defaultLoaderClient.get());
+webkitWebViewSetLoaderClient(webView, defaultLoaderClient.get(), toAPI(page));
}
static void webkitWebViewSetProperty(GObject* object, guint propId, const GValue* value, GParamSpec* paramSpec)
@@ -235,8 +247,7 @@
return;
WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
-webkitWebLoaderClientAttachLoaderClientToPage(loaderClient, toAPI(page));
-priv-loaderClient = loaderClient;
+webkitWebViewSetLoaderClient(webView, loaderClient, toAPI(page));
}
/**
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98250] trunk/Source
Title: [98250] trunk/Source Revision 98250 Author carlo...@webkit.org Date 2011-10-24 09:44:54 -0700 (Mon, 24 Oct 2011) Log Message [GTK] Fix make distcheck build https://bugs.webkit.org/show_bug.cgi?id=69745 Reviewed by Martin Robinson. Source/WebCore: * GNUmakefile.am: * GNUmakefile.list.am: Source/WebKit2: * GNUmakefile.am: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/GNUmakefile.am trunk/Source/WebCore/GNUmakefile.list.am trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am Diff Modified: trunk/Source/WebCore/ChangeLog (98249 => 98250) --- trunk/Source/WebCore/ChangeLog 2011-10-24 16:39:00 UTC (rev 98249) +++ trunk/Source/WebCore/ChangeLog 2011-10-24 16:44:54 UTC (rev 98250) @@ -1,3 +1,13 @@ +2011-10-24 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Fix make distcheck build +https://bugs.webkit.org/show_bug.cgi?id=69745 + +Reviewed by Martin Robinson. + +* GNUmakefile.am: +* GNUmakefile.list.am: + 2011-10-24 Alexander Pavlov apav...@chromium.org Web Inspector: [Styles] Adding a new style rule breaks things Modified: trunk/Source/WebCore/GNUmakefile.am (98249 => 98250) --- trunk/Source/WebCore/GNUmakefile.am 2011-10-24 16:39:00 UTC (rev 98249) +++ trunk/Source/WebCore/GNUmakefile.am 2011-10-24 16:44:54 UTC (rev 98250) @@ -684,7 +684,7 @@ DerivedSources/WebCore/EventFactory.cpp DerivedSources/WebCore/EventHeaders.h DerivedSources/WebCore/EventInterfaces.h: $(WebCore)/dom/make_event_factory.pl $(WebCore)/dom/EventFactory.in $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $ --events $(WebCore)/dom/EventFactory.in --outputDir $(GENSOURCES_WEBCORE) -# All Web Inspector generated files are created with this one call to CodeGeneratorInspector.pm +# All Web Inspector generated files are created with this one call to CodeGeneratorInspector.py DerivedSources/WebCore/InspectorProtocolVersion.h : $(WebCore)/inspector/Inspector.json $(WebCore)/inspector/generate-inspector-protocol-version $(PYTHON) $(WebCore)/inspector/generate-inspector-protocol-version -o $(GENSOURCES_WEBCORE)/InspectorProtocolVersion.h $(WebCore)/inspector/Inspector.json @@ -877,17 +877,18 @@ Source/WebCore/css/tokenizer.flex \ Source/WebCore/css/view-source.css \ Source/WebCore/css/WebKitFontFamilyNames.in \ + Source/WebCore/dom/EventFactory.in \ Source/WebCore/dom/make_names.pl \ + Source/WebCore/dom/make_event_factory.pl \ Source/WebCore/html/HTMLAttributeNames.in \ Source/WebCore/html/HTMLTagNames.in \ Source/WebCore/html/parser/create-html-entity-table \ Source/WebCore/html/parser/HTMLEntityNames.in \ Source/WebCore/icu/LICENSE \ - Source/WebCore/inspector/CodeGeneratorInspector.pm \ + Source/WebCore/inspector/CodeGeneratorInspector.py \ Source/WebCore/inspector/InjectedScriptSource.js \ Source/WebCore/inspector/Inspector.json \ Source/WebCore/inspector/Inspector-0.1.json \ - Source/WebCore/inspector/generate-inspector-idl \ Source/WebCore/inspector/generate-inspector-protocol-version \ Source/WebCore/inspector/xxd.pl \ Source/WebCore/LICENSE-APPLE \ Modified: trunk/Source/WebCore/GNUmakefile.list.am (98249 => 98250) --- trunk/Source/WebCore/GNUmakefile.list.am 2011-10-24 16:39:00 UTC (rev 98249) +++ trunk/Source/WebCore/GNUmakefile.list.am 2011-10-24 16:44:54 UTC (rev 98250) @@ -1210,6 +1210,7 @@ Source/WebCore/dom/EventDispatcher.cpp \ Source/WebCore/dom/EventDispatcher.h \ Source/WebCore/dom/EventException.h \ + Source/WebCore/dom/EventFactory.h \ Source/WebCore/dom/EventListener.h \ Source/WebCore/dom/EventListenerMap.cpp \ Source/WebCore/dom/EventListenerMap.h \ Modified: trunk/Source/WebKit2/ChangeLog (98249 => 98250) --- trunk/Source/WebKit2/ChangeLog 2011-10-24 16:39:00 UTC (rev 98249) +++ trunk/Source/WebKit2/ChangeLog 2011-10-24 16:44:54 UTC (rev 98250) @@ -1,5 +1,14 @@ 2011-10-24 Carlos Garcia Campos cgar...@igalia.com +[GTK] Fix make distcheck build +https://bugs.webkit.org/show_bug.cgi?id=69745 + +Reviewed by Martin Robinson. + +* GNUmakefile.am: + +2011-10-24 Carlos Garcia Campos cgar...@igalia.com + [GTK] Initial implementation of back forward list for WebKit2 GTK+ API https://bugs.webkit.org/show_bug.cgi?id=69343 Modified: trunk/Source/WebKit2/GNUmakefile.am (98249 => 98250) --- trunk/Source/WebKit2/GNUmakefile.am 2011-10-24 16:39:00 UTC (rev 98249) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-10-24 16:44:54 UTC (rev 98250) @@ -1376,7 +1376,7 @@ EXTRA_DIST += \ $(WebKit2)/UIProcess/API/gtk/docs/GNUmakefile.am \ - $(WebKit2)/UIProcess/API/gtk/docs/webkitgtk-docs.sgml \ - $(WebKit2)/UIProcess/API/gtk/docs/webkitgtk-sections.txt \ + $(WebKit2)/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml \ + $(WebKit2)/UIProcess/API/gtk/docs/webkit2gtk-sections.txt \ $(WebKit2)/UIProcess/API/gtk/docs/version.xml.in \ $(WebKit2)/UIProcess/API/gtk/docs/webkit2gtk.types
[webkit-changes] [98327] trunk/Source/WebKit2
Title: [98327] trunk/Source/WebKit2
Revision 98327
Author carlo...@webkit.org
Date 2011-10-25 01:37:35 -0700 (Tue, 25 Oct 2011)
Log Message
[GTK] Add go_to_back_forward_list_item() to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=69825
Reviewed by Martin Robinson.
* UIProcess/API/gtk/WebKitBackForwardListItem.cpp:
(webkitBackForwardListItemGetWKItem):
* UIProcess/API/gtk/WebKitBackForwardListPrivate.h:
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_go_to_back_forward_list_item):
* UIProcess/API/gtk/WebKitWebView.h:
* UIProcess/API/gtk/tests/TestBackForwardList.cpp:
(testBackForwardListNavigation):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListPrivate.h
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestBackForwardList.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98326 => 98327)
--- trunk/Source/WebKit2/ChangeLog 2011-10-25 08:24:14 UTC (rev 98326)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-25 08:37:35 UTC (rev 98327)
@@ -1,3 +1,19 @@
+2011-10-25 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Add go_to_back_forward_list_item() to WebKit2 GTK+ API
+https://bugs.webkit.org/show_bug.cgi?id=69825
+
+Reviewed by Martin Robinson.
+
+* UIProcess/API/gtk/WebKitBackForwardListItem.cpp:
+(webkitBackForwardListItemGetWKItem):
+* UIProcess/API/gtk/WebKitBackForwardListPrivate.h:
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkit_web_view_go_to_back_forward_list_item):
+* UIProcess/API/gtk/WebKitWebView.h:
+* UIProcess/API/gtk/tests/TestBackForwardList.cpp:
+(testBackForwardListNavigation):
+
2011-10-25 Vamshikrishna Yellenki vam...@motorola.com
[WK2]Critical warning while building WebKit2 GTK+
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp (98326 => 98327)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp 2011-10-25 08:24:14 UTC (rev 98326)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp 2011-10-25 08:37:35 UTC (rev 98327)
@@ -93,6 +93,11 @@
return listItem;
}
+WKBackForwardListItemRef webkitBackForwardListItemGetWKItem(WebKitBackForwardListItem* listItem)
+{
+return listItem-priv-wkListItem.get();
+}
+
/**
* webkit_back_forward_list_item_get_uri:
* @back_forward_list_item: a #WebKitBackForwardListItem
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListPrivate.h (98326 => 98327)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListPrivate.h 2011-10-25 08:24:14 UTC (rev 98326)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListPrivate.h 2011-10-25 08:37:35 UTC (rev 98327)
@@ -32,6 +32,7 @@
WebKitBackForwardList* webkitBackForwardListCreate(WKBackForwardListRef);
WebKitBackForwardListItem* webkitBackForwardListItemGetOrCreate(WKBackForwardListItemRef);
+WKBackForwardListItemRef webkitBackForwardListItemGetWKItem(WebKitBackForwardListItem*);
void webkitBackForwardListChanged(WebKitBackForwardList*, WKBackForwardListItemRef wkAddedItem, WKArrayRef wkRemovedItems);
#endif // WebKitBackForwardListPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (98326 => 98327)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-25 08:24:14 UTC (rev 98326)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-25 08:37:35 UTC (rev 98327)
@@ -482,3 +482,21 @@
return webView-priv-backForwardList.get();
}
+
+/**
+ * webkit_web_view_go_to_back_forward_list_item:
+ * @web_view: a #WebKitWebView
+ * @list_item: a #WebKitBackForwardListItem
+ *
+ * Loads the specific history item @list_item.
+ * You can monitor the status of the load operation using the
+ * #WebKitWebLoaderClient of @web_view. See webkit_web_view_get_loader_client().
+ */
+void webkit_web_view_go_to_back_forward_list_item(WebKitWebView* webView, WebKitBackForwardListItem* listItem)
+{
+g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
+g_return_if_fail(WEBKIT_IS_BACK_FORWARD_LIST_ITEM(listItem));
+
+WKPageGoToBackForwardListItem(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))),
+ webkitBackForwardListItemGetWKItem(listItem));
+}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (98326 => 98327)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-25 08:24:14 UTC (rev 98326)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-25 08:37:35 UTC (rev 98327)
@@ -66,69 +66,72 @@
};
WEBKIT_API GType
-webkit_web_view_get_type(void);
+webkit_web_view_get_type (void);
WEBKIT_API GtkWidget *
-webkit_web_view_new (void);
[webkit-changes] [98465] trunk/Source
Title: [98465] trunk/Source Revision 98465 Author carlo...@webkit.org Date 2011-10-26 05:39:02 -0700 (Wed, 26 Oct 2011) Log Message [GTK] Remove g_thread_init() calls from gtk-doc scanner too https://bugs.webkit.org/show_bug.cgi?id=70908 Reviewed by Gustavo Noronha Silva. Source/WebKit/gtk: * docs/GNUmakefile.am: Source/WebKit2: * UIProcess/API/gtk/docs/GNUmakefile.am: Modified Paths trunk/Source/WebKit/gtk/ChangeLog trunk/Source/WebKit/gtk/docs/GNUmakefile.am trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/gtk/docs/GNUmakefile.am Diff Modified: trunk/Source/WebKit/gtk/ChangeLog (98464 => 98465) --- trunk/Source/WebKit/gtk/ChangeLog 2011-10-26 12:33:45 UTC (rev 98464) +++ trunk/Source/WebKit/gtk/ChangeLog 2011-10-26 12:39:02 UTC (rev 98465) @@ -1,3 +1,12 @@ +2011-10-26 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Remove g_thread_init() calls from gtk-doc scanner too +https://bugs.webkit.org/show_bug.cgi?id=70908 + +Reviewed by Gustavo Noronha Silva. + +* docs/GNUmakefile.am: + 2011-10-25 Martin Robinson mrobin...@igalia.com [GTK] GtkAdjustment watcher updates adjustments too lazily Modified: trunk/Source/WebKit/gtk/docs/GNUmakefile.am (98464 => 98465) --- trunk/Source/WebKit/gtk/docs/GNUmakefile.am 2011-10-26 12:33:45 UTC (rev 98464) +++ trunk/Source/WebKit/gtk/docs/GNUmakefile.am 2011-10-26 12:39:02 UTC (rev 98465) @@ -18,7 +18,7 @@ DOC_SOURCE_DIR=$(top_srcdir)/Source/WebKit/gtk/webkit # Extra options to pass to gtkdoc-scangobj. Not normally needed. -SCANGOBJ_OPTIONS=--type-init-func=g_thread_init(NULL);g_type_init() +SCANGOBJ_OPTIONS=--type-init-func=g_type_init() # Extra options to supply to gtkdoc-scan. # e.g. SCAN_OPTIONS=--deprecated-guards=GTK_DISABLE_DEPRECATED Modified: trunk/Source/WebKit2/ChangeLog (98464 => 98465) --- trunk/Source/WebKit2/ChangeLog 2011-10-26 12:33:45 UTC (rev 98464) +++ trunk/Source/WebKit2/ChangeLog 2011-10-26 12:39:02 UTC (rev 98465) @@ -1,3 +1,12 @@ +2011-10-26 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Remove g_thread_init() calls from gtk-doc scanner too +https://bugs.webkit.org/show_bug.cgi?id=70908 + +Reviewed by Gustavo Noronha Silva. + +* UIProcess/API/gtk/docs/GNUmakefile.am: + 2011-10-25 Andras Becsi andras.be...@nokia.com [Qt][WK2] Add the animations on the ViewportInteractionEngine Modified: trunk/Source/WebKit2/UIProcess/API/gtk/docs/GNUmakefile.am (98464 => 98465) --- trunk/Source/WebKit2/UIProcess/API/gtk/docs/GNUmakefile.am 2011-10-26 12:33:45 UTC (rev 98464) +++ trunk/Source/WebKit2/UIProcess/API/gtk/docs/GNUmakefile.am 2011-10-26 12:39:02 UTC (rev 98465) @@ -21,7 +21,7 @@ DOC_SOURCE_DIR=$(top_srcdir)/Source/WebKit2/UIProcess/API/gtk # Extra options to pass to gtkdoc-scangobj. Not normally needed. -SCANGOBJ_OPTIONS=--type-init-func=g_thread_init(NULL);g_type_init() +SCANGOBJ_OPTIONS=--type-init-func=g_type_init() # Extra options to supply to gtkdoc-scan. # e.g. SCAN_OPTIONS=--deprecated-guards=GTK_DISABLE_DEPRECATED ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98484] trunk/Source/WebKit2
Title: [98484] trunk/Source/WebKit2
Revision 98484
Author carlo...@webkit.org
Date 2011-10-26 08:40:56 -0700 (Wed, 26 Oct 2011)
Log Message
[GTK] Inconsistent name of WebKitSettings macros
https://bugs.webkit.org/show_bug.cgi?id=70924
Reviewed by Martin Robinson.
Rename WEBKIT_TYPE_WEB_SETTINGS as WEBKIT_TYPE_SETTINGS and
WEBKIT_IS_WEB_SETTINGS as WEBKIT_IS_SETTINGS.
* UIProcess/API/gtk/WebKitSettings.cpp:
(webkit_settings_init):
(webkit_settings_new):
(webkit_settings_get_enable_javascript):
(webkit_settings_set_enable_javascript):
(webkit_settings_get_auto_load_images):
(webkit_settings_set_auto_load_images):
(webkit_settings_get_load_icons_ignoring_image_load_setting):
(webkit_settings_set_load_icons_ignoring_image_load_setting):
(webkit_settings_get_enable_offline_web_application_cache):
(webkit_settings_set_enable_offline_web_application_cache):
(webkit_settings_get_enable_html5_local_storage):
(webkit_settings_set_enable_html5_local_storage):
(webkit_settings_get_enable_html5_database):
(webkit_settings_set_enable_html5_database):
(webkit_settings_get_enable_xss_auditor):
(webkit_settings_set_enable_xss_auditor):
(webkit_settings_get_enable_frame_flattening):
(webkit_settings_set_enable_frame_flattening):
(webkit_settings_get_enable_plugins):
(webkit_settings_set_enable_plugins):
(webkit_settings_get_enable_java):
(webkit_settings_set_enable_java):
(webkit_settings_get_javascript_can_open_windows_automatically):
(webkit_settings_set_javascript_can_open_windows_automatically):
(webkit_settings_get_enable_hyperlink_auditing):
(webkit_settings_set_enable_hyperlink_auditing):
* UIProcess/API/gtk/WebKitSettings.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98483 => 98484)
--- trunk/Source/WebKit2/ChangeLog 2011-10-26 15:27:44 UTC (rev 98483)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-26 15:40:56 UTC (rev 98484)
@@ -1,3 +1,42 @@
+2011-10-26 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Inconsistent name of WebKitSettings macros
+https://bugs.webkit.org/show_bug.cgi?id=70924
+
+Reviewed by Martin Robinson.
+
+Rename WEBKIT_TYPE_WEB_SETTINGS as WEBKIT_TYPE_SETTINGS and
+WEBKIT_IS_WEB_SETTINGS as WEBKIT_IS_SETTINGS.
+
+* UIProcess/API/gtk/WebKitSettings.cpp:
+(webkit_settings_init):
+(webkit_settings_new):
+(webkit_settings_get_enable_javascript):
+(webkit_settings_set_enable_javascript):
+(webkit_settings_get_auto_load_images):
+(webkit_settings_set_auto_load_images):
+(webkit_settings_get_load_icons_ignoring_image_load_setting):
+(webkit_settings_set_load_icons_ignoring_image_load_setting):
+(webkit_settings_get_enable_offline_web_application_cache):
+(webkit_settings_set_enable_offline_web_application_cache):
+(webkit_settings_get_enable_html5_local_storage):
+(webkit_settings_set_enable_html5_local_storage):
+(webkit_settings_get_enable_html5_database):
+(webkit_settings_set_enable_html5_database):
+(webkit_settings_get_enable_xss_auditor):
+(webkit_settings_set_enable_xss_auditor):
+(webkit_settings_get_enable_frame_flattening):
+(webkit_settings_set_enable_frame_flattening):
+(webkit_settings_get_enable_plugins):
+(webkit_settings_set_enable_plugins):
+(webkit_settings_get_enable_java):
+(webkit_settings_set_enable_java):
+(webkit_settings_get_javascript_can_open_windows_automatically):
+(webkit_settings_set_javascript_can_open_windows_automatically):
+(webkit_settings_get_enable_hyperlink_auditing):
+(webkit_settings_set_enable_hyperlink_auditing):
+* UIProcess/API/gtk/WebKitSettings.h:
+
2011-10-26 Andras Becsi andras.be...@nokia.com
[Qt][WK2] Rename clean-up of QtPinchGestureRecognizer and QtViewportInteractionEngine
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (98483 => 98484)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2011-10-26 15:27:44 UTC (rev 98483)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2011-10-26 15:40:56 UTC (rev 98484)
@@ -385,7 +385,7 @@
static void webkit_settings_init(WebKitSettings* settings)
{
-WebKitSettingsPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(settings, WEBKIT_TYPE_WEB_SETTINGS, WebKitSettingsPrivate);
+WebKitSettingsPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(settings, WEBKIT_TYPE_SETTINGS, WebKitSettingsPrivate);
settings-priv = priv;
new (priv) WebKitSettingsPrivate();
@@ -402,7 +402,7 @@
**/
WebKitSettings* webkit_settings_new()
{
-return WEBKIT_SETTINGS(g_object_new(WEBKIT_TYPE_WEB_SETTINGS, NULL));
+return WEBKIT_SETTINGS(g_object_new(WEBKIT_TYPE_SETTINGS, NULL));
}
/**
@@ -416,7 +416,7 @@
**/
gboolean
[webkit-changes] [98485] trunk/Source/WebKit2
Title: [98485] trunk/Source/WebKit2 Revision 98485 Author carlo...@webkit.org Date 2011-10-26 08:43:52 -0700 (Wed, 26 Oct 2011) Log Message [GTK] Add missing symbols to WebKit2 gtk-doc files https://bugs.webkit.org/show_bug.cgi?id=70927 Reviewed by Martin Robinson. * UIProcess/API/gtk/docs/webkit2gtk-docs.sgml: Add sections for WebKitBackForwardList, WebKitBackForwardListItem and WebKitSettings. * UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add missing symbols. * UIProcess/API/gtk/docs/webkit2gtk.types: Add missing types. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types Diff Modified: trunk/Source/WebKit2/ChangeLog (98484 => 98485) --- trunk/Source/WebKit2/ChangeLog 2011-10-26 15:40:56 UTC (rev 98484) +++ trunk/Source/WebKit2/ChangeLog 2011-10-26 15:43:52 UTC (rev 98485) @@ -1,5 +1,17 @@ 2011-10-26 Carlos Garcia Campos cgar...@igalia.com +[GTK] Add missing symbols to WebKit2 gtk-doc files +https://bugs.webkit.org/show_bug.cgi?id=70927 + +Reviewed by Martin Robinson. + +* UIProcess/API/gtk/docs/webkit2gtk-docs.sgml: Add sections for +WebKitBackForwardList, WebKitBackForwardListItem and WebKitSettings. +* UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add missing symbols. +* UIProcess/API/gtk/docs/webkit2gtk.types: Add missing types. + +2011-10-26 Carlos Garcia Campos cgar...@igalia.com + [GTK] Inconsistent name of WebKitSettings macros https://bugs.webkit.org/show_bug.cgi?id=70924 Modified: trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml (98484 => 98485) --- trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml 2011-10-26 15:40:56 UTC (rev 98484) +++ trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml 2011-10-26 15:43:52 UTC (rev 98485) @@ -11,10 +11,13 @@ chapter titleClass Overview/title +xi:include href="" xi:include href="" xi:include href="" -xi:include href="" xi:include href="" +xi:include href="" +xi:include href="" +xi:include href="" xi:include href="" /chapter Modified: trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt (98484 => 98485) --- trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2011-10-26 15:40:56 UTC (rev 98484) +++ trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2011-10-26 15:43:52 UTC (rev 98485) @@ -2,6 +2,7 @@ FILEWebKitWebViewBase/FILE TITLEWebKitWebViewBase/TITLE WebKitWebViewBase + SUBSECTION Standard WebKitWebViewBaseClass WEBKIT_WEB_VIEW_BASE @@ -10,6 +11,7 @@ WEBKIT_WEB_VIEW_BASE_CLASS WEBKIT_IS_WEB_VIEW_BASE_CLASS WEBKIT_WEB_VIEW_BASE_GET_CLASS + SUBSECTION Private webkit_web_view_base_get_type WebKitWebViewBasePrivate @@ -23,6 +25,7 @@ webkit_web_context_get_default webkit_web_context_get_cache_model webkit_web_context_set_cache_model + SUBSECTION Standard WebKitWebContextClass WEBKIT_WEB_CONTEXT @@ -31,6 +34,7 @@ WEBKIT_WEB_CONTEXT_CLASS WEBKIT_IS_WEB_CONTEXT_CLASS WEBKIT_WEB_CONTEXT_GET_CLASS + SUBSECTION Private WebKitWebContextPrivate webkit_web_context_get_type @@ -47,10 +51,19 @@ webkit_web_view_set_loader_client webkit_web_view_load_uri webkit_web_view_load_alternate_html +webkit_web_view_can_go_back webkit_web_view_go_back +webkit_web_view_can_go_forward webkit_web_view_go_forward webkit_web_view_reload webkit_web_view_reload_bypass_cache +webkit_web_view_stop_loading +webkit_web_view_get_estimated_load_progress +webkit_web_view_get_custom_charset +webkit_web_view_set_custom_charset +webkit_web_view_get_back_forward_list +webkit_web_view_go_to_back_forward_list_item + SUBSECTION Standard WebKitWebViewClass WEBKIT_WEB_VIEW @@ -59,6 +72,7 @@ WEBKIT_WEB_VIEW_CLASS WEBKIT_IS_WEB_VIEW_CLASS WEBKIT_WEB_VIEW_GET_CLASS + SUBSECTION Private webkit_web_view_get_type WebKitWebViewPrivate @@ -68,7 +82,7 @@ FILEWebKitWebLoaderClient/FILE TITLEWebKitWebLoaderClient/TITLE WebKitWebLoaderClient -webkit_web_loader_client_get_estimated_progress + SUBSECTION Standard WebKitWebLoaderClientClass WEBKIT_WEB_LOADER_CLIENT @@ -77,12 +91,104 @@ WEBKIT_WEB_LOADER_CLIENT_CLASS WEBKIT_IS_WEB_LOADER_CLIENT_CLASS WEBKIT_WEB_LOADER_CLIENT_GET_CLASS + SUBSECTION Private WebKitWebLoaderClientPrivate webkit_web_loader_client_get_type /SECTION SECTION +FILEWebKitBackForwardList/FILE +WebKitBackForwardList +webkit_back_forward_list_get_length +webkit_back_forward_list_get_current_item +webkit_back_forward_list_get_back_item +webkit_back_forward_list_get_forward_item +webkit_back_forward_list_get_nth_item +webkit_back_forward_list_get_back_list +webkit_back_forward_list_get_back_list_with_limit +webkit_back_forward_list_get_forward_list +webkit_back_forward_list_get_forward_list_with_limit +
[webkit-changes] [98599] trunk/Source/WebKit2
Title: [98599] trunk/Source/WebKit2
Revision 98599
Author carlo...@webkit.org
Date 2011-10-27 10:27:15 -0700 (Thu, 27 Oct 2011)
Log Message
[Cairo] Implement ShareableBitmap::paint() when scaleFactor=1
https://bugs.webkit.org/show_bug.cgi?id=71027
Reviewed by Martin Robinson.
Fixes windowless plugins in GTK+ port.
* Shared/cairo/ShareableBitmapCairo.cpp:
(WebKit::ShareableBitmap::paint): When scaleFactor is 1, simply
call the paint method that doesn't receive a scaleFactor.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98598 => 98599)
--- trunk/Source/WebKit2/ChangeLog 2011-10-27 17:24:49 UTC (rev 98598)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-27 17:27:15 UTC (rev 98599)
@@ -1,3 +1,16 @@
+2011-10-27 Carlos Garcia Campos cgar...@igalia.com
+
+[Cairo] Implement ShareableBitmap::paint() when scaleFactor=1
+https://bugs.webkit.org/show_bug.cgi?id=71027
+
+Reviewed by Martin Robinson.
+
+Fixes windowless plugins in GTK+ port.
+
+* Shared/cairo/ShareableBitmapCairo.cpp:
+(WebKit::ShareableBitmap::paint): When scaleFactor is 1, simply
+call the paint method that doesn't receive a scaleFactor.
+
2011-10-27 Sheriff Bot webkit.review@gmail.com
Unreviewed, rolling out r98556.
Modified: trunk/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp (98598 => 98599)
--- trunk/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp 2011-10-27 17:24:49 UTC (rev 98598)
+++ trunk/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp 2011-10-27 17:27:15 UTC (rev 98599)
@@ -55,10 +55,14 @@
context.platformContext()-drawSurfaceToContext(surface.get(), destRect, srcRect, context);
}
-void ShareableBitmap::paint(GraphicsContext, float /*scaleFactor*/, const IntPoint /*dstPoint*/, const IntRect /*srcRect*/)
+void ShareableBitmap::paint(GraphicsContext context, float scaleFactor, const IntPoint dstPoint, const IntRect srcRect)
{
-// See https://bugs.webkit.org/show_bug.cgi?id=64665.
-notImplemented();
+if (scaleFactor != 1) {
+// See https://bugs.webkit.org/show_bug.cgi?id=64665.
+notImplemented();
+return;
+}
+paint(context, dstPoint, srcRect);
}
PassRefPtrcairo_surface_t ShareableBitmap::createCairoSurface()
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [87057] trunk/Source/WebCore
Title: [87057] trunk/Source/WebCore
Revision 87057
Author carlo...@webkit.org
Date 2011-05-23 00:58:40 -0700 (Mon, 23 May 2011)
Log Message
2011-05-23 Carlos Garcia Campos cgar...@igalia.com
Unreviewed. Strict PassOwnPtr build fix.
* platform/text/gtk/TextCodecGtk.cpp:
(WebCore::newTextCodecGtk):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/text/gtk/TextCodecGtk.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (87056 => 87057)
--- trunk/Source/WebCore/ChangeLog 2011-05-23 07:50:27 UTC (rev 87056)
+++ trunk/Source/WebCore/ChangeLog 2011-05-23 07:58:40 UTC (rev 87057)
@@ -1,3 +1,10 @@
+2011-05-23 Carlos Garcia Campos cgar...@igalia.com
+
+Unreviewed. Strict PassOwnPtr build fix.
+
+* platform/text/gtk/TextCodecGtk.cpp:
+(WebCore::newTextCodecGtk):
+
2011-05-23 Mikhail Naganov mnaga...@chromium.org
Reviewed by Yury Semikhatsky.
Modified: trunk/Source/WebCore/platform/text/gtk/TextCodecGtk.cpp (87056 => 87057)
--- trunk/Source/WebCore/platform/text/gtk/TextCodecGtk.cpp 2011-05-23 07:50:27 UTC (rev 87056)
+++ trunk/Source/WebCore/platform/text/gtk/TextCodecGtk.cpp 2011-05-23 07:58:40 UTC (rev 87057)
@@ -57,7 +57,7 @@
static PassOwnPtrTextCodec newTextCodecGtk(const TextEncoding encoding, const void*)
{
-return new TextCodecGtk(encoding);
+return adoptPtr(new TextCodecGtk(encoding));
}
static bool isEncodingAvailable(const gchar* encodingName)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [87058] trunk/Source/WebKit2
Title: [87058] trunk/Source/WebKit2 Revision 87058 Author carlo...@webkit.org Date 2011-05-23 01:02:05 -0700 (Mon, 23 May 2011) Log Message 2011-05-23 Carlos Garcia Campos cgar...@igalia.com Unreviewed. Fix WebKit2 GTK build after r86990. * GNUmakefile.am: Remove UpdateChunk.cpp and UpdateChunk.h. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am Diff Modified: trunk/Source/WebKit2/ChangeLog (87057 => 87058) --- trunk/Source/WebKit2/ChangeLog 2011-05-23 07:58:40 UTC (rev 87057) +++ trunk/Source/WebKit2/ChangeLog 2011-05-23 08:02:05 UTC (rev 87058) @@ -1,3 +1,9 @@ +2011-05-23 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix WebKit2 GTK build after r86990. + +* GNUmakefile.am: Remove UpdateChunk.cpp and UpdateChunk.h. + 2011-05-21 John Sullivan sulli...@apple.com Reviewed by Darin Adler. Modified: trunk/Source/WebKit2/GNUmakefile.am (87057 => 87058) --- trunk/Source/WebKit2/GNUmakefile.am 2011-05-23 07:58:40 UTC (rev 87057) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-05-23 08:02:05 UTC (rev 87058) @@ -194,8 +194,6 @@ Source/WebKit2/Shared/gtk/NativeWebMouseEventGtk.cpp \ Source/WebKit2/Shared/gtk/NativeWebWheelEventGtk.cpp \ Source/WebKit2/Shared/gtk/PlatformCertificateInfo.h \ - Source/WebKit2/Shared/gtk/UpdateChunk.cpp \ - Source/WebKit2/Shared/gtk/UpdateChunk.h \ Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp \ Source/WebKit2/Shared/gtk/WebEventFactory.cpp \ Source/WebKit2/Shared/gtk/WebEventFactory.h \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [87517] trunk/Source/WebKit2
Title: [87517] trunk/Source/WebKit2 Revision 87517 Author carlo...@webkit.org Date 2011-05-27 09:14:39 -0700 (Fri, 27 May 2011) Log Message 2011-05-27 Carlos Garcia Campos cgar...@igalia.com Reviewed by Martin Robinson. [CAIRO] Don't copy the surface before drawing it into the context in ShareableBitmap::paint() https://bugs.webkit.org/show_bug.cgi?id=60757 cairo_image_surface_create_for_data() is already a shallow copy of the image, so we don't need to copy it again. * Shared/cairo/ShareableBitmapCairo.cpp: (WebKit::ShareableBitmap::paint): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (87516 => 87517) --- trunk/Source/WebKit2/ChangeLog 2011-05-27 16:10:00 UTC (rev 87516) +++ trunk/Source/WebKit2/ChangeLog 2011-05-27 16:14:39 UTC (rev 87517) @@ -1,3 +1,16 @@ +2011-05-27 Carlos Garcia Campos cgar...@igalia.com + +Reviewed by Martin Robinson. + +[CAIRO] Don't copy the surface before drawing it into the context in ShareableBitmap::paint() +https://bugs.webkit.org/show_bug.cgi?id=60757 + +cairo_image_surface_create_for_data() is already a shallow copy of +the image, so we don't need to copy it again. + +* Shared/cairo/ShareableBitmapCairo.cpp: +(WebKit::ShareableBitmap::paint): + 2011-05-26 Jeff Miller je...@apple.com Reviewed by Alexey Proskuryakov. Modified: trunk/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp (87516 => 87517) --- trunk/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp 2011-05-27 16:10:00 UTC (rev 87516) +++ trunk/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp 2011-05-27 16:14:39 UTC (rev 87517) @@ -50,11 +50,8 @@ CAIRO_FORMAT_ARGB32, m_size.width(), m_size.height(), m_size.width() * 4)); - -// This copy is not copy-on-write, so this is probably sub-optimal. -RefPtrcairo_surface_t surfaceCopy = copyCairoImageSurface(surface.get()); FloatRect destRect(dstPoint, srcRect.size()); -context.platformContext()-drawSurfaceToContext(surfaceCopy.get(), destRect, srcRect, context); +context.platformContext()-drawSurfaceToContext(surface.get(), destRect, srcRect, context); } PassRefPtrcairo_surface_t ShareableBitmap::createCairoSurface() ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [87685] trunk/Source/WebKit2
Title: [87685] trunk/Source/WebKit2 Revision 87685 Author carlo...@webkit.org Date 2011-05-30 07:13:32 -0700 (Mon, 30 May 2011) Log Message 2011-05-30 Carlos Garcia Campos cgar...@igalia.com Reviewed by Martin Robinson. [GTK] Remove some unneeded header includes https://bugs.webkit.org/show_bug.cgi?id=60536 * Platform/CoreIPC/Connection.cpp: Remove WebProcess.h. * Platform/CoreIPC/unix/ConnectionUnix.cpp: Remove ProcessLauncher.h and WebProcessProxy.h. Add wtf/OwnArrayPtr.h. * WebProcess/Plugins/Netscape/NPJSObject.cpp: Remove PluginView.h. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (87684 => 87685) --- trunk/Source/WebKit2/ChangeLog 2011-05-30 14:06:58 UTC (rev 87684) +++ trunk/Source/WebKit2/ChangeLog 2011-05-30 14:13:32 UTC (rev 87685) @@ -1,3 +1,15 @@ +2011-05-30 Carlos Garcia Campos cgar...@igalia.com + +Reviewed by Martin Robinson. + +[GTK] Remove some unneeded header includes +https://bugs.webkit.org/show_bug.cgi?id=60536 + +* Platform/CoreIPC/Connection.cpp: Remove WebProcess.h. +* Platform/CoreIPC/unix/ConnectionUnix.cpp: Remove +ProcessLauncher.h and WebProcessProxy.h. Add wtf/OwnArrayPtr.h. +* WebProcess/Plugins/Netscape/NPJSObject.cpp: Remove PluginView.h. + 2011-05-29 Darin Adler da...@apple.com Reviewed by Dan Bernstein. Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp (87684 => 87685) --- trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp 2011-05-30 14:06:58 UTC (rev 87684) +++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp 2011-05-30 14:13:32 UTC (rev 87685) @@ -29,7 +29,6 @@ #include BinarySemaphore.h #include CoreIPCMessageKinds.h #include RunLoop.h -#include WebProcess.h #include WorkItem.h #include wtf/CurrentTime.h Modified: trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp (87684 => 87685) --- trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp 2011-05-30 14:06:58 UTC (rev 87684) +++ trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp 2011-05-30 14:13:32 UTC (rev 87685) @@ -28,15 +28,14 @@ #include Connection.h #include ArgumentEncoder.h -#include ProcessLauncher.h #include WorkItem.h #include SharedMemory.h -#include WebProcessProxy.h #include sys/socket.h #include unistd.h #include errno.h #include fcntl.h #include wtf/Assertions.h +#include wtf/OwnArrayPtr.h #if PLATFORM(QT) #include QApplication Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp (87684 => 87685) --- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp 2011-05-30 14:06:58 UTC (rev 87684) +++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp 2011-05-30 14:13:32 UTC (rev 87685) @@ -29,7 +29,6 @@ #include JSNPObject.h #include NPRuntimeObjectMap.h #include NPRuntimeUtilities.h -#include PluginView.h #include _javascript_Core/JSLock.h #include _javascript_Core/JSObject.h #include WebCore/Frame.h ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [87690] trunk/Tools
Title: [87690] trunk/Tools
Revision 87690
Author carlo...@webkit.org
Date 2011-05-30 09:25:06 -0700 (Mon, 30 May 2011)
Log Message
2011-05-30 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[GTK] Implement _javascript_ dialogs in MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=61725
* MiniBrowser/gtk/BrowserWindow.c:
(WKStringGetCString): Helper function to get a UTF-8 c string from
a WKStringRef.
(WKURLGetCString): Helper function to get a UTF-8 c string from a
WKURLRef.
(browserWindowUpdateURL): Update to use WKURLGetCString.
(didReceiveTitleForFrame): Update to use WKStringGetCString.
(createMessageDialog): Create a GtkMessageDialog.
(runJavaScriptAlert):
(runJavaScriptConfirm):
(runJavaScriptPrompt):
(browserWindowUIClientInit):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/gtk/BrowserWindow.c
Diff
Modified: trunk/Tools/ChangeLog (87689 => 87690)
--- trunk/Tools/ChangeLog 2011-05-30 16:17:56 UTC (rev 87689)
+++ trunk/Tools/ChangeLog 2011-05-30 16:25:06 UTC (rev 87690)
@@ -1,3 +1,23 @@
+2011-05-30 Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Martin Robinson.
+
+[GTK] Implement _javascript_ dialogs in MiniBrowser
+https://bugs.webkit.org/show_bug.cgi?id=61725
+
+* MiniBrowser/gtk/BrowserWindow.c:
+(WKStringGetCString): Helper function to get a UTF-8 c string from
+a WKStringRef.
+(WKURLGetCString): Helper function to get a UTF-8 c string from a
+WKURLRef.
+(browserWindowUpdateURL): Update to use WKURLGetCString.
+(didReceiveTitleForFrame): Update to use WKStringGetCString.
+(createMessageDialog): Create a GtkMessageDialog.
+(runJavaScriptAlert):
+(runJavaScriptConfirm):
+(runJavaScriptPrompt):
+(browserWindowUIClientInit):
+
2011-05-29 Yuta Kitamura yu...@chromium.org
Reviewed by Kent Tamura.
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (87689 => 87690)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-05-30 16:17:56 UTC (rev 87689)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-05-30 16:25:06 UTC (rev 87690)
@@ -185,6 +185,22 @@
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
}
+static char* WKStringGetCString(WKStringRef string)
+{
+size_t length = WKStringGetMaximumUTF8CStringSize(string);
+char *buffer = (char *) g_malloc(length);
+WKStringGetUTF8CString(string, buffer, length);
+return buffer;
+}
+
+static char* WKURLGetCString(WKURLRef url)
+{
+WKStringRef urlString = WKURLCopyString(url);
+char *urlText = WKStringGetCString(urlString);
+WKRelease(urlString);
+return urlText;
+}
+
static void browserWindowUpdateTitle(BrowserWindow* window)
{
GString *string = g_string_new(window-title);
@@ -220,13 +236,9 @@
return;
}
-WKStringRef urlString = WKURLCopyString(url);
-size_t length = WKStringGetMaximumUTF8CStringSize(urlString);
-char* buffer = (char *)g_malloc(length * sizeof(char));
-WKStringGetUTF8CString(urlString, buffer, length);
-gtk_entry_set_text(GTK_ENTRY(window-uriEntry), buffer);
-g_free(buffer);
-WKRelease(urlString);
+char *urlText = WKURLGetCString(url);
+gtk_entry_set_text(GTK_ENTRY(window-uriEntry), urlText);
+g_free(urlText);
}
// Loader client.
@@ -300,11 +312,9 @@
if (!WKFrameIsMainFrame(frame))
return;
-size_t length = WKStringGetMaximumUTF8CStringSize(title);
-char* buffer = (char *)g_malloc(length * sizeof(char));
-WKStringGetUTF8CString(title, buffer, length);
-browserWindowSetTitle(BROWSER_WINDOW(clientInfo), buffer);
-g_free(buffer);
+char *titleText = WKStringGetCString(title);
+browserWindowSetTitle(BROWSER_WINDOW(clientInfo), titleText);
+g_free(titleText);
}
static void didFirstLayoutForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
@@ -400,10 +410,59 @@
gtk_widget_destroy(GTK_WIDGET(clientInfo));
}
+static GtkWidget* createMessageDialog(GtkWindow *parent, GtkMessageType type, GtkButtonsType buttons, gint defaultResponse, WKStringRef message, WKFrameRef frame)
+{
+char *messageText = WKStringGetCString(message);
+GtkWidget *dialog = gtk_message_dialog_new(parent, GTK_DIALOG_DESTROY_WITH_PARENT, type, buttons, %s, messageText);
+g_free(messageText);
+
+WKURLRef url = ""
+char *urlText = WKURLGetCString(url);
+WKRelease(url);
+gchar *title = g_strdup_printf(_javascript_ - %s, urlText);
+g_free(urlText);
+gtk_window_set_title(GTK_WINDOW(dialog), title);
+g_free(title);
+
+gtk_dialog_set_default_response(GTK_DIALOG(dialog), defaultResponse);
+
+return dialog;
+}
+
static void runJavaScriptAlert(WKPageRef page, WKStringRef message,
[webkit-changes] [87808] trunk/Tools
Title: [87808] trunk/Tools
Revision 87808
Author carlo...@webkit.org
Date 2011-06-01 09:08:24 -0700 (Wed, 01 Jun 2011)
Log Message
2011-06-01 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[GTK] run-launcher should run MiniBrowser in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=61858
* Scripts/run-launcher: Check whether -2 command line option has
been passed and run MiniBrowser instead of GtkLauncher.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/run-launcher
Diff
Modified: trunk/Tools/ChangeLog (87807 => 87808)
--- trunk/Tools/ChangeLog 2011-06-01 16:01:12 UTC (rev 87807)
+++ trunk/Tools/ChangeLog 2011-06-01 16:08:24 UTC (rev 87808)
@@ -1,3 +1,13 @@
+2011-06-01 Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Martin Robinson.
+
+[GTK] run-launcher should run MiniBrowser in WebKit2
+https://bugs.webkit.org/show_bug.cgi?id=61858
+
+* Scripts/run-launcher: Check whether -2 command line option has
+been passed and run MiniBrowser instead of GtkLauncher.
+
2011-05-31 Hao Zheng zheng...@chromium.org
Reviewed by Dirk Pranke.
Modified: trunk/Tools/Scripts/run-launcher (87807 => 87808)
--- trunk/Tools/Scripts/run-launcher 2011-06-01 16:01:12 UTC (rev 87807)
+++ trunk/Tools/Scripts/run-launcher 2011-06-01 16:08:24 UTC (rev 87808)
@@ -65,7 +65,14 @@
} else {
if (isGtk()) {
-$launcherPath = catdir($launcherPath, Programs, GtkLauncher);
+if (isWK2()) {
+$launcherPath = catdir($launcherPath, Programs, MiniBrowser);
+
+# isWK2() removes the -2 option from @ARGV, but not @args. We do not want to pass -2 to MiniBrowser.
+@args = @ARGV;
+} else {
+$launcherPath = catdir($launcherPath, Programs, GtkLauncher);
+}
}
if (isEfl()) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88145] trunk
Title: [88145] trunk Revision 88145 Author carlo...@webkit.org Date 2011-06-06 00:57:26 -0700 (Mon, 06 Jun 2011) Log Message 2011-06-06 Carlos Garcia Campos cgar...@igalia.com Unreviewed. Fix the GTK+ build. * GNUmakefile.am: Add _javascript_core_cflags variable. 2011-06-06 Carlos Garcia Campos cgar...@igalia.com Unreviewed. Fix the GTK+ build. * GNUmakefile.am: Add _javascript_core_cflags variable. 2011-06-06 Carlos Garcia Campos cgar...@igalia.com Unreviewed. Fix the GTK+ build. * GNUmakefile.am: Use _javascript_core_cflags when building libWebCoreInternals. Modified Paths trunk/ChangeLog trunk/GNUmakefile.am trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/GNUmakefile.am trunk/Tools/ChangeLog trunk/Tools/GNUmakefile.am Diff Modified: trunk/ChangeLog (88144 => 88145) --- trunk/ChangeLog 2011-06-06 07:27:29 UTC (rev 88144) +++ trunk/ChangeLog 2011-06-06 07:57:26 UTC (rev 88145) @@ -1,3 +1,9 @@ +2011-06-06 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix the GTK+ build. + +* GNUmakefile.am: Add _javascript_core_cflags variable. + 2011-06-04 Kevin Ollivier kev...@theolliviers.com [wx] Unreviewed build fix. Restore the PPC build and allow users to specify architectures Modified: trunk/GNUmakefile.am (88144 => 88145) --- trunk/GNUmakefile.am 2011-06-06 07:27:29 UTC (rev 88144) +++ trunk/GNUmakefile.am 2011-06-06 07:57:26 UTC (rev 88145) @@ -53,6 +53,7 @@ MOFILES := _javascript_core_h_api := _javascript_core_cppflags:= +_javascript_core_cflags := _javascript_core_sources := _javascript_core_built_sources := _javascript_core_built_nosources := Modified: trunk/Source/_javascript_Core/ChangeLog (88144 => 88145) --- trunk/Source/_javascript_Core/ChangeLog 2011-06-06 07:27:29 UTC (rev 88144) +++ trunk/Source/_javascript_Core/ChangeLog 2011-06-06 07:57:26 UTC (rev 88145) @@ -1,3 +1,9 @@ +2011-06-06 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix the GTK+ build. + +* GNUmakefile.am: Add _javascript_core_cflags variable. + 2011-06-04 Kevin Ollivier kev...@theolliviers.com [wx] Unreviewed build fix. Restore the PPC build and allow users to specify architectures Modified: trunk/Source/_javascript_Core/GNUmakefile.am (88144 => 88145) --- trunk/Source/_javascript_Core/GNUmakefile.am 2011-06-06 07:27:29 UTC (rev 88144) +++ trunk/Source/_javascript_Core/GNUmakefile.am 2011-06-06 07:57:26 UTC (rev 88145) @@ -35,9 +35,7 @@ libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \ -fstrict-aliasing \ -O3 \ - $(global_cflags) \ - $(GLIB_CFLAGS) \ - $(UNICODE_CFLAGS) + $(_javascript_core_cflags) libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \ $(global_cppflags) \ @@ -70,6 +68,11 @@ -I$(top_builddir)/Source/_javascript_Core/parser \ -I$(top_builddir)/Source/_javascript_Core/runtime +_javascript_core_cflags += \ + $(global_cflags) \ + $(GLIB_CFLAGS) \ + $(UNICODE_CFLAGS) + Source/_javascript_Core/Lexer.lut.h: $(srcdir)/Source/_javascript_Core/create_hash_table $(srcdir)/Source/_javascript_Core/parser/Keywords.table $(AM_V_GEN)$(PERL) $^ $@ Modified: trunk/Tools/ChangeLog (88144 => 88145) --- trunk/Tools/ChangeLog 2011-06-06 07:27:29 UTC (rev 88144) +++ trunk/Tools/ChangeLog 2011-06-06 07:57:26 UTC (rev 88145) @@ -1,3 +1,9 @@ +2011-06-06 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix the GTK+ build. + +* GNUmakefile.am: Use _javascript_core_cflags when building libWebCoreInternals. + 2011-06-05 Alexey Proskuryakov a...@apple.com Add an e-mail address for Cameron McCormack that matches Bugzilla (so that auto-completion Modified: trunk/Tools/GNUmakefile.am (88144 => 88145) --- trunk/Tools/GNUmakefile.am 2011-06-06 07:27:29 UTC (rev 88144) +++ trunk/Tools/GNUmakefile.am 2011-06-06 07:57:26 UTC (rev 88145) @@ -61,8 +61,12 @@ -I$(top_builddir)/DerivedSources/WebCore libWebCoreInternals_la_CXXFLAGS = \ + $(global_cxxflags) \ + $(libWebCoreInternals_la_CFLAGS) + +libWebCoreInternals_la_CFLAGS = \ -fno-strict-aliasing \ - $(global_cxxflags) + $(_javascript_core_cflags) # DumpRenderTree Programs_DumpRenderTree_CPPFLAGS = \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88147] trunk/Source/WebKit2
Title: [88147] trunk/Source/WebKit2
Revision 88147
Author carlo...@webkit.org
Date 2011-06-06 01:35:50 -0700 (Mon, 06 Jun 2011)
Log Message
2011-06-06 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Anders Carlsson.
[UNIX] SOCK_DGRAM sockets are not notified when the other end closes the connection
https://bugs.webkit.org/show_bug.cgi?id=61538
Use SOCK_STREAM instead of SOCK_DGRAM sockets. Rework the message
receiver code to support stream sockets, since it requires to
handle message boundaries. The same code works for DGRAM sockets,
so this change shouldn't break other ports using DGRAM.
* Platform/CoreIPC/Connection.h:
* Platform/CoreIPC/unix/ConnectionUnix.cpp:
(CoreIPC::Connection::platformInitialize):
(CoreIPC::Connection::processMessage): Process messages from data
already received.
(CoreIPC::readBytesFromSocket): Read from socket using recvmsg().
(CoreIPC::Connection::readyReadHandler):
* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
(WebKit::ProcessLauncher::launchProcess): Use SOCK_DGRAM in
socketpair().
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/CoreIPC/Connection.h
trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp
trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (88146 => 88147)
--- trunk/Source/WebKit2/ChangeLog 2011-06-06 08:09:17 UTC (rev 88146)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-06 08:35:50 UTC (rev 88147)
@@ -1 +1,24 @@
+2011-06-06 Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Anders Carlsson.
+
+[UNIX] SOCK_DGRAM sockets are not notified when the other end closes the connection
+https://bugs.webkit.org/show_bug.cgi?id=61538
+
+Use SOCK_STREAM instead of SOCK_DGRAM sockets. Rework the message
+receiver code to support stream sockets, since it requires to
+handle message boundaries. The same code works for DGRAM sockets,
+so this change shouldn't break other ports using DGRAM.
+
+* Platform/CoreIPC/Connection.h:
+* Platform/CoreIPC/unix/ConnectionUnix.cpp:
+(CoreIPC::Connection::platformInitialize):
+(CoreIPC::Connection::processMessage): Process messages from data
+already received.
+(CoreIPC::readBytesFromSocket): Read from socket using recvmsg().
+(CoreIPC::Connection::readyReadHandler):
+* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+(WebKit::ProcessLauncher::launchProcess): Use SOCK_DGRAM in
+socketpair().
+
== Rolled over to ChangeLog-2011-06-04 ==
Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.h (88146 => 88147)
--- trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2011-06-06 08:09:17 UTC (rev 88146)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2011-06-06 08:35:50 UTC (rev 88147)
@@ -337,9 +337,12 @@
#elif USE(UNIX_DOMAIN_SOCKETS) || OS(SYMBIAN)
// Called on the connection queue.
void readyReadHandler();
+bool processMessage();
Vectoruint8_t m_readBuffer;
-size_t m_currentMessageSize;
+size_t m_readBufferSize;
+Vectorint m_fileDescriptors;
+size_t m_fileDescriptorsSize;
int m_socketDescriptor;
#if PLATFORM(QT)
Modified: trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp (88146 => 88147)
--- trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp 2011-06-06 08:09:17 UTC (rev 88146)
+++ trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp 2011-06-06 08:35:50 UTC (rev 88147)
@@ -93,7 +93,9 @@
{
m_socketDescriptor = identifier;
m_readBuffer.resize(messageMaxSize);
-m_currentMessageSize = 0;
+m_readBufferSize = 0;
+m_fileDescriptors.resize(attachmentMaxAmount);
+m_fileDescriptorsSize = 0;
#if PLATFORM(QT)
m_socketNotifier = 0;
@@ -157,116 +159,181 @@
T m_attachments;
};
-void Connection::readyReadHandler()
+bool Connection::processMessage()
{
+if (m_readBufferSize sizeof(MessageInfo))
+return false;
+
+uint8_t* messageData = m_readBuffer.data();
+MessageInfo messageInfo;
+memcpy(messageInfo, messageData, sizeof(messageInfo));
+messageData += sizeof(messageInfo);
+
+size_t messageLength = sizeof(MessageInfo) + messageInfo.attachmentCount() * sizeof(size_t) + (messageInfo.isMessageBodyOOL() ? 0 : messageInfo.bodySize());
+if (m_readBufferSize messageLength)
+return false;
+
DequeAttachment attachments;
-#if PLATFORM(QT)
-SocketNotifierResourceGuard socketNotifierEnabler(m_socketNotifier);
-#endif
AttachmentResourceGuardDequeAttachment, DequeAttachment::iterator attachementDisposer(attachments);
+RefPtrWebKit::SharedMemory oolMessageBody;
-OwnArrayPtrchar attachmentDescriptorBuffer = adoptArrayPtr(new char[CMSG_SPACE(sizeof(int) * (attachmentMaxAmount))]);
[webkit-changes] [88244] trunk/Source
Title: [88244] trunk/Source
Revision 88244
Author carlo...@webkit.org
Date 2011-06-07 09:35:06 -0700 (Tue, 07 Jun 2011)
Log Message
2011-06-07 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[GTK] Move moduleMixesGtkSymbols() from PluginPackage to PluginView
https://bugs.webkit.org/show_bug.cgi?id=62200
In WebKit2 PluginPackage is used by the UI process to load plugins
in order to get information about them, but it doesn't use any GTK
symbol. So the UI process should be able to load plugins even when
building with GTK3, but we should not allow the plugin view to use
the plugin if it mixes GTK2 and GTK3 symbols.
* plugins/PluginPackage.h:
(WebCore::PluginPackage::module): New method to return the
platform module.
* plugins/gtk/PluginPackageGtk.cpp:
(WebCore::PluginPackage::load): Remove moduleMixesGtkSymbols().
* plugins/gtk/PluginViewGtk.cpp:
(WebCore::PluginView::updatePluginWidget): Check whether plugin
was successfully loaded before trying to create the drawable.
(WebCore::PluginView::paint): Return early if plugin didn't start
or was not successfully loaded.
(WebCore::PluginView::handleKeyboardEvent): Ditto.
(WebCore::PluginView::handleMouseEvent): Ditto.
(WebCore::PluginView::handleFocusInEvent): Ditto.
(WebCore::PluginView::handleFocusOutEvent): Ditto.
(WebCore::moduleMixesGtkSymbols):
(WebCore::PluginView::platformStart): Check whether module is
mixing GTK+ 2 and GTK+ 3 symbols.
2011-06-07 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[GTK] Move moduleMixesGtkSymbols() from PluginPackage to PluginView
https://bugs.webkit.org/show_bug.cgi?id=62200
In WebKit2 PluginPackage is used by the UI process to load plugins
in order to get information about them, but it doesn't use any GTK
symbol. So the UI process should be able to load plugins even when
building with GTK3, but we should not allow the plugin view to use
the plugin if it mixes GTK2 and GTK3 symbols.
* WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
(WebKit::moduleMixesGtkSymbols):
(WebKit::NetscapePlugin::platformPostInitialize): Check whether
the module is mixing GTK+ 2 and GTK+ 3 symbols.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/plugins/PluginPackage.h
trunk/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp
trunk/Source/WebCore/plugins/gtk/PluginViewGtk.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (88243 => 88244)
--- trunk/Source/WebCore/ChangeLog 2011-06-07 16:33:06 UTC (rev 88243)
+++ trunk/Source/WebCore/ChangeLog 2011-06-07 16:35:06 UTC (rev 88244)
@@ -1,3 +1,34 @@
+2011-06-07 Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Martin Robinson.
+
+[GTK] Move moduleMixesGtkSymbols() from PluginPackage to PluginView
+https://bugs.webkit.org/show_bug.cgi?id=62200
+
+In WebKit2 PluginPackage is used by the UI process to load plugins
+in order to get information about them, but it doesn't use any GTK
+symbol. So the UI process should be able to load plugins even when
+building with GTK3, but we should not allow the plugin view to use
+the plugin if it mixes GTK2 and GTK3 symbols.
+
+* plugins/PluginPackage.h:
+(WebCore::PluginPackage::module): New method to return the
+platform module.
+* plugins/gtk/PluginPackageGtk.cpp:
+(WebCore::PluginPackage::load): Remove moduleMixesGtkSymbols().
+* plugins/gtk/PluginViewGtk.cpp:
+(WebCore::PluginView::updatePluginWidget): Check whether plugin
+was successfully loaded before trying to create the drawable.
+(WebCore::PluginView::paint): Return early if plugin didn't start
+or was not successfully loaded.
+(WebCore::PluginView::handleKeyboardEvent): Ditto.
+(WebCore::PluginView::handleMouseEvent): Ditto.
+(WebCore::PluginView::handleFocusInEvent): Ditto.
+(WebCore::PluginView::handleFocusOutEvent): Ditto.
+(WebCore::moduleMixesGtkSymbols):
+(WebCore::PluginView::platformStart): Check whether module is
+mixing GTK+ 2 and GTK+ 3 symbols.
+
2011-06-07 Sheriff Bot webkit.review@gmail.com
Unreviewed, rolling out r88238.
Modified: trunk/Source/WebCore/plugins/PluginPackage.h (88243 => 88244)
--- trunk/Source/WebCore/plugins/PluginPackage.h 2011-06-07 16:33:06 UTC (rev 88243)
+++ trunk/Source/WebCore/plugins/PluginPackage.h 2011-06-07 16:35:06 UTC (rev 88244)
@@ -58,6 +58,7 @@
const String path() const { return m_path; }
const String fileName() const { return
[webkit-changes] [88631] trunk
Title: [88631] trunk Revision 88631 Author carlo...@webkit.org Date 2011-06-13 01:56:53 -0700 (Mon, 13 Jun 2011) Log Message 2011-06-13 Carlos Garcia Campos cgar...@igalia.com Reviewed by Martin Robinson. [GTK] Export an API similar to WebKit1 https://bugs.webkit.org/show_bug.cgi?id=57820 * GNUmakefile.am: Add webkitwebviewcommon.h to public header list. * webkit/webkitwebview.h: Move declarations common to WebKit2 to webkitwebviewcommon.h. * webkit/webkitwebviewcommon.h: Added. 2011-06-13 Carlos Garcia Campos cgar...@igalia.com Reviewed by Martin Robinson. [GTK] Export an API similar to WebKit1 https://bugs.webkit.org/show_bug.cgi?id=57820 Add first implementation of WebKitWebView, a class with the same API than webkit1, that wraps the C API to provide a high level WebKit2 API for GTK port. * GNUmakefile.am: Add new files to compilation. * UIProcess/API/gtk/WebKitWebView.cpp: Added. (webkit_web_view_init): (webkit_web_view_class_init): (webkit_web_view_new): (webkit_web_view_load_uri): (webkit_web_view_go_back): (webkit_web_view_go_forward): * UIProcess/API/gtk/WebKitWebView.h: Added. * UIProcess/API/gtk/WebKitWebViewBase.cpp: (webkitWebViewBaseCreate): (webkitWebViewBaseCreateWebPage): * UIProcess/API/gtk/WebKitWebViewBasePrivate.h: * UIProcess/API/gtk/webkit/webkit.h: Added. 2011-06-13 Carlos Garcia Campos cgar...@igalia.com Reviewed by Martin Robinson. [GTK] Export an API similar to WebKit1 https://bugs.webkit.org/show_bug.cgi?id=57820 Build GtkLauncher2 for WebKit2. It's actually the same GtkLauncher code, but linking to libwebkit2gtk. * GNUmakefile.am: * GtkLauncher/main.c: (createBrowser): (main): Modified Paths trunk/Source/WebKit/gtk/ChangeLog trunk/Source/WebKit/gtk/GNUmakefile.am trunk/Source/WebKit/gtk/webkit/webkitwebview.h trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h trunk/Tools/ChangeLog trunk/Tools/GNUmakefile.am trunk/Tools/GtkLauncher/main.c Added Paths trunk/Source/WebKit/gtk/webkit/webkitwebviewcommon.h trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h trunk/Source/WebKit2/UIProcess/API/gtk/webkit/ trunk/Source/WebKit2/UIProcess/API/gtk/webkit/webkit.h Diff Modified: trunk/Source/WebKit/gtk/ChangeLog (88630 => 88631) --- trunk/Source/WebKit/gtk/ChangeLog 2011-06-13 06:38:38 UTC (rev 88630) +++ trunk/Source/WebKit/gtk/ChangeLog 2011-06-13 08:56:53 UTC (rev 88631) @@ -1,3 +1,15 @@ +2011-06-13 Carlos Garcia Campos cgar...@igalia.com + +Reviewed by Martin Robinson. + +[GTK] Export an API similar to WebKit1 +https://bugs.webkit.org/show_bug.cgi?id=57820 + +* GNUmakefile.am: Add webkitwebviewcommon.h to public header list. +* webkit/webkitwebview.h: Move declarations common to WebKit2 to +webkitwebviewcommon.h. +* webkit/webkitwebviewcommon.h: Added. + 2011-06-12 Adam Barth aba...@webkit.org Reviewed by Alexey Proskuryakov. Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (88630 => 88631) --- trunk/Source/WebKit/gtk/GNUmakefile.am 2011-06-13 06:38:38 UTC (rev 88630) +++ trunk/Source/WebKit/gtk/GNUmakefile.am 2011-06-13 08:56:53 UTC (rev 88631) @@ -137,7 +137,8 @@ $(srcdir)/Source/WebKit/gtk/webkit/webkitwebresource.h \ $(srcdir)/Source/WebKit/gtk/webkit/webkitwebsettings.h \ $(srcdir)/Source/WebKit/gtk/webkit/webkitwebwindowfeatures.h \ - $(srcdir)/Source/WebKit/gtk/webkit/webkitwebview.h + $(srcdir)/Source/WebKit/gtk/webkit/webkitwebview.h \ + $(srcdir)/Source/WebKit/gtk/webkit/webkitwebviewcommon.h webkitgtk_built_h_api += \ Source/WebKit/gtk/webkit/webkitversion.h Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.h (88630 => 88631) --- trunk/Source/WebKit/gtk/webkit/webkitwebview.h 2011-06-13 06:38:38 UTC (rev 88630) +++ trunk/Source/WebKit/gtk/webkit/webkitwebview.h 2011-06-13 08:56:53 UTC (rev 88631) @@ -32,6 +32,7 @@ #include webkit/webkitwebframe.h #include webkit/webkitwebhistoryitem.h #include webkit/webkitwebsettings.h +#include webkit/webkitwebviewcommon.h G_BEGIN_DECLS @@ -153,16 +154,7 @@ void (*_webkit_reserved2) (void); }; -WEBKIT_API GType -webkit_web_view_get_type (void); - -WEBKIT_API GtkWidget * -webkit_web_view_new (void); - WEBKIT_API G_CONST_RETURN gchar * -webkit_web_view_get_title (WebKitWebView*webView); - -WEBKIT_API G_CONST_RETURN gchar * webkit_web_view_get_uri (WebKitWebView*webView); WEBKIT_API void @@ -187,16 +179,10 @@ webkit_web_view_can_go_forward
[webkit-changes] [100898] trunk
Title: [100898] trunk Revision 100898 Author carlo...@webkit.org Date 2011-11-21 04:14:09 -0800 (Mon, 21 Nov 2011) Log Message [GTK] Update NEWS and configure.ac for 1.7.2 release https://bugs.webkit.org/show_bug.cgi?id=72868 Reviewed by Xan Lopez. .: * configure.ac: Bumped version number. Source/WebKit/gtk: * NEWS: Added release notes for 1.7.2. Modified Paths trunk/ChangeLog trunk/Source/WebKit/gtk/ChangeLog trunk/Source/WebKit/gtk/NEWS trunk/configure.ac Diff Modified: trunk/ChangeLog (100897 => 100898) --- trunk/ChangeLog 2011-11-21 12:02:30 UTC (rev 100897) +++ trunk/ChangeLog 2011-11-21 12:14:09 UTC (rev 100898) @@ -1,3 +1,12 @@ +2011-11-21 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Update NEWS and configure.ac for 1.7.2 release +https://bugs.webkit.org/show_bug.cgi?id=72868 + +Reviewed by Xan Lopez. + +* configure.ac: Bumped version number. + 2011-11-19 Kevin Ollivier kev...@theolliviers.com [wx] Build fix after GeneratedImage refactoring. Modified: trunk/Source/WebKit/gtk/ChangeLog (100897 => 100898) --- trunk/Source/WebKit/gtk/ChangeLog 2011-11-21 12:02:30 UTC (rev 100897) +++ trunk/Source/WebKit/gtk/ChangeLog 2011-11-21 12:14:09 UTC (rev 100898) @@ -1,3 +1,12 @@ +2011-11-21 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Update NEWS and configure.ac for 1.7.2 release +https://bugs.webkit.org/show_bug.cgi?id=72868 + +Reviewed by Xan Lopez. + +* NEWS: Added release notes for 1.7.2. + 2011-10-17 Antonio Gomes ago...@rim.com Pass a Frame* parameter in EditorClient::respondToChangedSelection Modified: trunk/Source/WebKit/gtk/NEWS (100897 => 100898) --- trunk/Source/WebKit/gtk/NEWS 2011-11-21 12:02:30 UTC (rev 100897) +++ trunk/Source/WebKit/gtk/NEWS 2011-11-21 12:14:09 UTC (rev 100898) @@ -1,4 +1,39 @@ = +WebKitGTK+ 1.7.2 += + +What's new in WebKitGTK+ 1.7.2? + + - Fix process freeze when right-clicking on windowless Flash. + - Performance improvements by avoiding unnecessary clips while +painting. + - Notify errors happening on downloads not started by a web view. + - Allow building with GLib = 2.31. + - Significant _javascript_ performance improvements on x86 and x86-64. + - Fix application cache directory in WebKit2. + - Add initial support for cookies in WebKit2. + - Implement support for downloads in WebKit2. + - Add methods to load HTML and plain text to WebKit2 GTK+ API. + - Add webkit_web_view_get_uri() to WebKit2 GTK+ API. + - Don't show items in option elements with display:none. + - Add webkit_web_view_load_request() to WebKit2 GTK+ API. + - Add support for WebAudio AudioFileReader. + - Port MiniBrowser to use WebKit2 GTK+ API instead of the C API. + - Add more settings to WebKitSettings in WebKit2 GTK+ API: Private +browsing, developer extras, resizable text areas, tabs to links, +caret mode, font settings, default charset. + - Fix windowless plugins drawing in WebKit2. + - Fix memory leak when fullscreening a video. + - Remove visited links from page's page group when clearing back +forward list. + - Switch to a backing store approach for painting WebKitWebView. It +improves scrolling performance. + - Add methods to get/set the settings of a web view to WebKit2 GTK+ +API. + - Add webkit_settings_new_with_settings() to WebKit2 GTK+ API. + - Add title property to WebKitWebView in WebKit2 GTK+ API. + += WebKitGTK+ 1.7.1 = Modified: trunk/configure.ac (100897 => 100898) --- trunk/configure.ac 2011-11-21 12:02:30 UTC (rev 100897) +++ trunk/configure.ac 2011-11-21 12:14:09 UTC (rev 100898) @@ -2,14 +2,14 @@ m4_define([webkit_major_version], [1]) m4_define([webkit_minor_version], [7]) -m4_define([webkit_micro_version], [1]) +m4_define([webkit_micro_version], [2]) # This is the version we'll be using as part of our User-Agent string # e.g., AppleWebKit/$(webkit_user_agent_version) ... # # Sourced from Source/WebCore/Configurations/Version.xcconfig m4_define([webkit_user_agent_major_version], [535]) -m4_define([webkit_user_agent_minor_version], [7]) +m4_define([webkit_user_agent_minor_version], [10]) AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/]) @@ -35,7 +35,7 @@ dnl # Libtool library version, not to confuse with API version dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html -LIBWEBKITGTK_VERSION=11:1:11 +LIBWEBKITGTK_VERSION=11:2:11 AC_SUBST([LIBWEBKITGTK_VERSION]) AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz no-dist-gzip tar-ustar]) ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [100919] trunk/Tools
Title: [100919] trunk/Tools
Revision 100919
Author carlo...@webkit.org
Date 2011-11-21 08:21:53 -0800 (Mon, 21 Nov 2011)
Log Message
[GTK] Add a way to skip unit tests in the bots
https://bugs.webkit.org/show_bug.cgi?id=72879
Reviewed by Philippe Normand.
Rewrite the script in python to make it easier for everybody to
change it and add support for skipping tests.
* Scripts/run-gtk-tests:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/run-gtk-tests
Diff
Modified: trunk/Tools/ChangeLog (100918 => 100919)
--- trunk/Tools/ChangeLog 2011-11-21 16:19:05 UTC (rev 100918)
+++ trunk/Tools/ChangeLog 2011-11-21 16:21:53 UTC (rev 100919)
@@ -1,3 +1,15 @@
+2011-11-21 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Add a way to skip unit tests in the bots
+https://bugs.webkit.org/show_bug.cgi?id=72879
+
+Reviewed by Philippe Normand.
+
+Rewrite the script in python to make it easier for everybody to
+change it and add support for skipping tests.
+
+* Scripts/run-gtk-tests:
+
2011-11-21 Raphael Kubo da Costa k...@profusion.mobi
[EFL] Add more appcache functions to ewk_settings.
Modified: trunk/Tools/Scripts/run-gtk-tests (100918 => 100919)
--- trunk/Tools/Scripts/run-gtk-tests 2011-11-21 16:19:05 UTC (rev 100918)
+++ trunk/Tools/Scripts/run-gtk-tests 2011-11-21 16:21:53 UTC (rev 100919)
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!/usr/bin/env python
#
-# Copyright (C) 2009 Gustavo Noronha Silva g...@gnome.org
+# 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 Library General Public
@@ -17,52 +17,70 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-use strict;
-use warnings;
+from webkitpy.common.system.executive import Executive
+import subprocess
+import os, sys
-use FindBin;
-use lib $FindBin::Bin;
-use webkitdirs;
+class TestRunner:
-# This initializes the correct configuration (Release/Debug)
-setConfiguration();
+TEST_DIRS = [ unittests, WebKit2APITests ]
+SKIPPED = [ unittests/testdownload ]
-my @unitTests;
-my $programsDirectory = productDir() . /Programs;
-push(@unitTests, glob($programsDirectory . /unittests/*));
-push(@unitTests, glob($programsDirectory . /WebKit2APITests/*));
+def __init__(self):
+self._executive = Executive()
-if ($#unitTests 1) {
-die ERROR: tests not found in $programsDirectory.\n;
-}
+build_directory_script = os.path.join(os.path.dirname(__file__), webkit-build-directory)
+build_directory = self._executive.run_command([build_directory_script, --configuration]).rstrip()
-my $pid = fork();
-if ($pid == 0) {
-close(STDOUT) or die Can't close STDOUT: $!\n;
-close(STDERR) or die Can't close STDERR: $!\n;
-exec(Xvfb :31 -screen 0 800x600x24 -nolisten tcp);
-exit 1;
-} elsif ($pid == -1) {
-print Failed to fork Xvfb.;
-exit 1;
-}
+self._programs_path = os.path.join(build_directory, Programs)
+self._tests = []
+for test_dir in self.TEST_DIRS:
+for test_file in os.listdir(os.path.join(self._programs_path, test_dir)):
+test_relative_path = os.path.join(test_dir, test_file)
+if test_relative_path in self.SKIPPED:
+sys.stdout.write(Skipping test %s\n % (test_relative_path))
+sys.stdout.flush()
+continue
-$ENV{DISPLAY} = ':31';
+test_path = os.path.join(self._programs_path, test_relative_path)
+if os.path.isfile(test_path) and os.access(test_path, os.X_OK):
+self._tests.append(test_path)
-my $exitStatus = 0;
-foreach my $unitTest (@unitTests)
-{
-next unless (-f $unitTest and -x $unitTest);
+def run(self):
+if not self._tests:
+sys.stderr.write(ERROR: tests not found in %s.\n % (self._programs_path))
+sys.stderr.flush()
+return 1
-system gtester $unitTest;
-if ($?) {
-$exitStatus = $?;
-}
-}
+test_env = os.environ
+test_env[DISPLAY] = :31
-kill 9, $pid unless $pid = 0;
+exit_status = [0]
+def _error_handler(error):
+exit_status[0] = error.exit_code
-if ($exitStatus) {
-print Tests failed\n;
-exit $exitStatus;
-}
+for test in self._tests:
+out = self._executive.run_command(['gtester', test], env=test_env,
+ error_handler=_error_handler)
+sys.stdout.write(out)
+sys.stdout.flush()
+
+if exit_status[0]:
+sys.stdout.write(Tests failed\n)
+sys.stdout.flush()
+
+return exit_status[0]
+
+if __name__ == __main__:
+try:
+xvfb = Executive().popen([Xvfb, :31, -screen, 0, 800x600x24, -nolisten, tcp],
+ stdout=subprocess.PIPE,
[webkit-changes] [101004] trunk/Source/WebKit2
Title: [101004] trunk/Source/WebKit2
Revision 101004
Author carlo...@webkit.org
Date 2011-11-22 08:43:21 -0800 (Tue, 22 Nov 2011)
Log Message
Ensure web process before starting a download
https://bugs.webkit.org/show_bug.cgi?id=72499
Reviewed by Anders Carlsson.
* UIProcess/WebContext.cpp:
(WebKit::WebContext::download): Call ensureWebProcess().
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/WebContext.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (101003 => 101004)
--- trunk/Source/WebKit2/ChangeLog 2011-11-22 15:40:52 UTC (rev 101003)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-22 16:43:21 UTC (rev 101004)
@@ -1,3 +1,13 @@
+2011-11-22 Carlos Garcia Campos cgar...@igalia.com
+
+Ensure web process before starting a download
+https://bugs.webkit.org/show_bug.cgi?id=72499
+
+Reviewed by Anders Carlsson.
+
+* UIProcess/WebContext.cpp:
+(WebKit::WebContext::download): Call ensureWebProcess().
+
2011-11-22 Csaba Osztrogonác o...@webkit.org
Unreviewed buildfix after r101001.
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (101003 => 101004)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2011-11-22 15:40:52 UTC (rev 101003)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2011-11-22 16:43:21 UTC (rev 101004)
@@ -401,6 +401,8 @@
DownloadProxy* WebContext::download(WebPageProxy* initiatingPage, const ResourceRequest request)
{
+ensureWebProcess();
+
DownloadProxy* download = createDownloadProxy();
uint64_t initiatingPageID = initiatingPage ? initiatingPage-pageID() : 0;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [101244] trunk/Source/WebCore
Title: [101244] trunk/Source/WebCore Revision 101244 Author carlo...@webkit.org Date 2011-11-28 03:51:30 -0800 (Mon, 28 Nov 2011) Log Message Unreviewed. Fix make distcheck issues. * GNUmakefile.list.am: Add missing files. * bindings/gobject/GNUmakefile.am: Only build WebKitDOMHTMLPropertiesCollection when microdate is enabled. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/GNUmakefile.list.am trunk/Source/WebCore/bindings/gobject/GNUmakefile.am Diff Modified: trunk/Source/WebCore/ChangeLog (101243 => 101244) --- trunk/Source/WebCore/ChangeLog 2011-11-28 11:44:32 UTC (rev 101243) +++ trunk/Source/WebCore/ChangeLog 2011-11-28 11:51:30 UTC (rev 101244) @@ -1,3 +1,11 @@ +2011-11-28 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix make distcheck issues. + +* GNUmakefile.list.am: Add missing files. +* bindings/gobject/GNUmakefile.am: Only build +WebKitDOMHTMLPropertiesCollection when microdate is enabled. + 2011-11-28 Luke Macpherson macpher...@chromium.org Implement CSS border image properties in CSSStyleApplyProperty. Modified: trunk/Source/WebCore/GNUmakefile.list.am (101243 => 101244) --- trunk/Source/WebCore/GNUmakefile.list.am 2011-11-28 11:44:32 UTC (rev 101243) +++ trunk/Source/WebCore/GNUmakefile.list.am 2011-11-28 11:51:30 UTC (rev 101244) @@ -2080,6 +2080,9 @@ Source/WebCore/inspector/InspectorDOMStorageAgent.h \ Source/WebCore/inspector/InspectorDOMStorageResource.cpp \ Source/WebCore/inspector/InspectorDOMStorageResource.h \ + Source/WebCore/inspector/InspectorFileSystemAgent.cpp \ + Source/WebCore/inspector/InspectorFileSystemAgent.h \ + Source/WebCore/inspector/InspectorFileSystemInstrumentation.h \ Source/WebCore/inspector/InspectorFrontendChannel.h \ Source/WebCore/inspector/InspectorFrontendClient.h \ Source/WebCore/inspector/InspectorFrontendClientLocal.cpp \ Modified: trunk/Source/WebCore/bindings/gobject/GNUmakefile.am (101243 => 101244) --- trunk/Source/WebCore/bindings/gobject/GNUmakefile.am 2011-11-28 11:44:32 UTC (rev 101243) +++ trunk/Source/WebCore/bindings/gobject/GNUmakefile.am 2011-11-28 11:51:30 UTC (rev 101244) @@ -166,8 +166,6 @@ DerivedSources/webkit/WebKitDOMHTMLParamElementPrivate.h \ DerivedSources/webkit/WebKitDOMHTMLPreElement.cpp \ DerivedSources/webkit/WebKitDOMHTMLPreElementPrivate.h \ - DerivedSources/webkit/WebKitDOMHTMLPropertiesCollection.cpp \ - DerivedSources/webkit/WebKitDOMHTMLPropertiesCollectionPrivate.h \ DerivedSources/webkit/WebKitDOMHTMLQuoteElement.cpp \ DerivedSources/webkit/WebKitDOMHTMLQuoteElementPrivate.h \ DerivedSources/webkit/WebKitDOMHTMLScriptElement.cpp \ @@ -345,7 +343,6 @@ DerivedSources/webkit/WebKitDOMHTMLParagraphElement.h \ DerivedSources/webkit/WebKitDOMHTMLParamElement.h \ DerivedSources/webkit/WebKitDOMHTMLPreElement.h \ - DerivedSources/webkit/WebKitDOMHTMLPropertiesCollection.h \ DerivedSources/webkit/WebKitDOMHTMLQuoteElement.h \ DerivedSources/webkit/WebKitDOMHTMLScriptElement.h \ DerivedSources/webkit/WebKitDOMHTMLSelectElement.h \ @@ -429,6 +426,14 @@ DerivedSources/webkit/WebKitDOMTrackEventPrivate.h endif +if ENABLE_MICRODATA +webkitgtk_built_h_api += \ + $(top_builddir)/DerivedSources/webkit/WebKitDOMHTMLPropertiesCollection.h +webkitgtk_gdom_built_sources += \ + DerivedSources/webkit/WebKitDOMHTMLPropertiesCollection.cpp \ + DerivedSources/webkit/WebKitDOMHTMLPropertiesCollectionPrivate.h +endif + gdom_class_list := $(subst WebKitDOM,, $(filter-out %Private, $(basename $(notdir $(webkitgtk_gdom_built_sources) gdom_class_list += Custom EventTarget Object DerivedSources/webkit/webkitdom.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/bindings/gobject/GNUmakefile.am ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [101248] trunk/Source/WebKit2
Title: [101248] trunk/Source/WebKit2 Revision 101248 Author carlo...@webkit.org Date 2011-11-28 04:26:25 -0800 (Mon, 28 Nov 2011) Log Message [GTK] Rename WebKitNetworkRequest to WebKitURIRequest https://bugs.webkit.org/show_bug.cgi?id=73202 Reviewed by Martin Robinson. Network is confusing because the request can be for a local file uri. * GNUmakefile.am: * UIProcess/API/gtk/WebKitNetworkRequest.h: Removed. * UIProcess/API/gtk/WebKitURIRequest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.cpp. (webkitURIRequestFinalize): (webkitURIRequestGetProperty): (webkitURIRequestSetProperty): (webkit_uri_request_class_init): (webkit_uri_request_init): (webkit_uri_request_new): (webkit_uri_request_get_uri): * UIProcess/API/gtk/WebKitURIRequest.h: Added. * UIProcess/API/gtk/WebKitWebView.cpp: (webkit_web_view_load_request): * UIProcess/API/gtk/WebKitWebView.h: * UIProcess/API/gtk/docs/webkit2gtk-sections.txt: * UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp: (testLoadRequest): * UIProcess/API/gtk/tests/WebViewTest.cpp: (WebViewTest::loadRequest): * UIProcess/API/gtk/tests/WebViewTest.h: * UIProcess/API/gtk/webkit2.h: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h Added Paths trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.h Removed Paths trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.cpp trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.h Diff Modified: trunk/Source/WebKit2/ChangeLog (101247 => 101248) --- trunk/Source/WebKit2/ChangeLog 2011-11-28 12:20:45 UTC (rev 101247) +++ trunk/Source/WebKit2/ChangeLog 2011-11-28 12:26:25 UTC (rev 101248) @@ -1,3 +1,34 @@ +2011-11-28 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Rename WebKitNetworkRequest to WebKitURIRequest +https://bugs.webkit.org/show_bug.cgi?id=73202 + +Reviewed by Martin Robinson. + +Network is confusing because the request can be for a local file uri. + +* GNUmakefile.am: +* UIProcess/API/gtk/WebKitNetworkRequest.h: Removed. +* UIProcess/API/gtk/WebKitURIRequest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.cpp. +(webkitURIRequestFinalize): +(webkitURIRequestGetProperty): +(webkitURIRequestSetProperty): +(webkit_uri_request_class_init): +(webkit_uri_request_init): +(webkit_uri_request_new): +(webkit_uri_request_get_uri): +* UIProcess/API/gtk/WebKitURIRequest.h: Added. +* UIProcess/API/gtk/WebKitWebView.cpp: +(webkit_web_view_load_request): +* UIProcess/API/gtk/WebKitWebView.h: +* UIProcess/API/gtk/docs/webkit2gtk-sections.txt: +* UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp: +(testLoadRequest): +* UIProcess/API/gtk/tests/WebViewTest.cpp: +(WebViewTest::loadRequest): +* UIProcess/API/gtk/tests/WebViewTest.h: +* UIProcess/API/gtk/webkit2.h: + 2011-11-28 Simon Hausmann simon.hausm...@nokia.com [Qt] WTF should be built as separate static library Modified: trunk/Source/WebKit2/GNUmakefile.am (101247 => 101248) --- trunk/Source/WebKit2/GNUmakefile.am 2011-11-28 12:20:45 UTC (rev 101247) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-11-28 12:26:25 UTC (rev 101248) @@ -79,10 +79,10 @@ $(WebKit2)/UIProcess/API/gtk/WebKitBackForwardListItem.h \ $(WebKit2)/UIProcess/API/gtk/WebKitDefines.h \ $(WebKit2)/UIProcess/API/gtk/WebKitError.h \ - $(WebKit2)/UIProcess/API/gtk/WebKitNetworkRequest.h \ $(WebKit2)/UIProcess/API/gtk/WebKitWebContext.h \ $(WebKit2)/UIProcess/API/gtk/WebKitWebLoaderClient.h \ $(WebKit2)/UIProcess/API/gtk/WebKitSettings.h \ + $(WebKit2)/UIProcess/API/gtk/WebKitURIRequest.h \ $(WebKit2)/UIProcess/API/gtk/WebKitWebView.h \ $(WebKit2)/UIProcess/API/gtk/WebKitWebViewBase.h \ $(WebKit2)/UIProcess/API/gtk/webkit2.h @@ -502,12 +502,12 @@ Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h \ Source/WebKit2/UIProcess/API/gtk/WebKitError.h \ Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp \ - Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.cpp \ - Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.h \ Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h \ Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp \ Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h \ Source/WebKit2/UIProcess/API/gtk/WebKitSettingsPrivate.h \ + Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp \ +
[webkit-changes] [101350] trunk/Source/WebKit2
Title: [101350] trunk/Source/WebKit2 Revision 101350 Author carlo...@webkit.org Date 2011-11-29 03:10:53 -0800 (Tue, 29 Nov 2011) Log Message [GTK] Add WebKitURIResponse to WebKit2 GTK+ API https://bugs.webkit.org/show_bug.cgi?id=72946 Reviewed by Martin Robinson. * GNUmakefile.am: Add new files to compilation. * UIProcess/API/gtk/WebKitURIResponse.cpp: Added. (webkitURIResponseFinalize): (webkitURIResponseGetProperty): (webkitURIResponseSetProperty): (webkit_uri_response_class_init): (webkit_uri_response_init): (webkit_uri_response_get_uri): Return the URI of the response. (webkit_uri_response_get_status_code): Return the status code of the response, or SOUP_STATUS_NONE. (webkit_uri_response_get_content_length): Return the expected content length of the response. (webkitURIResponseCreateForSoupMessage): Private function to create a response object from a SoupMessage. (webkitURIResponseGetSoupMessage): Return the soup message associated to the response. (webkitURIResponseSetContentLength): Set the expected content length of the response. This is useful for non http responses. * UIProcess/API/gtk/WebKitURIResponse.h: Added. * UIProcess/API/gtk/WebKitURIResponsePrivate.h: Added. * UIProcess/API/gtk/docs/webkit2gtk-docs.sgml: Add new section. * UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new symbols. * UIProcess/API/gtk/docs/webkit2gtk.types: Add webkit_uri_response_get_type(). * UIProcess/API/gtk/webkit2.h: Add WebKitURIResponse.h. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h Added Paths trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.h trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIResponsePrivate.h Diff Modified: trunk/Source/WebKit2/ChangeLog (101349 => 101350) --- trunk/Source/WebKit2/ChangeLog 2011-11-29 11:04:43 UTC (rev 101349) +++ trunk/Source/WebKit2/ChangeLog 2011-11-29 11:10:53 UTC (rev 101350) @@ -1,3 +1,36 @@ +2011-11-29 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Add WebKitURIResponse to WebKit2 GTK+ API +https://bugs.webkit.org/show_bug.cgi?id=72946 + +Reviewed by Martin Robinson. + +* GNUmakefile.am: Add new files to compilation. +* UIProcess/API/gtk/WebKitURIResponse.cpp: Added. +(webkitURIResponseFinalize): +(webkitURIResponseGetProperty): +(webkitURIResponseSetProperty): +(webkit_uri_response_class_init): +(webkit_uri_response_init): +(webkit_uri_response_get_uri): Return the URI of the response. +(webkit_uri_response_get_status_code): Return the status code of +the response, or SOUP_STATUS_NONE. +(webkit_uri_response_get_content_length): Return the expected +content length of the response. +(webkitURIResponseCreateForSoupMessage): Private function to +create a response object from a SoupMessage. +(webkitURIResponseGetSoupMessage): Return the soup message +associated to the response. +(webkitURIResponseSetContentLength): Set the expected content +length of the response. This is useful for non http responses. +* UIProcess/API/gtk/WebKitURIResponse.h: Added. +* UIProcess/API/gtk/WebKitURIResponsePrivate.h: Added. +* UIProcess/API/gtk/docs/webkit2gtk-docs.sgml: Add new section. +* UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new symbols. +* UIProcess/API/gtk/docs/webkit2gtk.types: Add +webkit_uri_response_get_type(). +* UIProcess/API/gtk/webkit2.h: Add WebKitURIResponse.h. + 2011-11-29 Kenneth Rohde Christiansen kenn...@webkit.org [Qt] QQuickWebView gets wrong position after reload Modified: trunk/Source/WebKit2/GNUmakefile.am (101349 => 101350) --- trunk/Source/WebKit2/GNUmakefile.am 2011-11-29 11:04:43 UTC (rev 101349) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-11-29 11:10:53 UTC (rev 101350) @@ -83,6 +83,7 @@ $(WebKit2)/UIProcess/API/gtk/WebKitWebLoaderClient.h \ $(WebKit2)/UIProcess/API/gtk/WebKitSettings.h \ $(WebKit2)/UIProcess/API/gtk/WebKitURIRequest.h \ + $(WebKit2)/UIProcess/API/gtk/WebKitURIResponse.h \ $(WebKit2)/UIProcess/API/gtk/WebKitWebView.h \ $(WebKit2)/UIProcess/API/gtk/WebKitWebViewBase.h \ $(WebKit2)/UIProcess/API/gtk/webkit2.h @@ -508,6 +509,9 @@ Source/WebKit2/UIProcess/API/gtk/WebKitSettingsPrivate.h \ Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp \ Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.h \ + Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp \ + Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.h \ + Source/WebKit2/UIProcess/API/gtk/WebKitURIResponsePrivate.h \
[webkit-changes] [101383] trunk/Source
Title: [101383] trunk/Source Revision 101383 Author carlo...@webkit.org Date 2011-11-29 08:12:09 -0800 (Tue, 29 Nov 2011) Log Message Unreviewed. Fix the GTK+ port build after r101307. Source/WebCore: * GNUmakefile.list.am: Add missing files to compilation. Source/WebKit2: * GNUmakefile.am: Add missing files to compilation. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/GNUmakefile.list.am trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am Diff Modified: trunk/Source/WebCore/ChangeLog (101382 => 101383) --- trunk/Source/WebCore/ChangeLog 2011-11-29 16:10:05 UTC (rev 101382) +++ trunk/Source/WebCore/ChangeLog 2011-11-29 16:12:09 UTC (rev 101383) @@ -1,3 +1,9 @@ +2011-11-29 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix the GTK+ port build after r101307. + +* GNUmakefile.list.am: Add missing files to compilation. + 2011-11-29 Pavel Feldman pfeld...@google.com Web Inspector: split Preferences into Preferences and Capabilities. Modified: trunk/Source/WebCore/GNUmakefile.list.am (101382 => 101383) --- trunk/Source/WebCore/GNUmakefile.list.am 2011-11-29 16:10:05 UTC (rev 101382) +++ trunk/Source/WebCore/GNUmakefile.list.am 2011-11-29 16:12:09 UTC (rev 101383) @@ -2299,6 +2299,8 @@ Source/WebCore/notifications/NotificationCenter.cpp \ Source/WebCore/notifications/NotificationCenter.h \ Source/WebCore/notifications/NotificationContents.h \ + Source/WebCore/notifications/NotificationController.cpp \ + Source/WebCore/notifications/NotificationController.h \ Source/WebCore/notifications/Notification.cpp \ Source/WebCore/notifications/Notification.h \ Source/WebCore/notifications/NotificationPresenter.h \ Modified: trunk/Source/WebKit2/ChangeLog (101382 => 101383) --- trunk/Source/WebKit2/ChangeLog 2011-11-29 16:10:05 UTC (rev 101382) +++ trunk/Source/WebKit2/ChangeLog 2011-11-29 16:12:09 UTC (rev 101383) @@ -1,3 +1,9 @@ +2011-11-29 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix the GTK+ port build after r101307. + +* GNUmakefile.am: Add missing files to compilation. + 2011-11-29 Kenneth Rohde Christiansen kenn...@webkit.org [Qt] Add the infrastructure for enabling suspend/resume. Modified: trunk/Source/WebKit2/GNUmakefile.am (101382 => 101383) --- trunk/Source/WebKit2/GNUmakefile.am 2011-11-29 16:10:05 UTC (rev 101382) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-11-29 16:12:09 UTC (rev 101383) @@ -57,6 +57,9 @@ $(WebKit2)/UIProcess/API/C/WKInspector.h \ $(WebKit2)/UIProcess/API/C/WKKeyValueStorageManager.h \ $(WebKit2)/UIProcess/API/C/WKMediaCacheManager.h \ + $(WebKit2)/UIProcess/API/C/WKNotification.h \ + $(WebKit2)/UIProcess/API/C/WKNotificationManager.h \ + $(WebKit2)/UIProcess/API/C/WKNotificationProvider.h \ $(WebKit2)/UIProcess/API/C/WKNativeEvent.h \ $(WebKit2)/UIProcess/API/C/WKNavigationData.h \ $(WebKit2)/UIProcess/API/C/WKOpenPanelParameters.h \ @@ -147,6 +150,8 @@ DerivedSources/WebKit2/WebMediaCacheManagerMessages.h \ DerivedSources/WebKit2/WebMediaCacheManagerProxyMessageReceiver.cpp \ DerivedSources/WebKit2/WebMediaCacheManagerProxyMessages.h \ + DerivedSources/WebKit2/WebNotificationManagerProxyMessageReceiver.cpp \ + DerivedSources/WebKit2/WebNotificationManagerProxyMessages.h \ DerivedSources/WebKit2/WebPageProxyMessageReceiver.cpp \ DerivedSources/WebKit2/WebPageProxyMessages.h \ DerivedSources/WebKit2/WebPageMessageReceiver.cpp \ @@ -471,6 +476,11 @@ Source/WebKit2/UIProcess/API/C/WKNativeEvent.h \ Source/WebKit2/UIProcess/API/C/WKNavigationData.cpp \ Source/WebKit2/UIProcess/API/C/WKNavigationData.h \ + Source/WebKit2/UIProcess/API/C/WKNotification.cpp \ + Source/WebKit2/UIProcess/API/C/WKNotification.h \ + Source/WebKit2/UIProcess/API/C/WKNotificationManager.cpp \ + Source/WebKit2/UIProcess/API/C/WKNotificationManager.h \ + Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h \ Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.cpp \ Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.h \ Source/WebKit2/UIProcess/API/C/WKOpenPanelResultListener.cpp \ @@ -642,6 +652,12 @@ Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.h \ Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp \ Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h \ + Source/WebKit2/UIProcess/WebNotification.cpp \ + Source/WebKit2/UIProcess/WebNotification.h \ + Source/WebKit2/UIProcess/WebNotificationManagerProxy.cpp \ + Source/WebKit2/UIProcess/WebNotificationManagerProxy.h \ + Source/WebKit2/UIProcess/WebNotificationProvider.cpp \ + Source/WebKit2/UIProcess/WebNotificationProvider.h \ Source/WebKit2/UIProcess/WebLoaderClient.cpp \ Source/WebKit2/UIProcess/WebLoaderClient.h \ Source/WebKit2/UIProcess/WebNavigationData.cpp \ @@ -772,6 +788,8 @@ Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.h \ Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp \
[webkit-changes] [101412] trunk/Source/WebKit2
Title: [101412] trunk/Source/WebKit2 Revision 101412 Author carlo...@webkit.org Date 2011-11-29 13:22:55 -0800 (Tue, 29 Nov 2011) Log Message Unreviewed. Fix GTK+ WebKit2 build after r101312. * Scripts/generate-forwarding-headers.pl: Add blackberry to the list of platforms. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl Diff Modified: trunk/Source/WebKit2/ChangeLog (101411 => 101412) --- trunk/Source/WebKit2/ChangeLog 2011-11-29 21:22:10 UTC (rev 101411) +++ trunk/Source/WebKit2/ChangeLog 2011-11-29 21:22:55 UTC (rev 101412) @@ -1,3 +1,10 @@ +2011-11-29 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix GTK+ WebKit2 build after r101312. + +* Scripts/generate-forwarding-headers.pl: Add blackberry to the +list of platforms. + 2011-11-29 Tor Arne Vestbø tor.arne.ves...@nokia.com [Qt] Don't hard-code the list of WebKit2 generated sources Modified: trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl (101411 => 101412) --- trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl 2011-11-29 21:22:10 UTC (rev 101411) +++ trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl 2011-11-29 21:22:55 UTC (rev 101412) @@ -35,7 +35,7 @@ my $srcRoot = realpath(File::Spec-catfile(dirname(abs_path($0)), ../..)); my $incFromRoot = abs_path($ARGV[0]); -my @platformPrefixes = (cf, chromium, curl, efl, gtk, mac, qt, soup, v8, win, wx); +my @platformPrefixes = (blackberry, cf, chromium, curl, efl, gtk, mac, qt, soup, v8, win, wx); my @frameworks = ( _javascript_Core, WebCore, WebKit2); my @skippedPrefixes; my @frameworkHeaders; ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [101770] trunk/Source/WebKit2
Title: [101770] trunk/Source/WebKit2 Revision 101770 Author carlo...@webkit.org Date 2011-12-02 02:20:58 -0800 (Fri, 02 Dec 2011) Log Message Unreviewed. Fix GTK+ build after r101750. * GNUmakefile.am: Add missing files. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am Diff Modified: trunk/Source/WebKit2/ChangeLog (101769 => 101770) --- trunk/Source/WebKit2/ChangeLog 2011-12-02 10:17:25 UTC (rev 101769) +++ trunk/Source/WebKit2/ChangeLog 2011-12-02 10:20:58 UTC (rev 101770) @@ -1,3 +1,9 @@ +2011-12-02 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix GTK+ build after r101750. + +* GNUmakefile.am: Add missing files. + 2011-12-02 Gustavo Noronha Silva g...@gnome.org Unreviewed. GTK+ build fix. Modified: trunk/Source/WebKit2/GNUmakefile.am (101769 => 101770) --- trunk/Source/WebKit2/GNUmakefile.am 2011-12-02 10:17:25 UTC (rev 101769) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-12-02 10:20:58 UTC (rev 101770) @@ -150,6 +150,7 @@ DerivedSources/WebKit2/WebMediaCacheManagerMessages.h \ DerivedSources/WebKit2/WebMediaCacheManagerProxyMessageReceiver.cpp \ DerivedSources/WebKit2/WebMediaCacheManagerProxyMessages.h \ + DerivedSources/WebKit2/WebNotificationManagerMessageReceiver.cpp \ DerivedSources/WebKit2/WebNotificationManagerMessages.h \ DerivedSources/WebKit2/WebNotificationManagerProxyMessageReceiver.cpp \ DerivedSources/WebKit2/WebNotificationManagerProxyMessages.h \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [102564] trunk/Source/JavaScriptCore
Title: [102564] trunk/Source/_javascript_Core Revision 102564 Author carlo...@webkit.org Date 2011-12-12 02:03:13 -0800 (Mon, 12 Dec 2011) Log Message Unreviewed. Fix make distcheck issues. * GNUmakefile.list.am: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/GNUmakefile.list.am Diff Modified: trunk/Source/_javascript_Core/ChangeLog (102563 => 102564) --- trunk/Source/_javascript_Core/ChangeLog 2011-12-12 09:39:39 UTC (rev 102563) +++ trunk/Source/_javascript_Core/ChangeLog 2011-12-12 10:03:13 UTC (rev 102564) @@ -1,3 +1,9 @@ +2011-12-12 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix make distcheck issues. + +* GNUmakefile.list.am: + 2011-12-11 Sam Weinig s...@webkit.org Fix another signed vs. unsigned warning Modified: trunk/Source/_javascript_Core/GNUmakefile.list.am (102563 => 102564) --- trunk/Source/_javascript_Core/GNUmakefile.list.am 2011-12-12 09:39:39 UTC (rev 102563) +++ trunk/Source/_javascript_Core/GNUmakefile.list.am 2011-12-12 10:03:13 UTC (rev 102564) @@ -129,7 +129,6 @@ Source/_javascript_Core/dfg/DFGGPRInfo.h \ Source/_javascript_Core/dfg/DFGGraph.cpp \ Source/_javascript_Core/dfg/DFGGraph.h \ - Source/_javascript_Core/dfg/DFGIntrinsic.h \ Source/_javascript_Core/dfg/DFGJITCompiler.cpp \ Source/_javascript_Core/dfg/DFGJITCompiler.h \ Source/_javascript_Core/dfg/DFGNode.h \ @@ -365,6 +364,7 @@ Source/_javascript_Core/runtime/InitializeThreading.h \ Source/_javascript_Core/runtime/InternalFunction.cpp \ Source/_javascript_Core/runtime/InternalFunction.h \ + Source/_javascript_Core/runtime/Intrinsic.h \ Source/_javascript_Core/runtime/JSActivation.cpp \ Source/_javascript_Core/runtime/JSActivation.h \ Source/_javascript_Core/runtime/JSAPIValueWrapper.cpp \ @@ -650,6 +650,7 @@ Source/_javascript_Core/wtf/TCSpinLock.h \ Source/_javascript_Core/wtf/TCSystemAlloc.cpp \ Source/_javascript_Core/wtf/TCSystemAlloc.h \ + Source/_javascript_Core/wtf/TemporaryChange.h \ Source/_javascript_Core/wtf/text/AtomicString.cpp \ Source/_javascript_Core/wtf/text/AtomicString.h \ Source/_javascript_Core/wtf/text/AtomicStringHash.h \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [102667] trunk/Source/WebKit2
Title: [102667] trunk/Source/WebKit2 Revision 102667 Author carlo...@webkit.org Date 2011-12-13 02:29:57 -0800 (Tue, 13 Dec 2011) Log Message Unreviewed. Fix GTK+ build after r102640. * GNUmakefile.am: Add DownloadProxy sources again. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am Diff Modified: trunk/Source/WebKit2/ChangeLog (102666 => 102667) --- trunk/Source/WebKit2/ChangeLog 2011-12-13 10:24:44 UTC (rev 102666) +++ trunk/Source/WebKit2/ChangeLog 2011-12-13 10:29:57 UTC (rev 102667) @@ -1,3 +1,9 @@ +2011-12-13 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix GTK+ build after r102640. + +* GNUmakefile.am: Add DownloadProxy sources again. + 2011-12-12 Caio Marcelo de Oliveira Filho caio.olive...@openbossa.org [Qt][WK2] Move undo edit command PageClient callbacks into QtWebUndoController Modified: trunk/Source/WebKit2/GNUmakefile.am (102666 => 102667) --- trunk/Source/WebKit2/GNUmakefile.am 2011-12-13 10:24:44 UTC (rev 102666) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-12-13 10:29:57 UTC (rev 102667) @@ -95,6 +95,8 @@ webkit2_built_sources += \ DerivedSources/WebKit2/AuthenticationManagerMessageReceiver.cpp \ DerivedSources/WebKit2/AuthenticationManagerMessages.h \ + DerivedSources/WebKit2/DownloadProxyMessageReceiver.cpp \ + DerivedSources/WebKit2/DownloadProxyMessages.h \ DerivedSources/WebKit2/DrawingAreaMessageReceiver.cpp \ DerivedSources/WebKit2/DrawingAreaMessages.h \ DerivedSources/WebKit2/DrawingAreaProxyMessageReceiver.cpp \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [102673] trunk/Source/WebKit2
Title: [102673] trunk/Source/WebKit2 Revision 102673 Author carlo...@webkit.org Date 2011-12-13 05:23:54 -0800 (Tue, 13 Dec 2011) Log Message [GTK] Initial UI client implementation for WebKit2 GTK +API https://bugs.webkit.org/show_bug.cgi?id=69753 Reviewed by Martin Robinson. * GNUmakefile.am: Add new files to compilation. * UIProcess/API/gtk/WebKitUIClient.cpp: Added. (createNewPage): Call webkitWebViewCreateNewPage. (showPage): Call webkitWebViewReadyToShowPage. (closePage): Call webkitWebViewClosePage. (webkitUIClientAttachUIClientToPage): Initialize UI client and attach it to the given page. (webkit_ui_client_init): (webkit_ui_client_class_init): * UIProcess/API/gtk/WebKitUIClient.h: Added. * UIProcess/API/gtk/WebKitWebView.cpp: (webkitWebViewCreate): Default implementation of signal WebKitWebView::create that simply returns NULL. (webkitWebViewConstructed): Create the default UI client. (webkitWebViewAccumulatorObjectHandled): (webkit_web_view_class_init): (webkitWebViewCreateNewPage): Emit create signal. (webkitWebViewReadyToShowPage): Emit ready-to-show signal. (webkitWebViewClosePage): Emit close signal. * UIProcess/API/gtk/WebKitWebView.h: * UIProcess/API/gtk/WebKitWebViewPrivate.h: * UIProcess/API/gtk/tests/TestWebKitWebView.cpp: (testWebViewCreateReadyClose): (beforeAll): * UIProcess/API/gtk/webkit2marshal.list: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am 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/tests/TestWebKitWebView.cpp trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list Added Paths trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.h Diff Modified: trunk/Source/WebKit2/ChangeLog (102672 => 102673) --- trunk/Source/WebKit2/ChangeLog 2011-12-13 13:13:08 UTC (rev 102672) +++ trunk/Source/WebKit2/ChangeLog 2011-12-13 13:23:54 UTC (rev 102673) @@ -1,3 +1,36 @@ +2011-12-13 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Initial UI client implementation for WebKit2 GTK +API +https://bugs.webkit.org/show_bug.cgi?id=69753 + +Reviewed by Martin Robinson. + +* GNUmakefile.am: Add new files to compilation. +* UIProcess/API/gtk/WebKitUIClient.cpp: Added. +(createNewPage): Call webkitWebViewCreateNewPage. +(showPage): Call webkitWebViewReadyToShowPage. +(closePage): Call webkitWebViewClosePage. +(webkitUIClientAttachUIClientToPage): Initialize UI client and +attach it to the given page. +(webkit_ui_client_init): +(webkit_ui_client_class_init): +* UIProcess/API/gtk/WebKitUIClient.h: Added. +* UIProcess/API/gtk/WebKitWebView.cpp: +(webkitWebViewCreate): Default implementation of signal +WebKitWebView::create that simply returns NULL. +(webkitWebViewConstructed): Create the default UI client. +(webkitWebViewAccumulatorObjectHandled): +(webkit_web_view_class_init): +(webkitWebViewCreateNewPage): Emit create signal. +(webkitWebViewReadyToShowPage): Emit ready-to-show signal. +(webkitWebViewClosePage): Emit close signal. +* UIProcess/API/gtk/WebKitWebView.h: +* UIProcess/API/gtk/WebKitWebViewPrivate.h: +* UIProcess/API/gtk/tests/TestWebKitWebView.cpp: +(testWebViewCreateReadyClose): +(beforeAll): +* UIProcess/API/gtk/webkit2marshal.list: + 2011-12-13 Caio Marcelo de Oliveira Filho caio.olive...@openbossa.org [Qt][WK2] Move load navigation related functions out of QtWebPageProxy Modified: trunk/Source/WebKit2/GNUmakefile.am (102672 => 102673) --- trunk/Source/WebKit2/GNUmakefile.am 2011-12-13 13:13:08 UTC (rev 102672) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-12-13 13:23:54 UTC (rev 102673) @@ -527,6 +527,8 @@ Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp \ Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h \ Source/WebKit2/UIProcess/API/gtk/WebKitSettingsPrivate.h \ + Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp \ + Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.h \ Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp \ Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.h \ Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp \ Added: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp (0 => 102673) --- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp (rev 0) +++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2011-12-13 13:23:54 UTC (rev 102673) @@ -0,0 +1,103 @@ +/* + * 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 Library General Public + * License as published by the Free Software Foundation;
[webkit-changes] [102675] trunk/Source/WebKit2
Title: [102675] trunk/Source/WebKit2
Revision 102675
Author carlo...@webkit.org
Date 2011-12-13 05:31:55 -0800 (Tue, 13 Dec 2011)
Log Message
[GTK] Add support for _javascript_ dialogs in WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=71362
Reviewed by Martin Robinson.
* UIProcess/API/gtk/WebKitUIClient.cpp:
(runJavaScriptAlert): Call webkitWebViewRunJavaScriptAlert().
(runJavaScriptConfirm): Call webkitWebViewRunJavaScriptConfirm().
(runJavaScriptPrompt): Call webkitWebViewRunJavaScriptPrompt().
(webkitUIClientAttachUIClientToPage): Add implementation for
runJavaScriptAlert, runJavaScriptConfirm and runJavaScriptPrompt
callbacks.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewCreateJavaScriptDialog): Helper function to create
_javascript_ dialogs.
(webkitWebViewScriptAlert): Default implementation of signal
WebKitWebView::script-alert that shows a message dialog.
(webkitWebViewScriptConfirm): Default implementation of signal
WebKitWebView::script-confirm that shows a question dialog.
(webkitWebViewScriptPrompt): Default implementation of signal
WebKitWebView::script-prompt that shows a question dialog with a
text entry.
(webkit_web_view_class_init):
(webkitWebViewRunJavaScriptAlert): Emit WebKitWebView::script-alert.
(webkitWebViewRunJavaScriptConfirm): Emit WebKitWebView::script-confirm.
(webkitWebViewRunJavaScriptPrompt): Emit WebKitWebView::script-prompt.
* UIProcess/API/gtk/WebKitWebView.h:
* UIProcess/API/gtk/WebKitWebViewPrivate.h:
* UIProcess/API/gtk/tests/TestWebKitWebView.cpp:
(testWebViewJavaScriptDialogs):
(beforeAll):
* UIProcess/API/gtk/webkit2marshal.list:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.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/tests/TestWebKitWebView.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list
Diff
Modified: trunk/Source/WebKit2/ChangeLog (102674 => 102675)
--- trunk/Source/WebKit2/ChangeLog 2011-12-13 13:28:32 UTC (rev 102674)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-13 13:31:55 UTC (rev 102675)
@@ -1,3 +1,38 @@
+2011-12-13 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Add support for _javascript_ dialogs in WebKit2 GTK+ API
+https://bugs.webkit.org/show_bug.cgi?id=71362
+
+Reviewed by Martin Robinson.
+
+* UIProcess/API/gtk/WebKitUIClient.cpp:
+(runJavaScriptAlert): Call webkitWebViewRunJavaScriptAlert().
+(runJavaScriptConfirm): Call webkitWebViewRunJavaScriptConfirm().
+(runJavaScriptPrompt): Call webkitWebViewRunJavaScriptPrompt().
+(webkitUIClientAttachUIClientToPage): Add implementation for
+runJavaScriptAlert, runJavaScriptConfirm and runJavaScriptPrompt
+callbacks.
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkitWebViewCreateJavaScriptDialog): Helper function to create
+_javascript_ dialogs.
+(webkitWebViewScriptAlert): Default implementation of signal
+WebKitWebView::script-alert that shows a message dialog.
+(webkitWebViewScriptConfirm): Default implementation of signal
+WebKitWebView::script-confirm that shows a question dialog.
+(webkitWebViewScriptPrompt): Default implementation of signal
+WebKitWebView::script-prompt that shows a question dialog with a
+text entry.
+(webkit_web_view_class_init):
+(webkitWebViewRunJavaScriptAlert): Emit WebKitWebView::script-alert.
+(webkitWebViewRunJavaScriptConfirm): Emit WebKitWebView::script-confirm.
+(webkitWebViewRunJavaScriptPrompt): Emit WebKitWebView::script-prompt.
+* UIProcess/API/gtk/WebKitWebView.h:
+* UIProcess/API/gtk/WebKitWebViewPrivate.h:
+* UIProcess/API/gtk/tests/TestWebKitWebView.cpp:
+(testWebViewJavaScriptDialogs):
+(beforeAll):
+* UIProcess/API/gtk/webkit2marshal.list:
+
2011-12-13 Kenneth Rohde Christiansen kenn...@webkit.org
[Qt] Make sure that touch events result in the page view gaining focus
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp (102674 => 102675)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2011-12-13 13:28:32 UTC (rev 102674)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2011-12-13 13:31:55 UTC (rev 102675)
@@ -43,6 +43,22 @@
webkitWebViewClosePage(WEBKIT_WEB_VIEW(toImpl(page)-viewWidget()));
}
+static void runJavaScriptAlert(WKPageRef page, WKStringRef message, WKFrameRef, const void*)
+{
+webkitWebViewRunJavaScriptAlert(WEBKIT_WEB_VIEW(toImpl(page)-viewWidget()), toImpl(message)-string().utf8());
+}
+
+static bool runJavaScriptConfirm(WKPageRef page, WKStringRef message, WKFrameRef, const void*)
+{
+return
[webkit-changes] [102676] trunk/Tools
Title: [102676] trunk/Tools
Revision 102676
Author carlo...@webkit.org
Date 2011-12-13 05:39:49 -0800 (Tue, 13 Dec 2011)
Log Message
Unreviewed. Fix GTK+ API docs build.
* gtk/generate-gtkdoc:
(get_webkit2_options): Ignore WebKitUIClient since it's private
API.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/gtk/generate-gtkdoc
Diff
Modified: trunk/Tools/ChangeLog (102675 => 102676)
--- trunk/Tools/ChangeLog 2011-12-13 13:31:55 UTC (rev 102675)
+++ trunk/Tools/ChangeLog 2011-12-13 13:39:49 UTC (rev 102676)
@@ -1,3 +1,11 @@
+2011-12-13 Carlos Garcia Campos cgar...@igalia.com
+
+Unreviewed. Fix GTK+ API docs build.
+
+* gtk/generate-gtkdoc:
+(get_webkit2_options): Ignore WebKitUIClient since it's private
+API.
+
2011-12-13 Kenichi Ishibashi ba...@chromium.org
Reviewed, removed one of my email addresses to use the apprpriate one.
Modified: trunk/Tools/gtk/generate-gtkdoc (102675 => 102676)
--- trunk/Tools/gtk/generate-gtkdoc 2011-12-13 13:31:55 UTC (rev 102675)
+++ trunk/Tools/gtk/generate-gtkdoc 2011-12-13 13:39:49 UTC (rev 102676)
@@ -60,6 +60,7 @@
' -I' + src_path(),
'ignored_files': glob.glob(src_path('*Private.h')) + \
glob.glob(src_path('PageClientImpl.*')) + \
+ glob.glob(src_path('WebKitUIClient.*')) + \
glob.glob(src_path('tests/*.h'))
})
return (common.build_path('Source', 'WebKit2', 'webkit2gtk-3.0.pc'), options)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88800] trunk/Source
Title: [88800] trunk/Source Revision 88800 Author carlo...@webkit.org Date 2011-06-14 07:36:50 -0700 (Tue, 14 Jun 2011) Log Message 2011-06-14 Carlos Garcia Campos cgar...@igalia.com Reviewed by Martin Robinson. [GTK] Support authentication dialogs in WebKit2 https://bugs.webkit.org/show_bug.cgi?id=62366 Add a new class to show an authentication dialog that is used by both WebKit1 and WebKit2. * GNUmakefile.list.am: Add new files to compilation. * platform/gtk/GtkAuthenticationDialog.cpp: Added. (WebCore::addEntryToTable): (WebCore::sessionCanSavePasswords): (WebCore::GtkAuthenticationDialog::~GtkAuthenticationDialog): (WebCore::GtkAuthenticationDialog::GtkAuthenticationDialog): (WebCore::getSavedLogin): (WebCore::GtkAuthenticationDialog::show): (WebCore::GtkAuthenticationDialog::destroy): (WebCore::GtkAuthenticationDialog::savePasswordCallback): (WebCore::GtkAuthenticationDialog::savePassword): (WebCore::GtkAuthenticationDialog::authenticate): (WebCore::GtkAuthenticationDialog::authenticationDialogResponseCallback): * platform/gtk/GtkAuthenticationDialog.h: Added. 2011-06-14 Carlos Garcia Campos cgar...@igalia.com Reviewed by Martin Robinson. [GTK] Support authentication dialogs in WebKit2 https://bugs.webkit.org/show_bug.cgi?id=62366 Move the common code of webkitsoupauthdialog to a common C++ class in WebCore so that it can be used by WebKit2 too. The file has been converted into a C++ file. * GNUmakefile.am: Rename webkitsoupauthdialog.c to webkitsoupauthdialog.cpp. * webkit/webkitsoupauthdialog.c: Removed. * webkit/webkitsoupauthdialog.cpp: Added. (webkit_soup_auth_dialog_class_init): (webkit_soup_auth_dialog_init): (webkit_soup_auth_dialog_session_feature_init): (sessionAuthenticate): Use GtkAuthenticationDialog object from WebCore. (attach): (detach): * webkit/webkitsoupauthdialog.h: 2011-06-14 Carlos Garcia Campos cgar...@igalia.com Reviewed by Martin Robinson. [GTK] Support authentication dialogs in WebKit2 https://bugs.webkit.org/show_bug.cgi?id=62366 Add a new soup feature to show an authentication dialog when it gets a 401 HTTP response. * GNUmakefile.am: Add new files to compilation. * WebProcess/gtk/WebAuthDialog.cpp: Added. (web_auth_dialog_class_init): (web_auth_dialog_init): (sessionAuthenticate): (attach): (detach): (webAuthDialogSessionFeatureInit): * WebProcess/gtk/WebAuthDialog.h: Added. * WebProcess/gtk/WebProcessMainGtk.cpp: (WebKit::WebProcessMainGtk): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/GNUmakefile.list.am trunk/Source/WebKit/gtk/ChangeLog trunk/Source/WebKit/gtk/GNUmakefile.am trunk/Source/WebKit/gtk/webkit/webkitsoupauthdialog.h trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp Added Paths trunk/Source/WebCore/platform/gtk/GtkAuthenticationDialog.cpp trunk/Source/WebCore/platform/gtk/GtkAuthenticationDialog.h trunk/Source/WebKit/gtk/webkit/webkitsoupauthdialog.cpp trunk/Source/WebKit2/WebProcess/gtk/WebAuthDialog.cpp trunk/Source/WebKit2/WebProcess/gtk/WebAuthDialog.h Removed Paths trunk/Source/WebKit/gtk/webkit/webkitsoupauthdialog.c Diff Modified: trunk/Source/WebCore/ChangeLog (88799 => 88800) --- trunk/Source/WebCore/ChangeLog 2011-06-14 14:07:55 UTC (rev 88799) +++ trunk/Source/WebCore/ChangeLog 2011-06-14 14:36:50 UTC (rev 88800) @@ -1,3 +1,28 @@ +2011-06-14 Carlos Garcia Campos cgar...@igalia.com + +Reviewed by Martin Robinson. + +[GTK] Support authentication dialogs in WebKit2 +https://bugs.webkit.org/show_bug.cgi?id=62366 + +Add a new class to show an authentication dialog that is used by +both WebKit1 and WebKit2. + +* GNUmakefile.list.am: Add new files to compilation. +* platform/gtk/GtkAuthenticationDialog.cpp: Added. +(WebCore::addEntryToTable): +(WebCore::sessionCanSavePasswords): +(WebCore::GtkAuthenticationDialog::~GtkAuthenticationDialog): +(WebCore::GtkAuthenticationDialog::GtkAuthenticationDialog): +(WebCore::getSavedLogin): +(WebCore::GtkAuthenticationDialog::show): +(WebCore::GtkAuthenticationDialog::destroy): +(WebCore::GtkAuthenticationDialog::savePasswordCallback): +(WebCore::GtkAuthenticationDialog::savePassword): +(WebCore::GtkAuthenticationDialog::authenticate): +(WebCore::GtkAuthenticationDialog::authenticationDialogResponseCallback): +* platform/gtk/GtkAuthenticationDialog.h: Added. + 2011-06-14 Tommy Widenflycht tom...@google.com
[webkit-changes] [88802] trunk/Source
Title: [88802] trunk/Source
Revision 88802
Author carlo...@webkit.org
Date 2011-06-14 07:58:30 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[GTK] Rename convertWidgetRectToScreenRect() to convertWidgetPointToScreenPoint()
https://bugs.webkit.org/show_bug.cgi?id=62626
The method actually converts coordinates, the rectangle size is
not affected, so it can be modified to return a point
instead. Fix also a bug in the implementation, it was translating
the coordinates twice returning the wrong position when the given
rectangle was not at 0,0.
* platform/gtk/GtkUtilities.cpp:
(WebCore::convertWidgetPointToScreenPoint):
* platform/gtk/GtkUtilities.h:
* platform/gtk/PopupMenuGtk.cpp:
(WebCore::PopupMenuGtk::show): Use
convertWidgetPointToScreenPoint().
2011-06-14 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[GTK] Rename convertWidgetRectToScreenRect() to convertWidgetPointToScreenPoint()
https://bugs.webkit.org/show_bug.cgi?id=62626
* WebCoreSupport/ChromeClientGtk.cpp:
(WebKit::ChromeClient::windowToScreen): Update to use
convertWidgetPointToScreenPoint()
(WebKit::ChromeClient::screenToWindow): Ditto.
* webkit/webkitwebview.cpp: Remove globalPointForClientPoint()
since it does the same than convertWidgetPointToScreenPoint().
(webkit_web_view_popup_menu_handler): Use
convertWidgetPointToScreenPoint() instead of globalPointForClientPoint().
(doDragLeaveLater): Ditto.
(webkit_web_view_drag_motion): Ditto.
(webkit_web_view_drag_data_received): Ditto.
(webkit_web_view_drag_drop): Ditto.
2011-06-14 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[GTK] Rename convertWidgetRectToScreenRect() to convertWidgetPointToScreenPoint()
https://bugs.webkit.org/show_bug.cgi?id=62626
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::screenToWindow): Implement this method
using convertWidgetPointToScreenPoint().
(WebKit::PageClientImpl::windowToScreen): Update to use
convertWidgetPointToScreenPoint().
* UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
(WebKit::WebPopupMenuProxyGtk::showPopupMenu): Use
convertWidgetPointToScreenPoint().
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp
trunk/Source/WebCore/platform/gtk/GtkUtilities.h
trunk/Source/WebCore/platform/gtk/PopupMenuGtk.cpp
trunk/Source/WebKit/gtk/ChangeLog
trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp
trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (88801 => 88802)
--- trunk/Source/WebCore/ChangeLog 2011-06-14 14:38:30 UTC (rev 88801)
+++ trunk/Source/WebCore/ChangeLog 2011-06-14 14:58:30 UTC (rev 88802)
@@ -2,6 +2,26 @@
Reviewed by Martin Robinson.
+[GTK] Rename convertWidgetRectToScreenRect() to convertWidgetPointToScreenPoint()
+https://bugs.webkit.org/show_bug.cgi?id=62626
+
+The method actually converts coordinates, the rectangle size is
+not affected, so it can be modified to return a point
+instead. Fix also a bug in the implementation, it was translating
+the coordinates twice returning the wrong position when the given
+rectangle was not at 0,0.
+
+* platform/gtk/GtkUtilities.cpp:
+(WebCore::convertWidgetPointToScreenPoint):
+* platform/gtk/GtkUtilities.h:
+* platform/gtk/PopupMenuGtk.cpp:
+(WebCore::PopupMenuGtk::show): Use
+convertWidgetPointToScreenPoint().
+
+2011-06-14 Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Martin Robinson.
+
[GTK] Support authentication dialogs in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=62366
Modified: trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp (88801 => 88802)
--- trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp 2011-06-14 14:38:30 UTC (rev 88801)
+++ trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp 2011-06-14 14:58:30 UTC (rev 88802)
@@ -19,12 +19,12 @@
#include config.h
#include GtkUtilities.h
-#include IntRect.h
+#include IntPoint.h
#include gtk/gtk.h
namespace WebCore {
-IntRect convertWidgetRectToScreenRect(GtkWidget* widget, const IntRect rect)
+IntPoint convertWidgetPointToScreenPoint(GtkWidget* widget, const IntPoint point)
{
// FIXME: This is actually a very tricky operation and the results of this function should
// only be thought of as a guess. For instance, sometimes it may not correctly take into
@@
[webkit-changes] [88803] trunk/Source/WebKit2
Title: [88803] trunk/Source/WebKit2
Revision 88803
Author carlo...@webkit.org
Date 2011-06-14 08:03:51 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[GTK] Move the code to show the context menu from WebKitWebViewBase to WebContextMenuProxyGtk
https://bugs.webkit.org/show_bug.cgi?id=62627
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
* UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
* UIProcess/gtk/WebContextMenuProxyGtk.cpp:
(WebKit::WebContextMenuProxyGtk::showContextMenu):
(WebKit::WebContextMenuProxyGtk::hideContextMenu):
(WebKit::WebContextMenuProxyGtk::WebContextMenuProxyGtk):
(WebKit::WebContextMenuProxyGtk::~WebContextMenuProxyGtk):
(WebKit::WebContextMenuProxyGtk::menuPositionFunction):
* UIProcess/gtk/WebContextMenuProxyGtk.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp
trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (88802 => 88803)
--- trunk/Source/WebKit2/ChangeLog 2011-06-14 14:58:30 UTC (rev 88802)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-14 15:03:51 UTC (rev 88803)
@@ -2,6 +2,23 @@
Reviewed by Martin Robinson.
+[GTK] Move the code to show the context menu from WebKitWebViewBase to WebContextMenuProxyGtk
+https://bugs.webkit.org/show_bug.cgi?id=62627
+
+* UIProcess/API/gtk/WebKitWebViewBase.cpp:
+* UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
+* UIProcess/gtk/WebContextMenuProxyGtk.cpp:
+(WebKit::WebContextMenuProxyGtk::showContextMenu):
+(WebKit::WebContextMenuProxyGtk::hideContextMenu):
+(WebKit::WebContextMenuProxyGtk::WebContextMenuProxyGtk):
+(WebKit::WebContextMenuProxyGtk::~WebContextMenuProxyGtk):
+(WebKit::WebContextMenuProxyGtk::menuPositionFunction):
+* UIProcess/gtk/WebContextMenuProxyGtk.h:
+
+2011-06-14 Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Martin Robinson.
+
[GTK] Rename convertWidgetRectToScreenRect() to convertWidgetPointToScreenPoint()
https://bugs.webkit.org/show_bug.cgi?id=62626
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (88802 => 88803)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2011-06-14 14:58:30 UTC (rev 88802)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2011-06-14 15:03:51 UTC (rev 88803)
@@ -56,7 +56,6 @@
GtkIMContext* imContext;
GtkClickCounter clickCounter;
CString tooltipText;
-IntPoint lastPopupPosition;
};
G_DEFINE_TYPE(WebKitWebViewBase, webkit_web_view_base, GTK_TYPE_CONTAINER)
@@ -386,41 +385,4 @@
#endif
}
-static IntPoint globalPointForClientPoint(GdkWindow* window, const IntPoint clientPoint)
-{
-int x, y;
-gdk_window_get_origin(window, x, y);
-return clientPoint + IntSize(x, y);
-}
-static void popupMenuPositionFunction(GtkMenu* menu, gint* x, gint* y, gboolean* pushIn, gpointer userData)
-{
-WebKitWebViewBase* view = WEBKIT_WEB_VIEW_BASE(userData);
-WebKitWebViewBasePrivate* priv = view-priv;
-GdkScreen* screen = gtk_widget_get_screen(GTK_WIDGET(view));
-GtkRequisition menuSize;
-
-#ifdef GTK_API_VERSION_2
-gtk_widget_size_request(GTK_WIDGET(menu), menuSize);
-#else
-gtk_widget_get_preferred_size(GTK_WIDGET(menu), menuSize, 0);
-#endif
-
-*x = priv-lastPopupPosition.x();
-if ((*x + menuSize.width) = gdk_screen_get_width(screen))
-*x -= menuSize.width;
-
-*y = priv-lastPopupPosition.y();
-if ((*y + menuSize.height) = gdk_screen_get_height(screen))
-*y -= menuSize.height;
-
-*pushIn = FALSE;
-}
-
-void webkitWebViewBaseShowContextMenu(WebKitWebViewBase* webViewBase, GtkMenu* menu, const IntPoint position)
-{
-webViewBase-priv-lastPopupPosition = globalPointForClientPoint(gtk_widget_get_window(GTK_WIDGET(webViewBase)), position);
-
-// Display menu initiated by right click (mouse button pressed = 3).
-gtk_menu_popup(menu, 0, 0, popupMenuPositionFunction, webViewBase, 3, gtk_get_current_event_time());
-}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h (88802 => 88803)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h 2011-06-14 14:58:30 UTC (rev 88802)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h 2011-06-14 15:03:51 UTC (rev 88803)
@@ -46,8 +46,6 @@
void webkitWebViewBaseSetTooltipText(WebKitWebViewBase*, const char*);
-void webkitWebViewBaseShowContextMenu(WebKitWebViewBase*, GtkMenu*, const WebCore::IntPoint);
-
G_END_DECLS
#endif // WebKitWebViewBasePrivate_h
Modified:
[webkit-changes] [88912] trunk/Tools
Title: [88912] trunk/Tools
Revision 88912
Author carlo...@webkit.org
Date 2011-06-15 00:51:35 -0700 (Wed, 15 Jun 2011)
Log Message
2011-06-15 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[GTK] Add a statusbar to MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=62634
It shows the url of the current hovered link.
* MiniBrowser/gtk/BrowserWindow.c:
(browserWindowConstructed): Create the GtkSatusbar.
(mouseDidMoveOverElement): Update statusbar text.
(browserWindowUIClientInit): Add implementation for
mouseDidMoveOverElement().
* MiniBrowser/gtk/GNUmakefile.am: Add new files to compilation.
* MiniBrowser/gtk/WebBundle/WebBundleMain.c: Added.
(mouseDidMoveOverElement): Pass the url of the current hovered
link to the UI process.
(didCreatePage): Set the UI client adding an implementation for
mouseDidMoveOverElement().
(WKBundleInitialize):
* MiniBrowser/gtk/main.c:
(createWKContextWithInjectedBundle): Create a global context with
the injected bundle.
(loadURI): Use the global context.
(main):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/gtk/BrowserWindow.c
trunk/Tools/MiniBrowser/gtk/GNUmakefile.am
trunk/Tools/MiniBrowser/gtk/main.c
Added Paths
trunk/Tools/MiniBrowser/gtk/WebBundle/
trunk/Tools/MiniBrowser/gtk/WebBundle/WebBundleMain.c
Diff
Modified: trunk/Tools/ChangeLog (88911 => 88912)
--- trunk/Tools/ChangeLog 2011-06-15 07:08:41 UTC (rev 88911)
+++ trunk/Tools/ChangeLog 2011-06-15 07:51:35 UTC (rev 88912)
@@ -1,3 +1,30 @@
+2011-06-15 Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Martin Robinson.
+
+[GTK] Add a statusbar to MiniBrowser
+https://bugs.webkit.org/show_bug.cgi?id=62634
+
+It shows the url of the current hovered link.
+
+* MiniBrowser/gtk/BrowserWindow.c:
+(browserWindowConstructed): Create the GtkSatusbar.
+(mouseDidMoveOverElement): Update statusbar text.
+(browserWindowUIClientInit): Add implementation for
+mouseDidMoveOverElement().
+* MiniBrowser/gtk/GNUmakefile.am: Add new files to compilation.
+* MiniBrowser/gtk/WebBundle/WebBundleMain.c: Added.
+(mouseDidMoveOverElement): Pass the url of the current hovered
+link to the UI process.
+(didCreatePage): Set the UI client adding an implementation for
+mouseDidMoveOverElement().
+(WKBundleInitialize):
+* MiniBrowser/gtk/main.c:
+(createWKContextWithInjectedBundle): Create a global context with
+the injected bundle.
+(loadURI): Use the global context.
+(main):
+
2011-06-14 Lucas Forschler lforsch...@apple.com
Reviewed by Stephanie Lewis.
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (88911 => 88912)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-06-15 07:08:41 UTC (rev 88911)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-06-15 07:51:35 UTC (rev 88912)
@@ -36,11 +36,14 @@
struct _BrowserWindow {
GtkWindow parent;
-GtkWidget* mainBox;
-GtkWidget* uriEntry;
+GtkWidget *mainBox;
+GtkWidget *uriEntry;
+GtkWidget *statusBar;
WKViewRef webView;
-gchar* title;
+guint statusBarContextId;
+
+gchar *title;
gdouble loadProgress;
};
@@ -164,6 +167,11 @@
gtk_box_pack_start(GTK_BOX(window-mainBox), GTK_WIDGET(window-webView), TRUE, TRUE, 0);
gtk_widget_show(GTK_WIDGET(window-webView));
+window-statusBar = gtk_statusbar_new();
+window-statusBarContextId = gtk_statusbar_get_context_id(GTK_STATUSBAR(window-statusBar), Link Hover);
+gtk_box_pack_start(GTK_BOX(window-mainBox), window-statusBar, FALSE, FALSE, 0);
+gtk_widget_show(window-statusBar);
+
browserWindowLoaderClientInit(window);
browserWindowUIClientInit(window);
}
@@ -463,6 +471,22 @@
return returnValue;
}
+static void mouseDidMoveOverElement(WKPageRef page, WKEventModifiers modifiers, WKTypeRef userData, const void *clientInfo)
+{
+BrowserWindow *window = BROWSER_WINDOW(clientInfo);
+gtk_statusbar_pop(GTK_STATUSBAR(window-statusBar), window-statusBarContextId);
+
+if (!userData)
+return;
+
+if (WKGetTypeID(userData) != WKURLGetTypeID())
+return;
+
+gchar *link = WKURLGetCString((WKURLRef)userData);
+gtk_statusbar_push(GTK_STATUSBAR(window-statusBar), window-statusBarContextId, link);
+g_free(link);
+}
+
static void browserWindowUIClientInit(BrowserWindow *window)
{
WKPageUIClient uiClient = {
@@ -478,7 +502,7 @@
runJavaScriptConfirm,
runJavaScriptPrompt,
0, /* setStatusText */
-0, /* mouseDidMoveOverElement */
+mouseDidMoveOverElement,
0, /* missingPluginButtonClicked */
0, /* didNotHandleKeyEvent */
0, /*
[webkit-changes] [88917] trunk/Source/WebCore
Title: [88917] trunk/Source/WebCore Revision 88917 Author carlo...@webkit.org Date 2011-06-15 04:02:44 -0700 (Wed, 15 Jun 2011) Log Message 2011-06-15 Carlos Garcia Campos cgar...@igalia.com Unreviewed. Remove unneeded constructor declaration added by mistake in r88800. * platform/gtk/GtkAuthenticationDialog.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/gtk/GtkAuthenticationDialog.h Diff Modified: trunk/Source/WebCore/ChangeLog (88916 => 88917) --- trunk/Source/WebCore/ChangeLog 2011-06-15 10:38:41 UTC (rev 88916) +++ trunk/Source/WebCore/ChangeLog 2011-06-15 11:02:44 UTC (rev 88917) @@ -1,3 +1,9 @@ +2011-06-15 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Remove unneeded constructor declaration added by mistake in r88800. + +* platform/gtk/GtkAuthenticationDialog.h: + 2011-06-15 Pavel Podivilov podivi...@chromium.org Reviewed by Yury Semikhatsky. Modified: trunk/Source/WebCore/platform/gtk/GtkAuthenticationDialog.h (88916 => 88917) --- trunk/Source/WebCore/platform/gtk/GtkAuthenticationDialog.h 2011-06-15 10:38:41 UTC (rev 88916) +++ trunk/Source/WebCore/platform/gtk/GtkAuthenticationDialog.h 2011-06-15 11:02:44 UTC (rev 88917) @@ -42,8 +42,6 @@ void show(); private: -GtkAuthenticationDialog(); - void destroy(); void authenticate(); ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [89123] trunk/Source/WebKit2
Title: [89123] trunk/Source/WebKit2 Revision 89123 Author carlo...@webkit.org Date 2011-06-17 00:45:03 -0700 (Fri, 17 Jun 2011) Log Message 2011-06-17 Carlos Garcia Campos cgar...@igalia.com Unreviewed. Fix WebKit2 GTK build after r89060. * Shared/gtk/WebCoreArgumentCodersGtk.cpp: (CoreIPCencode): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (89122 => 89123) --- trunk/Source/WebKit2/ChangeLog 2011-06-17 06:56:00 UTC (rev 89122) +++ trunk/Source/WebKit2/ChangeLog 2011-06-17 07:45:03 UTC (rev 89123) @@ -1,3 +1,10 @@ +2011-06-17 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix WebKit2 GTK build after r89060. + +* Shared/gtk/WebCoreArgumentCodersGtk.cpp: +(CoreIPCencode): + 2011-06-16 Anders Carlsson ander...@apple.com Reviewed by Sam Weinig. Modified: trunk/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp (89122 => 89123) --- trunk/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp 2011-06-17 06:56:00 UTC (rev 89122) +++ trunk/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp 2011-06-17 07:45:03 UTC (rev 89123) @@ -98,6 +98,7 @@ encoder-encode(resourceResponse.url().string()); encoder-encode(static_castint32_t(resourceResponse.httpStatusCode())); +const HTTPHeaderMap headers = resourceResponse.httpHeaderFields(); encoder-encode(headers); encoder-encode(static_castuint32_t(resourceResponse.soupMessageFlags())); ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [89251] trunk/Source
Title: [89251] trunk/Source Revision 89251 Author carlo...@webkit.org Date 2011-06-20 09:40:08 -0700 (Mon, 20 Jun 2011) Log Message 2011-06-20 Carlos Garcia Campos cgar...@igalia.com Reviewed by Xan Lopez. [GTK] Split libWebCore into two libWebCore and libWebCoreGtk https://bugs.webkit.org/show_bug.cgi?id=60539 libWebCore contains all the webcore files except the ones actually using gtk while libWebCoreGtk contains only the files using gtk. It allows us to build a common WebCore lib and two different gtk WebCore libs depending on the gtk version. In WeKit2 gtk2 is not supported, but the plugin process needs to be built using gtk2 because plugins like flash still use gtk2. For WebKit2, we build the common libWebCore and two libWebCoreGtk, one using gtk3 and the other one using gtk2. * GNUmakefile.am: * GNUmakefile.list.am: 2011-06-20 Carlos Garcia Campos cgar...@igalia.com Reviewed by Xan Lopez. [GTK] Split libWebCore into two libWebCore and libWebCoreGtk https://bugs.webkit.org/show_bug.cgi?id=60539 * GNUmakefile.am: Link to libWebCoreGtk.la too. 2011-06-20 Carlos Garcia Campos cgar...@igalia.com Reviewed by Xan Lopez. [GTK] Split libWebCore into two libWebCore and libWebCoreGtk https://bugs.webkit.org/show_bug.cgi?id=60539 * GNUmakefile.am: Link to libWebCoreGtk.la too. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/GNUmakefile.am trunk/Source/WebCore/GNUmakefile.list.am trunk/Source/WebKit/gtk/ChangeLog trunk/Source/WebKit/gtk/GNUmakefile.am trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am Diff Modified: trunk/Source/WebCore/ChangeLog (89250 => 89251) --- trunk/Source/WebCore/ChangeLog 2011-06-20 16:37:46 UTC (rev 89250) +++ trunk/Source/WebCore/ChangeLog 2011-06-20 16:40:08 UTC (rev 89251) @@ -1,3 +1,22 @@ +2011-06-20 Carlos Garcia Campos cgar...@igalia.com + +Reviewed by Xan Lopez. + +[GTK] Split libWebCore into two libWebCore and libWebCoreGtk +https://bugs.webkit.org/show_bug.cgi?id=60539 + +libWebCore contains all the webcore files except the ones actually +using gtk while libWebCoreGtk contains only the files using +gtk. It allows us to build a common WebCore lib and two different +gtk WebCore libs depending on the gtk version. In WeKit2 gtk2 is +not supported, but the plugin process needs to be built using gtk2 +because plugins like flash still use gtk2. For WebKit2, we build +the common libWebCore and two libWebCoreGtk, one using gtk3 and +the other one using gtk2. + +* GNUmakefile.am: +* GNUmakefile.list.am: + 2011-06-20 Mike Reed r...@google.com Reviewed by Stephen White. Modified: trunk/Source/WebCore/GNUmakefile.am (89250 => 89251) --- trunk/Source/WebCore/GNUmakefile.am 2011-06-20 16:37:46 UTC (rev 89250) +++ trunk/Source/WebCore/GNUmakefile.am 2011-06-20 16:40:08 UTC (rev 89251) @@ -752,8 +752,7 @@ $(webcore_built_sources) libWebCore_la_SOURCES = \ - $(webcore_sources) \ - $(webcoregtk_sources) + $(webcore_sources) libWebCore_la_CXXFLAGS = \ $(SYMBOL_VISIBILITY_INLINES) \ @@ -770,6 +769,46 @@ $(webcoregtk_cppflags) \ $(_javascript_core_cppflags) \ -fno-strict-aliasing \ + $(CAIRO_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(ENCHANT_CFLAGS) \ + $(GEOCLUE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GSTREAMER_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ + $(LIBXML_CFLAGS) \ + $(LIBXSLT_CFLAGS) \ + $(SQLITE3_CFLAGS) \ + $(UNICODE_CFLAGS) \ + $(XRENDER_CFLAGS) \ + $(XT_CFLAGS) + +# We have a different library with only the files that require GTK+. It allows us +# to build a common WebCore lib and two different gtk WebCore libs depending on +# the gtk version. In WeKit2 gtk2 is not supported, but the plugin process needs to +# be built using gtk2 because plugins like flash still use gtk2. For WebKit2, we build +# the common libWebCore and two libWebCoreGtk, one using gtk3 and the other one using gtk2. +noinst_LTLIBRARIES += \ + libWebCoreGtk.la + +libWebCoreGtk_la_SOURCES = \ + $(webcoregtk_sources) + +libWebCoreGtk_la_CXXFLAGS = \ + $(SYMBOL_VISIBILITY_INLINES) \ + $(global_cxxflags) + +libWebCoreGtk_la_CFLAGS = \ + $(SYMBOL_VISIBILITY) \ + $(global_cflags) + +libWebCoreGtk_la_CPPFLAGS = \ + -DBUILDING_WEBKIT \ + $(global_cppflags) \ + $(webcore_cppflags) \ + $(webcoregtk_cppflags) \ + $(_javascript_core_cppflags) \ + -fno-strict-aliasing \ $(HILDON_CPPFLAGS) \ $(COVERAGE_CFLAGS) \ $(ENCHANT_CFLAGS) \ Modified: trunk/Source/WebCore/GNUmakefile.list.am (89250 => 89251) --- trunk/Source/WebCore/GNUmakefile.list.am 2011-06-20 16:37:46 UTC (rev 89250) +++ trunk/Source/WebCore/GNUmakefile.list.am 2011-06-20 16:40:08 UTC (rev 89251) @@ -1365,7 +1365,6 @@ Source/WebCore/editing/FormatBlockCommand.h \ Source/WebCore/editing/FrameSelection.cpp \
[webkit-changes] [89255] trunk/Tools
Title: [89255] trunk/Tools
Revision 89255
Author carlo...@webkit.org
Date 2011-06-20 10:35:31 -0700 (Mon, 20 Jun 2011)
Log Message
2011-06-20 Carlos Garcia Campos cgar...@igalia.com
Unreviewed. Fix WebKit2 GTK build after r89249.
* GtkLauncher/main.c:
(main):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/GtkLauncher/main.c
Diff
Modified: trunk/Tools/ChangeLog (89254 => 89255)
--- trunk/Tools/ChangeLog 2011-06-20 17:18:47 UTC (rev 89254)
+++ trunk/Tools/ChangeLog 2011-06-20 17:35:31 UTC (rev 89255)
@@ -1,3 +1,10 @@
+2011-06-20 Carlos Garcia Campos cgar...@igalia.com
+
+Unreviewed. Fix WebKit2 GTK build after r89249.
+
+* GtkLauncher/main.c:
+(main):
+
2011-06-20 Pavel Feldman pfeld...@chromium.org
Reviewed by Yury Semikhatsky.
Modified: trunk/Tools/GtkLauncher/main.c (89254 => 89255)
--- trunk/Tools/GtkLauncher/main.c 2011-06-20 17:18:47 UTC (rev 89254)
+++ trunk/Tools/GtkLauncher/main.c 2011-06-20 17:35:31 UTC (rev 89255)
@@ -239,6 +239,7 @@
return fileURL;
}
+#ifndef WEBKIT2
gboolean parseOptionEntryCallback(const gchar *optionNameFull, const gchar *value, gpointer data, GError **error)
{
WebKitWebSettings *webkitSettings = (WebKitWebSettings *)data;
@@ -368,6 +369,8 @@
g_array_free(optionEntriesArray, TRUE);
return TRUE;
}
+#endif
+
int main(int argc, char* argv[])
{
WebKitWebView *webView;
@@ -392,8 +395,10 @@
main_window = createWindow(webView);
+#ifndef WEBKIT2
if (!parseAdditionalOptions(webView, argc, argv))
return 1;
+#endif
gchar *uri =(gchar*)(argc 1 ? argv[1] : http://www.google.com/);
gchar *fileURL = filenameToURL(uri);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [89256] trunk/Source/WebKit2
Title: [89256] trunk/Source/WebKit2
Revision 89256
Author carlo...@webkit.org
Date 2011-06-20 10:49:13 -0700 (Mon, 20 Jun 2011)
Log Message
2011-06-20 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[UNIX] Don't use WebCore::PluginPackage to get plugin information
https://bugs.webkit.org/show_bug.cgi?id=62899
The problem is that both PluginPackage in WebCore and
NetscapePluginModule in webkit2 install their own netscape browser
functions and that can cause conflicts in some situations.
* Shared/Plugins/Netscape/NetscapePluginModule.h: Add helper
function to set plugin mime type descriptions.
* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
(WebKit::NetscapePluginModule::setMIMEDescription): Helper
function to set plugin mime type descriptions.
(WebKit::NetscapePluginModule::getPluginInfo): Use
NetscapePluginModule instead of PluginPackage.
* UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp: Remove unneeded
header include.
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::NPN_GetValue): Do not try to get the XDisplay if the
plugin doesn't have a view. It fixes a crash with flash plugin and
matches WebCore.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h
trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (89255 => 89256)
--- trunk/Source/WebKit2/ChangeLog 2011-06-20 17:35:31 UTC (rev 89255)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-20 17:49:13 UTC (rev 89256)
@@ -1,5 +1,30 @@
2011-06-20 Carlos Garcia Campos cgar...@igalia.com
+Reviewed by Martin Robinson.
+
+[UNIX] Don't use WebCore::PluginPackage to get plugin information
+https://bugs.webkit.org/show_bug.cgi?id=62899
+
+The problem is that both PluginPackage in WebCore and
+NetscapePluginModule in webkit2 install their own netscape browser
+functions and that can cause conflicts in some situations.
+
+* Shared/Plugins/Netscape/NetscapePluginModule.h: Add helper
+function to set plugin mime type descriptions.
+* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
+(WebKit::NetscapePluginModule::setMIMEDescription): Helper
+function to set plugin mime type descriptions.
+(WebKit::NetscapePluginModule::getPluginInfo): Use
+NetscapePluginModule instead of PluginPackage.
+* UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp: Remove unneeded
+header include.
+* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+(WebKit::NPN_GetValue): Do not try to get the XDisplay if the
+plugin doesn't have a view. It fixes a crash with flash plugin and
+matches WebCore.
+
+2011-06-20 Carlos Garcia Campos cgar...@igalia.com
+
Reviewed by Xan Lopez.
[GTK] Split libWebCore into two libWebCore and libWebCoreGtk
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h (89255 => 89256)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h 2011-06-20 17:35:31 UTC (rev 89255)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h 2011-06-20 17:49:13 UTC (rev 89256)
@@ -68,6 +68,7 @@
#if PLUGIN_ARCHITECTURE(X11)
void applyX11QuirksBeforeLoad();
+static void setMIMEDescription(const String mimeDescription, PluginModuleInfo);
#endif
bool tryGetSitesWithData(VectorString);
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (89255 => 89256)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2011-06-20 17:35:31 UTC (rev 89255)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2011-06-20 17:49:13 UTC (rev 89256)
@@ -28,8 +28,8 @@
#include NetscapePluginModule.h
-#include PluginDatabase.h
-#include PluginPackage.h
+#include NetscapeBrowserFuncs.h
+#include WebCore/FileSystem.h
#if PLATFORM(QT)
#include QLibrary
@@ -93,6 +93,31 @@
#endif
}
+void NetscapePluginModule::setMIMEDescription(const String mimeDescription, PluginModuleInfo plugin)
+{
+VectorString types;
+mimeDescription.lower().split(UChar(';'), false, types);
+plugin.info.mimes.reserveCapacity(types.size());
+
+size_t mimeInfoCount = 0;
+for (size_t i = 0; i types.size(); ++i) {
+VectorString mimeTypeParts;
+types[i].split(UChar(':'), true, mimeTypeParts);
+if (mimeTypeParts.size() = 0)
+continue;
+
+plugin.info.mimes.uncheckedAppend(MimeClassInfo());
+MimeClassInfo mimeInfo =
[webkit-changes] [89417] trunk/Source/WebKit/gtk
Title: [89417] trunk/Source/WebKit/gtk Revision 89417 Author carlo...@webkit.org Date 2011-06-22 03:22:15 -0700 (Wed, 22 Jun 2011) Log Message 2011-06-22 Carlos Garcia Campos cgar...@igalia.com Reviewed by Xan Lopez. [GTK] Make sure libsoup password manager macro is defined before including libsoup in webkitsoupauthdialog https://bugs.webkit.org/show_bug.cgi?id=63124 Fixes a crash when building with --enable-debug. * webkit/webkitsoupauthdialog.h: Define LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY before including libsoup.h. Modified Paths trunk/Source/WebKit/gtk/ChangeLog trunk/Source/WebKit/gtk/webkit/webkitsoupauthdialog.h Diff Modified: trunk/Source/WebKit/gtk/ChangeLog (89416 => 89417) --- trunk/Source/WebKit/gtk/ChangeLog 2011-06-22 10:16:09 UTC (rev 89416) +++ trunk/Source/WebKit/gtk/ChangeLog 2011-06-22 10:22:15 UTC (rev 89417) @@ -1,3 +1,16 @@ +2011-06-22 Carlos Garcia Campos cgar...@igalia.com + +Reviewed by Xan Lopez. + +[GTK] Make sure libsoup password manager macro is defined before including libsoup in webkitsoupauthdialog +https://bugs.webkit.org/show_bug.cgi?id=63124 + +Fixes a crash when building with --enable-debug. + +* webkit/webkitsoupauthdialog.h: Define +LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY +before including libsoup.h. + 2011-06-10 Martin Robinson mrobin...@igalia.com Reviewed by Xan Lopez. Modified: trunk/Source/WebKit/gtk/webkit/webkitsoupauthdialog.h (89416 => 89417) --- trunk/Source/WebKit/gtk/webkit/webkitsoupauthdialog.h 2011-06-22 10:16:09 UTC (rev 89416) +++ trunk/Source/WebKit/gtk/webkit/webkitsoupauthdialog.h 2011-06-22 10:22:15 UTC (rev 89417) @@ -21,6 +21,7 @@ #define webkitsoupauthdialog_h #include gtk/gtk.h +#define LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY #include libsoup/soup.h #include webkit/webkitdefines.h ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [89432] trunk/Tools
Title: [89432] trunk/Tools
Revision 89432
Author carlo...@webkit.org
Date 2011-06-22 08:27:54 -0700 (Wed, 22 Jun 2011)
Log Message
2011-06-22 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[GTK] Use GOption to parse main arguments in GtkLauncher
https://bugs.webkit.org/show_bug.cgi?id=63060
Instead of getting the settings from the view, create a new
settings object not associated with any view so that we can parse
the command line arguments before creating the view. It will also
allows to use the same settings for more than one view if we
eventually support passing more than one uri from the command
line.
* GtkLauncher/main.c:
(parseOptionEntryCallback): Make this function static. Also use
g_ascii_strtoll/g_ascii_strtod to parse int/float values instead
of atoi/atof to provide better error messages. And always fill the
error struct when the function fails.
(getOptionEntriesFromWebKitWebSettings): Use an array of
GOptionEntry structs instead of a GArray, since that is what
g_option_group_add_entries() expects and the array size doesn't
change.
(addWebSettingsGroupToContext): Helper function to add the
websettings group to the option context.
(main): Create the option context to parse command line arguments.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/GtkLauncher/main.c
Diff
Modified: trunk/Tools/ChangeLog (89431 => 89432)
--- trunk/Tools/ChangeLog 2011-06-22 15:24:53 UTC (rev 89431)
+++ trunk/Tools/ChangeLog 2011-06-22 15:27:54 UTC (rev 89432)
@@ -1,3 +1,30 @@
+2011-06-22 Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Martin Robinson.
+
+[GTK] Use GOption to parse main arguments in GtkLauncher
+https://bugs.webkit.org/show_bug.cgi?id=63060
+
+Instead of getting the settings from the view, create a new
+settings object not associated with any view so that we can parse
+the command line arguments before creating the view. It will also
+allows to use the same settings for more than one view if we
+eventually support passing more than one uri from the command
+line.
+
+* GtkLauncher/main.c:
+(parseOptionEntryCallback): Make this function static. Also use
+g_ascii_strtoll/g_ascii_strtod to parse int/float values instead
+of atoi/atof to provide better error messages. And always fill the
+error struct when the function fails.
+(getOptionEntriesFromWebKitWebSettings): Use an array of
+GOptionEntry structs instead of a GArray, since that is what
+g_option_group_add_entries() expects and the array size doesn't
+change.
+(addWebSettingsGroupToContext): Helper function to add the
+websettings group to the option context.
+(main): Create the option context to parse command line arguments.
+
2011-06-22 Martin Robinson mrobin...@igalia.com
Reviewed by Adam Roben.
Modified: trunk/Tools/GtkLauncher/main.c (89431 => 89432)
--- trunk/Tools/GtkLauncher/main.c 2011-06-22 15:24:53 UTC (rev 89431)
+++ trunk/Tools/GtkLauncher/main.c 2011-06-22 15:27:54 UTC (rev 89432)
@@ -25,6 +25,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include errno.h
#include gtk/gtk.h
#include stdlib.h
#include string.h
@@ -240,52 +241,85 @@
}
#ifndef WEBKIT2
-gboolean parseOptionEntryCallback(const gchar *optionNameFull, const gchar *value, gpointer data, GError **error)
+static gboolean parseOptionEntryCallback(const gchar *optionNameFull, const gchar *value, WebKitWebSettings *webSettings, GError **error)
{
-WebKitWebSettings *webkitSettings = (WebKitWebSettings *)data;
-
-g_assert(webkitSettings);
-
-if (strlen(optionNameFull) = 2)
+if (strlen(optionNameFull) = 2) {
+g_set_error(error, G_OPTION_ERROR, G_OPTION_ERROR_FAILED, Invalid option %s, optionNameFull);
return FALSE;
+}
/* We have two -- in option name so remove them. */
const gchar *optionName = optionNameFull + 2;
-GParamSpec *spec = g_object_class_find_property(G_OBJECT_GET_CLASS(webkitSettings), optionName);
-if (!spec)
+GParamSpec *spec = g_object_class_find_property(G_OBJECT_GET_CLASS(webSettings), optionName);
+if (!spec) {
+g_set_error(error, G_OPTION_ERROR, G_OPTION_ERROR_FAILED, Cannot find web settings for option %s, optionNameFull);
return FALSE;
+}
-/* Convert string to proper type. */
-GValue valueString = {0, {{0}}};
-GValue valueProperty = {0, {{0}}};
-g_value_init(valueString, G_TYPE_STRING);
-g_value_init(valueProperty, G_PARAM_SPEC_VALUE_TYPE(spec));
-g_value_set_static_string(valueString, value);
-if (!g_value_transform(valueString, valueProperty))
-return FALSE;
+switch
[webkit-changes] [89433] trunk/Source/WebKit2
Title: [89433] trunk/Source/WebKit2
Revision 89433
Author carlo...@webkit.org
Date 2011-06-22 08:44:04 -0700 (Wed, 22 Jun 2011)
Log Message
2011-06-22 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[GTK] Remove Connection::setShouldCloseConnectionOnProcessTermination()
https://bugs.webkit.org/show_bug.cgi?id=61627
Don't use Connection::setShouldCloseConnectionOnProcessTermination() for the
GTK port, when the process finishes the connection is closed and
the other process is already notified. We still need to monitor
the child process so that it doesn't become a zombie when it dntabi
* Platform/CoreIPC/Connection.h:
* Platform/CoreIPC/unix/ConnectionUnix.cpp:
* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
(WebKit::childFinishedFunction):
(WebKit::ProcessLauncher::launchProcess):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::didFinishLaunching):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/CoreIPC/Connection.h
trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp
trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (89432 => 89433)
--- trunk/Source/WebKit2/ChangeLog 2011-06-22 15:27:54 UTC (rev 89432)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-22 15:44:04 UTC (rev 89433)
@@ -1,3 +1,23 @@
+2011-06-22 Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Martin Robinson.
+
+[GTK] Remove Connection::setShouldCloseConnectionOnProcessTermination()
+https://bugs.webkit.org/show_bug.cgi?id=61627
+
+Don't use Connection::setShouldCloseConnectionOnProcessTermination() for the
+GTK port, when the process finishes the connection is closed and
+the other process is already notified. We still need to monitor
+the child process so that it doesn't become a zombie when it dntabi
+
+* Platform/CoreIPC/Connection.h:
+* Platform/CoreIPC/unix/ConnectionUnix.cpp:
+* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+(WebKit::childFinishedFunction):
+(WebKit::ProcessLauncher::launchProcess):
+* UIProcess/WebProcessProxy.cpp:
+(WebKit::WebProcessProxy::didFinishLaunching):
+
2011-06-20 Dimitri Glazkov dglaz...@chromium.org
Reviewed by Kent Tamura.
Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.h (89432 => 89433)
--- trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2011-06-22 15:27:54 UTC (rev 89432)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2011-06-22 15:44:04 UTC (rev 89433)
@@ -118,7 +118,7 @@
#if PLATFORM(MAC)
void setShouldCloseConnectionOnMachExceptions();
-#elif PLATFORM(QT) || PLATFORM(GTK)
+#elif PLATFORM(QT)
void setShouldCloseConnectionOnProcessTermination(WebKit::PlatformProcessIdentifier);
#endif
Modified: trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp (89432 => 89433)
--- trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp 2011-06-22 15:27:54 UTC (rev 89432)
+++ trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp 2011-06-22 15:44:04 UTC (rev 89433)
@@ -457,7 +457,7 @@
return true;
}
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(QT)
void Connection::setShouldCloseConnectionOnProcessTermination(WebKit::PlatformProcessIdentifier process)
{
m_connectionQueue.scheduleWorkOnTermination(process, WorkItem::create(this, Connection::connectionDidClose));
Modified: trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (89432 => 89433)
--- trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2011-06-22 15:27:54 UTC (rev 89432)
+++ trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2011-06-22 15:44:04 UTC (rev 89433)
@@ -56,6 +56,14 @@
#endif
}
+static void childFinishedFunction(GPid, gint status, gpointer userData)
+{
+if (WIFEXITED(status) !WEXITSTATUS(status))
+return;
+
+close(GPOINTER_TO_INT(userData));
+}
+
void ProcessLauncher::launchProcess()
{
GPid pid = 0;
@@ -83,6 +91,11 @@
close(sockets[0]);
m_processIdentifier = pid;
+
+// Monitor the child process, it calls waitpid to prevent the child process from becomming a zombie,
+// and it allows us to close the socket when the child process crashes.
+g_child_watch_add(m_processIdentifier, childFinishedFunction, GINT_TO_POINTER(sockets[1]));
+
// We've finished launching the process, message back to the main run loop.
RunLoop::main()-scheduleWork(WorkItem::create(this, ProcessLauncher::didFinishLaunchingProcess, m_processIdentifier, sockets[1]));
}
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (89432 => 89433)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2011-06-22 15:27:54 UTC (rev 89432)
+++
[webkit-changes] [89537] trunk/Source/WebKit2
Title: [89537] trunk/Source/WebKit2
Revision 89537
Author carlo...@webkit.org
Date 2011-06-22 23:44:36 -0700 (Wed, 22 Jun 2011)
Log Message
2011-06-22 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[UNIX] Check for npp directly when getting X display in NetscapeBrowserFuncs
https://bugs.webkit.org/show_bug.cgi?id=63149
NetscapePlugin::fromNPP() shouldn't be called with a null npp, it
contains an assert that make it crash when building with debug enabled.
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::NPN_GetValue):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (89536 => 89537)
--- trunk/Source/WebKit2/ChangeLog 2011-06-23 06:31:46 UTC (rev 89536)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-23 06:44:36 UTC (rev 89537)
@@ -1,3 +1,16 @@
+2011-06-22 Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Martin Robinson.
+
+[UNIX] Check for npp directly when getting X display in NetscapeBrowserFuncs
+https://bugs.webkit.org/show_bug.cgi?id=63149
+
+NetscapePlugin::fromNPP() shouldn't be called with a null npp, it
+contains an assert that make it crash when building with debug enabled.
+
+* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+(WebKit::NPN_GetValue):
+
2011-06-22 Nate Chapin jap...@chromium.org
Reviewed by Adam Barth.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (89536 => 89537)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2011-06-23 06:31:46 UTC (rev 89536)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2011-06-23 06:44:36 UTC (rev 89537)
@@ -504,8 +504,7 @@
break;
#elif PLUGIN_ARCHITECTURE(X11)
case NPNVxDisplay: {
- RefPtrNetscapePlugin plugin = NetscapePlugin::fromNPP(npp);
- if (!plugin)
+ if (!npp)
return NPERR_GENERIC_ERROR;
#if PLATFORM(QT)
*reinterpret_castDisplay**(value) = QX11Info::display();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [89539] trunk/Source/WebKit2
Title: [89539] trunk/Source/WebKit2
Revision 89539
Author carlo...@webkit.org
Date 2011-06-22 23:46:56 -0700 (Wed, 22 Jun 2011)
Log Message
2011-06-22 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[UNIX] Increment/decrement module load conter in NetscapePluginModule::getPluginInfo()
https://bugs.webkit.org/show_bug.cgi?id=63150
Since the method is static, we are using
NetscapePluginModule::getOrCreate() to get the module. If it's
created, the load counter is 0, so that when module is deleted,
shutdown() hasn't been called and the destructor crashes in the
assert that checks the module has been removed from the
initialized module list. We should increment the load counter, and
decrement it before getPluginInfo() returns, so that
decrementLoadCount() will call shutdown() if counter is 0 and the
module will be deleted from the list.
* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
(WebKit::NetscapePluginModule::getPluginInfo):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (89538 => 89539)
--- trunk/Source/WebKit2/ChangeLog 2011-06-23 06:46:55 UTC (rev 89538)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-23 06:46:56 UTC (rev 89539)
@@ -2,6 +2,26 @@
Reviewed by Martin Robinson.
+[UNIX] Increment/decrement module load conter in NetscapePluginModule::getPluginInfo()
+https://bugs.webkit.org/show_bug.cgi?id=63150
+
+Since the method is static, we are using
+NetscapePluginModule::getOrCreate() to get the module. If it's
+created, the load counter is 0, so that when module is deleted,
+shutdown() hasn't been called and the destructor crashes in the
+assert that checks the module has been removed from the
+initialized module list. We should increment the load counter, and
+decrement it before getPluginInfo() returns, so that
+decrementLoadCount() will call shutdown() if counter is 0 and the
+module will be deleted from the list.
+
+* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
+(WebKit::NetscapePluginModule::getPluginInfo):
+
+2011-06-22 Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Martin Robinson.
+
[UNIX] Check for npp directly when getting X display in NetscapeBrowserFuncs
https://bugs.webkit.org/show_bug.cgi?id=63149
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (89538 => 89539)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2011-06-23 06:46:55 UTC (rev 89538)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2011-06-23 06:46:56 UTC (rev 89539)
@@ -130,17 +130,23 @@
if (!pluginModule)
return false;
+pluginModule-incrementLoadCount();
+
plugin.path = pluginPath;
plugin.info.file = pathGetFileName(pluginPath);
Module* module = pluginModule-module();
NPP_GetValueProcPtr NPP_GetValue = module-functionPointerNPP_GetValueProcPtr(NP_GetValue);
-if (!NPP_GetValue)
+if (!NPP_GetValue) {
+pluginModule-decrementLoadCount();
return false;
+}
NP_GetMIMEDescriptionFuncPtr NP_GetMIMEDescription = module-functionPointerNP_GetMIMEDescriptionFuncPtr(NP_GetMIMEDescription);
-if (!NP_GetMIMEDescription)
+if (!NP_GetMIMEDescription) {
+pluginModule-decrementLoadCount();
return false;
+}
char* buffer = 0;
NPError err = NPP_GetValue(0, NPPVpluginDescriptionString, buffer);
@@ -148,11 +154,15 @@
plugin.info.desc = buffer;
const char* mimeDescription = NP_GetMIMEDescription();
-if (!mimeDescription)
+if (!mimeDescription) {
+pluginModule-decrementLoadCount();
return false;
+}
setMIMEDescription(mimeDescription, plugin);
+pluginModule-decrementLoadCount();
+
return true;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [89580] trunk/Source/WebKit2
Title: [89580] trunk/Source/WebKit2 Revision 89580 Author carlo...@webkit.org Date 2011-06-23 09:41:49 -0700 (Thu, 23 Jun 2011) Log Message 2011-06-23 Carlos Garcia Campos cgar...@igalia.com Reviewed by Martin Robinson. [UNIX] Fix compile warnings in NetscapePluginX11.cpp https://bugs.webkit.org/show_bug.cgi?id=63249 * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp: (WebKit::setXButtonEventFields): (WebKit::NetscapePlugin::platformHandleMouseEvent): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (89579 => 89580) --- trunk/Source/WebKit2/ChangeLog 2011-06-23 16:35:35 UTC (rev 89579) +++ trunk/Source/WebKit2/ChangeLog 2011-06-23 16:41:49 UTC (rev 89580) @@ -1,3 +1,14 @@ +2011-06-23 Carlos Garcia Campos cgar...@igalia.com + +Reviewed by Martin Robinson. + +[UNIX] Fix compile warnings in NetscapePluginX11.cpp +https://bugs.webkit.org/show_bug.cgi?id=63249 + +* WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp: +(WebKit::setXButtonEventFields): +(WebKit::NetscapePlugin::platformHandleMouseEvent): + 2011-06-22 Carlos Garcia Campos cgar...@igalia.com Reviewed by Martin Robinson. Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (89579 => 89580) --- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2011-06-23 16:35:35 UTC (rev 89579) +++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2011-06-23 16:41:49 UTC (rev 89580) @@ -359,6 +359,9 @@ case WebMouseEvent::RightButton: xButton.button = Button3; break; +default: +ASSERT_NOT_REACHED(); +break; } } @@ -409,6 +412,23 @@ case WebEvent::MouseMove: setXMotionEventFields(xEvent, event, m_frameRect.location()); break; +case WebEvent::NoType: +case WebEvent::Wheel: +case WebEvent::KeyDown: +case WebEvent::KeyUp: +case WebEvent::RawKeyDown: +case WebEvent::Char: +#if ENABLE(GESTURE_EVENTS) +case WebEvent::GestureScrollBegin: +case WebEvent::GestureScrollEnd: +#endif +#if ENABLE(TOUCH_EVENTS) +case WebEvent::TouchStart: +case WebEvent::TouchMove: +case WebEvent::TouchEnd: +case WebEvent::TouchCancel: +#endif +return false; } return NPP_HandleEvent(xEvent); ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [89654] trunk/Tools
Title: [89654] trunk/Tools Revision 89654 Author carlo...@webkit.org Date 2011-06-24 00:09:35 -0700 (Fri, 24 Jun 2011) Log Message 2011-06-24 Carlos Garcia Campos cgar...@igalia.com Unreviewed. Fix WebKit2 GTK build. * WebKitTestRunner/GNUmakefile.am: Modified Paths trunk/Tools/ChangeLog trunk/Tools/WebKitTestRunner/GNUmakefile.am Diff Modified: trunk/Tools/ChangeLog (89653 => 89654) --- trunk/Tools/ChangeLog 2011-06-24 06:43:34 UTC (rev 89653) +++ trunk/Tools/ChangeLog 2011-06-24 07:09:35 UTC (rev 89654) @@ -1,3 +1,9 @@ +2011-06-24 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix WebKit2 GTK build. + +* WebKitTestRunner/GNUmakefile.am: + 2011-06-23 Ryuan Choi ryuan.c...@samsung.com Unreviewed, add myself as committer. Modified: trunk/Tools/WebKitTestRunner/GNUmakefile.am (89653 => 89654) --- trunk/Tools/WebKitTestRunner/GNUmakefile.am 2011-06-24 06:43:34 UTC (rev 89653) +++ trunk/Tools/WebKitTestRunner/GNUmakefile.am 2011-06-24 07:09:35 UTC (rev 89654) @@ -90,6 +90,7 @@ -I$(srcdir)/Tools/WebKitTestRunner \ -I$(srcdir)/Tools/WebKitTestRunner/InjectedBundle \ -I$(srcdir)/Tools/WebKitTestRunner/InjectedBundle/Bindings \ + -I$(srcdir)/Source/WebCore/testing/js \ -I$(top_builddir)/DerivedSources/InjectedBundle \ -I$(top_builddir)/DerivedSources/WebKit2/include \ $(global_cppflags) \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [89673] trunk/Source/WebCore
Title: [89673] trunk/Source/WebCore
Revision 89673
Author carlo...@webkit.org
Date 2011-06-24 08:42:28 -0700 (Fri, 24 Jun 2011)
Log Message
2011-06-24 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[GTK] Fix runtime critical warnings in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=63256
Check whether there's a view widget before trying to use it in
PlatformScreenGtk. If there isn't a view widget, which is the case
in WebKit2, try to use the default GdkScreen and monitor.
* platform/gtk/PlatformScreenGtk.cpp:
(WebCore::getToplevel): Helper function to get the toplevel
widget.
(WebCore::getVisual): Use getToplevel().
(WebCore::getScreen): Helper funtion to get the screen of a
widget.
(WebCore::screenRect): Use getToplevel() and getScreen().
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (89672 => 89673)
--- trunk/Source/WebCore/ChangeLog 2011-06-24 14:14:48 UTC (rev 89672)
+++ trunk/Source/WebCore/ChangeLog 2011-06-24 15:42:28 UTC (rev 89673)
@@ -1,3 +1,22 @@
+2011-06-24 Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Martin Robinson.
+
+[GTK] Fix runtime critical warnings in WebKit2
+https://bugs.webkit.org/show_bug.cgi?id=63256
+
+Check whether there's a view widget before trying to use it in
+PlatformScreenGtk. If there isn't a view widget, which is the case
+in WebKit2, try to use the default GdkScreen and monitor.
+
+* platform/gtk/PlatformScreenGtk.cpp:
+(WebCore::getToplevel): Helper function to get the toplevel
+widget.
+(WebCore::getVisual): Use getToplevel().
+(WebCore::getScreen): Helper funtion to get the screen of a
+widget.
+(WebCore::screenRect): Use getToplevel() and getScreen().
+
2011-06-24 Yuta Kitamura yu...@chromium.org
Reviewed by Adam Barth.
Modified: trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp (89672 => 89673)
--- trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp 2011-06-24 14:14:48 UTC (rev 89672)
+++ trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp 2011-06-24 15:42:28 UTC (rev 89673)
@@ -45,25 +45,26 @@
namespace WebCore {
+static GtkWidget* getToplevel(GtkWidget* widget)
+{
+GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
+return gtk_widget_is_toplevel(toplevel) ? toplevel : 0;
+}
+
static GdkVisual* getVisual(Widget* widget)
{
if (!widget)
return 0;
GtkWidget* container = GTK_WIDGET(widget-root()-hostWindow()-platformPageClient());
-
-if (!container)
-return 0;
-
-if (!gtk_widget_get_realized(container)) {
-GtkWidget* toplevel = gtk_widget_get_toplevel(container);
-if (gtk_widget_is_toplevel(toplevel))
-container = toplevel;
-else
-return 0;
+if (!container) {
+GdkScreen* screen = gdk_screen_get_default();
+return screen ? gdk_screen_get_system_visual(screen) : 0;
}
-return gdk_window_get_visual(gtk_widget_get_window(container));
+if (!gtk_widget_get_realized(container))
+container = getToplevel(container);
+return container ? gdk_window_get_visual(gtk_widget_get_window(container)) : 0;
}
int screenDepth(Widget* widget)
@@ -88,23 +89,30 @@
return screenDepth(widget) 2;
}
+
+static GdkScreen* getScreen(GtkWidget* widget)
+{
+return gtk_widget_has_screen(widget) ? gtk_widget_get_screen(widget) : gdk_screen_get_default();
+}
+
FloatRect screenRect(Widget* widget)
{
if (!widget)
return FloatRect();
-GtkWidget* container = gtk_widget_get_toplevel(GTK_WIDGET(widget-root()-hostWindow()-platformPageClient()));
-if (!gtk_widget_is_toplevel(container))
-return FloatRect();
+GtkWidget* container = GTK_WIDGET(widget-root()-hostWindow()-platformPageClient());
+if (container)
+container = getToplevel(container);
-GdkScreen* screen = gtk_widget_has_screen(container) ? gtk_widget_get_screen(container) : gdk_screen_get_default();
+GdkScreen* screen = container ? getScreen(container) : gdk_screen_get_default();
if (!screen)
return FloatRect();
-gint monitor = gdk_screen_get_monitor_at_window(screen, gtk_widget_get_window(GTK_WIDGET(container)));
+gint monitor = container ? gdk_screen_get_monitor_at_window(screen, gtk_widget_get_window(container)) : 0;
+
GdkRectangle geometry;
gdk_screen_get_monitor_geometry(screen, monitor, geometry);
-
+
return FloatRect(geometry.x, geometry.y, geometry.width, geometry.height);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [89678] trunk/Source/WebKit2
Title: [89678] trunk/Source/WebKit2 Revision 89678 Author carlo...@webkit.org Date 2011-06-24 09:26:59 -0700 (Fri, 24 Jun 2011) Log Message 2011-06-24 Carlos Garcia Campos cgar...@igalia.com Reviewed by Martin Robinson. [X11] Do not call NPP_SetWindow with a null window handle on destroy https://bugs.webkit.org/show_bug.cgi?id=62981 * WebProcess/Plugins/Netscape/NetscapePlugin.cpp: (WebKit::NetscapePlugin::destroy): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (89677 => 89678) --- trunk/Source/WebKit2/ChangeLog 2011-06-24 16:09:26 UTC (rev 89677) +++ trunk/Source/WebKit2/ChangeLog 2011-06-24 16:26:59 UTC (rev 89678) @@ -1,3 +1,13 @@ +2011-06-24 Carlos Garcia Campos cgar...@igalia.com + +Reviewed by Martin Robinson. + +[X11] Do not call NPP_SetWindow with a null window handle on destroy +https://bugs.webkit.org/show_bug.cgi?id=62981 + +* WebProcess/Plugins/Netscape/NetscapePlugin.cpp: +(WebKit::NetscapePlugin::destroy): + 2011-06-23 Jamie Cooley james.coo...@nokia.com Reviewed by Andreas Kling. Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (89677 => 89678) --- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2011-06-24 16:09:26 UTC (rev 89677) +++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2011-06-24 16:26:59 UTC (rev 89678) @@ -513,7 +513,7 @@ // Stop all streams. stopAllStreams(); -#if !PLUGIN_ARCHITECTURE(MAC) +#if !PLUGIN_ARCHITECTURE(MAC) !PLUGIN_ARCHITECTURE(X11) m_npWindow.window = 0; callSetWindow(); #endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [90109] trunk/Tools
Title: [90109] trunk/Tools
Revision 90109
Author carlo...@webkit.org
Date 2011-06-30 06:02:47 -0700 (Thu, 30 Jun 2011)
Log Message
2011-06-30 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Martin Robinson.
[GTK] Add back/forward menu to MiniBrowser toolbar
https://bugs.webkit.org/show_bug.cgi?id=63445
* MiniBrowser/gtk/BrowserWindow.c:
(browser_window_init): Use a GtkMenuToolButton for navigation
widgets.
(browserWindowConstructed): Get the page BackForwardList.
(browserWindowHistoryItemActivated): Go to activated history item.
(browserWindowHistoryItemSelected): Show the url of currently
selected history item in the statusbar.
(createGtkActionFromBackForwardItem): Create a GtkAction from a
WKBackForwardListItemRef.
(browserWindowCreateMenuItemFromBackForwardItem): Create a
GtkMenuItem from a WKBackForwardListItemRef.
(browserWindowCreateBackForwardMenu): Create a GtkMenu with the
given history items.
(browserWindowUpdateNavigationActions): Update navigation widgets
sensitivity and history menus.
(didChangeBackForwardList): Call
browserWindowUpdateNavigationActions().
(browserWindowLoaderClientInit): Add didChangeBackForwardList
callback.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/gtk/BrowserWindow.c
Diff
Modified: trunk/Tools/ChangeLog (90108 => 90109)
--- trunk/Tools/ChangeLog 2011-06-30 12:55:39 UTC (rev 90108)
+++ trunk/Tools/ChangeLog 2011-06-30 13:02:47 UTC (rev 90109)
@@ -1,3 +1,30 @@
+2011-06-30 Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Martin Robinson.
+
+[GTK] Add back/forward menu to MiniBrowser toolbar
+https://bugs.webkit.org/show_bug.cgi?id=63445
+
+* MiniBrowser/gtk/BrowserWindow.c:
+(browser_window_init): Use a GtkMenuToolButton for navigation
+widgets.
+(browserWindowConstructed): Get the page BackForwardList.
+(browserWindowHistoryItemActivated): Go to activated history item.
+(browserWindowHistoryItemSelected): Show the url of currently
+selected history item in the statusbar.
+(createGtkActionFromBackForwardItem): Create a GtkAction from a
+WKBackForwardListItemRef.
+(browserWindowCreateMenuItemFromBackForwardItem): Create a
+GtkMenuItem from a WKBackForwardListItemRef.
+(browserWindowCreateBackForwardMenu): Create a GtkMenu with the
+given history items.
+(browserWindowUpdateNavigationActions): Update navigation widgets
+sensitivity and history menus.
+(didChangeBackForwardList): Call
+browserWindowUpdateNavigationActions().
+(browserWindowLoaderClientInit): Add didChangeBackForwardList
+callback.
+
2011-06-30 Dmitry Lomov dslo...@google.com
Reviewed by Adam Roben.
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (90108 => 90109)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-06-30 12:55:39 UTC (rev 90108)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-06-30 13:02:47 UTC (rev 90109)
@@ -39,9 +39,12 @@
GtkWidget *mainBox;
GtkWidget *uriEntry;
GtkWidget *statusBar;
+GtkWidget *backItem;
+GtkWidget *forwardItem;
WKViewRef webView;
guint statusBarContextId;
+WKBackForwardListRef history;
gchar *title;
gdouble loadProgress;
@@ -129,12 +132,16 @@
#endif
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ);
-GtkToolItem *item = gtk_tool_button_new_from_stock(GTK_STOCK_GO_BACK);
+GtkToolItem *item = gtk_menu_tool_button_new_from_stock(GTK_STOCK_GO_BACK);
+window-backItem = GTK_WIDGET(item);
+gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(item), 0);
g_signal_connect_swapped(item, clicked, G_CALLBACK(goBackCallback), (gpointer)window);
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
gtk_widget_show(GTK_WIDGET(item));
-item = gtk_tool_button_new_from_stock(GTK_STOCK_GO_FORWARD);
+item = gtk_menu_tool_button_new_from_stock(GTK_STOCK_GO_FORWARD);
+window-forwardItem = GTK_WIDGET(item);
+gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(item), 0);
g_signal_connect_swapped(G_OBJECT(item), clicked, G_CALLBACK(goForwardCallback), (gpointer)window);
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
gtk_widget_show(GTK_WIDGET(item));
@@ -172,6 +179,8 @@
gtk_box_pack_start(GTK_BOX(window-mainBox), window-statusBar, FALSE, FALSE, 0);
gtk_widget_show(window-statusBar);
+window-history = WKPageGetBackForwardList(WKViewGetPage(window-webView));
+
browserWindowLoaderClientInit(window);
browserWindowUIClientInit(window);
}
@@ -249,6 +258,111 @@
g_free(urlText);
}
+static void browserWindowHistoryItemActivated(BrowserWindow *window, GtkAction *action)
+{
+WKBackForwardListItemRef item =
[webkit-changes] [90216] trunk/Tools
Title: [90216] trunk/Tools
Revision 90216
Author carlo...@webkit.org
Date 2011-07-01 00:50:49 -0700 (Fri, 01 Jul 2011)
Log Message
2011-07-01 Carlos Garcia Campos cgar...@igalia.com
Unreviewed. Fix WebKit2 GTK build after r90163.
* MiniBrowser/gtk/WebBundle/WebBundleMain.c:
(didCreatePage):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/gtk/WebBundle/WebBundleMain.c
Diff
Modified: trunk/Tools/ChangeLog (90215 => 90216)
--- trunk/Tools/ChangeLog 2011-07-01 07:47:55 UTC (rev 90215)
+++ trunk/Tools/ChangeLog 2011-07-01 07:50:49 UTC (rev 90216)
@@ -1,3 +1,10 @@
+2011-07-01 Carlos Garcia Campos cgar...@igalia.com
+
+Unreviewed. Fix WebKit2 GTK build after r90163.
+
+* MiniBrowser/gtk/WebBundle/WebBundleMain.c:
+(didCreatePage):
+
2011-07-01 Adam Barth aba...@webkit.org
Exit faster when we get a keyboard interrupt. Previously, we'd open
Modified: trunk/Tools/MiniBrowser/gtk/WebBundle/WebBundleMain.c (90215 => 90216)
--- trunk/Tools/MiniBrowser/gtk/WebBundle/WebBundleMain.c 2011-07-01 07:47:55 UTC (rev 90215)
+++ trunk/Tools/MiniBrowser/gtk/WebBundle/WebBundleMain.c 2011-07-01 07:50:49 UTC (rev 90216)
@@ -41,7 +41,7 @@
{
WKBundlePageUIClient uiClient;
memset(uiClient, 0, sizeof(uiClient));
-uiClient.version = WKBundlePageUIClientCurrentVersion;
+uiClient.version = kWKBundlePageUIClientCurrentVersion;
uiClient.mouseDidMoveOverElement = mouseDidMoveOverElement;
WKBundlePageSetUIClient(page, uiClient);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [90551] trunk/Tools
Title: [90551] trunk/Tools
Revision 90551
Author carlo...@webkit.org
Date 2011-07-07 03:29:19 -0700 (Thu, 07 Jul 2011)
Log Message
2011-07-07 Carlos Garcia Campos cgar...@igalia.com
[GTK] Open links in a new window when clicking with the middle button in MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=63988
Reviewed by Martin Robinson.
* MiniBrowser/gtk/BrowserWindow.c:
(browserWindowConstructed):
(decidePolicyForNavigationAction): Ignore the action if a link is
clicked with the middle buttonm and open the link in a new window.
(browserWindowPolicyClientInit):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/gtk/BrowserWindow.c
Diff
Modified: trunk/Tools/ChangeLog (90550 => 90551)
--- trunk/Tools/ChangeLog 2011-07-07 09:06:37 UTC (rev 90550)
+++ trunk/Tools/ChangeLog 2011-07-07 10:29:19 UTC (rev 90551)
@@ -1,3 +1,16 @@
+2011-07-07 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Open links in a new window when clicking with the middle button in MiniBrowser
+https://bugs.webkit.org/show_bug.cgi?id=63988
+
+Reviewed by Martin Robinson.
+
+* MiniBrowser/gtk/BrowserWindow.c:
+(browserWindowConstructed):
+(decidePolicyForNavigationAction): Ignore the action if a link is
+clicked with the middle buttonm and open the link in a new window.
+(browserWindowPolicyClientInit):
+
2011-07-07 Adam Barth aba...@webkit.org
Remove style_references.py
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (90550 => 90551)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-07-07 09:06:37 UTC (rev 90550)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-07-07 10:29:19 UTC (rev 90551)
@@ -56,6 +56,7 @@
static void browserWindowLoaderClientInit(BrowserWindow*);
static void browserWindowUIClientInit(BrowserWindow*);
+static void browserWindowPolicyClientInit(BrowserWindow*);
static gint windowCount = 0;
@@ -183,6 +184,7 @@
browserWindowLoaderClientInit(window);
browserWindowUIClientInit(window);
+browserWindowPolicyClientInit(window);
}
static void browser_window_class_init(BrowserWindowClass* klass)
@@ -654,6 +656,37 @@
WKPageSetPageUIClient(WKViewGetPage(window-webView), uiClient);
}
+static void decidePolicyForNavigationAction(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
+{
+if (navigationType != kWKFrameNavigationTypeLinkClicked || mouseButton != kWKEventMouseButtonMiddleButton) {
+WKFramePolicyListenerUse(listener);
+return;
+}
+
+WKViewRef webView = WKViewCreate(WKPageGetContext(page), 0);
+GtkWidget *window = browser_window_new(webView);
+WKURLRef url = ""
+WKPageLoadURL(WKViewGetPage(webView), url);
+WKRelease(url);
+gtk_widget_grab_focus(GTK_WIDGET(webView));
+gtk_widget_show(window);
+
+WKFramePolicyListenerIgnore(listener);
+}
+
+static void browserWindowPolicyClientInit(BrowserWindow* window)
+{
+WKPagePolicyClient policyClient = {
+kWKPagePolicyClientCurrentVersion,
+window, /* clientInfo */
+decidePolicyForNavigationAction,
+0, /* decidePolicyForNewWindowAction */
+0, /* decidePolicyForResponse */
+0 /* unableToImplementPolicy */
+};
+WKPageSetPagePolicyClient(WKViewGetPage(window-webView), policyClient);
+}
+
// Public API.
GtkWidget* browser_window_new(WKViewRef view)
{
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [91011] trunk/Tools
Title: [91011] trunk/Tools Revision 91011 Author carlo...@webkit.org Date 2011-07-14 10:40:21 -0700 (Thu, 14 Jul 2011) Log Message 2011-07-14 Carlos Garcia Campos cgar...@igalia.com Unreviewed. Fix WebKit2 GTK build after r90953. * WebKitTestRunner/GNUmakefile.am: Modified Paths trunk/Tools/ChangeLog trunk/Tools/WebKitTestRunner/GNUmakefile.am Diff Modified: trunk/Tools/ChangeLog (91010 => 91011) --- trunk/Tools/ChangeLog 2011-07-14 17:32:13 UTC (rev 91010) +++ trunk/Tools/ChangeLog 2011-07-14 17:40:21 UTC (rev 91011) @@ -1,3 +1,9 @@ +2011-07-14 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix WebKit2 GTK build after r90953. + +* WebKitTestRunner/GNUmakefile.am: + 2011-07-14 Adam Barth aba...@webkit.org garden-o-matic results pane should be more discoverable Modified: trunk/Tools/WebKitTestRunner/GNUmakefile.am (91010 => 91011) --- trunk/Tools/WebKitTestRunner/GNUmakefile.am 2011-07-14 17:32:13 UTC (rev 91010) +++ trunk/Tools/WebKitTestRunner/GNUmakefile.am 2011-07-14 17:40:21 UTC (rev 91011) @@ -55,10 +55,10 @@ DerivedSources/InjectedBundle/JSEventSendingController.cpp \ DerivedSources/InjectedBundle/JSGCController.cpp \ DerivedSources/InjectedBundle/JSLayoutTestController.cpp -BUILT_SOURCES += $(injected_bundle_built_sources) +BUILT_SOURCES += $(nodist_injected_bundle_built_sources) Libraries_libTestRunnerInjectedBundle_la_SOURCES = \ - $(injected_bundle_built_sources) \ + $(nodist_injected_bundle_built_sources) \ Tools/WebKitTestRunner/InjectedBundle/ActivateFonts.h \ Tools/WebKitTestRunner/InjectedBundle/Bindings/JSWrappable.h \ Tools/WebKitTestRunner/InjectedBundle/Bindings/JSWrapper.cpp \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [91013] trunk/Source/WebKit2
Title: [91013] trunk/Source/WebKit2
Revision 91013
Author carlo...@webkit.org
Date 2011-07-14 10:44:29 -0700 (Thu, 14 Jul 2011)
Log Message
Reviewed by Anders Carlsson.
Implement plugin process for UNIX platform
https://bugs.webkit.org/show_bug.cgi?id=60629
* Platform/CoreIPC/Attachment.h:
* Platform/CoreIPC/unix/AttachmentUnix.cpp:
(CoreIPC::Attachment::Attachment): Add the ability to pass a
socket via Attachment.
* Platform/unix/SharedMemoryUnix.cpp:
(WebKit::SharedMemory::Handle::encode): Remove assertions that
check that the Handle is not null. In
PluginProxy::geometryDidChange we pass a null Handle if we do not
need to allocate a new backing store.
(WebKit::SharedMemory::Handle::releaseToAttachment): Ditto.
* PluginProcess/PluginProcess.cpp:
(WebKit::PluginProcess::createWebProcessConnection): Use
Attachment. Set up the connection with socketpair.
* UIProcess/Plugins/PluginProcessProxy.cpp:
(WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch):
(WebKit::PluginProcessProxy::didCreateWebProcessConnection):
* UIProcess/Plugins/PluginProcessProxy.h:
* UIProcess/Plugins/PluginProcessProxy.messages.in:
* UIProcess/WebProcessProxy.messages.in:
* WebProcess/Plugins/PluginProcessConnectionManager.cpp:
(WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
Use Attachment to pass the connection.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/CoreIPC/Attachment.h
trunk/Source/WebKit2/Platform/CoreIPC/unix/AttachmentUnix.cpp
trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp
trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp
trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in
trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in
trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (91012 => 91013)
--- trunk/Source/WebKit2/ChangeLog 2011-07-14 17:42:12 UTC (rev 91012)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-14 17:44:29 UTC (rev 91013)
@@ -1,3 +1,33 @@
+2011-07-14 Balazs Kelemen kbal...@webkit.org and Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Anders Carlsson.
+
+Implement plugin process for UNIX platform
+https://bugs.webkit.org/show_bug.cgi?id=60629
+
+* Platform/CoreIPC/Attachment.h:
+* Platform/CoreIPC/unix/AttachmentUnix.cpp:
+(CoreIPC::Attachment::Attachment): Add the ability to pass a
+socket via Attachment.
+* Platform/unix/SharedMemoryUnix.cpp:
+(WebKit::SharedMemory::Handle::encode): Remove assertions that
+check that the Handle is not null. In
+PluginProxy::geometryDidChange we pass a null Handle if we do not
+need to allocate a new backing store.
+(WebKit::SharedMemory::Handle::releaseToAttachment): Ditto.
+* PluginProcess/PluginProcess.cpp:
+(WebKit::PluginProcess::createWebProcessConnection): Use
+Attachment. Set up the connection with socketpair.
+* UIProcess/Plugins/PluginProcessProxy.cpp:
+(WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch):
+(WebKit::PluginProcessProxy::didCreateWebProcessConnection):
+* UIProcess/Plugins/PluginProcessProxy.h:
+* UIProcess/Plugins/PluginProcessProxy.messages.in:
+* UIProcess/WebProcessProxy.messages.in:
+* WebProcess/Plugins/PluginProcessConnectionManager.cpp:
+(WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
+Use Attachment to pass the connection.
+
2011-07-14 Ada Chan adac...@apple.com
Implement support to center selection on a page for WebKit2.
Modified: trunk/Source/WebKit2/Platform/CoreIPC/Attachment.h (91012 => 91013)
--- trunk/Source/WebKit2/Platform/CoreIPC/Attachment.h 2011-07-14 17:42:12 UTC (rev 91012)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Attachment.h 2011-07-14 17:44:29 UTC (rev 91013)
@@ -41,7 +41,8 @@
MachPortType,
MachOOLMemoryType,
#elif USE(UNIX_DOMAIN_SOCKETS)
-MappedMemory
+SocketType,
+MappedMemoryType
#endif
};
@@ -50,6 +51,7 @@
Attachment(void* address, mach_msg_size_t size, mach_msg_copy_options_t copyOptions, bool deallocate);
#elif USE(UNIX_DOMAIN_SOCKETS)
Attachment(int fileDescriptor, size_t);
+Attachment(int fileDescriptor);
#endif
Type type() const { return m_type; }
Modified: trunk/Source/WebKit2/Platform/CoreIPC/unix/AttachmentUnix.cpp (91012 => 91013)
--- trunk/Source/WebKit2/Platform/CoreIPC/unix/AttachmentUnix.cpp 2011-07-14 17:42:12 UTC (rev 91012)
+++ trunk/Source/WebKit2/Platform/CoreIPC/unix/AttachmentUnix.cpp 2011-07-14 17:44:29 UTC (rev 91013)
@@ -33,14 +33,19 @@
namespace CoreIPC {
Attachment::Attachment(int fileDescriptor, size_t size)
-: m_type(MappedMemory)
+:
[webkit-changes] [91015] trunk
Title: [91015] trunk Revision 91015 Author carlo...@webkit.org Date 2011-07-14 10:49:47 -0700 (Thu, 14 Jul 2011) Log Message Reviewed by Martin Robinson. [GTK] Implement Plugin Process https://bugs.webkit.org/show_bug.cgi?id=60546 .: * configure.ac: Always check for gtk2 when building the plugin process. Source/WebKit2: * GNUmakefile.am: Add new files to compilation. * PluginProcess/gtk/PluginProcessMainGtk.cpp: Added. (WebKit::PluginProcessMainGtk): * PluginProcess/gtk/PluginProcessMainGtk.h: Added. * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp: (WebKit::ProcessLauncher::launchProcess): * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp: (WebKit::moduleMixesGtkSymbols): * gtk/PluginMainGtk.cpp: Added. (main): Modified Paths trunk/ChangeLog trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp trunk/configure.ac Added Paths trunk/Source/WebKit2/PluginProcess/gtk/PluginProcessMainGtk.cpp trunk/Source/WebKit2/PluginProcess/gtk/PluginProcessMainGtk.h trunk/Source/WebKit2/gtk/PluginMainGtk.cpp Diff Modified: trunk/ChangeLog (91014 => 91015) --- trunk/ChangeLog 2011-07-14 17:45:04 UTC (rev 91014) +++ trunk/ChangeLog 2011-07-14 17:49:47 UTC (rev 91015) @@ -1,3 +1,13 @@ +2011-07-14 Carlos Garcia Campos cgar...@igalia.com + +Reviewed by Martin Robinson. + +[GTK] Implement Plugin Process +https://bugs.webkit.org/show_bug.cgi?id=60546 + +* configure.ac: Always check for gtk2 when building the plugin +process. + 2011-07-14 MORITA Hajime morr...@google.com Unreviewed, rolling out r90976, r90981, and r90985. Modified: trunk/Source/WebKit2/ChangeLog (91014 => 91015) --- trunk/Source/WebKit2/ChangeLog 2011-07-14 17:45:04 UTC (rev 91014) +++ trunk/Source/WebKit2/ChangeLog 2011-07-14 17:49:47 UTC (rev 91015) @@ -1,3 +1,21 @@ +2011-07-14 Carlos Garcia Campos cgar...@igalia.com + +Reviewed by Martin Robinson. + +[GTK] Implement Plugin Process +https://bugs.webkit.org/show_bug.cgi?id=60546 + +* GNUmakefile.am: Add new files to compilation. +* PluginProcess/gtk/PluginProcessMainGtk.cpp: Added. +(WebKit::PluginProcessMainGtk): +* PluginProcess/gtk/PluginProcessMainGtk.h: Added. +* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp: +(WebKit::ProcessLauncher::launchProcess): +* WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp: +(WebKit::moduleMixesGtkSymbols): +* gtk/PluginMainGtk.cpp: Added. +(main): + 2011-07-14 Balazs Kelemen kbal...@webkit.org and Carlos Garcia Campos cgar...@igalia.com Reviewed by Anders Carlsson. Modified: trunk/Source/WebKit2/GNUmakefile.am (91014 => 91015) --- trunk/Source/WebKit2/GNUmakefile.am 2011-07-14 17:45:04 UTC (rev 91014) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-07-14 17:49:47 UTC (rev 91015) @@ -978,6 +978,7 @@ Programs_WebKitWebProcess_CFLAGS = \ $(global_cflags) \ + $(CAIRO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GTK_CFLAGS) \ $(LIBSOUP_CFLAGS) @@ -994,3 +995,225 @@ Programs_WebKitWebProcess_LDFLAGS = \ -no-fast-install \ -no-install + +# PluginProcess +if ENABLE_PLUGIN_PROCESS + +# We need to make sure plugin process is always built with gtk2, because plugins like flash +# still use gtk2. Since webcore was built with gtk3, we need to build webcoregtk sources again with gtk2 +noinst_LTLIBRARIES += \ + libWebCoreGtk2.la + +libWebCoreGtk2_la_SOURCES = \ + $(webcoregtk_sources) + +libWebCoreGtk2_la_CXXFLAGS = \ + $(SYMBOL_VISIBILITY_INLINES) \ + $(global_cxxflags) + +libWebCoreGtk2_la_CFLAGS = \ + $(SYMBOL_VISIBILITY) \ + $(global_cflags) + +libWebCoreGtk2_la_CPPFLAGS = \ + -DBUILDING_WEBKIT \ + -DGTK_API_VERSION_2=1 \ + $(global_cppflags) \ + $(webcore_cppflags) \ + $(webcoregtk_cppflags) \ + $(_javascript_core_cppflags) \ + -fno-strict-aliasing \ + $(COVERAGE_CFLAGS) \ + $(ENCHANT_CFLAGS) \ + $(GEOCLUE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GSTREAMER_CFLAGS) \ + $(GTK2_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ + $(LIBXML_CFLAGS) \ + $(LIBXSLT_CFLAGS) \ + $(SQLITE3_CFLAGS) \ + $(UNICODE_CFLAGS) \ + $(XRENDER_CFLAGS) \ + $(XT_CFLAGS) + +plugin_process_built_sources = \ + DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp \ + DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h \ + DerivedSources/WebKit2/PluginControllerProxyMessageReceiver.cpp \ + DerivedSources/WebKit2/PluginControllerProxyMessages.h \ + DerivedSources/WebKit2/PluginProcessMessageReceiver.cpp \ + DerivedSources/WebKit2/PluginProcessMessages.h \ + DerivedSources/WebKit2/WebProcessConnectionMessageReceiver.cpp \ + DerivedSources/WebKit2/WebProcessConnectionMessages.h + +bin_PROGRAMS += \ + Programs/WebKitPluginProcess + +Programs_WebKitPluginProcess_CPPFLAGS = \ + -include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \ + -I$(srcdir)/Source/WebKit2 \ +
[webkit-changes] [91016] trunk/Source/WebKit2
Title: [91016] trunk/Source/WebKit2
Revision 91016
Author carlo...@webkit.org
Date 2011-07-14 10:52:53 -0700 (Thu, 14 Jul 2011)
Log Message
Reviewed by Anders Carlsson.
[UNIX] Allow sending null handles in messages
https://bugs.webkit.org/show_bug.cgi?id=60621
Only valid file descriptors are now sent using sendmsg() control
messages, and instead of sending a list of attachment sizes we now
send a list of AttachmentInfo structs. AttachmentInfo contains
information about the attachments including the size for
MappedMemory attachmens and whether the attachment is null or not.
* Platform/CoreIPC/unix/ConnectionUnix.cpp:
(CoreIPC::AttachmentInfo::AttachmentInfo): New class containing
information about the attachments sent.
(CoreIPC::AttachmentInfo::setType): Set the attachment type.
(CoreIPC::AttachmentInfo::getType): Return the attachment type.
(CoreIPC::AttachmentInfo::setSize): Set the size for MappedMemory attachments.
(CoreIPC::AttachmentInfo::getSize): Get the size for MappedMemory attachments.
(CoreIPC::AttachmentInfo::setNull): Set attachment as null, it
contains an invalid file descriptor, so the receiver shouldn't
expect a file desriptor for this attachment.
(CoreIPC::AttachmentInfo::isNull): Return whether attachment is
null, it contains an invalid file descriptor.
(CoreIPC::Connection::processMessage):
(CoreIPC::Connection::sendOutgoingMessage):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (91015 => 91016)
--- trunk/Source/WebKit2/ChangeLog 2011-07-14 17:49:47 UTC (rev 91015)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-14 17:52:53 UTC (rev 91016)
@@ -1,5 +1,33 @@
2011-07-14 Carlos Garcia Campos cgar...@igalia.com
+Reviewed by Anders Carlsson.
+
+[UNIX] Allow sending null handles in messages
+https://bugs.webkit.org/show_bug.cgi?id=60621
+
+Only valid file descriptors are now sent using sendmsg() control
+messages, and instead of sending a list of attachment sizes we now
+send a list of AttachmentInfo structs. AttachmentInfo contains
+information about the attachments including the size for
+MappedMemory attachmens and whether the attachment is null or not.
+
+* Platform/CoreIPC/unix/ConnectionUnix.cpp:
+(CoreIPC::AttachmentInfo::AttachmentInfo): New class containing
+information about the attachments sent.
+(CoreIPC::AttachmentInfo::setType): Set the attachment type.
+(CoreIPC::AttachmentInfo::getType): Return the attachment type.
+(CoreIPC::AttachmentInfo::setSize): Set the size for MappedMemory attachments.
+(CoreIPC::AttachmentInfo::getSize): Get the size for MappedMemory attachments.
+(CoreIPC::AttachmentInfo::setNull): Set attachment as null, it
+contains an invalid file descriptor, so the receiver shouldn't
+expect a file desriptor for this attachment.
+(CoreIPC::AttachmentInfo::isNull): Return whether attachment is
+null, it contains an invalid file descriptor.
+(CoreIPC::Connection::processMessage):
+(CoreIPC::Connection::sendOutgoingMessage):
+
+2011-07-14 Carlos Garcia Campos cgar...@igalia.com
+
Reviewed by Martin Robinson.
[GTK] Implement Plugin Process
Modified: trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp (91015 => 91016)
--- trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp 2011-07-14 17:49:47 UTC (rev 91015)
+++ trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp 2011-07-14 17:52:53 UTC (rev 91016)
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2010 Apple Inc. All rights reserved.
* Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2011 Igalia S.L.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -89,6 +90,39 @@
size_t m_attachmentCount;
};
+class AttachmentInfo {
+public:
+AttachmentInfo()
+: m_type(Attachment::Uninitialized)
+, m_size(0)
+, m_isNull(false)
+{
+}
+
+void setType(Attachment::Type type) { m_type = type; }
+Attachment::Type getType() { return m_type; }
+void setSize(size_t size)
+{
+ASSERT(m_type == Attachment::MappedMemoryType);
+m_size = size;
+}
+
+size_t getSize()
+{
+ASSERT(m_type == Attachment::MappedMemoryType);
+return m_size;
+}
+
+// The attachment is not null unless explicitly set.
+void setNull() { m_isNull = true; }
+bool isNull() { return m_isNull; }
+
+private:
+Attachment::Type m_type;
+size_t m_size;
+bool m_isNull;
+};
+
void Connection::platformInitialize(Identifier identifier)
{
m_socketDescriptor = identifier;
@@ -169,7 +203,7 @@
memcpy(messageInfo, messageData, sizeof(messageInfo));
messageData +=
[webkit-changes] [91062] trunk/Source/WebKit2
Title: [91062] trunk/Source/WebKit2
Revision 91062
Author carlo...@webkit.org
Date 2011-07-15 03:40:36 -0700 (Fri, 15 Jul 2011)
Log Message
Reviewed by Martin Robinson.
[GTK] Install a custom X error handler in plugin process
https://bugs.webkit.org/show_bug.cgi?id=63248
Some plugins, specially flash, can cause X errors that when
handled by the default X error handler (or the GDK one) abort the
process. Since we don't want to crash due to buggy plugins, we
install a custom error handler to show a warning when a X error
happens without aborting.
* PluginProcess/gtk/PluginProcessMainGtk.cpp:
(WebKit::webkitgtkXError):
(WebKit::PluginProcessMainGtk):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/PluginProcess/gtk/PluginProcessMainGtk.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (91061 => 91062)
--- trunk/Source/WebKit2/ChangeLog 2011-07-15 10:06:31 UTC (rev 91061)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-15 10:40:36 UTC (rev 91062)
@@ -1,3 +1,20 @@
+2011-07-15 Carlos Garcia Campos cgar...@igalia.com
+
+Reviewed by Martin Robinson.
+
+[GTK] Install a custom X error handler in plugin process
+https://bugs.webkit.org/show_bug.cgi?id=63248
+
+Some plugins, specially flash, can cause X errors that when
+handled by the default X error handler (or the GDK one) abort the
+process. Since we don't want to crash due to buggy plugins, we
+install a custom error handler to show a warning when a X error
+happens without aborting.
+
+* PluginProcess/gtk/PluginProcessMainGtk.cpp:
+(WebKit::webkitgtkXError):
+(WebKit::PluginProcessMainGtk):
+
2011-07-14 Carlos Garcia Campos cgar...@igalia.com
Reviewed by Anders Carlsson.
Modified: trunk/Source/WebKit2/PluginProcess/gtk/PluginProcessMainGtk.cpp (91061 => 91062)
--- trunk/Source/WebKit2/PluginProcess/gtk/PluginProcessMainGtk.cpp 2011-07-15 10:06:31 UTC (rev 91061)
+++ trunk/Source/WebKit2/PluginProcess/gtk/PluginProcessMainGtk.cpp 2011-07-15 10:40:36 UTC (rev 91062)
@@ -28,12 +28,27 @@
#include PluginProcess.h
#include WebKit2/RunLoop.h
+#include gdk/gdkx.h
#include gtk/gtk.h
#include runtime/InitializeThreading.h
#include wtf/Threading.h
namespace WebKit {
+static int webkitgtkXError(Display* xdisplay, XErrorEvent* error)
+{
+gchar errorMessage[64];
+XGetErrorText(xdisplay, error-error_code, errorMessage, 63);
+g_warning(The program '%s' received an X Window System error.\n
+ This probably reflects a bug in a browser plugin.\n
+ The error was '%s'.\n
+(Details: serial %ld error_code %d request_code %d minor_code %d)\n,
+ g_get_prgname(), errorMessage,
+ error-serial, error-error_code,
+ error-request_code, error-minor_code);
+return 0;
+}
+
WK_EXPORT int PluginProcessMainGtk(int argc, char* argv[])
{
ASSERT(argc == 2);
@@ -44,6 +59,11 @@
WTF::initializeMainThread();
RunLoop::initializeMainRunLoop();
+// Plugins can produce X errors that are handled by the GDK X error handler, which
+// exits the process. Since we don't want to crash due to plugin bugs, we install a
+// custom error handler to show a warning when a X error happens without aborting.
+XSetErrorHandler(webkitgtkXError);
+
int socket = atoi(argv[1]);
WebKit::PluginProcess::shared().initialize(socket, RunLoop::main());
RunLoop::run();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [91063] trunk
Title: [91063] trunk Revision 91063 Author carlo...@webkit.org Date 2011-07-15 04:09:38 -0700 (Fri, 15 Jul 2011) Log Message [GTK] Build plugin process by default when building WebKit2 https://bugs.webkit.org/show_bug.cgi?id=64592 Reviewed by Philippe Normand. * configure.ac: Modified Paths trunk/ChangeLog trunk/configure.ac Diff Modified: trunk/ChangeLog (91062 => 91063) --- trunk/ChangeLog 2011-07-15 10:40:36 UTC (rev 91062) +++ trunk/ChangeLog 2011-07-15 11:09:38 UTC (rev 91063) @@ -1,3 +1,12 @@ +2011-07-15 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Build plugin process by default when building WebKit2 +https://bugs.webkit.org/show_bug.cgi?id=64592 + +Reviewed by Philippe Normand. + +* configure.ac: + 2011-07-14 Carlos Garcia Campos cgar...@igalia.com Reviewed by Martin Robinson. Modified: trunk/configure.ac (91062 => 91063) --- trunk/configure.ac 2011-07-15 10:40:36 UTC (rev 91062) +++ trunk/configure.ac 2011-07-15 11:09:38 UTC (rev 91063) @@ -1110,7 +1110,7 @@ AC_ARG_ENABLE(plugin_process, AC_HELP_STRING([--enable-plugin-process], [build plugin process for WebKit2 [default=yes]]), - [], [enable_plugin_process=no]) + [], [enable_plugin_process=yes]) # Build the plugin process only when building webkit2. if test $enable_webkit2 = no; then enable_plugin_process=no ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [91751] trunk/Tools
Title: [91751] trunk/Tools
Revision 91751
Author carlo...@webkit.org
Date 2011-07-26 05:16:28 -0700 (Tue, 26 Jul 2011)
Log Message
2011-07-26 Carlos Garcia Campos cgar...@igalia.com
Unreviewed. Fix WebKitGtk build with GTK+ 3.x after r91707.
* DumpRenderTree/gtk/SelfScrollingWebKitWebView.cpp:
(getPreferredSizeMethod):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/gtk/SelfScrollingWebKitWebView.cpp
Diff
Modified: trunk/Tools/ChangeLog (91750 => 91751)
--- trunk/Tools/ChangeLog 2011-07-26 10:20:53 UTC (rev 91750)
+++ trunk/Tools/ChangeLog 2011-07-26 12:16:28 UTC (rev 91751)
@@ -1,3 +1,10 @@
+2011-07-26 Carlos Garcia Campos cgar...@igalia.com
+
+Unreviewed. Fix WebKitGtk build with GTK+ 3.x after r91707.
+
+* DumpRenderTree/gtk/SelfScrollingWebKitWebView.cpp:
+(getPreferredSizeMethod):
+
2011-07-26 MORITA Hajime morr...@google.com
[Chromium][DRT] MockSpellCheck.cpp should be clang clean
Modified: trunk/Tools/DumpRenderTree/gtk/SelfScrollingWebKitWebView.cpp (91750 => 91751)
--- trunk/Tools/DumpRenderTree/gtk/SelfScrollingWebKitWebView.cpp 2011-07-26 10:20:53 UTC (rev 91750)
+++ trunk/Tools/DumpRenderTree/gtk/SelfScrollingWebKitWebView.cpp 2011-07-26 12:16:28 UTC (rev 91751)
@@ -70,8 +70,8 @@
#else
static void getPreferredSizeMethod(GtkWidget*, gint* minimum, gint* natural)
{
-minimum = 1;
-natural = 1;
+*minimum = 1;
+*natural = 1;
}
#endif
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [91929] trunk/Source/WebCore
Title: [91929] trunk/Source/WebCore
Revision 91929
Author carlo...@webkit.org
Date 2011-07-28 08:22:37 -0700 (Thu, 28 Jul 2011)
Log Message
[GTK] Copy and paste is broken in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=65252
Reviewed by Martin Robinson.
Use gtk_clipboard_get_for_display() instead of
gtk_widget_get_clipboard(), using the the default display when
there's no page client widget, which is the case of WebKit2.
* platform/gtk/PasteboardHelper.cpp:
(WebCore::displayFromFrame): Return the display of the current
frame widget or the default display if there's no widget.
(WebCore::PasteboardHelper::getClipboard):
(WebCore::PasteboardHelper::getPrimarySelectionClipboard):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (91928 => 91929)
--- trunk/Source/WebCore/ChangeLog 2011-07-28 15:13:34 UTC (rev 91928)
+++ trunk/Source/WebCore/ChangeLog 2011-07-28 15:22:37 UTC (rev 91929)
@@ -1,3 +1,20 @@
+2011-07-28 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Copy and paste is broken in WebKit2
+https://bugs.webkit.org/show_bug.cgi?id=65252
+
+Reviewed by Martin Robinson.
+
+Use gtk_clipboard_get_for_display() instead of
+gtk_widget_get_clipboard(), using the the default display when
+there's no page client widget, which is the case of WebKit2.
+
+* platform/gtk/PasteboardHelper.cpp:
+(WebCore::displayFromFrame): Return the display of the current
+frame widget or the default display if there's no widget.
+(WebCore::PasteboardHelper::getClipboard):
+(WebCore::PasteboardHelper::getPrimarySelectionClipboard):
+
2011-07-28 Vsevolod Vlasov vse...@chromium.org
Web Inspector: Add resource initiator column to network panel.
Modified: trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp (91928 => 91929)
--- trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2011-07-28 15:13:34 UTC (rev 91928)
+++ trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2011-07-28 15:22:37 UTC (rev 91929)
@@ -90,7 +90,7 @@
gtk_target_list_unref(m_targetList);
}
-static inline GtkWidget* widgetFromFrame(Frame* frame)
+static inline GdkDisplay* displayFromFrame(Frame* frame)
{
ASSERT(frame);
Page* page = frame-page();
@@ -98,8 +98,7 @@
Chrome* chrome = page-chrome();
ASSERT(chrome);
PlatformPageClient client = chrome-platformPageClient();
-ASSERT(client);
-return client;
+return client ? gtk_widget_get_display(client) : gdk_display_get_default();
}
GtkClipboard* PasteboardHelper::getCurrentClipboard(Frame* frame)
@@ -111,12 +110,12 @@
GtkClipboard* PasteboardHelper::getClipboard(Frame* frame) const
{
-return gtk_widget_get_clipboard(widgetFromFrame(frame), GDK_SELECTION_CLIPBOARD);
+return gtk_clipboard_get_for_display(displayFromFrame(frame), GDK_SELECTION_CLIPBOARD);
}
GtkClipboard* PasteboardHelper::getPrimarySelectionClipboard(Frame* frame) const
{
-return gtk_widget_get_clipboard(widgetFromFrame(frame), GDK_SELECTION_PRIMARY);
+return gtk_clipboard_get_for_display(displayFromFrame(frame), GDK_SELECTION_PRIMARY);
}
GtkTargetList* PasteboardHelper::targetList() const
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [92273] trunk
Title: [92273] trunk Revision 92273 Author carlo...@webkit.org Date 2011-08-03 05:20:12 -0700 (Wed, 03 Aug 2011) Log Message [GTK] Install web and plugin processes in libexecdir instead of bindir https://bugs.webkit.org/show_bug.cgi?id=65600 Reviewed by Martin Robinson. .: * GNUmakefile.am: Initialize libexec_PROGRAMS, only used by WebKit2 in this moment. Source/WebKit2: Launch processes from libexecdir or WEBKIT_EXEC_PATH environment variable when it's set. This variable will be used by MiniBrowser and unit tests to find processes without having to install them. * GNUmakefile.am: * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp: (WebKit::ProcessLauncher::launchProcess): Tools: Set WEBKIT_EXEC_PATH environment variable to use web and plugin process from current directory instead of the intalled ones. * MiniBrowser/gtk/GNUmakefile.am: * MiniBrowser/gtk/main.c: (main): * WebKitTestRunner/GNUmakefile.am: * WebKitTestRunner/gtk/main.cpp: (main): Modified Paths trunk/ChangeLog trunk/GNUmakefile.am trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp trunk/Tools/ChangeLog trunk/Tools/MiniBrowser/gtk/GNUmakefile.am trunk/Tools/MiniBrowser/gtk/main.c trunk/Tools/WebKitTestRunner/GNUmakefile.am trunk/Tools/WebKitTestRunner/gtk/main.cpp Diff Modified: trunk/ChangeLog (92272 => 92273) --- trunk/ChangeLog 2011-08-03 11:55:26 UTC (rev 92272) +++ trunk/ChangeLog 2011-08-03 12:20:12 UTC (rev 92273) @@ -1,5 +1,15 @@ 2011-08-03 Carlos Garcia Campos cgar...@igalia.com +[GTK] Install web and plugin processes in libexecdir instead of bindir +https://bugs.webkit.org/show_bug.cgi?id=65600 + +Reviewed by Martin Robinson. + +* GNUmakefile.am: Initialize libexec_PROGRAMS, only used by +WebKit2 in this moment. + +2011-08-03 Carlos Garcia Campos cgar...@igalia.com + [GTK] Reorganize pkg-config files https://bugs.webkit.org/show_bug.cgi?id=65548 Modified: trunk/GNUmakefile.am (92272 => 92273) --- trunk/GNUmakefile.am 2011-08-03 11:55:26 UTC (rev 92272) +++ trunk/GNUmakefile.am 2011-08-03 12:20:12 UTC (rev 92273) @@ -45,6 +45,7 @@ # Libraries and support components bin_PROGRAMS := noinst_PROGRAMS := +libexec_PROGRAMS := noinst_HEADERS := noinst_LTLIBRARIES := lib_LTLIBRARIES := Modified: trunk/Source/WebKit2/ChangeLog (92272 => 92273) --- trunk/Source/WebKit2/ChangeLog 2011-08-03 11:55:26 UTC (rev 92272) +++ trunk/Source/WebKit2/ChangeLog 2011-08-03 12:20:12 UTC (rev 92273) @@ -1,3 +1,19 @@ +2011-08-03 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Install web and plugin processes in libexecdir instead of bindir +https://bugs.webkit.org/show_bug.cgi?id=65600 + +Reviewed by Martin Robinson. + +Launch processes from libexecdir or WEBKIT_EXEC_PATH +environment variable when it's set. This variable will be used by +MiniBrowser and unit tests to find processes without having to +install them. + +* GNUmakefile.am: +* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp: +(WebKit::ProcessLauncher::launchProcess): + 2011-08-03 Pavel Feldman pfeld...@chromium.org Web Inspector: remove Node parameter from the InspectorClient::highlight Modified: trunk/Source/WebKit2/GNUmakefile.am (92272 => 92273) --- trunk/Source/WebKit2/GNUmakefile.am 2011-08-03 11:55:26 UTC (rev 92272) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-08-03 12:20:12 UTC (rev 92273) @@ -844,6 +844,7 @@ -I$(top_builddir)/DerivedSources/WebKit2/include/_javascript_Core \ -I$(top_builddir)/DerivedSources/WebKit2/include/WebCore \ -I$(top_builddir)/DerivedSources/WebKit2/include/WebKit2 \ + -DLIBEXECDIR=\$(libexecdir)\ \ $(webcore_cppflags) \ $(webcoregtk_cppflags) \ $(_javascript_core_cppflags) \ @@ -960,7 +961,7 @@ $(top_builddir)/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc # WebKitWebProcess -bin_PROGRAMS += \ +libexec_PROGRAMS += \ Programs/WebKitWebProcess Programs_WebKitWebProcess_CPPFLAGS = \ @@ -1037,7 +1038,7 @@ $(XT_CFLAGS) \ $(ZLIB_LIBS) -bin_PROGRAMS += \ +libexec_PROGRAMS += \ Programs/WebKitPluginProcess Programs_WebKitPluginProcess_CPPFLAGS = \ Modified: trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (92272 => 92273) --- trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2011-08-03 11:55:26 UTC (rev 92272) +++ trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2011-08-03 12:20:12 UTC (rev 92273) @@ -76,7 +76,8 @@ return; } -GOwnPtrgchar binaryPath(g_build_filename(applicationDirectoryPath().data(), +const gchar* execDirectory = g_getenv(WEBKIT_EXEC_PATH); +GOwnPtrgchar binaryPath(g_build_filename(execDirectory ? execDirectory : LIBEXECDIR, m_launchOptions.processType == ProcessLauncher::WebProcess ? gWebKitWebProcessName :
[webkit-changes] [98842] trunk/Source
Title: [98842] trunk/Source Revision 98842 Author carlo...@webkit.org Date 2011-10-31 03:26:48 -0700 (Mon, 31 Oct 2011) Log Message Unreviewed. Fix make distcheck build. Source/WebCore: * GNUmakefile.am: Add InFilesCompiler.pm to SCRIPTS_BINDINGS and EXTRA_DIST. Also remove duplicated entries in EXTRA_DIST. Source/WebKit2: * GNUmakefile.am: Remove docs/GNUmakefile.in from EXTRA_DIST, since its generation was removed from configure.ac in r98498. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/GNUmakefile.am trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am Diff Modified: trunk/Source/WebCore/ChangeLog (98841 => 98842) --- trunk/Source/WebCore/ChangeLog 2011-10-31 09:35:58 UTC (rev 98841) +++ trunk/Source/WebCore/ChangeLog 2011-10-31 10:26:48 UTC (rev 98842) @@ -1,3 +1,10 @@ +2011-10-31 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix make distcheck build. + +* GNUmakefile.am: Add InFilesCompiler.pm to SCRIPTS_BINDINGS and +EXTRA_DIST. Also remove duplicated entries in EXTRA_DIST. + 2011-10-31 Pavel Feldman pfeld...@chromium.org Web Inspector: factor out ResourceUtils, clean up externs. Modified: trunk/Source/WebCore/GNUmakefile.am (98841 => 98842) --- trunk/Source/WebCore/GNUmakefile.am 2011-10-31 09:35:58 UTC (rev 98841) +++ trunk/Source/WebCore/GNUmakefile.am 2011-10-31 10:26:48 UTC (rev 98842) @@ -657,6 +657,7 @@ $(WebCore)/bindings/scripts/CodeGenerator.pm \ $(WebCore)/bindings/scripts/IDLParser.pm \ $(WebCore)/bindings/scripts/IDLStructure.pm \ + $(WebCore)/bindings/scripts/InFilesCompiler.pm \ $(WebCore)/bindings/scripts/InFilesParser.pm \ $(WebCore)/bindings/scripts/generate-bindings.pl \ $(WebCore)/bindings/scripts/preprocessor.pm @@ -857,20 +858,16 @@ $(shell ls $(srcdir)/Source/WebCore/xml/*.idl) \ Source/ThirdParty/ANGLE/src/compiler/glslang.l \ Source/ThirdParty/ANGLE/src/compiler/glslang.y \ - Source/WebCore/bindings/scripts/CodeGenerator.pm \ - Source/WebCore/bindings/scripts/IDLParser.pm \ - Source/WebCore/bindings/scripts/IDLStructure.pm \ - Source/WebCore/bindings/scripts/InFilesParser.pm \ - Source/WebCore/bindings/scripts/generate-bindings.pl \ - Source/WebCore/bindings/scripts/preprocessor.pm \ Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm \ Source/WebCore/bindings/scripts/CodeGeneratorJS.pm \ Source/WebCore/bindings/scripts/CodeGenerator.pm \ - Source/WebCore/bindings/scripts/generate-bindings.pl \ - Source/WebCore/bindings/scripts/gobject-generate-headers.pl \ Source/WebCore/bindings/scripts/IDLParser.pm \ Source/WebCore/bindings/scripts/IDLStructure.pm \ + Source/WebCore/bindings/scripts/InFilesCompiler.pm \ Source/WebCore/bindings/scripts/InFilesParser.pm \ + Source/WebCore/bindings/scripts/generate-bindings.pl \ + Source/WebCore/bindings/scripts/gobject-generate-headers.pl \ + Source/WebCore/bindings/scripts/preprocessor.pm \ Source/WebCore/ChangeLog \ Source/WebCore/css/CSSGrammar.y \ Source/WebCore/css/CSSPropertyNames.in \ Modified: trunk/Source/WebKit2/ChangeLog (98841 => 98842) --- trunk/Source/WebKit2/ChangeLog 2011-10-31 09:35:58 UTC (rev 98841) +++ trunk/Source/WebKit2/ChangeLog 2011-10-31 10:26:48 UTC (rev 98842) @@ -1,3 +1,10 @@ +2011-10-31 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix make distcheck build. + +* GNUmakefile.am: Remove docs/GNUmakefile.in from EXTRA_DIST, +since its generation was removed from configure.ac in r98498. + 2011-10-28 Jeff Miller je...@apple.com More work on WebKit2 should respect WebKitOmitPDFSupport preference on the Mac Modified: trunk/Source/WebKit2/GNUmakefile.am (98841 => 98842) --- trunk/Source/WebKit2/GNUmakefile.am 2011-10-31 09:35:58 UTC (rev 98841) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-10-31 10:26:48 UTC (rev 98842) @@ -1395,7 +1395,6 @@ $(WebKit2)/UIProcess/API/gtk/docs/webkit2gtk-sections.txt \ $(WebKit2)/UIProcess/API/gtk/docs/version.xml.in \ $(WebKit2)/UIProcess/API/gtk/docs/webkit2gtk.types \ - $(WebKit2)/UIProcess/API/gtk/docs/GNUmakefile.in \ $(WebKit2)/Scripts/generate-message-receiver.py \ $(WebKit2)/Scripts/generate-messages-header.py \ $(WebKit2)/Scripts/webkit2/__init__.py \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98845] trunk/Source/WebKit2
Title: [98845] trunk/Source/WebKit2
Revision 98845
Author carlo...@webkit.org
Date 2011-10-31 04:45:37 -0700 (Mon, 31 Oct 2011)
Log Message
[GTK] Add methods to get/set the settings of a web view to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=71109
Reviewed by Martin Robinson.
* GNUmakefile.am: Add WebKitSettingsPrivate.h.
* UIProcess/API/gtk/WebKitSettings.cpp:
(webkitSettingsAttachSettingsToPage): Set the preferences of the
given WebKitSettings object to the page group of the given WKPage.
* UIProcess/API/gtk/WebKitSettingsPrivate.h: Added.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewConstructed): Create the default WebKitSettings for
the view.
(webkit_web_view_set_settings):
(webkit_web_view_get_settings):
* UIProcess/API/gtk/WebKitWebView.h:
* UIProcess/API/gtk/docs/webkit2gtk-sections.txt:
* UIProcess/API/gtk/tests/TestWebKitWebView.cpp:
(testWebViewSettings):
(beforeAll):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/GNUmakefile.am
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt
trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp
Added Paths
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettingsPrivate.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98844 => 98845)
--- trunk/Source/WebKit2/ChangeLog 2011-10-31 11:23:34 UTC (rev 98844)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-31 11:45:37 UTC (rev 98845)
@@ -1,5 +1,28 @@
2011-10-31 Carlos Garcia Campos cgar...@igalia.com
+[GTK] Add methods to get/set the settings of a web view to WebKit2 GTK+ API
+https://bugs.webkit.org/show_bug.cgi?id=71109
+
+Reviewed by Martin Robinson.
+
+* GNUmakefile.am: Add WebKitSettingsPrivate.h.
+* UIProcess/API/gtk/WebKitSettings.cpp:
+(webkitSettingsAttachSettingsToPage): Set the preferences of the
+given WebKitSettings object to the page group of the given WKPage.
+* UIProcess/API/gtk/WebKitSettingsPrivate.h: Added.
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkitWebViewConstructed): Create the default WebKitSettings for
+the view.
+(webkit_web_view_set_settings):
+(webkit_web_view_get_settings):
+* UIProcess/API/gtk/WebKitWebView.h:
+* UIProcess/API/gtk/docs/webkit2gtk-sections.txt:
+* UIProcess/API/gtk/tests/TestWebKitWebView.cpp:
+(testWebViewSettings):
+(beforeAll):
+
+2011-10-31 Carlos Garcia Campos cgar...@igalia.com
+
Unreviewed. Fix make distcheck build.
* GNUmakefile.am: Remove docs/GNUmakefile.in from EXTRA_DIST,
Modified: trunk/Source/WebKit2/GNUmakefile.am (98844 => 98845)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-10-31 11:23:34 UTC (rev 98844)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-10-31 11:45:37 UTC (rev 98845)
@@ -497,6 +497,7 @@
Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h \
Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp \
Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h \
+ Source/WebKit2/UIProcess/API/gtk/WebKitSettingsPrivate.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp \
Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h \
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (98844 => 98845)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2011-10-31 11:23:34 UTC (rev 98844)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2011-10-31 11:45:37 UTC (rev 98845)
@@ -32,9 +32,8 @@
#include WebKitSettings.h
#include WebKitPrivate.h
-#include WebKit2/WKPreferences.h
+#include WebKitSettingsPrivate.h
#include WebKit2/WKRetainPtr.h
-#include WebKit2/WKType.h
#include glib/gi18n-lib.h
struct _WebKitSettingsPrivate {
@@ -380,6 +379,11 @@
priv-preferences = adoptWK(WKPreferencesCreate());
}
+void webkitSettingsAttachSettingsToPage(WebKitSettings* settings, WKPageRef wkPage)
+{
+WKPageGroupSetPreferences(WKPageGetPageGroup(wkPage), settings-priv-preferences.get());
+}
+
/**
* webkit_settings_new:
*
Added: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettingsPrivate.h (0 => 98845)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettingsPrivate.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettingsPrivate.h 2011-10-31 11:45:37 UTC (rev 98845)
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2011 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *
[webkit-changes] [98846] trunk/Source/WebKit2
Title: [98846] trunk/Source/WebKit2
Revision 98846
Author carlo...@webkit.org
Date 2011-10-31 04:55:52 -0700 (Mon, 31 Oct 2011)
Log Message
[GTK] Add webkit_settings_new_with_settings() to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=7
Reviewed by Martin Robinson.
Convenient method to create a WebKitSettings object with initial
settings.
* UIProcess/API/gtk/WebKitSettings.cpp:
(webkit_settings_new_with_settings):
* UIProcess/API/gtk/WebKitSettings.h:
* UIProcess/API/gtk/docs/webkit2gtk-sections.txt:
* UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
(testWebKitSettingsNewWithSettings):
(beforeAll):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h
trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt
trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98845 => 98846)
--- trunk/Source/WebKit2/ChangeLog 2011-10-31 11:45:37 UTC (rev 98845)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-31 11:55:52 UTC (rev 98846)
@@ -1,5 +1,23 @@
2011-10-31 Carlos Garcia Campos cgar...@igalia.com
+[GTK] Add webkit_settings_new_with_settings() to WebKit2 GTK+ API
+https://bugs.webkit.org/show_bug.cgi?id=7
+
+Reviewed by Martin Robinson.
+
+Convenient method to create a WebKitSettings object with initial
+settings.
+
+* UIProcess/API/gtk/WebKitSettings.cpp:
+(webkit_settings_new_with_settings):
+* UIProcess/API/gtk/WebKitSettings.h:
+* UIProcess/API/gtk/docs/webkit2gtk-sections.txt:
+* UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
+(testWebKitSettingsNewWithSettings):
+(beforeAll):
+
+2011-10-31 Carlos Garcia Campos cgar...@igalia.com
+
[GTK] Add methods to get/set the settings of a web view to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=71109
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (98845 => 98846)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2011-10-31 11:45:37 UTC (rev 98845)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2011-10-31 11:55:52 UTC (rev 98846)
@@ -388,7 +388,8 @@
* webkit_settings_new:
*
* Creates a new #WebKitSettings instance with default values. It must
- * be manually attached to a WebView.
+ * be manually attached to a #WebKitWebView.
+ * See also webkit_settings_new_with_settings().
*
* Returns: a new #WebKitSettings instance.
*/
@@ -398,6 +399,26 @@
}
/**
+ * webkit_settings_new_with_settings:
+ * @first_setting_name: name of first setting to set
+ * @...: value of first setting, followed by more settings,
+ *%NULL-terminated
+ *
+ * Creates a new #WebKitSettings instance with the given settings. It must
+ * be manually attached to a #WebKitWebView.
+ *
+ * Returns: a new #WebKitSettings instance.
+ */
+WebKitSettings* webkit_settings_new_with_settings(const gchar* firstSettingName, ...)
+{
+va_list args;
+va_start(args, firstSettingName);
+WebKitSettings* settings = WEBKIT_SETTINGS(g_object_new_valist(WEBKIT_TYPE_SETTINGS, firstSettingName, args));
+va_end(args);
+return settings;
+}
+
+/**
* webkit_settings_get_enable_javascript:
* @settings: a #WebKitSettings
*
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h (98845 => 98846)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h 2011-10-31 11:45:37 UTC (rev 98845)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h 2011-10-31 11:55:52 UTC (rev 98846)
@@ -71,90 +71,94 @@
webkit_settings_get_type(void);
WEBKIT_API WebKitSettings *
-webkit_settings_new(void);
+webkit_settings_new(void);
+WEBKIT_API WebKitSettings *
+webkit_settings_new_with_settings (const gchar*first_setting_name,
+...);
+
WEBKIT_API gboolean
-webkit_settings_get_enable_javascript (WebKitSettings* settings);
+webkit_settings_get_enable_javascript (WebKitSettings *settings);
WEBKIT_API void
-webkit_settings_set_enable_javascript (WebKitSettings* settings,
-gboolean enabled);
+webkit_settings_set_enable_javascript (WebKitSettings *settings,
+gbooleanenabled);
WEBKIT_API gboolean
-webkit_settings_get_auto_load_images (WebKitSettings* settings);
+webkit_settings_get_auto_load_images (WebKitSettings *settings);
WEBKIT_API void
-webkit_settings_set_auto_load_images (WebKitSettings* settings,
-
[webkit-changes] [98864] trunk/Source/WebKit/gtk
Title: [98864] trunk/Source/WebKit/gtk Revision 98864 Author carlo...@webkit.org Date 2011-10-31 10:43:06 -0700 (Mon, 31 Oct 2011) Log Message [GTK] Install html and tmpl dirs in a $(DOC_MODULE) dir in tarball https://bugs.webkit.org/show_bug.cgi?id=71224 Reviewed by Martin Robinson. * GNUmakefile.gtk-doc.am: Copy html and tmpl dirs to $(distdir)/$(DOC_MODULE). Modified Paths trunk/Source/WebKit/gtk/ChangeLog trunk/Source/WebKit/gtk/GNUmakefile.gtk-doc.am Diff Modified: trunk/Source/WebKit/gtk/ChangeLog (98863 => 98864) --- trunk/Source/WebKit/gtk/ChangeLog 2011-10-31 17:38:27 UTC (rev 98863) +++ trunk/Source/WebKit/gtk/ChangeLog 2011-10-31 17:43:06 UTC (rev 98864) @@ -1,3 +1,13 @@ +2011-10-31 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Install html and tmpl dirs in a $(DOC_MODULE) dir in tarball +https://bugs.webkit.org/show_bug.cgi?id=71224 + +Reviewed by Martin Robinson. + +* GNUmakefile.gtk-doc.am: Copy html and tmpl dirs to +$(distdir)/$(DOC_MODULE). + 2011-10-29 Martin Robinson mrobin...@igalia.com [GTK] Switch to a backing store approach for painting WebKitWebView Modified: trunk/Source/WebKit/gtk/GNUmakefile.gtk-doc.am (98863 => 98864) --- trunk/Source/WebKit/gtk/GNUmakefile.gtk-doc.am 2011-10-31 17:38:27 UTC (rev 98863) +++ trunk/Source/WebKit/gtk/GNUmakefile.gtk-doc.am 2011-10-31 17:43:06 UTC (rev 98864) @@ -196,13 +196,13 @@ dist-hook: doc-dist-hook doc-dist-hook: dist-check-gtkdoc dist-hook-local - @mkdir $(distdir)/tmpl - @mkdir $(distdir)/html - @-cp ./Documentation/tmpl/*.sgml $(distdir)/tmpl - @cp ./Documentation/html/* $(distdir)/html + @mkdir -p $(distdir)/$(DOC_MODULE)/tmpl + @mkdir -p $(distdir)/$(DOC_MODULE)/html + @-cp ./Documentation/tmpl/*.sgml $(distdir)/$(DOC_MODULE)/tmpl + @cp ./Documentation/html/* $(distdir)/$(DOC_MODULE)/html @-cp ./Documentation/$(DOC_MODULE).types $(distdir)/ @-cp ./Documentation/$(DOC_MODULE)-sections.txt $(distdir)/ @cd $(distdir) rm -f $(DISTCLEANFILES) - @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/$(DOC_MODULE)/html .PHONY : dist-hook-local docs ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [99156] trunk/Tools
Title: [99156] trunk/Tools Revision 99156 Author carlo...@webkit.org Date 2011-11-03 02:59:32 -0700 (Thu, 03 Nov 2011) Log Message [GTK] Remove GtkLauncher2 https://bugs.webkit.org/show_bug.cgi?id=71449 Reviewed by Martin Robinson. GtkLauncher2 is the GtkLauncher code compiled with webkit2. This made sense when we wanted to implement the exactly same wk1 API for wk2. Now the code would require an ifdef for most the api, so it's better to remove GtkLauncher2 and port MiniBrowser to the new GTK+ API. * GNUmakefile.am: * GtkLauncher/main.c: (notifyProgressCb): (closeWebViewCb): (createBrowser): (addWebSettingsGroupToContext): (main): Modified Paths trunk/Tools/ChangeLog trunk/Tools/GNUmakefile.am trunk/Tools/GtkLauncher/main.c Diff Modified: trunk/Tools/ChangeLog (99155 => 99156) --- trunk/Tools/ChangeLog 2011-11-03 09:56:33 UTC (rev 99155) +++ trunk/Tools/ChangeLog 2011-11-03 09:59:32 UTC (rev 99156) @@ -1,3 +1,24 @@ +2011-11-03 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Remove GtkLauncher2 +https://bugs.webkit.org/show_bug.cgi?id=71449 + +Reviewed by Martin Robinson. + +GtkLauncher2 is the GtkLauncher code compiled with webkit2. This +made sense when we wanted to implement the exactly same wk1 API +for wk2. Now the code would require an ifdef for most the api, so +it's better to remove GtkLauncher2 and port MiniBrowser to the new +GTK+ API. + +* GNUmakefile.am: +* GtkLauncher/main.c: +(notifyProgressCb): +(closeWebViewCb): +(createBrowser): +(addWebSettingsGroupToContext): +(main): + 2011-11-02 Philippe Normand pnorm...@igalia.com [GTK] [DRT] ttf-liberation fonts moved to a new location (in Debian) Modified: trunk/Tools/GNUmakefile.am (99155 => 99156) --- trunk/Tools/GNUmakefile.am 2011-11-03 09:56:33 UTC (rev 99155) +++ trunk/Tools/GNUmakefile.am 2011-11-03 09:59:32 UTC (rev 99156) @@ -2,36 +2,7 @@ Programs/DumpRenderTree \ Programs/GtkLauncher -if ENABLE_WEBKIT2 -noinst_PROGRAMS += \ - Programs/GtkLauncher2 - -# FIXME: should this dependency be automatically identified by -# automake somehow? -Tools/GtkLauncher/main.c: $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.h $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.cpp -endif - # GtkLauncher -gtklauncher_sources = \ - Tools/GtkLauncher/main.c - -gtklauncher_cflags = \ - -fno-strict-aliasing \ - $(global_cflags) \ - $(GTK_CFLAGS) \ - $(LIBSOUP_CFLAGS) - -gtklauncher_ldadd = \ - libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ - $(GTK_LIBS) \ - $(GLIB_LIBS) \ - $(LIBSOUP_LIBS) \ - $(WINMM_LIBS) - -gtklauncher_ldflags = \ - -no-fast-install \ - -no-install - Programs_GtkLauncher_CPPFLAGS = \ -I$(srcdir)/Source/WebKit/gtk \ -I$(srcdir)/Source/WebCore/platform/network/soup/cache/ \ @@ -41,49 +12,27 @@ $(_javascript_core_cppflags) Programs_GtkLauncher_SOURCES = \ - $(gtklauncher_sources) + Tools/GtkLauncher/main.c Programs_GtkLauncher_CFLAGS = \ -ansi \ - $(gtklauncher_cflags) + -fno-strict-aliasing \ + $(global_cflags) \ + $(GTK_CFLAGS) \ + $(LIBSOUP_CFLAGS) Programs_GtkLauncher_LDADD = \ libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ - $(gtklauncher_ldadd) + libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ + $(GTK_LIBS) \ + $(GLIB_LIBS) \ + $(LIBSOUP_LIBS) \ + $(WINMM_LIBS) Programs_GtkLauncher_LDFLAGS = \ - $(gtklauncher_ldflags) + -no-fast-install \ + -no-install -if ENABLE_WEBKIT2 -Programs_GtkLauncher2_CPPFLAGS = \ - -I$(srcdir)/Source \ - -I$(top_builddir)/DerivedSources/WebKit2/include \ - -I$(srcdir)/Source/WebKit2/UIProcess/API/gtk \ - -I$(top_builddir)/Source/WebKit2/UIProcess/API/gtk \ - -I$(srcdir)/Source/WebKit/gtk \ - -I$(top_builddir)/DerivedSources/WebKit2/webkit2gtk \ - -I$(top_builddir)/DerivedSources/WebKit2/webkit2gtk/include \ - -I$(top_builddir)/Source/WebKit/gtk \ - -I$(top_builddir)/DerivedSources \ - $(global_cppflags) \ - $(_javascript_core_cppflags) - -Programs_GtkLauncher2_SOURCES = \ - $(gtklauncher_sources) - -Programs_GtkLauncher2_CFLAGS = \ - -DWEBKIT2=\1\ \ - $(gtklauncher_cflags) - -Programs_GtkLauncher2_LDADD = \ - libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ - $(gtklauncher_ldadd) - -Programs_GtkLauncher2_LDFLAGS = \ - $(gtklauncher_ldflags) - -endif - # libWebCoreInternals # We must split off the window.internals implementation into a separate # convenience library because it requires a different include path order @@ -219,11 +168,6 @@ Programs/DumpRenderTree \ Programs/GtkLauncher -if ENABLE_WEBKIT2 -CLEANFILES += \ - Programs/GtkLauncher2 -endif - if TARGET_X11 # Build TestNetscapePlugin only for X11 Modified: trunk/Tools/GtkLauncher/main.c (99155 => 99156) --- trunk/Tools/GtkLauncher/main.c 2011-11-03 09:56:33 UTC (rev 99155) +++
[webkit-changes] [99198] trunk/Source/WebKit2
Title: [99198] trunk/Source/WebKit2 Revision 99198 Author carlo...@webkit.org Date 2011-11-03 09:04:49 -0700 (Thu, 03 Nov 2011) Log Message [GTK] Use WEBKIT_API instead of WK_EXPORT in WebKitEnumTypes.h https://bugs.webkit.org/show_bug.cgi?id=71457 Reviewed by Martin Robinson. * GNUmakefile.am: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am Diff Modified: trunk/Source/WebKit2/ChangeLog (99197 => 99198) --- trunk/Source/WebKit2/ChangeLog 2011-11-03 15:40:22 UTC (rev 99197) +++ trunk/Source/WebKit2/ChangeLog 2011-11-03 16:04:49 UTC (rev 99198) @@ -1,3 +1,12 @@ +2011-11-03 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Use WEBKIT_API instead of WK_EXPORT in WebKitEnumTypes.h +https://bugs.webkit.org/show_bug.cgi?id=71457 + +Reviewed by Martin Robinson. + +* GNUmakefile.am: + 2011-11-03 Kenneth Rohde Christiansen kenn...@webkit.org [Qt] Bounce back limits are wrong in some situations Modified: trunk/Source/WebKit2/GNUmakefile.am (99197 => 99198) --- trunk/Source/WebKit2/GNUmakefile.am 2011-11-03 15:40:22 UTC (rev 99197) +++ trunk/Source/WebKit2/GNUmakefile.am 2011-11-03 16:04:49 UTC (rev 99198) @@ -1057,13 +1057,13 @@ --fhead #ifndef WEBKIT_ENUM_TYPES_H\n \ --fhead #define WEBKIT_ENUM_TYPES_H\n\n \ --fhead #include glib-object.h\n\n \ - --fhead #include WebKit2/WKBase.h\n\n \ + --fhead #include webkit2/WebKitDefines.h\n\n \ --fhead G_BEGIN_DECLS\n\n \ --ftail G_END_DECLS\n\n \ --ftail #endif\n \ --fprod #include webkit2/@basename@\n\n \ --eprod #define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n \ - --eprod WK_EXPORT GType\n@enum_name@_get_type(void);\n\n \ + --eprod WEBKIT_API GType\n@enum_name@_get_type(void);\n\n \ $(webkit2gtk_headers) | \ sed 's,web_kit,webkit,' | \ sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
