Changeset 87925 in webkit


Ignore:
Timestamp:
Jun 2, 2011 10:16:17 AM (13 years ago)
Author:
joone.hur@collabora.co.uk
Message:

2011-06-02 Joone Hur <joone.hur@collabora.co.uk>

Reviewed by Martin Robinson.

[GTK] Only load dictionaries if spell check is enabled
https://bugs.webkit.org/show_bug.cgi?id=32879

We don't need to call enchant if enable-spell-checking is false.

  • webkit/webkitwebview.cpp: (webkit_web_view_update_settings): Skip loading dictionaries when enable-spell-checking is false. (webkit_web_view_settings_notify): Ditto.
Location:
trunk/Source/WebKit/gtk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/gtk/ChangeLog

    r87830 r87925  
     12011-06-02  Joone Hur  <joone.hur@collabora.co.uk>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [GTK] Only load dictionaries if spell check is enabled
     6        https://bugs.webkit.org/show_bug.cgi?id=32879
     7
     8        We don't need to call enchant if enable-spell-checking is false.
     9
     10        * webkit/webkitwebview.cpp:
     11        (webkit_web_view_update_settings): Skip loading dictionaries when enable-spell-checking is false.
     12        (webkit_web_view_settings_notify): Ditto.
     13
    1142011-06-01  Xan Lopez  <xlopez@igalia.com>
    215
  • trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

    r87623 r87925  
    32023202        enableDOMPaste, tabKeyCyclesThroughElements, enableWebGL,
    32033203        enableSiteSpecificQuirks, usePageCache, enableJavaApplet,
    3204         enableHyperlinkAuditing, enableFullscreen, enableDNSPrefetching;
     3204        enableHyperlinkAuditing, enableFullscreen, enableDNSPrefetching,
     3205        enableSpellChecking;
    32053206
    32063207    WebKitEditingBehavior editingBehavior;
     
    32413242                 "enable-java-applet", &enableJavaApplet,
    32423243                 "enable-hyperlink-auditing", &enableHyperlinkAuditing,
     3244                 "enable-spell-checking", &enableSpellChecking,
    32433245                 "spell-checking-languages", &defaultSpellCheckingLanguages,
    32443246                 "enable-fullscreen", &enableFullscreen,
     
    32893291
    32903292#if ENABLE(SPELLCHECK)
    3291     WebKit::EditorClient* client = static_cast<WebKit::EditorClient*>(core(webView)->editorClient());
    3292     static_cast<WebKit::TextCheckerClientEnchant*>(client->textChecker())->updateSpellCheckingLanguage(defaultSpellCheckingLanguages);
     3293    if (enableSpellChecking) {
     3294        WebKit::EditorClient* client = static_cast<WebKit::EditorClient*>(core(webView)->editorClient());
     3295        static_cast<WebKit::TextCheckerClientEnchant*>(client->textChecker())->updateSpellCheckingLanguage(defaultSpellCheckingLanguages);
     3296    }
    32933297#endif
    32943298
     
    34163420#if ENABLE(SPELLCHECK)
    34173421    else if (name == g_intern_string("spell-checking-languages")) {
    3418         WebKit::EditorClient* client = static_cast<WebKit::EditorClient*>(core(webView)->editorClient());
    3419         static_cast<WebKit::TextCheckerClientEnchant*>(client->textChecker())->updateSpellCheckingLanguage(g_value_get_string(&value));
     3422        gboolean enableSpellChecking;
     3423        g_object_get(G_OBJECT(webSettings), "enable-spell-checking", &enableSpellChecking, NULL);
     3424        if (enableSpellChecking) {
     3425            WebKit::EditorClient* client = static_cast<WebKit::EditorClient*>(core(webView)->editorClient());
     3426            static_cast<WebKit::TextCheckerClientEnchant*>(client->textChecker())->updateSpellCheckingLanguage(g_value_get_string(&value));
     3427        }
    34203428    }
    34213429#endif
Note: See TracChangeset for help on using the changeset viewer.