diff options
author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 22:06:14 +0000 |
---|---|---|
committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 22:06:14 +0000 |
commit | 051236f654c97138dd90a81c84e2b4dcaeb29918 (patch) | |
tree | ba065c97767f081d19f804d3a196b3ebba5d0609 /chrome_frame/utils.h | |
parent | 507c71074588f718be1808bc0ffe51f3733f6eb7 (diff) | |
download | chromium_src-051236f654c97138dd90a81c84e2b4dcaeb29918.zip chromium_src-051236f654c97138dd90a81c84e2b4dcaeb29918.tar.gz chromium_src-051236f654c97138dd90a81c84e2b4dcaeb29918.tar.bz2 |
Fix #1 for multiple request issue (both POST and GET) after activating the onhttpequiv approach.
There's a ton going on here. Brief summary: I'm introducing a caching layer for top level page requests that we then use again when switching the document from mshtml to cf.
Also in this change list:
* Removing the previous way of shifting the document moniker
over to the worker thread when a new chrome document is
created. Instead we use a request cache object.
* Refactoring the part of the Bho class that offered access
to it via TLS. This was needed for better testability but
also makes (imho) the separation clearer and will possibly
help in the future if we don't have a Bho object.
* Added a bit of logging that I'd prefer to keep in there until we're confident enough with onhttpequiv.
* Enabling two previously disabled tests (the ones I added for multiple requests)
* Adding several more unit tests for the new code.
Review URL: http://codereview.chromium.org/668187
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/utils.h')
-rw-r--r-- | chrome_frame/utils.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h index adbd65e..6209248 100644 --- a/chrome_frame/utils.h +++ b/chrome_frame/utils.h @@ -22,6 +22,21 @@ extern const wchar_t kChromeContentPrefix[]; extern const wchar_t kChromeProtocolPrefix[]; extern const wchar_t kChromeFrameHeadlessMode[]; extern const wchar_t kEnableGCFProtocol[]; +extern const wchar_t kChromeMimeType[]; + +typedef enum ProtocolPatchMethod { + PATCH_METHOD_IBROWSER = 0, + PATCH_METHOD_INET_PROTOCOL, // 1 + PATCH_METHOD_IBROWSER_AND_MONIKER, // 2 +}; + +// A REG_DWORD config value that maps to the ProtocolPatchMethod enum. +// To get the config value, call: +// ProtocolPatchMethod patch_method = +// static_cast<ProtocolPatchMethod>( +// GetConfigInt(PATCH_METHOD_IBROWSER, kPatchProtocols)); +extern const wchar_t kPatchProtocols[]; + // This function is very similar to the AtlRegisterTypeLib function except // that it takes a parameter that specifies whether to register the typelib @@ -351,6 +366,9 @@ std::wstring GetActualUrlFromMoniker(IMoniker* moniker, // Checks if a window is a top level window bool IsTopLevelWindow(HWND window); +// Seeks a stream back to position 0. +HRESULT RewindStream(IStream* stream); + extern Lock g_ChromeFrameHistogramLock; // Thread safe versions of the UMA histogram macros we use for ChromeFrame. |