Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/Notification.cpp

Issue 29416579: Issue 5034 - Part 1: Pass a JsValue directly to SetProperty() and return from GetProperty() (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/
Patch Set: Created April 18, 2017, 9:17 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2017 eyeo GmbH 3 * Copyright (C) 2006-2017 eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 } 57 }
58 } 58 }
59 59
60 Notification::Notification(JsValue&& jsValue) 60 Notification::Notification(JsValue&& jsValue)
61 : JsValue(std::move(jsValue)) 61 : JsValue(std::move(jsValue))
62 { 62 {
63 } 63 }
64 64
65 NotificationType Notification::GetType() const 65 NotificationType Notification::GetType() const
66 { 66 {
67 return StringToNotificationType(GetProperty("type")->AsString()); 67 return StringToNotificationType(GetProperty("type").AsString());
68 } 68 }
69 69
70 NotificationTexts Notification::GetTexts() const 70 NotificationTexts Notification::GetTexts() const
71 { 71 {
72 JsValue jsTexts = jsEngine->Evaluate("API.getNotificationTexts")->Call(*this); 72 JsValue jsTexts = jsEngine->Evaluate("API.getNotificationTexts")->Call(*this);
73 NotificationTexts notificationTexts; 73 NotificationTexts notificationTexts;
74 JsValuePtr jsTitle = jsTexts.GetProperty("title"); 74 JsValue jsTitle = jsTexts.GetProperty("title");
75 if (jsTitle->IsString()) 75 if (jsTitle.IsString())
76 { 76 {
77 notificationTexts.title = jsTitle->AsString(); 77 notificationTexts.title = jsTitle.AsString();
78 } 78 }
79 JsValuePtr jsMessage = jsTexts.GetProperty("message"); 79 JsValue jsMessage = jsTexts.GetProperty("message");
80 if (jsMessage->IsString()) 80 if (jsMessage.IsString())
81 { 81 {
82 notificationTexts.message = jsMessage->AsString(); 82 notificationTexts.message = jsMessage.AsString();
83 } 83 }
84 return notificationTexts; 84 return notificationTexts;
85 } 85 }
86 86
87 std::vector<std::string> Notification::GetLinks() const 87 std::vector<std::string> Notification::GetLinks() const
88 { 88 {
89 std::vector<std::string> retValue; 89 std::vector<std::string> retValue;
90 JsValuePtr jsLinks = GetProperty("links"); 90 JsValue jsLinks = GetProperty("links");
91 if (!jsLinks->IsArray()) 91 if (!jsLinks.IsArray())
92 { 92 {
93 return retValue; 93 return retValue;
94 } 94 }
95 JsValueList urlLinksList = jsLinks->AsList(); 95 JsValueList urlLinksList = jsLinks.AsList();
96 for (const auto& link : urlLinksList) 96 for (const auto& link : urlLinksList)
97 { 97 {
98 retValue.push_back(link->AsString()); 98 retValue.push_back(link->AsString());
99 } 99 }
100 return retValue; 100 return retValue;
101 } 101 }
102 102
103 void Notification::MarkAsShown() 103 void Notification::MarkAsShown()
104 { 104 {
105 jsEngine->Evaluate("API.markNotificationAsShown")->Call(*GetProperty("id")); 105 jsEngine->Evaluate("API.markNotificationAsShown")->Call(GetProperty("id"));
106 } 106 }
OLDNEW
« src/JsEngine.cpp ('K') | « src/JsValue.cpp ('k') | src/WebRequestJsObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld