Changeset 152084 in webkit


Ignore:
Timestamp:
Jun 27, 2013 1:49:15 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK] [WK2] Check value of WEBKIT_INJECTED_BUNDLE_PATH
https://bugs.webkit.org/show_bug.cgi?id=118055

Patch by Alberto Garcia <agarcia@igalia.com> on 2013-06-27
Reviewed by Carlos Garcia Campos.

If the directory pointed at by WEBKIT_INJECTED_BUNDLE_PATH does
not exist, fall back to the system directory.

This makes MiniBrowser work outside the build tree.

  • UIProcess/API/gtk/WebKitWebContext.cpp:

(injectedBundleDirectory):

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r152077 r152084  
     12013-06-27  Alberto Garcia  <agarcia@igalia.com>
     2
     3        [GTK] [WK2] Check value of WEBKIT_INJECTED_BUNDLE_PATH
     4        https://bugs.webkit.org/show_bug.cgi?id=118055
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        If the directory pointed at by WEBKIT_INJECTED_BUNDLE_PATH does
     9        not exist, fall back to the system directory.
     10
     11        This makes MiniBrowser work outside the build tree.
     12
     13        * UIProcess/API/gtk/WebKitWebContext.cpp:
     14        (injectedBundleDirectory):
     15
    1162013-06-26  Simon Cooper  <scooper@apple.com>
    217
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp

    r149642 r152084  
    175175static CString injectedBundleDirectory()
    176176{
    177     if (const char* bundleDirectory = g_getenv("WEBKIT_INJECTED_BUNDLE_PATH"))
     177    const char* bundleDirectory = g_getenv("WEBKIT_INJECTED_BUNDLE_PATH");
     178    if (bundleDirectory && g_file_test(bundleDirectory, G_FILE_TEST_IS_DIR))
    178179        return bundleDirectory;
    179180
Note: See TracChangeset for help on using the changeset viewer.