Changeset 74933 in webkit


Ignore:
Timestamp:
Jan 3, 2011 1:20:13 PM (13 years ago)
Author:
kov@webkit.org
Message:

WebKit/gtk

2011-01-03 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

Final patch, removing webkitprivate.{cpp,h}, and adding a
webkitglobals module to hold non-object-specific functions and
definitions that do not make sense on their own.

  • GNUmakefile.am:
  • WebCoreSupport/ChromeClientGtk.cpp: (WebKit::ChromeClient::createWindow):
  • WebCoreSupport/ContextMenuClientGtk.cpp:
  • WebCoreSupport/DocumentLoaderGtk.cpp: (WebKit::DocumentLoader::attachToFrame):
  • WebCoreSupport/DragClientGtk.cpp:
  • WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
  • WebCoreSupport/EditorClientGtk.cpp: (WebKit::EditorClient::ignoreWordInSpellDocument): (WebKit::EditorClient::learnWord): (WebKit::EditorClient::checkSpellingOfString): (WebKit::EditorClient::getGuessesForWord):
  • WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::FrameLoaderClient::createDocumentLoader):
  • WebCoreSupport/InspectorClientGtk.cpp:
  • webkit/webkit.h:
  • webkit/webkitapplicationcache.cpp: (webkit_application_cache_set_maximum_size):
  • webkit/webkitdownload.cpp: (webkit_download_class_init):
  • webkit/webkitgeolocationpolicydecision.cpp:
  • webkit/webkitglobals.cpp: Added. (webkit_get_default_session): (webkit_set_cache_model): (webkit_get_cache_model): (webkit_get_web_plugin_database): (currentToplevelCallback): (closeIconDatabaseOnExit): (webkitInit): (WebKit::pasteboardHelperInstance):
  • webkit/webkitglobals.h: Added.
  • webkit/webkitglobalsprivate.h: Copied from WebKit/gtk/webkit/webkitwebsettingsprivate.h.
  • webkit/webkithittestresult.cpp: (webkit_hit_test_result_class_init):
  • webkit/webkitnetworkrequest.cpp: (webkit_network_request_class_init):
  • webkit/webkitnetworkresponse.cpp: (webkit_network_response_class_init):
  • webkit/webkitprivate.cpp: Removed.
  • webkit/webkitprivate.h: Removed.
  • webkit/webkitsecurityorigin.cpp:
  • webkit/webkitviewportattributes.cpp:
  • webkit/webkitwebbackforwardlist.cpp: (webkit_web_back_forward_list_class_init):
  • webkit/webkitwebdatabase.cpp:
  • webkit/webkitwebdatasource.cpp: (webkit_web_data_source_class_init): (webkit_web_data_source_new_with_request): (WebKit::kitNew):
  • webkit/webkitwebframe.cpp: (webkit_web_frame_class_init):
  • webkit/webkitwebframeprivate.h:
  • webkit/webkitwebhistoryitem.cpp: (webkit_web_history_item_class_init):
  • webkit/webkitwebinspector.cpp:
  • webkit/webkitwebnavigationaction.cpp:
  • webkit/webkitwebplugin.cpp: (webkit_web_plugin_class_init):
  • webkit/webkitwebplugindatabase.cpp: (webkit_web_plugin_database_class_init):
  • webkit/webkitwebpluginprivate.h:
  • webkit/webkitwebpolicydecision.cpp:
  • webkit/webkitwebresource.cpp:
  • webkit/webkitwebsettings.cpp: (webkit_web_settings_class_init): (webkitWebViewGetEnchantDicts): (WebKit::core):
  • webkit/webkitwebsettingsprivate.h:
  • webkit/webkitwebview.cpp: (webkit_web_view_class_init): (webkit_web_view_update_settings): (webkit_web_view_settings_notify):
  • webkit/webkitwebview.h:
  • webkit/webkitwebwindowfeatures.cpp: (webkit_web_window_features_class_init): (WebKit::kitNew):

WebCore

2011-01-03 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

Fix DOM bindings generation to no longer include the now-gone
webkitprivate.h header, including the appropriate replacements
instead.

  • bindings/scripts/CodeGeneratorGObject.pm:
