summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r76408: Fix Bridge.hBen Murdoch2011-05-231-1/+1
| | | | | | | | Cherry pick of upstream http://trac.webkit.org/changeset/79988 Needed now due to FastAllocBase and Noncopyable changes in this merge. Change-Id: I26c91f7940b106db21e26c37507490acd1546cff
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-161-0/+106
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3