Attachment 187536 Details for Bug 109407 – Patch

[patch] Patch

109407_inspector_crashes.patch (text/plain), 1.87 KB, created by Chris Dumez on 2013-02-11 03:03:57 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2013-02-11 03:03:57 PST

Size: 1.87 KB

patch

obsolete

>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index a7ad1d1..eac43f1 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,19 @@
>+2013-02-11  Christophe Dumez  <ch.dumez@sisa.samsung.com>
>+
>+        [WK2] Several Web inspector tests crash after r142160.
>+        https://bugs.webkit.org/show_bug.cgi?id=109407
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WebPageProxy::reattachToWebProcess() should initialize m_inspector
>+        BEFORE calling initializeWebPage() since the latter uses m_inspector
>+        when INSPECTOR_SERVER is defined. This patch also moves the
>+        initialization of m_fullScreenManager before the call to
>+        initializeWebPage() to be safe.
>+
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::WebPageProxy::reattachToWebProcess):
>+
> 2013-02-10  Sam Weinig  <sam@webkit.org>
> 
>         Make the Plug-in XPCService build work even when building in Xcode
>diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp
>index ec2c1f9..2b949ad 100644
>--- a/Source/WebKit2/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp
>@@ -396,17 +396,17 @@ void WebPageProxy::reattachToWebProcess()
>     m_process->addExistingWebPage(this, m_pageID);
>     m_process->addMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID, this);
> 
>-    initializeWebPage();
>-
>-    m_pageClient->didRelaunchProcess();
>-    m_drawingArea->waitForBackingStoreUpdateOnNextPaint();
>-
> #if ENABLE(INSPECTOR)
>     m_inspector = WebInspectorProxy::create(this);
> #endif
> #if ENABLE(FULLSCREEN_API)
>     m_fullScreenManager = WebFullScreenManagerProxy::create(this);
> #endif
>+
>+    initializeWebPage();
>+
>+    m_pageClient->didRelaunchProcess();
>+    m_drawingArea->waitForBackingStoreUpdateOnNextPaint();
> }
> 
> void WebPageProxy::reattachToWebProcessWithItem(WebBackForwardListItem* item)

Actions: View | Formatted Diff | Diff

Attachments on bug 109407: 187531 | 187532 | 187536 | 187537