projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
tools
/
telemetry
/
telemetry
/
core
/
backends
/
chrome
/
system_info_backend.py
diff --git
a/src/tools/telemetry/telemetry/core/backends/chrome/system_info_backend.py
b/src/tools/telemetry/telemetry/core/backends/chrome/system_info_backend.py
index
00a78a7
..
615b62d
100644
(file)
--- a/
src/tools/telemetry/telemetry/core/backends/chrome/system_info_backend.py
+++ b/
src/tools/telemetry/telemetry/core/backends/chrome/system_info_backend.py
@@
-8,14
+8,19
@@
from telemetry.core.backends.chrome import inspector_websocket
class SystemInfoBackend(object):
class SystemInfoBackend(object):
- def __init__(self, devtools_port):
+ def __init__(self, devtools_port
, devtools_page=None
):
self._port = devtools_port
self._port = devtools_port
+ self._page = devtools_page
def GetSystemInfo(self, timeout=10):
req = {'method': 'SystemInfo.getInfo'}
websocket = inspector_websocket.InspectorWebsocket()
try:
def GetSystemInfo(self, timeout=10):
req = {'method': 'SystemInfo.getInfo'}
websocket = inspector_websocket.InspectorWebsocket()
try:
- websocket.Connect('ws://127.0.0.1:%i/devtools/browser' % self._port)
+ if self._page:
+ websocket.Connect('ws://127.0.0.1:%i/devtools/page/%i' %
+ (self._port, self._page))
+ else:
+ websocket.Connect('ws://127.0.0.1:%i/devtools/browser' % self._port)
res = websocket.SyncRequest(req, timeout)
finally:
websocket.Disconnect()
res = websocket.SyncRequest(req, timeout)
finally:
websocket.Disconnect()