bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 113143.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@426 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-12-16 14:51:10 +00:00
parent 9fadd1724f
commit eff39b0f11
59 changed files with 337 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libcef/browser_devtools_agent.cc
View File

@@ -43,23 +43,11 @@ class WebKitClientMessageLoopImpl
} // namespace
// static
void BrowserDevToolsAgent::DispatchMessageLoop() {
MessageLoop* current = MessageLoop::current();
bool old_state = current->NestableTasksAllowed();
current->SetNestableTasksAllowed(true);
current->RunAllPending();
current->SetNestableTasksAllowed(old_state);
}
BrowserDevToolsAgent::BrowserDevToolsAgent()
: ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
dev_tools_client_(NULL) {
static int dev_tools_agent_counter;
routing_id_ = ++dev_tools_agent_counter;
if (routing_id_ == 1)
WebDevToolsAgent::setMessageLoopDispatchHandler(
&BrowserDevToolsAgent::DispatchMessageLoop);
}
BrowserDevToolsAgent::~BrowserDevToolsAgent() {
@@ -75,6 +63,10 @@ void BrowserDevToolsAgent::sendMessageToInspectorFrontend(
dev_tools_client_->AsyncCall(BrowserDevToolsCallArgs(data));
}
int BrowserDevToolsAgent::hostIdentifier() {
return routing_id_;
}
void BrowserDevToolsAgent::runtimePropertyChanged(
const WebKit::WebString& name,
const WebKit::WebString& value) {
@@ -101,12 +93,6 @@ void BrowserDevToolsAgent::Call(const BrowserDevToolsCallArgs &args) {
dev_tools_client_->all_messages_processed();
}
void BrowserDevToolsAgent::DelayedFrontendLoaded() {
WebDevToolsAgent *web_agent = GetWebAgent();
if (web_agent)
web_agent->frontendLoaded();
}
WebDevToolsAgent* BrowserDevToolsAgent::GetWebAgent() {
if (!web_view_)
return NULL;
@@ -129,13 +115,6 @@ void BrowserDevToolsAgent::detach() {
dev_tools_client_ = NULL;
}
void BrowserDevToolsAgent::frontendLoaded() {
MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(&BrowserDevToolsAgent::DelayedFrontendLoaded,
weak_factory_.GetWeakPtr()));
}
bool BrowserDevToolsAgent::evaluateInWebInspector(
long call_id,
const std::string& script) {