Changeset 96014 in webkit


Ignore:
Timestamp:
Sep 26, 2011 3:46:28 PM (13 years ago)
Author:
ap@apple.com
Message:

REGRESSION (r95747): Activating the web inspector causes the web process to be killed
​https://bugs.webkit.org/show_bug.cgi?id=68762

Reviewed by Anders Carlsson.

  • UIProcess/WebInspectorProxy.cpp: (WebKit::WebInspectorProxy::createInspectorPage):

Tell Web process that loading resources from WebCore resources directory is OK.

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::loadHTMLString):
(WebKit::WebPageProxy::loadAlternateHTMLString):

  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::assumeReadAccessToBaseURL):

  • UIProcess/WebProcessProxy.h:

Renamed willLoadHTMLStringWithBaseURL to more generic assumeReadAccessToBaseURL.

  • UIProcess/WebInspectorProxy.h:
  • UIProcess/efl/WebInspectorEfl.cpp:

(WebKit::WebInspectorProxy::inspectorBaseURL):

  • UIProcess/gtk/WebInspectorGtk.cpp:

(WebKit::WebInspectorProxy::inspectorBaseURL):

  • UIProcess/mac/WebInspectorProxyMac.mm:

(WebKit::WebInspectorProxy::inspectorBaseURL):

  • UIProcess/qt/WebInspectorProxyQt.cpp:

(WebKit::WebInspectorProxy::inspectorBaseURL):

  • UIProcess/win/WebInspectorProxyWin.cpp:

(WebKit::WebInspectorProxy::inspectorBaseURL):
Report what base directory Inspector has access to.

Location:
trunk/Source/WebKit2
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r95999 r96014  
     12011-09-26  Alexey Proskuryakov  <ap@apple.com>
     2
     3        REGRESSION (r95747): Activating the web inspector causes the web process to be killed
     4        https://bugs.webkit.org/show_bug.cgi?id=68762
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * UIProcess/WebInspectorProxy.cpp: (WebKit::WebInspectorProxy::createInspectorPage):
     9        Tell Web process that loading resources from WebCore resources directory is OK.
     10
     11        * UIProcess/WebPageProxy.cpp:
     12        (WebKit::WebPageProxy::loadHTMLString):
     13        (WebKit::WebPageProxy::loadAlternateHTMLString):
     14        * UIProcess/WebProcessProxy.cpp:
     15        (WebKit::WebProcessProxy::assumeReadAccessToBaseURL):
     16        * UIProcess/WebProcessProxy.h:
     17        Renamed willLoadHTMLStringWithBaseURL to more generic assumeReadAccessToBaseURL.
     18
     19        * UIProcess/WebInspectorProxy.h:
     20        * UIProcess/efl/WebInspectorEfl.cpp:
     21        (WebKit::WebInspectorProxy::inspectorBaseURL):
     22        * UIProcess/gtk/WebInspectorGtk.cpp:
     23        (WebKit::WebInspectorProxy::inspectorBaseURL):
     24        * UIProcess/mac/WebInspectorProxyMac.mm:
     25        (WebKit::WebInspectorProxy::inspectorBaseURL):
     26        * UIProcess/qt/WebInspectorProxyQt.cpp:
     27        (WebKit::WebInspectorProxy::inspectorBaseURL):
     28        * UIProcess/win/WebInspectorProxyWin.cpp:
     29        (WebKit::WebInspectorProxy::inspectorBaseURL):
     30        Report what base directory Inspector has access to.
     31
    1322011-09-26  Nayan Kumar K  <nayankk@motorola.com>
    233

  • trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp

    r95901 r96014  
    213213    if (shouldOpenAttached())
    214214        url += "?docked=true";
     215    m_page->process()->assumeReadAccessToBaseURL(inspectorBaseURL());
    215216    inspectorPage->loadURL(url);
    216217}

  • trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h

    r95901 r96014  
    126126    // Implemented the platform WebInspectorProxy file
    127127    String inspectorPageURL() const;
     128    String inspectorBaseURL() const;
    128129
    129130    // Called by WebInspectorProxy messages

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r95901 r96014  
    448448        reattachToWebProcess();
    449449
    450     process()->willLoadHTMLStringWithBaseURL(baseURL);
     450    process()->assumeReadAccessToBaseURL(baseURL);
    451451    process()->send(Messages::WebPage::LoadHTMLString(htmlString, baseURL), m_pageID);
    452452    process()->responsivenessTimer()->start();
    … …  
    461461        m_mainFrame->setUnreachableURL(unreachableURL);
    462462
    463     process()->willLoadHTMLStringWithBaseURL(baseURL);
     463    process()->assumeReadAccessToBaseURL(baseURL);
    464464    process()->send(Messages::WebPage::LoadAlternateHTMLString(htmlString, baseURL, unreachableURL), m_pageID);
    465465    process()->responsivenessTimer()->start();

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

    r95901 r96014  
    204204}
    205205
    206 void WebProcessProxy::willLoadHTMLStringWithBaseURL(const String& urlString)
     206void WebProcessProxy::assumeReadAccessToBaseURL(const String& urlString)
    207207{
    208208    KURL url(KURL(), urlString);

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

    r95901 r96014  
    106106
    107107    void willAcquireUniversalFileReadSandboxExtension() { m_mayHaveUniversalFileReadSandboxExtension = true; }
    108     void willLoadHTMLStringWithBaseURL(const String&);
     108    void assumeReadAccessToBaseURL(const String&);
    109109
    110110    bool checkURLReceivedFromWebProcess(const String&);

  • trunk/Source/WebKit2/UIProcess/efl/WebInspectorEfl.cpp

    r95901 r96014  
    6666}
    6767
     68String WebInspectorProxy::inspectorBaseURL() const
     69{
     70    notImplemented();
     71    return String();
     72}
     73
    6874unsigned WebInspectorProxy::platformInspectedWindowHeight()
    6975{

  • trunk/Source/WebKit2/UIProcess/gtk/WebInspectorGtk.cpp

    r95901 r96014  
    6767}
    6868
     69String WebInspectorProxy::inspectorBaseURL() const
     70{
     71    notImplemented();
     72    return String();
     73}
     74
    6975unsigned WebInspectorProxy::platformInspectedWindowHeight()
    7076{

  • trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm

    r95901 r96014  
    255255}
    256256
     257String WebInspectorProxy::inspectorBaseURL() const
     258{
     259    // Web Inspector uses localized strings, so it's not contained within inspector directory.
     260    NSString *path = [[NSBundle bundleWithIdentifier:@"com.apple.WebCore"] resourcePath];
     261    ASSERT(path);
     262
     263    return [[NSURL fileURLWithPath:path] absoluteString];
     264}
     265
    257266} // namespace WebKit
    258267

  • trunk/Source/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp

    r95901 r96014  
    8181}
    8282
    83 String WebInspectorProxy::inspectorPageURL() const
     83String WebInspectorProxy::inspectorBaseURL() const
    8484{
    8585    notImplemented();

  • trunk/Source/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp

    r95901 r96014  
    326326}
    327327
     328String WebInspectorProxy::inspectorBaseURL() const
     329{
     330    // Web Inspector uses localized strings, so it's not contained within inspector directory.
     331    RetainPtr<CFURLRef> htmlURLRef(AdoptCF, CFBundleCopyResourcesDirectoryURL(webKitBundle()));
     332    if (!htmlURLRef)
     333        return String();
     334
     335    return String(CFURLGetString(htmlURLRef.get()));
     336}
     337
    328338} // namespace WebKit
    329339
Note: See TracChangeset for help on using the changeset viewer.