Changeset 73696 in webkit


Ignore:
Timestamp:
Dec 10, 2010 2:06:46 AM (13 years ago)
Author:
kov@webkit.org
Message:

2010-12-09 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Martin Robinson.

[GTK] Split webkitprivate.{cpp,h} in more manageable chunks
​https://bugs.webkit.org/show_bug.cgi?id=50698

Split private bits of WebKitWebFrame to its own private header, and
to its implementation file.

  • GNUmakefile.am:
  • WebCoreSupport/ChromeClientGtk.cpp:
  • WebCoreSupport/DragClientGtk.cpp:
  • WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
  • WebCoreSupport/FrameLoaderClientGtk.cpp:
  • webkit/webkitprivate.cpp:
  • webkit/webkitprivate.h:
  • webkit/webkitwebdatasource.cpp:
  • webkit/webkitwebframe.cpp: (WebKit::getViewFromFrame): (WebKit::core): (WebKit::kit):
  • webkit/webkitwebframeprivate.h: Added.
  • webkit/webkitwebpolicydecision.cpp:
  • webkit/webkitwebview.cpp:
Location:
trunk/WebKit/gtk
Files:
1 added
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/gtk/ChangeLog

    r73628 r73696  
     12010-12-09  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [GTK] Split webkitprivate.{cpp,h} in more manageable chunks
     6        https://bugs.webkit.org/show_bug.cgi?id=50698
     7
     8        Split private bits of WebKitWebFrame to its own private header, and
     9        to its implementation file.
     10
     11        * GNUmakefile.am:
     12        * WebCoreSupport/ChromeClientGtk.cpp:
     13        * WebCoreSupport/DragClientGtk.cpp:
     14        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
     15        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     16        * webkit/webkitprivate.cpp:
     17        * webkit/webkitprivate.h:
     18        * webkit/webkitwebdatasource.cpp:
     19        * webkit/webkitwebframe.cpp:
     20        (WebKit::getViewFromFrame):
     21        (WebKit::core):
     22        (WebKit::kit):
     23        * webkit/webkitwebframeprivate.h: Added.
     24        * webkit/webkitwebpolicydecision.cpp:
     25        * webkit/webkitwebview.cpp:
     26
    1272010-12-09  Antonio Gomes  <agomes@rim.com>
    228

  • trunk/WebKit/gtk/GNUmakefile.am

    r73628 r73696  
    188188        WebKit/gtk/webkit/webkitwebdatasource.cpp \
    189189        WebKit/gtk/webkit/webkitwebframe.cpp \
     190        WebKit/gtk/webkit/webkitwebframeprivate.h \
    190191        WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
    191192        WebKit/gtk/webkit/webkitwebinspector.cpp \
    … …  
    198199        WebKit/gtk/webkit/webkitwebsettings.cpp \
    199200        WebKit/gtk/webkit/webkitwebview.cpp \
     201        WebKit/gtk/webkit/webkitwebviewprivate.h \
    200202        WebKit/gtk/webkit/webkitwebwindowfeatures.cpp
    201203

  • trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

    r73624 r73696  
    5151#include "webkitnetworkrequest.h"
    5252#include "webkitprivate.h"
     53#include "webkitwebframeprivate.h"
    5354#include "webkitwebview.h"
    5455#include "webkitwebviewprivate.h"

  • trunk/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp

    r73539 r73696  
    3434#include "RenderObject.h"
    3535#include "webkitprivate.h"
     36#include "webkitwebframeprivate.h"
    3637#include "webkitwebviewprivate.h"
    3738#include "webkitwebview.h"

  • trunk/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

    r73628 r73696  
    5151#include "WorkerThread.h"
    5252#include "webkitprivate.h"
     53#include "webkitwebframeprivate.h"
    5354#include "webkitwebviewprivate.h"
    5455#include "webkitwebview.h"

  • trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r73608 r73696  
    6464#include "webkitprivate.h"
    6565#include "webkitwebframe.h"
     66#include "webkitwebframeprivate.h"
    6667#include "webkitwebnavigationaction.h"
    6768#include "webkitwebpolicydecision.h"

  • trunk/WebKit/gtk/webkit/webkitprivate.cpp

    r73539 r73696  
    6666namespace WebKit {
    6767
    68 WebKitWebView* getViewFromFrame(WebKitWebFrame* frame)
    69 {
    70     WebKitWebFramePrivate* priv = frame->priv;
    71     return priv->webView;
    72 }
    73 
    74 WebCore::Frame* core(WebKitWebFrame* frame)
    75 {
    76     if (!frame)
    77         return 0;
    78 
    79     WebKitWebFramePrivate* priv = frame->priv;
    80     return priv ? priv->coreFrame : 0;
    81 }
    82 
    83 WebKitWebFrame* kit(WebCore::Frame* coreFrame)
    84 {
    85     if (!coreFrame)
    86         return 0;
    87 
    88     ASSERT(coreFrame->loader());
    89     WebKit::FrameLoaderClient* client = static_cast<WebKit::FrameLoaderClient*>(coreFrame->loader()->client());
    90     return client ? client->webFrame() : 0;
    91 }
    92 
    9368WebKitWebNavigationReason kit(WebCore::NavigationType type)
    9469{

  • trunk/WebKit/gtk/webkit/webkitprivate.h

    r73628 r73696  
    8383    class PasteboardHelperGtk;
    8484
    85     WebKitWebView* getViewFromFrame(WebKitWebFrame*);
    86 
    87     WebCore::Frame* core(WebKitWebFrame*);
    88     WebKitWebFrame* kit(WebCore::Frame*);
    89 
    9085    WebCore::HistoryItem* core(WebKitWebHistoryItem*);
    9186    WebKitWebHistoryItem* kit(PassRefPtr<WebCore::HistoryItem>);
    … …  
    119114#define WEBKIT_PARAM_READABLE ((GParamFlags)(G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))
    120115#define WEBKIT_PARAM_READWRITE ((GParamFlags)(G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))
    121 
    122     #define WEBKIT_WEB_FRAME_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_FRAME, WebKitWebFramePrivate))
    123     typedef struct _WebKitWebFramePrivate WebKitWebFramePrivate;
    124     struct _WebKitWebFramePrivate {
    125         WebCore::Frame* coreFrame;
    126         WebKitWebView* webView;
    127 
    128         gchar* name;
    129         gchar* title;
    130         gchar* uri;
    131         WebKitLoadStatus loadStatus;
    132         WebKitSecurityOrigin* origin;
    133     };
    134116
    135117#define WEBKIT_SECURITY_ORIGIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_SECURITY_ORIGIN, WebKitSecurityOriginPrivate))
    … …  
    165147    webkitUserAgent();
    166148
    167     void
    168     webkit_web_frame_core_frame_gone(WebKitWebFrame*);
    169 
    170149    // WebKitWebHistoryItem private
    171150    WebKitWebHistoryItem*
    … …  
    243222    webkit_network_request_get_message(WebKitNetworkRequest* request);
    244223
    245     // FIXME: move this functionality into a 'WebKitWebDataSource' once implemented
    246     WEBKIT_API gchar*
    247     webkit_web_frame_get_response_mime_type(WebKitWebFrame* frame);
    248 
    249224    // FIXME: Move these to webkitwebframe.h once their API has been discussed.
    250225

  • trunk/WebKit/gtk/webkit/webkitwebdatasource.cpp

    r73539 r73696  
    3232#include "runtime/InitializeThreading.h"
    3333#include "webkitprivate.h"
     34#include "webkitwebframeprivate.h"
    3435#include "webkitwebresource.h"
    3536#include "webkitwebviewprivate.h"

  • trunk/WebKit/gtk/webkit/webkitwebframe.cpp

    r73539 r73696  
    5454#include "webkitmarshal.h"
    5555#include "webkitprivate.h"
     56#include "webkitwebframeprivate.h"
    5657#include "webkitwebview.h"
    5758#include "webkitwebviewprivate.h"
    … …  
    967968    return webkit_network_response_new_with_core_response(loader->response());
    968969}
     970
     971namespace WebKit {
     972
     973WebKitWebView* getViewFromFrame(WebKitWebFrame* frame)
     974{
     975    WebKitWebFramePrivate* priv = frame->priv;
     976    return priv->webView;
     977}
     978
     979WebCore::Frame* core(WebKitWebFrame* frame)
     980{
     981    if (!frame)
     982        return 0;
     983
     984    WebKitWebFramePrivate* priv = frame->priv;
     985    return priv ? priv->coreFrame : 0;
     986}
     987
     988WebKitWebFrame* kit(WebCore::Frame* coreFrame)
     989{
     990    if (!coreFrame)
     991        return 0;
     992
     993    ASSERT(coreFrame->loader());
     994    WebKit::FrameLoaderClient* client = static_cast<WebKit::FrameLoaderClient*>(coreFrame->loader()->client());
     995    return client ? client->webFrame() : 0;
     996}
     997
     998}

  • trunk/WebKit/gtk/webkit/webkitwebpolicydecision.cpp

    r49288 r73696  
    2424#include "FrameLoaderTypes.h"
    2525#include "webkitprivate.h"
     26#include "webkitwebframeprivate.h"
    2627
    2728using namespace WebKit;

  • trunk/WebKit/gtk/webkit/webkitwebview.cpp

    r73624 r73696  
    8686#include "webkitprivate.h"
    8787#include "webkitwebbackforwardlist.h"
     88#include "webkitwebframeprivate.h"
    8889#include "webkitwebhistoryitem.h"
    8990#include "webkitwebinspector.h"
Note: See TracChangeset for help on using the changeset viewer.