diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/V8Bindings.vcproj | 4 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 4 | ||||
| -rw-r--r-- | webkit/build/port/port.vcproj | 8 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/ScriptCachedPageData.h | 52 | ||||
| -rw-r--r-- | webkit/port/history/CachedPage.cpp | 77 |
6 files changed, 61 insertions, 86 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@7222", + "/trunk/deps/third_party/WebKit@7261", "src/third_party/icu38": "/trunk/deps/third_party/icu38@6780", diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj index b3362e2..bebcad7 100644 --- a/webkit/build/V8Bindings/V8Bindings.vcproj +++ b/webkit/build/V8Bindings/V8Bindings.vcproj @@ -2485,6 +2485,10 @@ > </File> <File + RelativePath="..\..\port\bindings\v8\ScriptCachedPageData.h" + > + </File> + <File RelativePath="..\..\port\bindings\v8\ScriptCallFrame.cpp" > </File> diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index b082719..14cb243 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -5306,6 +5306,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\history\CachedPage.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\history\CachedPage.h" > </File> diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj index b388f20..0566b843 100644 --- a/webkit/build/port/port.vcproj +++ b/webkit/build/port/port.vcproj @@ -1397,14 +1397,6 @@ </File> </Filter> </Filter> - <Filter - Name="history" - > - <File - RelativePath="..\..\port\history\CachedPage.cpp" - > - </File> - </Filter> </Files> <Globals> </Globals> diff --git a/webkit/port/bindings/v8/ScriptCachedPageData.h b/webkit/port/bindings/v8/ScriptCachedPageData.h new file mode 100644 index 0000000..f804d65 --- /dev/null +++ b/webkit/port/bindings/v8/ScriptCachedPageData.h @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2008, Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef ScriptCachedPageData_h +#define ScriptCachedPageData_h + +// We don't use WebKit's page caching, so this implementation is just a stub. + +namespace WebCore { + class Page; + class DOMWindow; + + class ScriptCachedPageData { + public: + ScriptCachedPageData(Page*) { } + ~ScriptCachedPageData() { } + + void restore(Page*) { } + void clear() { } + DOMWindow* domWindow() const { return 0; } + }; + +} // namespace WebCore + +#endif // ScriptCachedPageData_h diff --git a/webkit/port/history/CachedPage.cpp b/webkit/port/history/CachedPage.cpp deleted file mode 100644 index cc26e7e..0000000 --- a/webkit/port/history/CachedPage.cpp +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright (c) 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#include "config.h" - -#include "CachedPage.h" -#include "Document.h" -#include "DocumentLoader.h" -#include "DOMWindow.h" -#include "FrameView.h" -#include "CachedPagePlatformData.h" - -// NOTE: this implementation is purposefully stubbed-out to do nothing since we -// don't use webkit's page cache. - -namespace WebCore { - -PassRefPtr<CachedPage> CachedPage::create(Page*) { - return 0; -} - -CachedPage::~CachedPage() { -} - -void CachedPage::clear() { -} - -void CachedPage::restore(Page*) { -} - - -void CachedPage::setTimeStamp(double) { -} - -void CachedPage::setTimeStampToNow() { -} - -double CachedPage::timeStamp() const { - return 0.0; -} - -void CachedPage::setDocumentLoader(PassRefPtr<DocumentLoader>) { -} - -DocumentLoader* CachedPage::documentLoader() { - return 0; -} - -DOMWindow* CachedPage::domWindow() const { return 0; } - -} |