Location:
trunk
Files:
2 added
2 deleted
39 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r74926 r74933  
     12011-01-03  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        Fix DOM bindings generation to no longer include the now-gone
     9        webkitprivate.h header, including the appropriate replacements
     10        instead.
     11
     12        * bindings/scripts/CodeGeneratorGObject.pm:
     13
    1142011-01-03  Brady Eidson  <beidson@apple.com>
    215

  • trunk/WebCore/bindings/scripts/CodeGeneratorGObject.pm

    r72691 r74933  
    13341334    push(@cPrefix, "\n");
    13351335
     1336    $implIncludes{"webkitdefines.h"} = 1;
     1337    $implIncludes{"webkitglobalsprivate.h"} = 1;
    13361338    $implIncludes{"webkitmarshal.h"} = 1;
    1337     $implIncludes{"webkitprivate.h"} = 1;
    13381339    $implIncludes{"DOMObjectCache.h"} = 1;
    13391340    $implIncludes{"WebKitDOMBinding.h"} = 1;

  • trunk/WebKit/gtk/ChangeLog

    r74867 r74933  
     12011-01-03  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        Final patch, removing webkitprivate.{cpp,h}, and adding a
     9        webkitglobals module to hold non-object-specific functions and
     10        definitions that do not make sense on their own.
     11
     12        * GNUmakefile.am:
     13        * WebCoreSupport/ChromeClientGtk.cpp:
     14        (WebKit::ChromeClient::createWindow):
     15        * WebCoreSupport/ContextMenuClientGtk.cpp:
     16        * WebCoreSupport/DocumentLoaderGtk.cpp:
     17        (WebKit::DocumentLoader::attachToFrame):
     18        * WebCoreSupport/DragClientGtk.cpp:
     19        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
     20        * WebCoreSupport/EditorClientGtk.cpp:
     21        (WebKit::EditorClient::ignoreWordInSpellDocument):
     22        (WebKit::EditorClient::learnWord):
     23        (WebKit::EditorClient::checkSpellingOfString):
     24        (WebKit::EditorClient::getGuessesForWord):
     25        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     26        (WebKit::FrameLoaderClient::createDocumentLoader):
     27        * WebCoreSupport/InspectorClientGtk.cpp:
     28        * webkit/webkit.h:
     29        * webkit/webkitapplicationcache.cpp:
     30        (webkit_application_cache_set_maximum_size):
     31        * webkit/webkitdownload.cpp:
     32        (webkit_download_class_init):
     33        * webkit/webkitgeolocationpolicydecision.cpp:
     34        * webkit/webkitglobals.cpp: Added.
     35        (webkit_get_default_session):
     36        (webkit_set_cache_model):
     37        (webkit_get_cache_model):
     38        (webkit_get_web_plugin_database):
     39        (currentToplevelCallback):
     40        (closeIconDatabaseOnExit):
     41        (webkitInit):
     42        (WebKit::pasteboardHelperInstance):
     43        * webkit/webkitglobals.h: Added.
     44        * webkit/webkitglobalsprivate.h: Copied from WebKit/gtk/webkit/webkitwebsettingsprivate.h.
     45        * webkit/webkithittestresult.cpp:
     46        (webkit_hit_test_result_class_init):
     47        * webkit/webkitnetworkrequest.cpp:
     48        (webkit_network_request_class_init):
     49        * webkit/webkitnetworkresponse.cpp:
     50        (webkit_network_response_class_init):
     51        * webkit/webkitprivate.cpp: Removed.
     52        * webkit/webkitprivate.h: Removed.
     53        * webkit/webkitsecurityorigin.cpp:
     54        * webkit/webkitviewportattributes.cpp:
     55        * webkit/webkitwebbackforwardlist.cpp:
     56        (webkit_web_back_forward_list_class_init):
     57        * webkit/webkitwebdatabase.cpp:
     58        * webkit/webkitwebdatasource.cpp:
     59        (webkit_web_data_source_class_init):
     60        (webkit_web_data_source_new_with_request):
     61        (WebKit::kitNew):
     62        * webkit/webkitwebframe.cpp:
     63        (webkit_web_frame_class_init):
     64        * webkit/webkitwebframeprivate.h:
     65        * webkit/webkitwebhistoryitem.cpp:
     66        (webkit_web_history_item_class_init):
     67        * webkit/webkitwebinspector.cpp:
     68        * webkit/webkitwebnavigationaction.cpp:
     69        * webkit/webkitwebplugin.cpp:
     70        (webkit_web_plugin_class_init):
     71        * webkit/webkitwebplugindatabase.cpp:
     72        (webkit_web_plugin_database_class_init):
     73        * webkit/webkitwebpluginprivate.h:
     74        * webkit/webkitwebpolicydecision.cpp:
     75        * webkit/webkitwebresource.cpp:
     76        * webkit/webkitwebsettings.cpp:
     77        (webkit_web_settings_class_init):
     78        (webkitWebViewGetEnchantDicts):
     79        (WebKit::core):
     80        * webkit/webkitwebsettingsprivate.h:
     81        * webkit/webkitwebview.cpp:
     82        (webkit_web_view_class_init):
     83        (webkit_web_view_update_settings):
     84        (webkit_web_view_settings_notify):
     85        * webkit/webkitwebview.h:
     86        * webkit/webkitwebwindowfeatures.cpp:
     87        (webkit_web_window_features_class_init):
     88        (WebKit::kitNew):
     89
    1902011-01-02  Xan Lopez  <xlopez@igalia.com>
    291

  • trunk/WebKit/gtk/GNUmakefile.am

    r74867 r74933  
    192192        WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \
    193193        WebKit/gtk/webkit/webkitapplicationcache.cpp \
     194        WebKit/gtk/webkit/webkitapplicationcacheprivate.h \
    194195        WebKit/gtk/webkit/webkitdownload.cpp \
    195196        WebKit/gtk/webkit/webkitdownloadprivate.h \
    196197        WebKit/gtk/webkit/webkiterror.cpp \
    197198        WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \
     199        WebKit/gtk/webkit/webkitglobals.cpp \
     200        WebKit/gtk/webkit/webkitglobals.h \
     201        WebKit/gtk/webkit/webkitglobalsprivate.h \
    198202        WebKit/gtk/webkit/webkithittestresult.cpp \
    199203        WebKit/gtk/webkit/webkithittestresultprivate.h \
    … …  
    202206        WebKit/gtk/webkit/webkitnetworkresponse.cpp \
    203207        WebKit/gtk/webkit/webkitnetworkresponseprivate.h \
    204         WebKit/gtk/webkit/webkitprivate.cpp \
    205         WebKit/gtk/webkit/webkitprivate.h \
    206208        WebKit/gtk/webkit/webkitsecurityorigin.cpp \
    207209        WebKit/gtk/webkit/webkitsecurityoriginprivate.h \

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

    r74731 r74933  
    4949#include "WindowFeatures.h"
    5050#include "webkitgeolocationpolicydecision.h"
     51#include "webkitgeolocationpolicydecisionprivate.h"
    5152#include "webkitnetworkrequest.h"
    52 #include "webkitprivate.h"
    5353#include "webkitsecurityoriginprivate.h"
    5454#include "webkitviewportattributesprivate.h"
    … …  
    5656#include "webkitwebview.h"
    5757#include "webkitwebviewprivate.h"
     58#include "webkitwebwindowfeaturesprivate.h"
    5859#include <glib.h>
    5960#include <glib/gi18n-lib.h>
    … …  
    157158        return 0;
    158159
    159     WebKitWebWindowFeatures* webWindowFeatures = webkit_web_window_features_new_from_core_features(coreFeatures);
    160     g_object_set(webView, "window-features", webWindowFeatures, NULL);
    161     g_object_unref(webWindowFeatures);
     160    PlatformRefPtr<WebKitWebWindowFeatures> webWindowFeatures(adoptPlatformRef(kitNew(coreFeatures)));
     161    g_object_set(webView, "window-features", webWindowFeatures.get(), NULL);
    162162
    163163    if (!frameLoadRequest.isEmpty())

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

    r73906 r74933  
    2727#include "NotImplemented.h"
    2828#include "Page.h"
    29 #include "webkitprivate.h"
    3029#include "webkitwebviewprivate.h"
    3130#include <glib-object.h>

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

    r52412 r74933  
    3131#include "DocumentLoaderGtk.h"
    3232
    33 #include "webkitprivate.h"
     33#include "GRefPtr.h"
    3434#include "webkitwebdatasource.h"
     35#include "webkitwebdatasourceprivate.h"
    3536
    3637using namespace WebCore;
    … …  
    6970    // We may get to here without having a datasource, when the data
    7071    // is coming from the page cache.
    71     WebKitWebDataSource* dataSource = webkit_web_data_source_new_with_loader(this);
    72     setDataSource(dataSource);
    73     g_object_unref(dataSource);
     72    PlatformRefPtr<WebKitWebDataSource> dataSource(adoptPlatformRef(kitNew(this)));
     73    setDataSource(dataSource.get());
    7474}
    7575

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

    r73696 r74933  
    3333#include "PasteboardHelper.h"
    3434#include "RenderObject.h"
    35 #include "webkitprivate.h"
    3635#include "webkitwebframeprivate.h"
    3736#include "webkitwebviewprivate.h"

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

    r73740 r74933  
    2222#include "DumpRenderTreeSupportGtk.h"
    2323
     24#include "APICast.h"
     25#include "AXObjectCache.h"
    2426#include "AccessibilityObjectWrapperAtk.h"
    2527#include "AnimationController.h"
    26 #include "APICast.h"
    27 #include "AXObjectCache.h"
     28#include "DOMWrapperWorld.h"
    2829#include "Document.h"
    2930#include "FocusController.h"
    3031#include "FrameLoaderClientGtk.h"
     32#include "FrameTree.h"
    3133#include "FrameView.h"
    32 #include "FrameTree.h"
    3334#include "GCController.h"
    3435#include "GraphicsContext.h"
    … …  
    4445#include "PrintContext.h"
    4546#include "RenderListItem.h"
     47#include "RenderTreeAsText.h"
    4648#include "RenderView.h"
    47 #include "RenderTreeAsText.h"
    4849#include "SecurityOrigin.h"
     50#include "WorkerThread.h"
     51#include "webkitwebframe.h"
     52#include "webkitwebframeprivate.h"
     53#include "webkitwebview.h"
     54#include "webkitwebviewprivate.h"
     55#include <JavaScriptCore/APICast.h>
     56
    4957#if ENABLE(SVG)
    5058#include "SVGSMILElement.h"
    5159#endif
    52 #include "WorkerThread.h"
    53 #include "webkitprivate.h"
    54 #include "webkitwebframeprivate.h"
    55 #include "webkitwebviewprivate.h"
    56 #include "webkitwebview.h"
    57 #include "webkitwebframe.h"
    58 #include "DOMWrapperWorld.h"
    59 #include <JavaScriptCore/APICast.h>
    6060
    6161using namespace JSC;

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

    r74697 r74933  
    4545#include "WebKitDOMRangePrivate.h"
    4646#include "WindowsKeyboardCodes.h"
     47#include "webkitglobalsprivate.h"
    4748#include "webkitmarshal.h"
    48 #include "webkitprivate.h"
    4949#include "webkitwebsettingsprivate.h"
    5050#include "webkitwebviewprivate.h"
    … …  
    890890void EditorClient::ignoreWordInSpellDocument(const String& text)
    891891{
    892     GSList* dicts = webkit_web_settings_get_enchant_dicts(m_webView);
     892    GSList* dicts = webkitWebViewGetEnchantDicts(m_webView);
    893893
    894894    for (; dicts; dicts = dicts->next) {
    … …  
    901901void EditorClient::learnWord(const String& text)
    902902{
    903     GSList* dicts = webkit_web_settings_get_enchant_dicts(m_webView);
     903    GSList* dicts = webkitWebViewGetEnchantDicts(m_webView);
    904904
    905905    for (; dicts; dicts = dicts->next) {
    … …  
    912912void EditorClient::checkSpellingOfString(const UChar* text, int length, int* misspellingLocation, int* misspellingLength)
    913913{
    914     GSList* dicts = webkit_web_settings_get_enchant_dicts(m_webView);
     914    GSList* dicts = webkitWebViewGetEnchantDicts(m_webView);
    915915    if (!dicts)
    916916        return;
    … …  
    10051005void EditorClient::getGuessesForWord(const String& word, const String& context, WTF::Vector<String>& guesses)
    10061006{
    1007     GSList* dicts = webkit_web_settings_get_enchant_dicts(m_webView);
     1007    GSList* dicts = webkitWebViewGetEnchantDicts(m_webView);
    10081008    guesses.clear();
    10091009

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

    r74571 r74933  
    5959#include "ResourceRequest.h"
    6060#include "ScriptController.h"
     61#include "Settings.h"
    6162#include "webkiterror.h"
     63#include "webkitglobals.h"
     64#include "webkitglobalsprivate.h"
    6265#include "webkitnetworkrequest.h"
    6366#include "webkitnetworkrequestprivate.h"
    6467#include "webkitnetworkresponse.h"
    6568#include "webkitnetworkresponseprivate.h"
    66 #include "webkitprivate.h"
    6769#include "webkitviewportattributes.h"
    6870#include "webkitviewportattributesprivate.h"
     71#include "webkitwebdatasourceprivate.h"
    6972#include "webkitwebframe.h"
    7073#include "webkitwebframeprivate.h"
    … …  
    7578#include "webkitwebresource.h"
    7679#include "webkitwebresourceprivate.h"
     80#include "webkitwebsettingsprivate.h"
    7781#include "webkitwebview.h"
    7882#include "webkitwebviewprivate.h"
    … …  
    241245    RefPtr<WebKit::DocumentLoader> loader = WebKit::DocumentLoader::create(request, substituteData);
    242246
    243     WebKitWebDataSource* webDataSource = webkit_web_data_source_new_with_loader(loader.get());
    244     loader->setDataSource(webDataSource);
    245     g_object_unref(webDataSource);
     247    PlatformRefPtr<WebKitWebDataSource> webDataSource(adoptPlatformRef(kitNew(loader.get())));
     248    loader->setDataSource(webDataSource.get());
    246249
    247250    return loader.release();

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

    r73702 r74933  
    2525#include "NotImplemented.h"
    2626#include "PlatformString.h"
    27 #include "webkitprivate.h"
    2827#include "webkitversion.h"
    2928#include "webkitwebinspector.h"

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

    r73858 r74933  
    2727#include <webkit/webkitdownload.h>
    2828#include <webkit/webkitgeolocationpolicydecision.h>
     29#include <webkit/webkitglobals.h>
    2930#include <webkit/webkithittestresult.h>
    3031#include <webkit/webkitnetworkrequest.h>

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

    r49801 r74933  
    1919
    2020#include "config.h"
    21 #include "webkitprivate.h"
    22 
    23 #include <wtf/UnusedParam.h>
    2421
    2522#include "ApplicationCacheStorage.h"
     23#include "webkitapplicationcacheprivate.h"
     24#include <wtf/UnusedParam.h>
    2625
    2726void webkit_application_cache_set_maximum_size(unsigned long long size)
    2827{
    29 #if ENABLE(OFFLINE_WEB_APPLICATIONS)   
     28#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    3029    WebCore::cacheStorage().empty();
    3130    WebCore::cacheStorage().vacuumDatabaseFile();

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

    r73906 r74933  
    2020
    2121#include "config.h"
    22 
    23 #include <glib/gi18n-lib.h>
     22#include "webkitdownload.h"
     23
    2424#include "GRefPtr.h"
    2525#include "Noncopyable.h"
    … …  
    2929#include "ResourceRequest.h"
    3030#include "ResourceResponse.h"
    31 #include "webkitdownload.h"
    3231#include "webkitdownloadprivate.h"
    3332#include "webkitenumtypes.h"
     33#include "webkitglobals.h"
     34#include "webkitglobalsprivate.h"
    3435#include "webkitmarshal.h"
    3536#include "webkitnetworkrequestprivate.h"
    3637#include "webkitnetworkresponse.h"
    3738#include "webkitnetworkresponseprivate.h"
    38 #include "webkitprivate.h"
     39#include <glib/gi18n-lib.h>
     40#include <glib/gstdio.h>
    3941#include <wtf/text/CString.h>
    40 
    41 #include <glib/gstdio.h>
    4242
    4343#ifdef ERROR
    … …  
    231231    objectClass->set_property = webkit_download_set_property;
    232232
    233     webkit_init();
     233    webkitInit();
    234234
    235235    /**

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

    r73906 r74933  
    2121#include "webkitgeolocationpolicydecision.h"
    2222
    23 #include "webkitprivate.h"
    2423#include "Geolocation.h"
     24#include "webkitgeolocationpolicydecisionprivate.h"
    2525
    26 using namespace WebKit;
    2726using namespace WebCore;
    2827

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

    r74932 r74933  
    2121 */
    2222
    23 #ifndef webkitwebsettingsprivate_h
    24 #define webkitwebsettingsprivate_h
     23#ifndef webkitglobalsprivate_h
     24#define webkitglobalsprivate_h
    2525
    26 #include "webkitwebsettings.h"
     26#include <glib.h>
     27
     28#define WEBKIT_PARAM_READABLE ((GParamFlags)(G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))
     29#define WEBKIT_PARAM_READWRITE ((GParamFlags)(G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))
     30
     31namespace WebKit {
     32
     33class PasteboardHelperGtk;
     34PasteboardHelperGtk* pasteboardHelperInstance();
     35
     36}
    2737
    2838extern "C" {
    2939
    30 WEBKIT_API void webkit_web_settings_add_extra_plugin_directory(WebKitWebView*, const gchar* directory);
    31 
    32 GSList* webkit_web_settings_get_enchant_dicts(WebKitWebView*);
     40void webkitInit();
    3341
    3442}

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

    r73906 r74933  
    2424#include "GOwnPtr.h"
    2525#include "HitTestResult.h"
     26#include "KURL.h"
    2627#include "WebKitDOMBinding.h"
    2728#include "WebKitDOMNode.h"
    2829#include "webkitenumtypes.h"
    29 #include "webkitprivate.h"
     30#include "webkitglobals.h"
     31#include "webkitglobalsprivate.h"
     32#include <glib/gi18n-lib.h>
    3033#include <wtf/text/CString.h>
    31 
    32 #include <glib/gi18n-lib.h>
    3334
    3435/**
    … …  
    143144    objectClass->set_property = webkit_hit_test_result_set_property;
    144145
    145     webkit_init();
     146    webkitInit();
    146147
    147148    /**

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

    r73906 r74933  
    2222#include "webkitnetworkrequest.h"
    2323
     24#include "GRefPtr.h"
    2425#include "ResourceRequest.h"
    25 #include "webkitprivate.h"
     26#include "webkitglobalsprivate.h"
     27#include <glib/gi18n-lib.h>
    2628#include <wtf/text/CString.h>
    27 
    28 #include <glib/gi18n-lib.h>
    2929
    3030/**
    … …  
    121121    objectClass->set_property = webkit_network_request_set_property;
    122122
    123     webkit_init();
     123    webkitInit();
    124124
    125125    /**

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

    r73855 r74933  
    2525#include "GRefPtr.h"
    2626#include "ResourceResponse.h"
    27 #include "webkitprivate.h"
    28 
     27#include "webkitglobalsprivate.h"
    2928#include <glib/gi18n-lib.h>
     29#include <wtf/text/CString.h>
    3030
    3131/**
    … …  
    121121    objectClass->set_property = webkit_network_response_set_property;
    122122
    123     webkit_init();
     123    webkitInit();
    124124
    125125    /**

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

    r73906 r74933  
    2323#include "DatabaseTracker.h"
    2424#include "PlatformString.h"
    25 #include "webkitprivate.h"
     25#include "webkitglobalsprivate.h"
    2626#include "webkitsecurityoriginprivate.h"
    2727#include <glib/gi18n-lib.h>

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

    r73906 r74933  
    2323
    2424#include "Chrome.h"
    25 #include "webkitprivate.h"
     25#include "Frame.h"
     26#include "Page.h"
     27#include "webkitglobalsprivate.h"
    2628#include "webkitviewportattributesprivate.h"
    2729#include "webkitwebviewprivate.h"

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

    r73906 r74933  
    2424#include "BackForwardListImpl.h"
    2525#include "HistoryItem.h"
    26 #include "webkitprivate.h"
     26#include "Page.h"
     27#include "webkitglobalsprivate.h"
    2728#include "webkitwebbackforwardlistprivate.h"
    2829#include "webkitwebhistoryitem.h"
    … …  
    8586    object_class->dispose = webkit_web_back_forward_list_dispose;
    8687
    87     webkit_init();
     88    webkitInit();
    8889
    8990    g_type_class_add_private(klass, sizeof(WebKitWebBackForwardListPrivate));

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

    r73906 r74933  
    2323#include "DatabaseDetails.h"
    2424#include "DatabaseTracker.h"
    25 #include "webkitprivate.h"
     25#include "webkitglobalsprivate.h"
    2626#include "webkitsecurityoriginprivate.h"
    2727#include <glib/gi18n-lib.h>

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

    r73906 r74933  
    3131#include "SubstituteData.h"
    3232#include "runtime/InitializeThreading.h"
     33#include "webkitglobalsprivate.h"
    3334#include "webkitnetworkrequestprivate.h"
    34 #include "webkitprivate.h"
     35#include "webkitwebdatasourceprivate.h"
    3536#include "webkitwebframeprivate.h"
    3637#include "webkitwebresource.h"
    … …  
    127128    gobject_class->finalize = webkit_web_data_source_finalize;
    128129
    129     webkit_init();
     130    webkitInit();
    130131
    131132    g_type_class_add_private(gobject_class, sizeof(WebKitWebDataSourcePrivate));
    … …  
    135136{
    136137    webDataSource->priv = G_TYPE_INSTANCE_GET_PRIVATE(webDataSource, WEBKIT_TYPE_WEB_DATA_SOURCE, WebKitWebDataSourcePrivate);
    137 }
    138 
    139 WebKitWebDataSource* webkit_web_data_source_new_with_loader(PassRefPtr<WebKit::DocumentLoader> loader)
    140 {
    141     WebKitWebDataSource* webDataSource = WEBKIT_WEB_DATA_SOURCE(g_object_new(WEBKIT_TYPE_WEB_DATA_SOURCE, NULL));
    142     WebKitWebDataSourcePrivate* priv = webDataSource->priv;
    143     priv->loader = loader.releaseRef();
    144 
    145     return webDataSource;
    146138}
    147139
    … …  
    183175    const gchar* uri = webkit_network_request_get_uri(request);
    184176
    185     WebKitWebDataSource* datasource;
    186     datasource = webkit_web_data_source_new_with_loader(
    187         WebKit::DocumentLoader::create(ResourceRequest(KURL(KURL(), String::fromUTF8(uri))),
    188                                        SubstituteData()));
     177    ResourceRequest resourceRequest(ResourceRequest(KURL(KURL(), String::fromUTF8(uri))));
     178    WebKitWebDataSource* datasource = kitNew(WebKit::DocumentLoader::create(resourceRequest, SubstituteData()));
    189179
    190180    WebKitWebDataSourcePrivate* priv = datasource->priv;
    … …  
    438428    return webkit_web_view_get_subresources(webView);
    439429}
     430
     431namespace WebKit {
     432
     433WebKitWebDataSource* kitNew(PassRefPtr<WebKit::DocumentLoader> loader)
     434{
     435    WebKitWebDataSource* webDataSource = WEBKIT_WEB_DATA_SOURCE(g_object_new(WEBKIT_TYPE_WEB_DATA_SOURCE, NULL));
     436    WebKitWebDataSourcePrivate* priv = webDataSource->priv;
     437    priv->loader = loader.releaseRef();
     438
     439    return webDataSource;
     440}
     441
     442}

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

    r74730 r74933  
    5252#include "SubstituteData.h"
    5353#include "webkitenumtypes.h"
     54#include "webkitglobalsprivate.h"
    5455#include "webkitmarshal.h"
    5556#include "webkitnetworkrequestprivate.h"
    5657#include "webkitnetworkresponseprivate.h"
    57 #include "webkitprivate.h"
    5858#include "webkitsecurityoriginprivate.h"
    5959#include "webkitwebframeprivate.h"
    … …  
    182182static void webkit_web_frame_class_init(WebKitWebFrameClass* frameClass)
    183183{
    184     webkit_init();
     184    webkitInit();
    185185
    186186    /*

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

    r73906 r74933  
    2323#ifndef webkitwebframeprivate_h
    2424#define webkitwebframeprivate_h
     25
     26#include "Frame.h"
     27#include "webkitwebframe.h"
    2528
    2629namespace WebKit {

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

    r73906 r74933  
    2020
    2121#include "config.h"
    22 
    2322#include "webkitwebhistoryitem.h"
    24 #include "webkitprivate.h"
    2523
    2624#include "HistoryItem.h"
    2725#include "PlatformString.h"
     26#include "webkitglobalsprivate.h"
    2827#include "webkitwebhistoryitemprivate.h"
    2928#include <glib.h>
    … …  
    129128    gobject_class->get_property = webkit_web_history_item_get_property;
    130129
    131     webkit_init();
     130    webkitInit();
    132131
    133132    /**

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

    r74765 r74933  
    3434#include "RenderView.h"
    3535#include "webkit/WebKitDOMNodePrivate.h"
     36#include "webkitglobalsprivate.h"
    3637#include "webkitmarshal.h"
    37 #include "webkitprivate.h"
    3838#include "webkitwebinspectorprivate.h"
    3939#include <glib/gi18n-lib.h>

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

    r73906 r74933  
    1919
    2020#include "config.h"
    21 
     21#include "webkitwebnavigationaction.h"
     22
     23#include "FrameLoaderTypes.h"
     24#include "webkitenumtypes.h"
     25#include "webkitglobalsprivate.h"
     26#include <glib/gi18n-lib.h>
     27#include <string.h>
    2228#include <wtf/Assertions.h>
    23 #include "FrameLoaderTypes.h"
    24 
    25 #include <glib/gi18n-lib.h>
    26 #include "webkitwebnavigationaction.h"
    27 #include "webkitprivate.h"
    28 #include "webkitenumtypes.h"
    29 
    30 #include <string.h>
    3129
    3230static void webkit_web_navigation_action_set_target_frame(WebKitWebNavigationAction* navigationAction, const gchar* targetFrame);

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

    r74367 r74933  
    2121
    2222#include "PluginPackage.h"
    23 #include "webkitprivate.h"
     23#include "webkitglobalsprivate.h"
    2424#include "webkitwebpluginprivate.h"
    2525#include <glib/gi18n-lib.h>
    … …  
    9999static void webkit_web_plugin_class_init(WebKitWebPluginClass* klass)
    100100{
    101     webkit_init();
     101    webkitInit();
    102102
    103103    GObjectClass* gobjectClass = reinterpret_cast<GObjectClass*>(klass);

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

    r74367 r74933  
    2121
    2222#include "PluginDatabase.h"
    23 #include "webkitprivate.h"
     23#include "webkitglobalsprivate.h"
    2424#include "webkitwebplugindatabaseprivate.h"
    2525#include "webkitwebpluginprivate.h"
    … …  
    4848static void webkit_web_plugin_database_class_init(WebKitWebPluginDatabaseClass* klass)
    4949{
    50     webkit_init();
     50    webkitInit();
    5151
    5252    GObjectClass* gobjectClass = reinterpret_cast<GObjectClass*>(klass);

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

    r73906 r74933  
    2222#include "webkitwebplugin.h"
    2323#include <glib-object.h>
     24#include <wtf/text/CString.h>
    2425
    2526namespace WebCore {

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

    r73906 r74933  
    2121#include "webkitwebpolicydecision.h"
    2222
     23#include "FrameLoaderClient.h"
    2324#include "FrameLoaderTypes.h"
    24 #include "webkitprivate.h"
    2525#include "webkitwebframeprivate.h"
    2626#include "webkitwebpolicydecisionprivate.h"

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

    r73906 r74933  
    2626#include "SharedBuffer.h"
    2727#include "webkitenumtypes.h"
     28#include "webkitglobalsprivate.h"
    2829#include "webkitmarshal.h"
    29 #include "webkitprivate.h"
    3030#include "webkitwebresourceprivate.h"
     31#include <glib.h>
     32#include <glib/gi18n-lib.h>
    3133#include <wtf/Assertions.h>
    3234#include <wtf/text/CString.h>
    33 
    34 #include <glib.h>
    35 #include <glib/gi18n-lib.h>
    3635
    3736/**
    … …  
    4544
    4645using namespace WebCore;
    47 using namespace WebKit;
    4846
    4947enum {

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

    r73906 r74933  
    2727#include "webkitwebsettings.h"
    2828
     29#include "EditingBehavior.h"
    2930#include "FileSystem.h"
    3031#include "Language.h"
    3132#include "PluginDatabase.h"
    3233#include "webkitenumtypes.h"
    33 #include "webkitprivate.h"
     34#include "webkitglobalsprivate.h"
    3435#include "webkitversion.h"
    3536#include "webkitwebsettingsprivate.h"
     37#include <enchant.h>
    3638#include <wtf/text/CString.h>
    3739#include <wtf/text/StringConcatenate.h>
    3840#include <glib/gi18n-lib.h>
     41
    3942#if OS(UNIX)
    4043#include <sys/utsname.h>
    … …  
    242245    gobject_class->get_property = webkit_web_settings_get_property;
    243246
    244     webkit_init();
     247    webkitInit();
    245248
    246249    GParamFlags flags = (GParamFlags)(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT);
    … …  
    14051408
    14061409/**
    1407  * webkit_web_settings_get_enchant_dicts:
    1408  * @web_view: a #WebKitWebView
    1409  *
    1410  * Internal use only. Retrieves a GSList of EnchantDicts from the
    1411  * #WebKitWebSettings of @web_view.
    1412  *
    1413  * Since: 1.1.22
    1414  */
    1415 GSList* webkit_web_settings_get_enchant_dicts(WebKitWebView* webView)
    1416 {
    1417     g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0);
    1418 
    1419     WebKitWebSettings* settings = webkit_web_view_get_settings(webView);
    1420 
    1421     return settings->priv->enchant_dicts;
    1422 }
    1423 
    1424 /**
    14251410 * webkit_web_settings_get_user_agent:
    14261411 * @web_settings: a #WebKitWebSettings
    … …  
    14391424    return priv->user_agent;
    14401425}
     1426
     1427GSList* webkitWebViewGetEnchantDicts(WebKitWebView* webView)
     1428{
     1429    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0);
     1430
     1431    WebKitWebSettings* settings = webkit_web_view_get_settings(webView);
     1432
     1433    return settings->priv->enchant_dicts;
     1434}
     1435
     1436namespace WebKit {
     1437
     1438WebCore::EditingBehaviorType core(WebKitEditingBehavior type)
     1439{
     1440    return (WebCore::EditingBehaviorType)type;
     1441}
     1442
     1443}

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

    r73855 r74933  
    3030WEBKIT_API void webkit_web_settings_add_extra_plugin_directory(WebKitWebView*, const gchar* directory);
    3131
    32 GSList* webkit_web_settings_get_enchant_dicts(WebKitWebView*);
     32GSList* webkitWebViewGetEnchantDicts(WebKitWebView*);
     33
     34WTF::String webkitUserAgent();
    3335
    3436}

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

    r74028 r74933  
    7777#include "ScriptValue.h"
    7878#include "Scrollbar.h"
     79#include "Settings.h"
    7980#include "webkit/WebKitDOMDocumentPrivate.h"
    8081#include "webkitdownload.h"
    … …  
    8283#include "webkitenumtypes.h"
    8384#include "webkitgeolocationpolicydecision.h"
     85#include "webkitglobalsprivate.h"
    8486#include "webkithittestresultprivate.h"
    8587#include "webkitmarshal.h"
    8688#include "webkitnetworkrequest.h"
    8789#include "webkitnetworkresponse.h"
    88 #include "webkitprivate.h"
    8990#include "webkitviewportattributes.h"
    9091#include "webkitviewportattributesprivate.h"
    … …  
    9798#include "webkitwebpolicydecision.h"
    9899#include "webkitwebresource.h"
     100#include "webkitwebsettingsprivate.h"
    99101#include "webkitwebplugindatabaseprivate.h"
     102#include "webkitwebwindowfeatures.h"
    100103#include "webkitwebviewprivate.h"
    101104#include <gdk/gdkkeysyms.h>
    … …  
    138141
    139142static const double defaultDPI = 96.0;
    140 static WebKitCacheModel cacheModel = WEBKIT_CACHE_MODEL_DEFAULT;
    141143static IntPoint globalPointForClientPoint(GdkWindow* window, const IntPoint& clientPoint);
    142144
    … …  
    17581760    GtkBindingSet* binding_set;
    17591761
    1760     webkit_init();
     1762    webkitInit();
    17611763
    17621764    /*
    … …  
    33313333    settings->setJavaScriptCanAccessClipboard(javaScriptCanAccessClipboard);
    33323334    settings->setOfflineWebApplicationCacheEnabled(enableOfflineWebAppCache);
    3333     settings->setEditingBehaviorType(core(editingBehavior));
     3335    settings->setEditingBehaviorType(static_cast<WebCore::EditingBehaviorType>(editingBehavior));
    33343336    settings->setAllowUniversalAccessFromFileURLs(enableUniversalAccessFromFileURI);
    33353337    settings->setAllowFileAccessFromFileURLs(enableFileAccessFromFileURI);
    … …  
    34373439        settings->setOfflineWebApplicationCacheEnabled(g_value_get_boolean(&value));
    34383440    else if (name == g_intern_string("editing-behavior"))
    3439         settings->setEditingBehaviorType(core(static_cast<WebKitEditingBehavior>(g_value_get_enum(&value))));
     3441        settings->setEditingBehaviorType(static_cast<WebCore::EditingBehaviorType>(g_value_get_enum(&value)));
    34403442    else if (name == g_intern_string("enable-universal-access-from-file-uris"))
    34413443        settings->setAllowUniversalAccessFromFileURLs(g_value_get_boolean(&value));
    … …  
    50515053}
    50525054
    5053 /**
    5054  * SECTION:webkit
    5055  * @short_description: Global functions controlling WebKit
    5056  *
    5057  * WebKit manages many resources which are not related to specific
    5058  * views. These functions relate to cross-view limits, such as cache
    5059  * sizes, database quotas, and the HTTP session management.
    5060  */
    5061 
    5062 /**
    5063  * webkit_get_default_session:
    5064  *
    5065  * Retrieves the default #SoupSession used by all web views.
    5066  * Note that the session features are added by WebKit on demand,
    5067  * so if you insert your own #SoupCookieJar before any network
    5068  * traffic occurs, WebKit will use it instead of the default.
    5069  *
    5070  * Return value: (transfer none): the default #SoupSession
    5071  *
    5072  * Since: 1.1.1
    5073  */
    5074 SoupSession* webkit_get_default_session ()
    5075 {
    5076     webkit_init();
    5077     return ResourceHandle::defaultSession();
    5078 }
    5079 
    5080 /**
    5081  * webkit_set_cache_model:
    5082  * @cache_model: a #WebKitCacheModel
    5083  *
    5084  * Specifies a usage model for WebViews, which WebKit will use to
    5085  * determine its caching behavior. All web views follow the cache
    5086  * model. This cache model determines the RAM and disk space to use
    5087  * for caching previously viewed content .
    5088  *
    5089  * Research indicates that users tend to browse within clusters of
    5090  * documents that hold resources in common, and to revisit previously
    5091  * visited documents. WebKit and the frameworks below it include
    5092  * built-in caches that take advantage of these patterns,
    5093  * substantially improving document load speed in browsing
    5094  * situations. The WebKit cache model controls the behaviors of all of
    5095  * these caches, including various WebCore caches.
    5096  *
    5097  * Browsers can improve document load speed substantially by
    5098  * specifying WEBKIT_CACHE_MODEL_WEB_BROWSER. Applications without a
    5099  * browsing interface can reduce memory usage substantially by
    5100  * specifying WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER. Default value is
    5101  * WEBKIT_CACHE_MODEL_WEB_BROWSER.
    5102  *
    5103  * Since: 1.1.18
    5104  */
    5105 void webkit_set_cache_model(WebKitCacheModel model)
    5106 {
    5107     webkit_init();
    5108 
    5109     if (cacheModel == model)
    5110         return;
    5111 
    5112     // FIXME: Add disk cache handling when soup has the API
    5113     guint cacheTotalCapacity;
    5114     guint cacheMinDeadCapacity;
    5115     guint cacheMaxDeadCapacity;
    5116     gdouble deadDecodedDataDeletionInterval;
    5117     guint pageCacheCapacity;
    5118 
    5119     switch (model) {
    5120     case WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER:
    5121         pageCacheCapacity = 0;
    5122         cacheTotalCapacity = 0;
    5123         cacheMinDeadCapacity = 0;
    5124         cacheMaxDeadCapacity = 0;
    5125         deadDecodedDataDeletionInterval = 0;
    5126         break;
    5127     case WEBKIT_CACHE_MODEL_WEB_BROWSER:
    5128         // Page cache capacity (in pages). Comment from Mac port:
    5129         // (Research indicates that value / page drops substantially after 3 pages.)
    5130         pageCacheCapacity = 3;
    5131         cacheTotalCapacity = 32 * 1024 * 1024;
    5132         cacheMinDeadCapacity = cacheTotalCapacity / 4;
    5133         cacheMaxDeadCapacity = cacheTotalCapacity / 2;
    5134         deadDecodedDataDeletionInterval = 60;
    5135         break;
    5136     default:
    5137         g_return_if_reached();
    5138     }
    5139 
    5140     cache()->setCapacities(cacheMinDeadCapacity, cacheMaxDeadCapacity, cacheTotalCapacity);
    5141     cache()->setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
    5142     pageCache()->setCapacity(pageCacheCapacity);
    5143     cacheModel = model;
    5144 }
    5145 
    5146 /**
    5147  * webkit_get_cache_model:
    5148  *
    5149  * Returns the current cache model. For more information about this
    5150  * value check the documentation of the function
    5151  * webkit_set_cache_model().
    5152  *
    5153  * Return value: the current #WebKitCacheModel
    5154  *
    5155  * Since: 1.1.18
    5156  */
    5157 WebKitCacheModel webkit_get_cache_model()
    5158 {
    5159     webkit_init();
    5160     return cacheModel;
    5161 }
    5162 
    5163 /**
    5164  * webkit_get_web_plugin_database:
    5165  *
    5166  * Returns the current #WebKitWebPluginDatabase with information about
    5167  * all the plugins WebKit knows about in this instance.
    5168  *
    5169  * Return value: (transfer none): the current #WebKitWebPluginDatabase
    5170  *
    5171  * Since: 1.3.8
    5172  */
    5173 WebKitWebPluginDatabase* webkit_get_web_plugin_database()
    5174 {
    5175     static WebKitWebPluginDatabase* database = 0;
    5176 
    5177     webkit_init();
    5178 
    5179     if (!database)
    5180         database = webkit_web_plugin_database_new();
    5181 
    5182     return database;
    5183 }
    5184 
    51855055GtkMenu* webkit_web_view_get_context_menu(WebKitWebView* webView)
    51865056{

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

    r73858 r74933  
    5151} WebKitNavigationResponse;
    5252
    53 /* 
    54  * WebKitCacheModel:
    55  * @WEBKIT_CACHE_MODEL_DEFAULT: The default cache model. This is
    56  *   WEBKIT_CACHE_MODEL_WEB_BROWSER.
    57  * @WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER: Disable the cache completely, which
    58  *   substantially reduces memory usage. Useful for applications that only
    59  *   access local files.
    60  * @WEBKIT_CACHE_MODEL_WEB_BROWSER: Improve document load speed substantially
    61  *   by caching previously viewed content.
    62  *
    63  * Enum values used for determining the webview cache model.
    64  */
    65 typedef enum {
    66     WEBKIT_CACHE_MODEL_DEFAULT,
    67     WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER,
    68     WEBKIT_CACHE_MODEL_WEB_BROWSER
    69 } WebKitCacheModel;
    70 
    7153typedef enum
    7254{
    … …  
    362344                                                 gboolean              full_content_zoom);
    363345
    364 WEBKIT_API SoupSession*
    365 webkit_get_default_session                      (void);
    366 
    367 WEBKIT_API WebKitWebPluginDatabase *
    368 webkit_get_web_plugin_database                  (void);
    369 
    370346WEBKIT_API const gchar*
    371347webkit_web_view_get_encoding                    (WebKitWebView        * webView);
    … …  
    422398webkit_web_view_get_icon_uri                    (WebKitWebView        *webView);
    423399
    424 WEBKIT_API void
    425 webkit_set_cache_model                          (WebKitCacheModel     cache_model);
    426 
    427 WEBKIT_API WebKitCacheModel
    428 webkit_get_cache_model                          (void);
    429 
    430400WEBKIT_API WebKitDOMDocument *
    431401webkit_web_view_get_dom_document                (WebKitWebView        *webView);

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

    r73906 r74933  
    2020
    2121#include "config.h"
     22#include "webkitwebwindowfeatures.h"
    2223
    2324#include "WindowFeatures.h"
    24 #include "webkitwebwindowfeatures.h"
    25 #include "webkitprivate.h"
     25#include "webkitglobalsprivate.h"
     26#include "webkitwebwindowfeaturesprivate.h"
    2627
    2728/**
    … …  
    101102    GParamFlags flags = (GParamFlags)(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT);
    102103
    103     webkit_init();
     104    webkitInit();
    104105
    105106    /**
    … …  
    377378{
    378379    return WEBKIT_WEB_WINDOW_FEATURES(g_object_new(WEBKIT_TYPE_WEB_WINDOW_FEATURES, NULL));
    379 }
    380 
    381 // for internal use only
    382 WebKitWebWindowFeatures* webkit_web_window_features_new_from_core_features(const WebCore::WindowFeatures& features)
    383 {
    384     WebKitWebWindowFeatures *webWindowFeatures = webkit_web_window_features_new();
    385 
    386     if(features.xSet)
    387         g_object_set(webWindowFeatures, "x", static_cast<int>(features.x), NULL);
    388 
    389     if(features.ySet)
    390         g_object_set(webWindowFeatures, "y", static_cast<int>(features.y), NULL);
    391 
    392     if(features.widthSet)
    393         g_object_set(webWindowFeatures, "width", static_cast<int>(features.width), NULL);
    394 
    395     if(features.heightSet)
    396         g_object_set(webWindowFeatures, "height", static_cast<int>(features.height), NULL);
    397 
    398     g_object_set(webWindowFeatures,
    399                  "toolbar-visible", features.toolBarVisible,
    400                  "statusbar-visible", features.statusBarVisible,
    401                  "scrollbar-visible", features.scrollbarsVisible,
    402                  "menubar-visible", features.menuBarVisible,
    403                  "locationbar-visible", features.locationBarVisible,
    404                  "fullscreen", features.fullscreen,
    405                  NULL);
    406 
    407     return webWindowFeatures;
    408380}
    409381
    … …  
    444416    return FALSE;
    445417}
     418
     419namespace WebKit {
     420
     421WebKitWebWindowFeatures* kitNew(const WebCore::WindowFeatures& features)
     422{
     423    WebKitWebWindowFeatures *webWindowFeatures = webkit_web_window_features_new();
     424
     425    if(features.xSet)
     426        g_object_set(webWindowFeatures, "x", static_cast<int>(features.x), NULL);
     427
     428    if(features.ySet)
     429        g_object_set(webWindowFeatures, "y", static_cast<int>(features.y), NULL);
     430
     431    if(features.widthSet)
     432        g_object_set(webWindowFeatures, "width", static_cast<int>(features.width), NULL);
     433
     434    if(features.heightSet)
     435        g_object_set(webWindowFeatures, "height", static_cast<int>(features.height), NULL);
     436
     437    g_object_set(webWindowFeatures,
     438                 "toolbar-visible", features.toolBarVisible,
     439                 "statusbar-visible", features.statusBarVisible,
     440                 "scrollbar-visible", features.scrollbarsVisible,
     441                 "menubar-visible", features.menuBarVisible,
     442                 "locationbar-visible", features.locationBarVisible,
     443                 "fullscreen", features.fullscreen,
     444                 NULL);
     445
     446    return webWindowFeatures;
     447}
     448
     449}
Note: See TracChangeset for help on using the changeset viewer.