Chromium Code Reviews| Index: third_party/WebKit/Source/modules/presentation/Presentation.cpp |
| diff --git a/third_party/WebKit/Source/modules/presentation/Presentation.cpp b/third_party/WebKit/Source/modules/presentation/Presentation.cpp |
| index 8a3e16adae0692710e19bc76d58210d09b634497..15b217a37a1c9b698bc8fdc1af9684ff7dc1edf8 100644 |
| --- a/third_party/WebKit/Source/modules/presentation/Presentation.cpp |
| +++ b/third_party/WebKit/Source/modules/presentation/Presentation.cpp |
| @@ -10,6 +10,8 @@ |
| #include "modules/presentation/PresentationController.h" |
| #include "modules/presentation/PresentationReceiver.h" |
| #include "modules/presentation/PresentationRequest.h" |
| +#include "platform/weborigin/KURL.h" |
| +#include "wtf/Vector.h" |
| namespace blink { |
| @@ -37,6 +39,9 @@ PresentationRequest* Presentation::defaultRequest() const { |
| } |
| void Presentation::setDefaultRequest(PresentationRequest* request) { |
| + if (!request) |
| + return; |
|
mlamouri (slow - plz ping)
2016/12/10 12:06:18
Wouldn't this prevent `navigator.presentation.defa
zhaobin
2016/12/12 19:53:45
Done.
zhaobin
2016/12/12 19:53:45
yes, it will break defaultRequest = null. Reverted
|
| + |
| m_defaultRequest = request; |
| if (!frame()) |
| @@ -45,7 +50,7 @@ void Presentation::setDefaultRequest(PresentationRequest* request) { |
| PresentationController* controller = PresentationController::from(*frame()); |
| if (!controller) |
| return; |
| - controller->setDefaultRequestUrl(request ? request->url() : KURL()); |
| + controller->setDefaultRequestUrl(request->urls()); |
| } |
| PresentationReceiver* Presentation::receiver() { |