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

Delta Between Two Patch Sets: src/FilterEngine.cpp

Issue 29419623: Issue 5165 - Remove SubscriptionPtr (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/
Left Patch Set: Make Subscription(JsValue&&) protected Created April 21, 2017, 3:46 p.m.
Right Patch Set: Call the inherited operator Created April 24, 2017, 8:13 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « shell/src/SubscriptionsCommand.cpp ('k') | test/FilterEngine.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 { 70 {
71 JsValue func = jsEngine->Evaluate("API.removeFilterFromList"); 71 JsValue func = jsEngine->Evaluate("API.removeFilterFromList");
72 func.Call(*this); 72 func.Call(*this);
73 } 73 }
74 74
75 bool Filter::operator==(const Filter& filter) const 75 bool Filter::operator==(const Filter& filter) const
76 { 76 {
77 return GetProperty("text").AsString() == filter.GetProperty("text").AsString() ; 77 return GetProperty("text").AsString() == filter.GetProperty("text").AsString() ;
78 } 78 }
79 79
80 Subscription::Subscription(const Subscription& src)
81 : JsValue(src)
82 {
83 }
84
85 Subscription::Subscription(Subscription&& src)
86 : JsValue(std::move(src))
87 {
88 }
89
80 Subscription::Subscription(JsValue&& value) 90 Subscription::Subscription(JsValue&& value)
81 : JsValue(std::move(value)) 91 : JsValue(std::move(value))
82 { 92 {
83 if (!IsObject()) 93 if (!IsObject())
84 throw std::runtime_error("JavaScript value is not an object"); 94 throw std::runtime_error("JavaScript value is not an object");
95 }
96
97 Subscription& Subscription::operator=(const Subscription& src)
98 {
99 static_cast<JsValue&>(*this) = src;
100 return *this;
101 }
102
103 Subscription& Subscription::operator=(Subscription&& src)
104 {
105 static_cast<JsValue&>(*this) = std::move(src);
106 return *this;
85 } 107 }
86 108
87 bool Subscription::IsListed() const 109 bool Subscription::IsListed() const
88 { 110 {
89 JsValue func = jsEngine->Evaluate("API.isListedSubscription"); 111 JsValue func = jsEngine->Evaluate("API.isListedSubscription");
90 return func.Call(*this).AsBool(); 112 return func.Call(*this).AsBool();
91 } 113 }
92 114
93 void Subscription::AddToList() 115 void Subscription::AddToList()
94 { 116 {
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parent Url); 595 FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parent Url);
574 if (filter) 596 if (filter)
575 { 597 {
576 return filter; 598 return filter;
577 } 599 }
578 currentUrl = parentUrl; 600 currentUrl = parentUrl;
579 } 601 }
580 while (urlIterator != documentUrls.end()); 602 while (urlIterator != documentUrls.end());
581 return FilterPtr(); 603 return FilterPtr();
582 } 604 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld