Merge 140539

Source/WebCore/inspector/InspectorFrontendClientLocal.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 148 matching lines @@
     } else if (canAttachWindow()) {
         attachWindow();
         setAttachedWindow(true);
     }
 }
 
 bool InspectorFrontendClientLocal::canAttachWindow()
 {
     // 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;
 }
 
 void InspectorFrontendClientLocal::setDockingUnavailable(bool unavailable)
 {
     evaluateOnLoad(String::format("[\"setDockingUnavailable\", %s]", unavailable ? "true" : "false"));
 }
 
@@ skipping 110 matching lines @@
 {
     using namespace std;
     return roundf(max(minimumAttachedHeight, min<float>(preferredHeight, totalWindowHeight * maximumAttachedHeightRatio)));
 }
 
 void InspectorFrontendClientLocal::sendMessageToBackend(const String& message)
 {
     m_dispatchTask->dispatch(message);
 }
 
+bool InspectorFrontendClientLocal::isUnderTest()
+{
+    return m_inspectorController->isUnderTest();
+}
+
 bool InspectorFrontendClientLocal::evaluateAsBoolean(const String& expression)
 {
     if (!m_frontendPage->mainFrame())
         return false;
     ScriptValue value = m_frontendPage->mainFrame()->script()->executeScript(expression);
     return value.toString(mainWorldScriptState(m_frontendPage->mainFrame())) == "true";
 }
 
 void InspectorFrontendClientLocal::evaluateOnLoad(const String& expression)
 {
     if (m_frontendLoaded)
         m_frontendPage->mainFrame()->script()->executeScript("InspectorFrontendAPI.dispatch(" + expression + ")");
     else
         m_evaluateOnLoad.append(expression);
 }
 
 } // namespace WebCore
 
 #endif