summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-27 00:50:16 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-27 00:50:16 +0000
commitf8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd (patch)
tree7d8eafaff84f2dc9a32072c9b5de115d7f535500
parent3adb24ec4914ccb68cb9db958eadba2f54b58fe0 (diff)
downloadchromium_src-f8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd.zip
chromium_src-f8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd.tar.gz
chromium_src-f8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd.tar.bz2
src/webkit side of webKit merge 38653:38729
Review URL: http://codereview.chromium.org/12708 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6081 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS8
-rw-r--r--WEBKIT_MERGE_REVISION2
-rw-r--r--chrome/renderer/greasemonkey_slave.cc2
-rw-r--r--chrome/renderer/render_view.cc2
-rw-r--r--webkit/build/V8Bindings/V8Bindings.vcproj8
-rw-r--r--webkit/build/WebCore/SConscript1
-rw-r--r--webkit/build/WebCore/WebCore.vcproj8
-rw-r--r--webkit/data/purify/test_shell_tests.exe_MLK.txt510
-rw-r--r--webkit/glue/webframe.h2
-rw-r--r--webkit/glue/webframe_impl.cc11
-rw-r--r--webkit/glue/webframe_impl.h2
-rw-r--r--webkit/port/bindings/v8/ScriptController.cpp16
-rw-r--r--webkit/port/bindings/v8/ScriptController.h3
-rw-r--r--webkit/port/bindings/v8/ScriptSourceCode.h72
-rw-r--r--webkit/port/bindings/v8/ScriptString.h65
-rw-r--r--webkit/port/page/inspector/InspectorController.cpp2
-rw-r--r--webkit/tools/layout_tests/test_lists/win/tests_fixable.txt14
-rw-r--r--webkit/webkit.xcodeproj/project.pbxproj6
18 files changed, 454 insertions, 280 deletions
diff --git a/DEPS b/DEPS
index 1d1e863..784ce95 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@63",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@6051",
+ "/trunk/deps/third_party/WebKit@6080",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@5827",
@@ -21,13 +21,13 @@ deps = {
"http://v8.googlecode.com/svn/trunk@768",
"src/webkit/data/layout_tests/LayoutTests":
- "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38653",
+ "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38729",
"src/third_party/WebKit/WebKit":
- "http://svn.webkit.org/repository/webkit/trunk/WebKit@38653",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKit@38729",
"src/third_party/WebKit/WebKitLibraries":
- "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@38653",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@38729",
}
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 8346fb6..610c8b5 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@38653 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@38729 \ No newline at end of file
diff --git a/chrome/renderer/greasemonkey_slave.cc b/chrome/renderer/greasemonkey_slave.cc
index f2de9fb..4cf9439 100644
--- a/chrome/renderer/greasemonkey_slave.cc
+++ b/chrome/renderer/greasemonkey_slave.cc
@@ -162,7 +162,7 @@ bool GreasemonkeySlave::InjectScripts(WebFrame* frame) {
script != scripts_.end(); ++script) {
if (script->MatchesUrl(frame->GetURL())) {
frame->ExecuteJavaScript(script->GetBody().as_string(),
- script->GetURL().as_string());
+ GURL(script->GetURL().as_string()));
}
}
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 835e73f..2cedc6d 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2373,7 +2373,7 @@ void RenderView::EvaluateScript(const std::wstring& frame_xpath,
if (!web_frame)
return;
- web_frame->ExecuteJavaScript(WideToUTF8(script), "");
+ web_frame->ExecuteJavaScript(WideToUTF8(script), GURL());
}
void RenderView::OnScriptEvalRequest(const std::wstring& frame_xpath,
diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index 28eb130..53198a2 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -2521,6 +2521,14 @@
>
</File>
<File
+ RelativePath="..\..\port\bindings\v8\ScriptSourceCode.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\port\bindings\v8\ScriptString.h"
+ >
+ </File>
+ <File
RelativePath="..\..\port\bindings\v8\ScriptValue.cpp"
>
</File>
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 1111c3b..722b8ed 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -400,6 +400,7 @@ input_files = [
'$WEBCORE_DIR/platform/GeolocationService.cpp',
'$WEBCORE_DIR/platform/KURL.cpp',
'$WEBCORE_DIR/platform/Length.cpp',
+ '$WEBCORE_DIR/platform/LinkHash.cpp',
'$WEBCORE_DIR/platform/Logging.cpp',
'$PORT_DIR/platform/MIMETypeRegistry.cpp',
'$WEBCORE_DIR/platform/Scrollbar.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index bab99ae..000139a 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -1009,6 +1009,14 @@
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\LengthSize.h"
>
</File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\LinkHash.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\LinkHash.h"
+ >
+ </File>
<File
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\LocalizedStrings.h"
>
diff --git a/webkit/data/purify/test_shell_tests.exe_MLK.txt b/webkit/data/purify/test_shell_tests.exe_MLK.txt
index 5b3a907..3cb01b6 100644
--- a/webkit/data/purify/test_shell_tests.exe_MLK.txt
+++ b/webkit/data/purify/test_shell_tests.exe_MLK.txt
@@ -1,255 +1,255 @@
-WebCore::ChromiumBridge::getPlugins(bool,Vector<PluginInfo::WebCore *,0>::WTF *) [test_shell_tests.exe]
-Alloc Location
- ...
- webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
- webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
- third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
- third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
- third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
- third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
- webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
- webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedData(char const*,int)
- third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::addData(char const*,int,bool)
- third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(char const*,int,long long,bool)
- third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didReceiveData(char const*,int,long long,bool)
- third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(ResourceHandle::WebCore *,char const*,int,int)
- webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::OnReceivedData(char const*,int)
- webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::HandleDataUrl(void)
- base/tuple.h ?DispatchToMethod@VResourceHandleInternal@WebCore@@P812@AEXXZ@@YAXPAVResourceHandleInternal@WebCore@@P801@AEXXZABUTuple0@@@Z
- ^^^
-
-WTF::fastMalloc(UINT) [test_shell_tests.exe]
-Alloc Location
- ...
- third_party/webkit/javascriptcore/wtf/fastmalloc.cpp WTF::fastMalloc(UINT)
- third_party/webkit/webcore/platform/text/stringbuffer.h WebCore::StringBuffer::StringBuffer(UINT)
- third_party/webkit/webcore/platform/text/string.cpp WebCore::String::append(String::WebCore const&)
- webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
- webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
- third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
- third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
- third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
- third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
- webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
- webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedData(char const*,int)
- third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::addData(char const*,int,bool)
- third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(char const*,int,long long,bool)
- third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didReceiveData(char const*,int,long long,bool)
- third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(ResourceHandle::WebCore *,char const*,int,int)
- webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::OnReceivedData(char const*,int)
- webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::HandleDataUrl(void)
- base/tuple.h ?DispatchToMethod@VResourceHandleInternal@WebCore@@P812@AEXXZ@@YAXPAVResourceHandleInternal@WebCore@@P801@AEXXZABUTuple0@@@Z
- ^^^
-
-WebCore::StringImpl::adopt(StringBuffer::WebCore&) [test_shell_tests.exe]
-Alloc Location
- ...
- third_party/webkit/webcore/platform/text/stringimpl.cpp WebCore::StringImpl::adopt(StringBuffer::WebCore&)
- third_party/webkit/webcore/platform/text/string.cpp WebCore::String::append(String::WebCore const&)
- webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
- webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
- third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
- third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
- third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
- third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
- webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
- webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedData(char const*,int)
- third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::addData(char const*,int,bool)
- third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(char const*,int,long long,bool)
- third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didReceiveData(char const*,int,long long,bool)
- third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(ResourceHandle::WebCore *,char const*,int,int)
- webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::OnReceivedData(char const*,int)
- webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::HandleDataUrl(void)
- base/tuple.h ?DispatchToMethod@VResourceHandleInternal@WebCore@@P812@AEXXZ@@YAXPAVResourceHandleInternal@WebCore@@P801@AEXXZABUTuple0@@@Z
- ^^^
-
-WebCore::StringImpl::create(wchar_t const *,unsigned int) [test_shell_tests.exe]
-Alloc Location
- ...
- third_party/webkit/webcore/platform/text/stringimpl.cpp WebCore::StringImpl::create(wchar_t const *,unsigned int)
- third_party/webkit/webcore/platform/text/string.cpp WebCore::String::String(wchar_t const *,unsigned int)
- webkit/glue/glue_util.cc webkit_glue::StdWStringToString(class std::basic_string const &)
- webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
- webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
- third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
- third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
- third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
- third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
- webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
- webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedData(char const*,int)
- third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::addData(char const*,int,bool)
- third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(char const*,int,long long,bool)
- third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didReceiveData(char const*,int,long long,bool)
- third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(ResourceHandle::WebCore *,char const*,int,int)
- webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::OnReceivedData(char const*,int)
- webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::HandleDataUrl(void)
- base/tuple.h ?DispatchToMethod@VResourceHandleInternal@WebCore@@P812@AEXXZ@@YAXPAVResourceHandleInternal@WebCore@@P801@AEXXZABUTuple0@@@Z
- ^^^
-
-WTF::fastMalloc(UINT) [test_shell_tests.exe]
-Alloc Location
- ...
- third_party/webkit/javascriptcore/wtf/fastmalloc.cpp WTF::fastMalloc(UINT)
- third_party/webkit/javascriptcore/wtf/vector.h WTF::VectorBufferBase::allocateBuffer(unsigned int)
- third_party/webkit/javascriptcore/wtf/vector.h WTF::Vector::reserveCapacity(unsigned int)
- third_party/webkit/javascriptcore/wtf/vector.h WTF::Vector::expandCapacity(unsigned int)
- third_party/webkit/javascriptcore/wtf/vector.h WTF::Vector::expandCapacity(unsigned int,wchar_t const *)
- third_party/webkit/javascriptcore/wtf/vector.h WTF::Vector::_W::append(wchar_t const *,unsigned int)
- third_party/webkit/webcore/platform/text/textcodecicu.cpp WebCore::TextCodecICU::decode(char const*,UINT,bool,bool,bool&)
- third_party/webkit/webcore/platform/text/textdecoder.cpp WebCore::TextDecoder::checkForBOM(char const*,UINT,bool,bool,bool&)
- third_party/webkit/webcore/platform/text/textdecoder.h WebCore::TextDecoder::decode(char const*,UINT,bool,bool,bool&)
- third_party/webkit/webcore/platform/text/textencoding.cpp WebCore::TextEncoding::decode(char const*,UINT,bool,bool&)const
- third_party/webkit/webcore/platform/text/textencoding.h WebCore::TextEncoding::decode(char const*,UINT)const
- third_party/webkit/webcore/platform/text/string.cpp WebCore::String::fromUTF8(char const*,UINT)
- webkit/glue/glue_util.cc webkit_glue::StdStringToString(basic_string::std const&)
- webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
- webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
- third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
- third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
- third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
- third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
- webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
- webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
-
-WebCore::StringImpl::adopt(class WTF::Vector<wchar_t,0> &) [test_shell_tests.exe]
-Alloc Location
- ...
- third_party/webkit/webcore/platform/text/stringimpl.cpp WebCore::StringImpl::adopt(class WTF::Vector &)
- third_party/webkit/webcore/platform/text/platformstring.h WebCore::String::adopt(class WTF::Vector &)
- third_party/webkit/webcore/platform/text/textcodecicu.cpp WebCore::TextCodecICU::decode(char const*,UINT,bool,bool,bool&)
- third_party/webkit/webcore/platform/text/textdecoder.cpp WebCore::TextDecoder::checkForBOM(char const*,UINT,bool,bool,bool&)
- third_party/webkit/webcore/platform/text/textdecoder.h WebCore::TextDecoder::decode(char const*,UINT,bool,bool,bool&)
- third_party/webkit/webcore/platform/text/textencoding.cpp WebCore::TextEncoding::decode(char const*,UINT,bool,bool&)const
- third_party/webkit/webcore/platform/text/textencoding.h WebCore::TextEncoding::decode(char const*,UINT)const
- third_party/webkit/webcore/platform/text/string.cpp WebCore::String::fromUTF8(char const*,UINT)
- webkit/glue/glue_util.cc webkit_glue::StdStringToString(basic_string::std const&)
- webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
- webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
- third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
- third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
- third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
- third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
- webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
- webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedData(char const*,int)
- third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::addData(char const*,int,bool)
- third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(char const*,int,long long,bool)
- third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didReceiveData(char const*,int,long long,bool)
-
-WTF::fastMalloc(UINT) [test_shell_tests.exe]
-Alloc Location
- ...
- third_party/webkit/javascriptcore/wtf/fastmalloc.cpp WTF::fastMalloc(UINT)
- third_party/webkit/javascriptcore/wtf/vector.h WTF::VectorBufferBase::allocateBuffer(UINT)
- third_party/webkit/javascriptcore/wtf/vector.h WTF::Vector::reserveCapacity(UINT)
- third_party/webkit/javascriptcore/wtf/vector.h WTF::Vector::expandCapacity(UINT)
- third_party/webkit/javascriptcore/wtf/vector.h WTF::Vector::expandCapacity(UINT,MimeClassInfo::WebCore * const const*)
- third_party/webkit/javascriptcore/wtf/vector.h ?append@PAUMimeClassInfo@WebCore@@@?$Vector@PAUMimeClassInfo@WebCore@@$0A@@WTF@@QAEXABQAUMimeClassInfo@WebCore@@@Z
- webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
- webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
- third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
- third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
- third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
- third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
- webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
- webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedData(char const*,int)
- third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::addData(char const*,int,bool)
- third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(char const*,int,long long,bool)
- third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didReceiveData(char const*,int,long long,bool)
- third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(ResourceHandle::WebCore *,char const*,int,int)
- webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::OnReceivedData(char const*,int)
- webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::HandleDataUrl(void)
-
-WTF::fastMalloc(UINT) [test_shell_tests.exe]
-Alloc Location
- ...
- third_party/webkit/javascriptcore/wtf/fastmalloc.cpp WTF::fastMalloc(UINT)
- third_party/webkit/webcore/platform/text/stringimpl.cpp WebCore::newUCharVector
- third_party/webkit/webcore/platform/text/stringimpl.cpp WebCore::StringImpl::StringImpl(wchar_t const *,unsigned int)
- third_party/webkit/webcore/platform/text/stringimpl.cpp WebCore::StringImpl::create(wchar_t const *,unsigned int)
- third_party/webkit/webcore/platform/text/string.cpp WebCore::String::String(wchar_t const *,unsigned int)
- webkit/glue/glue_util.cc webkit_glue::StdWStringToString(class std::basic_string const &)
- webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
- webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
- webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
- third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
- third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
- third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
- third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
- webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
- webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
- third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
- third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedData(char const*,int)
- third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::addData(char const*,int,bool)
- third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(char const*,int,long long,bool)
- third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didReceiveData(char const*,int,long long,bool)
- third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(ResourceHandle::WebCore *,char const*,int,int)
- webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::OnReceivedData(char const*,int)
- webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::HandleDataUrl(void)
+WebCore::ChromiumBridge::getPlugins(bool,Vector<PluginInfo::WebCore *,0>::WTF *) [test_shell_tests.exe]
+Alloc Location
+ ...
+ webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
+ webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
+ third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
+ third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
+ third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
+ third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
+ webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
+ webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedData(char const*,int)
+ third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::addData(char const*,int,bool)
+ third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(char const*,int,long long,bool)
+ third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didReceiveData(char const*,int,long long,bool)
+ third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(ResourceHandle::WebCore *,char const*,int,int)
+ webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::OnReceivedData(char const*,int)
+ webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::HandleDataUrl(void)
+ base/tuple.h ?DispatchToMethod@VResourceHandleInternal@WebCore@@P812@AEXXZ@@YAXPAVResourceHandleInternal@WebCore@@P801@AEXXZABUTuple0@@@Z
+ ^^^
+
+WTF::fastMalloc(UINT) [test_shell_tests.exe]
+Alloc Location
+ ...
+ third_party/webkit/javascriptcore/wtf/fastmalloc.cpp WTF::fastMalloc(UINT)
+ third_party/webkit/webcore/platform/text/stringbuffer.h WebCore::StringBuffer::StringBuffer(UINT)
+ third_party/webkit/webcore/platform/text/string.cpp WebCore::String::append(String::WebCore const&)
+ webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
+ webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
+ third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
+ third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
+ third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
+ third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
+ webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
+ webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedData(char const*,int)
+ third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::addData(char const*,int,bool)
+ third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(char const*,int,long long,bool)
+ third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didReceiveData(char const*,int,long long,bool)
+ third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(ResourceHandle::WebCore *,char const*,int,int)
+ webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::OnReceivedData(char const*,int)
+ webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::HandleDataUrl(void)
+ base/tuple.h ?DispatchToMethod@VResourceHandleInternal@WebCore@@P812@AEXXZ@@YAXPAVResourceHandleInternal@WebCore@@P801@AEXXZABUTuple0@@@Z
+ ^^^
+
+WebCore::StringImpl::adopt(StringBuffer::WebCore&) [test_shell_tests.exe]
+Alloc Location
+ ...
+ third_party/webkit/webcore/platform/text/stringimpl.cpp WebCore::StringImpl::adopt(StringBuffer::WebCore&)
+ third_party/webkit/webcore/platform/text/string.cpp WebCore::String::append(String::WebCore const&)
+ webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
+ webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
+ third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
+ third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
+ third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
+ third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
+ webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
+ webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedData(char const*,int)
+ third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::addData(char const*,int,bool)
+ third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(char const*,int,long long,bool)
+ third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didReceiveData(char const*,int,long long,bool)
+ third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(ResourceHandle::WebCore *,char const*,int,int)
+ webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::OnReceivedData(char const*,int)
+ webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::HandleDataUrl(void)
+ base/tuple.h ?DispatchToMethod@VResourceHandleInternal@WebCore@@P812@AEXXZ@@YAXPAVResourceHandleInternal@WebCore@@P801@AEXXZABUTuple0@@@Z
+ ^^^
+
+WebCore::StringImpl::create(wchar_t const *,unsigned int) [test_shell_tests.exe]
+Alloc Location
+ ...
+ third_party/webkit/webcore/platform/text/stringimpl.cpp WebCore::StringImpl::create(wchar_t const *,unsigned int)
+ third_party/webkit/webcore/platform/text/string.cpp WebCore::String::String(wchar_t const *,unsigned int)
+ webkit/glue/glue_util.cc webkit_glue::StdWStringToString(class std::basic_string const &)
+ webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
+ webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
+ third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
+ third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
+ third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
+ third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
+ webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
+ webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedData(char const*,int)
+ third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::addData(char const*,int,bool)
+ third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(char const*,int,long long,bool)
+ third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didReceiveData(char const*,int,long long,bool)
+ third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(ResourceHandle::WebCore *,char const*,int,int)
+ webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::OnReceivedData(char const*,int)
+ webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::HandleDataUrl(void)
+ base/tuple.h ?DispatchToMethod@VResourceHandleInternal@WebCore@@P812@AEXXZ@@YAXPAVResourceHandleInternal@WebCore@@P801@AEXXZABUTuple0@@@Z
+ ^^^
+
+WTF::fastMalloc(UINT) [test_shell_tests.exe]
+Alloc Location
+ ...
+ third_party/webkit/javascriptcore/wtf/fastmalloc.cpp WTF::fastMalloc(UINT)
+ third_party/webkit/javascriptcore/wtf/vector.h WTF::VectorBufferBase::allocateBuffer(unsigned int)
+ third_party/webkit/javascriptcore/wtf/vector.h WTF::Vector::reserveCapacity(unsigned int)
+ third_party/webkit/javascriptcore/wtf/vector.h WTF::Vector::expandCapacity(unsigned int)
+ third_party/webkit/javascriptcore/wtf/vector.h WTF::Vector::expandCapacity(unsigned int,wchar_t const *)
+ third_party/webkit/javascriptcore/wtf/vector.h WTF::Vector::_W::append(wchar_t const *,unsigned int)
+ third_party/webkit/webcore/platform/text/textcodecicu.cpp WebCore::TextCodecICU::decode(char const*,UINT,bool,bool,bool&)
+ third_party/webkit/webcore/platform/text/textdecoder.cpp WebCore::TextDecoder::checkForBOM(char const*,UINT,bool,bool,bool&)
+ third_party/webkit/webcore/platform/text/textdecoder.h WebCore::TextDecoder::decode(char const*,UINT,bool,bool,bool&)
+ third_party/webkit/webcore/platform/text/textencoding.cpp WebCore::TextEncoding::decode(char const*,UINT,bool,bool&)const
+ third_party/webkit/webcore/platform/text/textencoding.h WebCore::TextEncoding::decode(char const*,UINT)const
+ third_party/webkit/webcore/platform/text/string.cpp WebCore::String::fromUTF8(char const*,UINT)
+ webkit/glue/glue_util.cc webkit_glue::StdStringToString(basic_string::std const&)
+ webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
+ webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
+ third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
+ third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
+ third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
+ third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
+ webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
+ webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
+
+WebCore::StringImpl::adopt(class WTF::Vector<wchar_t,0> &) [test_shell_tests.exe]
+Alloc Location
+ ...
+ third_party/webkit/webcore/platform/text/stringimpl.cpp WebCore::StringImpl::adopt(class WTF::Vector &)
+ third_party/webkit/webcore/platform/text/platformstring.h WebCore::String::adopt(class WTF::Vector &)
+ third_party/webkit/webcore/platform/text/textcodecicu.cpp WebCore::TextCodecICU::decode(char const*,UINT,bool,bool,bool&)
+ third_party/webkit/webcore/platform/text/textdecoder.cpp WebCore::TextDecoder::checkForBOM(char const*,UINT,bool,bool,bool&)
+ third_party/webkit/webcore/platform/text/textdecoder.h WebCore::TextDecoder::decode(char const*,UINT,bool,bool,bool&)
+ third_party/webkit/webcore/platform/text/textencoding.cpp WebCore::TextEncoding::decode(char const*,UINT,bool,bool&)const
+ third_party/webkit/webcore/platform/text/textencoding.h WebCore::TextEncoding::decode(char const*,UINT)const
+ third_party/webkit/webcore/platform/text/string.cpp WebCore::String::fromUTF8(char const*,UINT)
+ webkit/glue/glue_util.cc webkit_glue::StdStringToString(basic_string::std const&)
+ webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
+ webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
+ third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
+ third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
+ third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
+ third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
+ webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
+ webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedData(char const*,int)
+ third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::addData(char const*,int,bool)
+ third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(char const*,int,long long,bool)
+ third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didReceiveData(char const*,int,long long,bool)
+
+WTF::fastMalloc(UINT) [test_shell_tests.exe]
+Alloc Location
+ ...
+ third_party/webkit/javascriptcore/wtf/fastmalloc.cpp WTF::fastMalloc(UINT)
+ third_party/webkit/javascriptcore/wtf/vector.h WTF::VectorBufferBase::allocateBuffer(UINT)
+ third_party/webkit/javascriptcore/wtf/vector.h WTF::Vector::reserveCapacity(UINT)
+ third_party/webkit/javascriptcore/wtf/vector.h WTF::Vector::expandCapacity(UINT)
+ third_party/webkit/javascriptcore/wtf/vector.h WTF::Vector::expandCapacity(UINT,MimeClassInfo::WebCore * const const*)
+ third_party/webkit/javascriptcore/wtf/vector.h ?append@PAUMimeClassInfo@WebCore@@@?$Vector@PAUMimeClassInfo@WebCore@@$0A@@WTF@@QAEXABQAUMimeClassInfo@WebCore@@@Z
+ webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
+ webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
+ third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
+ third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
+ third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
+ third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
+ webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
+ webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedData(char const*,int)
+ third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::addData(char const*,int,bool)
+ third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(char const*,int,long long,bool)
+ third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didReceiveData(char const*,int,long long,bool)
+ third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(ResourceHandle::WebCore *,char const*,int,int)
+ webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::OnReceivedData(char const*,int)
+ webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::HandleDataUrl(void)
+
+WTF::fastMalloc(UINT) [test_shell_tests.exe]
+Alloc Location
+ ...
+ third_party/webkit/javascriptcore/wtf/fastmalloc.cpp WTF::fastMalloc(UINT)
+ third_party/webkit/webcore/platform/text/stringimpl.cpp WebCore::newUCharVector
+ third_party/webkit/webcore/platform/text/stringimpl.cpp WebCore::StringImpl::StringImpl(wchar_t const *,unsigned int)
+ third_party/webkit/webcore/platform/text/stringimpl.cpp WebCore::StringImpl::create(wchar_t const *,unsigned int)
+ third_party/webkit/webcore/platform/text/string.cpp WebCore::String::String(wchar_t const *,unsigned int)
+ webkit/glue/glue_util.cc webkit_glue::StdWStringToString(class std::basic_string const &)
+ webkit/glue/chromium_bridge_impl.cc WebCore::ChromiumBridge::getPlugins(bool,Vector::WTF *)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::LoadPlugins(bool)
+ webkit/port/bridge/chromium/pluginschromium.cpp WebCore::PluginInfoStore::pluginCount(void)const
+ webkit/port/plugins/chromium/plugindatachromium.cpp WebCore::PluginData::initPlugins(void)
+ third_party/webkit/webcore/plugins/plugindata.cpp WebCore::PluginData::PluginData(Page::WebCore const*)
+ third_party/webkit/webcore/plugins/plugindata.h WebCore::PluginData::create(Page::WebCore const*)
+ third_party/webkit/webcore/page/page.cpp WebCore::Page::pluginData(void)const
+ third_party/webkit/webcore/dom/domimplementation.cpp WebCore::DOMImplementation::createDocument(String::WebCore const&,Frame::WebCore *,bool)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::begin(KURL::WebCore const&,bool,SecurityOrigin::WebCore *)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedFirstData(void)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::setEncoding(String::WebCore const&,bool)
+ webkit/glue/webframe_impl.cc WebFrameImpl::DidReceiveData(DocumentLoader::WebCore *,char const*,int)
+ webkit/glue/webframeloaderclient_impl.cc WebFrameLoaderClient::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::committedLoad(DocumentLoader::WebCore *,char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::commitLoad(char const*,int)
+ third_party/webkit/webcore/loader/documentloader.cpp WebCore::DocumentLoader::receivedData(char const*,int)
+ third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::receivedData(char const*,int)
+ third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::addData(char const*,int,bool)
+ third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(char const*,int,long long,bool)
+ third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didReceiveData(char const*,int,long long,bool)
+ third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didReceiveData(ResourceHandle::WebCore *,char const*,int,int)
+ webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::OnReceivedData(char const*,int)
+ webkit/glue/resource_handle_impl.cc WebCore::ResourceHandleInternal::HandleDataUrl(void)
diff --git a/webkit/glue/webframe.h b/webkit/glue/webframe.h
index 1a8d19e..05fd9327 100644
--- a/webkit/glue/webframe.h
+++ b/webkit/glue/webframe.h
@@ -96,7 +96,7 @@ class WebFrame : public base::RefCounted<WebFrame> {
// the URL where the script in question can be found, if any. The renderer may
// request this URL to show the developer the source of the error.
virtual void ExecuteJavaScript(const std::string& js_code,
- const std::string& script_url) = 0;
+ const GURL& script_url) = 0;
// Returns a string representing the state of the previous page load for
// later use when loading as well as the uri and title of the page. The
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 4058d76..58b9e48 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -106,6 +106,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
#include "ResourceHandle.h"
#include "ResourceRequest.h"
#include "ScriptController.h"
+#include "ScriptSourceCode.h"
#include "ScriptValue.h"
#include "ScrollbarTheme.h"
#include "SelectionController.h"
@@ -1533,10 +1534,12 @@ void WebFrameImpl::LoadAlternateHTMLErrorPage(const WebRequest* request,
}
void WebFrameImpl::ExecuteJavaScript(const std::string& js_code,
- const std::string& script_url) {
- frame_->loader()->executeScript(webkit_glue::StdStringToString(script_url),
- 1, // base line number (for errors)
- webkit_glue::StdStringToString(js_code));
+ const GURL& script_url) {
+ WebCore::ScriptSourceCode source_code(
+ webkit_glue::StdStringToString(js_code),
+ webkit_glue::GURLToKURL(script_url),
+ 1); // base line number (for errors)
+ frame_->loader()->executeScript(source_code);
}
std::wstring WebFrameImpl::GetName() {
diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h
index 497b698..320a114 100644
--- a/webkit/glue/webframe_impl.h
+++ b/webkit/glue/webframe_impl.h
@@ -96,7 +96,7 @@ class WebFrameImpl : public WebFrame {
bool replace,
const GURL& fake_url);
virtual void ExecuteJavaScript(const std::string& js_code,
- const std::string& script_url);
+ const GURL& script_url);
virtual bool GetPreviousState(GURL* url, std::wstring* title,
std::string* history_state) const;
virtual bool GetCurrentState(GURL* url, std::wstring* title,
diff --git a/webkit/port/bindings/v8/ScriptController.cpp b/webkit/port/bindings/v8/ScriptController.cpp
index 0086459..c286b8c 100644
--- a/webkit/port/bindings/v8/ScriptController.cpp
+++ b/webkit/port/bindings/v8/ScriptController.cpp
@@ -43,6 +43,7 @@
#include "npruntime_priv.h"
#include "np_v8object.h"
#include "PausedTimeouts.h"
+#include "ScriptSourceCode.h"
#include "Widget.h"
#include "v8_proxy.h"
@@ -263,12 +264,8 @@ bool ScriptController::processingUserGesture() const
// Evaluate a script file in the environment of this proxy.
-ScriptValue ScriptController::evaluate(const String& filename, int baseLine,
- const String& code, Node* node, bool* succ)
+ScriptValue ScriptController::evaluate(const ScriptSourceCode& sourceCode)
{
- if (succ)
- *succ = false;
-
v8::HandleScope hs;
v8::Handle<v8::Context> context = V8Proxy::GetContext(m_proxy->frame());
if (context.IsEmpty())
@@ -279,15 +276,14 @@ ScriptValue ScriptController::evaluate(const String& filename, int baseLine,
// HTMLTokenizer used to use base zero line numbers for scripts, now it
// uses base 1. This confuses v8, which uses line offsets from the
// first line.
- v8::Local<v8::Value> obj = m_proxy->Evaluate(filename, baseLine - 1, code,
- node);
+ v8::Local<v8::Value> obj = m_proxy->Evaluate(sourceCode.url(),
+ sourceCode.startLine() - 1,
+ sourceCode.source(),
+ NULL);
if (obj.IsEmpty() || obj->IsUndefined())
return ScriptValue();
- if (succ)
- *succ = true;
-
return ScriptValue(obj);
}
diff --git a/webkit/port/bindings/v8/ScriptController.h b/webkit/port/bindings/v8/ScriptController.h
index 71954f1..c7daeb8 100644
--- a/webkit/port/bindings/v8/ScriptController.h
+++ b/webkit/port/bindings/v8/ScriptController.h
@@ -127,6 +127,7 @@ class Frame;
class HTMLPlugInElement;
class Node;
class PausedTimeouts;
+class ScriptSourceCode;
class String;
class Widget;
@@ -148,7 +149,7 @@ public:
// Evaluate a script file in the environment of this proxy.
// If succeeded, 'succ' is set to true and result is returned
// as a string.
- ScriptValue evaluate(const String& filename, int baseLine, const String& code, Node* node = NULL, bool* succ = NULL);
+ ScriptValue evaluate(const ScriptSourceCode&);
void disposeJSResult(JSResult result);
void collectGarbage();
diff --git a/webkit/port/bindings/v8/ScriptSourceCode.h b/webkit/port/bindings/v8/ScriptSourceCode.h
new file mode 100644
index 0000000..63071a9
--- /dev/null
+++ b/webkit/port/bindings/v8/ScriptSourceCode.h
@@ -0,0 +1,72 @@
+/*
+ * 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 ScriptSourceCode_h
+#define ScriptSourceCode_h
+
+#include "CachedScript.h"
+#include "KURL.h"
+#include "PlatformString.h"
+
+namespace WebCore {
+
+class ScriptSourceCode {
+public:
+ ScriptSourceCode(const String& source, const KURL& url = KURL(), int startLine = 1)
+ : m_source(source)
+ , m_url(url)
+ , m_startLine(startLine)
+ {
+ }
+
+ // We lose the encoding information from CachedScript.
+ // Not sure if that matters.
+ ScriptSourceCode(CachedScript* cs)
+ : m_source(cs->script())
+ , m_url(cs->url())
+ , m_startLine(1)
+ {
+ }
+
+ bool isEmpty() const { return m_source.isEmpty(); }
+
+ const String& source() const { return m_source; }
+ const KURL& url() const { return m_url; }
+ int startLine() const { return m_startLine; }
+
+private:
+ String m_source;
+ KURL m_url;
+ int m_startLine;
+};
+
+} // namespace WebCore
+
+#endif // ScriptSourceCode_h
diff --git a/webkit/port/bindings/v8/ScriptString.h b/webkit/port/bindings/v8/ScriptString.h
new file mode 100644
index 0000000..fd379e3
--- /dev/null
+++ b/webkit/port/bindings/v8/ScriptString.h
@@ -0,0 +1,65 @@
+/*
+ * 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 ScriptString_h
+#define ScriptString_h
+
+#include "PlatformString.h"
+
+namespace WebCore {
+
+class ScriptString {
+public:
+ ScriptString(const char* s) : m_str(s) {}
+
+ operator String() const { return m_str; }
+
+ bool isNull() const { return m_str.isNull(); }
+ size_t size() const { return m_str.length(); }
+
+ ScriptString& operator=(const char* s)
+ {
+ m_str = s;
+ return *this;
+ }
+
+ ScriptString& operator+=(const String& s)
+ {
+ m_str += s;
+ return *this;
+ }
+
+private:
+ String m_str;
+};
+
+} // namespace WebCore
+
+#endif // ScriptString_h
diff --git a/webkit/port/page/inspector/InspectorController.cpp b/webkit/port/page/inspector/InspectorController.cpp
index 25f6311..8c8db35 100644
--- a/webkit/port/page/inspector/InspectorController.cpp
+++ b/webkit/port/page/inspector/InspectorController.cpp
@@ -1634,7 +1634,7 @@ void InspectorController::didFailLoading(DocumentLoader* loader, unsigned long i
}
}
-void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identifier, String& sourceString)
+void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identifier, const String& sourceString)
{
notImplemented();
}
diff --git a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
index 4438ea6..204f9f8 100644
--- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
@@ -1168,3 +1168,17 @@ LayoutTests/fast/css/computed-style.html = FAIL
LayoutTests/fast/repaint/change-transform.html = FAIL
LayoutTests/transitions/transition-drt-api-delay.html = TIMEOUT
LayoutTests/transitions/transition-shorthand-delay.html = TIMEOUT
+
+// MERGE 38653:38729: Expectations changed upstream
+LayoutTests/editing/execCommand/19653-4.html = FAIL
+LayoutTests/editing/deleting/5168598.html = FAIL
+LayoutTests/editing/deleting/delete-link-1.html = FAIL
+LayoutTests/editing/inserting/insert-before-link-1.html = FAIL
+LayoutTests/editing/execCommand/19089.html = FAIL
+LayoutTests/fast/block/positioning/047.html = FAIL
+LayoutTests/fast/text/cg-fallback-bolding.html = FAIL
+
+// MERGE 38653:38729: New tests
+LayoutTests/fast/repaint/outline-child-repaint.html = FAIL
+LayoutTests/http/tests/misc/single-character-pi-stylesheet.xhtml = FAIL
+LayoutTests/fast/workers/stress-js-execution.html = TIMEOUT
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 63b1a17..c635227 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -460,6 +460,7 @@
934CC0040EBFE0E000A658F2 /* chromium_bridge_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 934CC0030EBFE0E000A658F2 /* chromium_bridge_impl.cc */; };
934CC2280EDCC37600A658F2 /* RGBColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 934CC2270EDCC37600A658F2 /* RGBColor.cpp */; };
934CC3590EDCCEFE00A658F2 /* ScriptValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 934CC3570EDCCEFE00A658F2 /* ScriptValue.cpp */; };
+ 934CC5050EDE183200A658F2 /* LinkHash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 934CC5030EDE183200A658F2 /* LinkHash.cpp */; };
93BF8E990EA6B0E50030F05C /* AuthenticationChallengeChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BF8E600EA6AED30030F05C /* AuthenticationChallengeChromium.cpp */; };
93BF8E9A0EA6B0EA0030F05C /* CookieJarChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BF8E610EA6AED30030F05C /* CookieJarChromium.cpp */; };
93BF8E9B0EA6B0EF0030F05C /* DNSChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BF8E620EA6AED30030F05C /* DNSChromium.cpp */; };
@@ -3970,6 +3971,8 @@
934CC2290EDCC38400A658F2 /* RGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RGBColor.h; sourceTree = "<group>"; };
934CC3570EDCCEFE00A658F2 /* ScriptValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptValue.cpp; sourceTree = "<group>"; };
934CC3580EDCCEFE00A658F2 /* ScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptValue.h; sourceTree = "<group>"; };
+ 934CC5030EDE183200A658F2 /* LinkHash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LinkHash.cpp; sourceTree = "<group>"; };
+ 934CC5040EDE183200A658F2 /* LinkHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkHash.h; sourceTree = "<group>"; };
93BF8E5F0EA6AED30030F05C /* AuthenticationChallenge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AuthenticationChallenge.h; path = chromium/AuthenticationChallenge.h; sourceTree = "<group>"; };
93BF8E600EA6AED30030F05C /* AuthenticationChallengeChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AuthenticationChallengeChromium.cpp; path = chromium/AuthenticationChallengeChromium.cpp; sourceTree = "<group>"; };
93BF8E610EA6AED30030F05C /* CookieJarChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CookieJarChromium.cpp; path = chromium/CookieJarChromium.cpp; sourceTree = "<group>"; };
@@ -5630,6 +5633,8 @@
7B5E95300D7F3E94001ECF42 /* Length.h */,
4D1641170EC29D01008F024E /* LengthBox.h */,
4D1641180EC29D01008F024E /* LengthSize.h */,
+ 934CC5030EDE183200A658F2 /* LinkHash.cpp */,
+ 934CC5040EDE183200A658F2 /* LinkHash.h */,
7B5E90D00D7F3CC2001ECF42 /* LocalizedStrings.h */,
7B5E90D20D7F3CC2001ECF42 /* Logging.cpp */,
7B5E90D30D7F3CC2001ECF42 /* Logging.h */,
@@ -8792,6 +8797,7 @@
E45625540E268E87005E4685 /* LayoutState.cpp in Sources */,
B53CCC720E9BD0B300D51C9A /* LegacyWebArchive.cpp in Sources */,
ABBD249F0EB7BFC500BEC658 /* Length.cpp in Sources */,
+ 934CC5050EDE183200A658F2 /* LinkHash.cpp in Sources */,
E45625550E268E87005E4685 /* ListMarkerBox.cpp in Sources */,
E456248B0E268E87005E4685 /* loader.cpp in Sources */,
E45624FC0E268E87005E4685 /* LocalCurrentGraphicsContext.mm in Sources */,