Merge r12911....

third_party/WebKit/WebCore/inspector/InspectorController.cpp

 /*
  * Copyright (C) 2007 Google Inc. All rights reserved.
  * Authors: Collin Jackson, Adam Barth
  *
  * This is the V8 version of the KJS InspectorController, which is located in
  * webkit/pending.
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 1118 matching lines @@
 
     // inspect() will implicitly call ElementsPanel's focusedNodeChanged() and the hover feedback will be stopped there.
     inspect(node);
 }
 
 
 void InspectorController::windowScriptObjectAvailable()
 {
     if (!m_page || !enabled())
         return;
+
+    // Grant the inspector the ability to script the inspected page.
+    m_page->mainFrame()->document()->securityOrigin()->grantUniversalAccess();
     
     v8::HandleScope handle_scope;
     v8::Handle<v8::Context> context = V8Proxy::GetContext(m_page->mainFrame());
     v8::Context::Scope scope(context);
 
     // InspectorController.idl exposes the methods of InspectorController to JavaScript
     v8::Handle<v8::Object> global = context->Global();
     v8::Handle<v8::Value> inspectorController = V8Proxy::ToV8Object(V8ClassIndex::INSPECTORCONTROLLER, this);
     global->Set(v8::String::New("InspectorController"), inspectorController);
 }
@@ skipping 914 matching lines @@
 }
 
 bool InspectorController::stopTiming(const String& title, double& elapsed)
 {
     elapsed = 0;
     notImplemented();
     return false;
 }
 
 } // namespace WebCore