[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[Gustavo Noronha Silva]

The following commit has been merged in the debian/experimental branch:
commit 396fdebdf1ec0e7d7c8d2d3771349cb7b3d4d2fb
Merge: 02cdae34d3f19a91ac6fcc228faf361fd0aaf9e6 077ea5779616345f72ff4740f1df04484a05eeae
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Sat Dec 11 09:14:05 2010 -0200

    Merge branch 'webkit-1.3' into debian/experimental
    
    Conflicts:
    	WebKit/gtk/JSCore-3.0.gir
    	WebKit/gtk/JSCore.gir.in
    	WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
    	WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
    	WebKit/gtk/po/es.po~
    	WebKit/gtk/webkit/webkitwebsettings.cpp

diff --combined WebKit/gtk/webkit/webkitprivate.h
index a5718dc,e090ed4..35994b0
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@@ -46,7 -46,7 +46,7 @@@
  #include <webkit/webkitsecurityorigin.h>
  
  #include "ArchiveResource.h"
- #include "BackForwardList.h"
+ #include "BackForwardListImpl.h"
  #include "DataObjectGtk.h"
  #include "DragActions.h"
  #include "Frame.h"
@@@ -55,7 -55,10 +55,10 @@@
  #include "HistoryItem.h"
  #include "InspectorClientGtk.h"
  #include "IntPoint.h"
+ #include "IntRect.h"
  #include "FrameLoaderClient.h"
+ #include "FullscreenVideoController.h"
+ #include "Node.h"
  #include "Page.h"
  #include "PlatformString.h"
  #include "ResourceHandle.h"
@@@ -90,7 -93,7 +93,7 @@@ namespace WebKit 
      WebCore::HistoryItem* core(WebKitWebHistoryItem*);
      WebKitWebHistoryItem* kit(PassRefPtr<WebCore::HistoryItem>);
  
-     WebCore::BackForwardList* core(WebKitWebBackForwardList*);
+     WebCore::BackForwardListImpl* core(WebKitWebBackForwardList*);
  
      WebKitWebNavigationReason kit(WebCore::NavigationType type);
      WebCore::NavigationType core(WebKitWebNavigationReason reason);
@@@ -121,6 -124,10 +124,10 @@@
  extern "C" {
      void webkit_init();
  
+ #ifdef HAVE_GSETTINGS
+     GSettings* inspectorGSettings();
+ #endif
+ 
  #define WEBKIT_PARAM_READABLE ((GParamFlags)(G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))
  #define WEBKIT_PARAM_READWRITE ((GParamFlags)(G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))
  
@@@ -128,50 -135,61 +135,61 @@@
      typedef struct _WebKitWebViewPrivate WebKitWebViewPrivate;
      struct _WebKitWebViewPrivate {
          WebCore::Page* corePage;
-         WebKitWebSettings* webSettings;
-         WebKitWebInspector* webInspector;
-         WebKitWebWindowFeatures* webWindowFeatures;
+         PlatformRefPtr<WebKitWebSettings> webSettings;
+         PlatformRefPtr<WebKitWebInspector> webInspector;
+         PlatformRefPtr<WebKitWebWindowFeatures> webWindowFeatures;
  
          WebKitWebFrame* mainFrame;
-         WebKitWebBackForwardList* backForwardList;
+         PlatformRefPtr<WebKitWebBackForwardList> backForwardList;
  
-         GtkMenu* currentMenu;
+         PlatformRefPtr<GtkMenu> currentMenu;
          gint lastPopupXPosition;
          gint lastPopupYPosition;
  
          HashSet<GtkWidget*> children;
          bool editable;
-         GtkIMContext* imContext;
+         PlatformRefPtr<GtkIMContext> imContext;
  
          gboolean transparent;
  
-         GtkAdjustment* horizontalAdjustment;
-         GtkAdjustment* verticalAdjustment;
+         PlatformRefPtr<GtkAdjustment> horizontalAdjustment;
+         PlatformRefPtr<GtkAdjustment> verticalAdjustment;
+ 
+ #ifndef GTK_API_VERSION_2
+         // GtkScrollablePolicy needs to be checked when
+         // driving the scrollable adjustment values
+         GtkScrollablePolicy horizontalScrollingPolicy;
+         GtkScrollablePolicy verticalScrollingPolicy;
+ #endif
  
          gboolean zoomFullContent;
          WebKitLoadStatus loadStatus;
-         char* encoding;
-         char* customEncoding;
+         CString encoding;
+         CString customEncoding;
  
-         char* iconURI;
+         CString iconURI;
  
          gboolean disposing;
          gboolean usePrimaryForPaste;
  
+ #if ENABLE(VIDEO)
+         FullscreenVideoController* fullscreenVideoController;
+ #endif
+ 
          // These are hosted here because the DataSource object is
          // created too late in the frame loading process.
-         WebKitWebResource* mainResource;
-         char* mainResourceIdentifier;
-         GHashTable* subResources;
-         char* tooltipText;
+         PlatformRefPtr<WebKitWebResource> mainResource;
+         CString mainResourceIdentifier;
+         PlatformRefPtr<GHashTable> subResources;
+         CString tooltipText;
+         WebCore::IntRect tooltipArea;
  
          int currentClickCount;
-         WebCore::IntPoint* previousClickPoint;
+         WebCore::IntPoint previousClickPoint;
          guint previousClickButton;
          guint32 previousClickTime;
- 
-         HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> >* draggingDataObjects;
-         HashMap<GdkDragContext*, WebKit::DroppingContext*>* droppingContexts;
+         HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> > draggingDataObjects;
+         HashMap<GdkDragContext*, WebKit::DroppingContext*> droppingContexts;
      };
  
      #define WEBKIT_WEB_FRAME_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_FRAME, WebKitWebFramePrivate))
@@@ -197,12 -215,9 +215,12 @@@
          gboolean disposed;
      };
  
-     PassRefPtr<WebCore::Frame>
-     webkit_web_frame_init_with_web_view(WebKitWebView*, WebCore::HTMLFrameOwnerElement*);
+     WTF::String
+     webkitUserAgent();
  
 +    WebCore::String
 +    chromeUserAgent();
 +
      void
      webkit_web_frame_core_frame_gone(WebKitWebFrame*);
  
@@@ -265,6 -280,9 +283,9 @@@
      void
      webkit_web_view_add_resource(WebKitWebView*, const char*, WebKitWebResource*);
  
+     void
+     webkit_web_view_remove_resource(WebKitWebView*, const char*);
+ 
      WebKitWebResource*
      webkit_web_view_get_resource(WebKitWebView*, char*);
  
@@@ -280,6 -298,15 +301,15 @@@
      void
      webkit_web_view_set_tooltip_text(WebKitWebView*, const char*);
  
+     GtkMenu*
+     webkit_web_view_get_context_menu(WebKitWebView*);
+ 
+     WEBKIT_API void
+     webkit_web_view_execute_core_command_by_name(WebKitWebView* webView, const gchar* name, const gchar* value);
+ 
+     WEBKIT_API gboolean
+     webkit_web_view_is_command_enabled(WebKitWebView* webView, const gchar* name);
+ 
      WebKitDownload*
      webkit_download_new_with_handle(WebKitNetworkRequest* request, WebCore::ResourceHandle* handle, const WebCore::ResourceResponse& response);
  
@@@ -348,6 -375,12 +378,12 @@@
      webkit_web_frame_number_of_active_animations(WebKitWebFrame* frame);
  
      WEBKIT_API void
+     webkit_web_frame_suspend_animations(WebKitWebFrame* frame);
+ 
+     WEBKIT_API void
+     webkit_web_frame_resume_animations(WebKitWebFrame* frame);
+ 
+     WEBKIT_API void
      webkit_web_frame_clear_main_frame_name(WebKitWebFrame* frame);
  
      WEBKIT_API AtkObject*
@@@ -357,9 -390,6 +393,6 @@@
      webkit_web_view_get_selected_text (WebKitWebView* web_view);
  
      WEBKIT_API void
-     webkit_web_view_set_group_name(WebKitWebView* web_view, const gchar* group_name);
- 
-     WEBKIT_API void
      webkit_web_settings_add_extra_plugin_directory (WebKitWebView *web_view, const gchar* directory);
  
      GSList*
@@@ -401,6 -431,9 +434,9 @@@
  
      WEBKIT_API void
      webkit_web_frame_layout(WebKitWebFrame* frame);
+ 
+     void webkitWebViewEnterFullscreen(WebKitWebView* webView, WebCore::Node* node);
+     void webkitWebViewExitFullscreen(WebKitWebView* webView);
  }
  
  #endif

-- 
WebKit Debian packaging