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

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

Issue 29323561: Issue #3383 - Rewrite and simplify browser-site handling in CPluginClass (Closed)
Left Patch Set: address comments Created Nov. 30, 2015, 4:30 p.m.
Right Patch Set: initialization; shorten comment Created Dec. 3, 2015, 2:23 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/PluginClass.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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 delete m_tab; 115 delete m_tab;
116 } 116 }
117 117
118 HWND CPluginClass::GetBrowserHWND() const 118 HWND CPluginClass::GetBrowserHWND() const
119 { 119 {
120 if (!m_webBrowser2) 120 if (!m_webBrowser2)
121 { 121 {
122 DEBUG_ERROR_LOG(0, 0, 0, "CPluginClass::GetBrowserHWND - Reached with m_webB rowser2 == nullptr"); 122 DEBUG_ERROR_LOG(0, 0, 0, "CPluginClass::GetBrowserHWND - Reached with m_webB rowser2 == nullptr");
123 return nullptr; 123 return nullptr;
124 } 124 }
125 SHANDLE_PTR hBrowserWndHandle; 125 SHANDLE_PTR hBrowserWndHandle = 0;
126 HRESULT hr = m_webBrowser2->get_HWND(&hBrowserWndHandle); 126 HRESULT hr = m_webBrowser2->get_HWND(&hBrowserWndHandle);
127 if (FAILED(hr)) 127 if (FAILED(hr))
128 { 128 {
129 DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_GET_BROWSER_WINDOW, "Cl ass::GetBrowserHWND - failed"); 129 DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_GET_BROWSER_WINDOW, "Cl ass::GetBrowserHWND - failed");
130 return nullptr; 130 return nullptr;
131 } 131 }
132 return (HWND)hBrowserWndHandle; 132 return (HWND)hBrowserWndHandle;
133 } 133 }
134 134
135 bool CPluginClass::IsRootBrowser(IWebBrowser2* otherBrowser) 135 bool CPluginClass::IsRootBrowser(IWebBrowser2* otherBrowser)
(...skipping 1497 matching lines...) Expand 10 before | Expand all | Expand 10 after
1633 s_criticalSectionLocal.Unlock(); 1633 s_criticalSectionLocal.Unlock();
1634 1634
1635 return icon; 1635 return icon;
1636 } 1636 }
1637 1637
1638 ATOM CPluginClass::GetAtomPaneClass() 1638 ATOM CPluginClass::GetAtomPaneClass()
1639 { 1639 {
1640 return s_atomPaneClass; 1640 return s_atomPaneClass;
1641 } 1641 }
1642 1642
LEFTRIGHT

Powered by Google App Engine
This is Rietveld