Merge 140539

Source/WebCore/inspector/InspectorFrontendClientLocal.cpp

Index: Source/WebCore/inspector/InspectorFrontendClientLocal.cpp
===================================================================
--- Source/WebCore/inspector/InspectorFrontendClientLocal.cpp	(revision 142083)
+++ Source/WebCore/inspector/InspectorFrontendClientLocal.cpp	(working copy)
@@ -166,7 +166,7 @@
 {
     // Don't allow the attach if the window would be too small to accommodate the minimum inspector height.
     // Also don't allow attaching to another inspector -- two inspectors in one window is too much!
-    bool isInspectorPage = m_inspectorController->inspectedPage()->inspectorController()->hasInspectorFrontendClient();
+    bool isInspectorPage = m_inspectorController->hasInspectorFrontendClient();
     unsigned inspectedPageHeight = m_inspectorController->inspectedPage()->mainFrame()->view()->visibleHeight();
     unsigned maximumAttachedHeight = inspectedPageHeight * maximumAttachedHeightRatio;
     return minimumAttachedHeight <= maximumAttachedHeight && !isInspectorPage;
@@ -297,6 +297,11 @@
     m_dispatchTask->dispatch(message);
 }
 
+bool InspectorFrontendClientLocal::isUnderTest()
+{
+    return m_inspectorController->isUnderTest();
+}
+
 bool InspectorFrontendClientLocal::evaluateAsBoolean(const String& expression)
 {
     if (!m_frontendPage->mainFrame())