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

Delta Between Two Patch Sets: src/plugin/PluginTabBase.cpp

Issue 29331767: Issue #1234 + Clean up - CPluginTab (dead code, nullptr defect fix, etc.) (Closed)
Left Patch Set: add removal of stub class, optimization for res:// Created Dec. 3, 2015, 7:27 p.m.
Right Patch Set: rebase only Created Dec. 15, 2015, 4:39 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 | « src/plugin/PluginTabBase.h ('k') | no next file » | 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-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 std::wstring documentUrl = GetDocumentUrl(); 264 std::wstring documentUrl = GetDocumentUrl();
265 265
266 if (isDocumentBrowser) 266 if (isDocumentBrowser)
267 { 267 {
268 if (url != documentUrl) 268 if (url != documentUrl)
269 { 269 {
270 SetDocumentUrl(url); 270 SetDocumentUrl(url);
271 } 271 }
272 InjectABP(browser); 272 InjectABP(browser);
273 } 273 }
274 CString urlLegacy = ToCString(url); 274 if (BeginsWith(url, L"res://"))
275 if (urlLegacy.Left(6) == "res://")
276 { 275 {
277 return; 276 return;
278 } 277 }
279 // Get document 278 // Get document
280 CComPtr<IDispatch> pDocDispatch; 279 CComPtr<IDispatch> pDocDispatch;
281 HRESULT hr = browser->get_Document(&pDocDispatch); 280 HRESULT hr = browser->get_Document(&pDocDispatch);
282 if (FAILED(hr) || !pDocDispatch) 281 if (FAILED(hr) || !pDocDispatch)
283 { 282 {
284 return; 283 return;
285 } 284 }
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 LogQueue::LogPluginError(pluginError.GetErrorCode(), pluginError.GetEr rorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), true, p luginError.GetProcessId(), pluginError.GetThreadId()); 432 LogQueue::LogPluginError(pluginError.GetErrorCode(), pluginError.GetEr rorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), true, p luginError.GetProcessId(), pluginError.GetThreadId());
434 } 433 }
435 434
436 // Non-hanging sleep 435 // Non-hanging sleep
437 Sleep(50); 436 Sleep(50);
438 } 437 }
439 438
440 tabLoopIteration++; 439 tabLoopIteration++;
441 } 440 }
442 } 441 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld