| Index: third_party/WebKit/Source/web/InspectorEmulationAgent.cpp
|
| diff --git a/third_party/WebKit/Source/web/InspectorEmulationAgent.cpp b/third_party/WebKit/Source/web/InspectorEmulationAgent.cpp
|
| index 0ee85d6aec3469316998ec6fc19b2cb19843b753..700a8d84c2b558680be62a5158b70c6c89273c5e 100644
|
| --- a/third_party/WebKit/Source/web/InspectorEmulationAgent.cpp
|
| +++ b/third_party/WebKit/Source/web/InspectorEmulationAgent.cpp
|
| @@ -21,6 +21,8 @@ static const char touchEventEmulationEnabled[] = "touchEventEmulationEnabled";
|
| static const char emulatedMedia[] = "emulatedMedia";
|
| }
|
|
|
| +using namespace protocol;
|
| +
|
| PassOwnPtrWillBeRawPtr<InspectorEmulationAgent> InspectorEmulationAgent::create(WebLocalFrameImpl* webLocalFrameImpl, Client* client)
|
| {
|
| return adoptPtrWillBeNoop(new InspectorEmulationAgent(webLocalFrameImpl, client));
|
| @@ -46,7 +48,7 @@ void InspectorEmulationAgent::restore()
|
| {
|
| ErrorString error;
|
| setScriptExecutionDisabled(&error, m_state->booleanProperty(EmulationAgentState::scriptExecutionDisabled, false));
|
| - setTouchEmulationEnabled(&error, m_state->booleanProperty(EmulationAgentState::touchEventEmulationEnabled, false), nullptr);
|
| + setTouchEmulationEnabled(&error, m_state->booleanProperty(EmulationAgentState::touchEventEmulationEnabled, false), TypeBuilder::optional(String()));
|
| String emulatedMedia;
|
| m_state->getString(EmulationAgentState::emulatedMedia, &emulatedMedia);
|
| setEmulatedMedia(&error, emulatedMedia);
|
| @@ -56,7 +58,7 @@ void InspectorEmulationAgent::disable(ErrorString*)
|
| {
|
| ErrorString error;
|
| setScriptExecutionDisabled(&error, false);
|
| - setTouchEmulationEnabled(&error, false, nullptr);
|
| + setTouchEmulationEnabled(&error, false, TypeBuilder::optional(String()));
|
| setEmulatedMedia(&error, String());
|
| }
|
|
|
| @@ -76,7 +78,7 @@ void InspectorEmulationAgent::setScriptExecutionDisabled(ErrorString*, bool valu
|
| webViewImpl()->devToolsEmulator()->setScriptExecutionDisabled(value);
|
| }
|
|
|
| -void InspectorEmulationAgent::setTouchEmulationEnabled(ErrorString*, bool enabled, const String* configuration)
|
| +void InspectorEmulationAgent::setTouchEmulationEnabled(ErrorString*, bool enabled, const OptionalValue<String>& configuration)
|
| {
|
| m_state->setBoolean(EmulationAgentState::touchEventEmulationEnabled, enabled);
|
| webViewImpl()->devToolsEmulator()->setTouchEventEmulationEnabled(enabled);
|
|
|