[Pkg-chromium-commit] chromium-browser/chromium-browser.squeeze: 731 fix 70336.patch

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.squeeze
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.squeeze
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 731
Revision Id: iuculano at debian.org-20110306222453-ggthk9eozawxljsd
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : fix 70336.patch

--------------------------------------------------------
  ** Modified :
        - debian/patches/70336.patch

-------------- next part --------------
=== modified file 'debian/patches/70336.patch'
--- a/debian/patches/70336.patch	2011-03-06 18:57:52 +0000
+++ b/debian/patches/70336.patch	2011-03-06 22:24:53 +0000
@@ -52,10 +52,10 @@
          state->hadException = false;
 --- a/src/third_party/WebKit/WebCore/dom/ScriptExecutionContext.cpp
 +++ b/src/third_party/WebKit/WebCore/dom/ScriptExecutionContext.cpp
-@@ -274,3 +274,14 @@ JSC::JSGlobalData* ScriptExecutionContex
- #endif
+@@ -225,6 +225,17 @@ void ScriptExecutionContext::setSecurity
+     m_securityOrigin = securityOrigin;
+ }
  
- } // namespace WebCore
 +bool ScriptExecutionContext::sanitizeScriptError(String& errorMessage, int& lineNumber, String& sourceURL)
 +{
 +    KURL targetURL = completeURL(sourceURL);
@@ -67,6 +67,9 @@
 +    return true;
 +}
 +
+ void ScriptExecutionContext::addTimeout(int timeoutId, DOMTimer* timer)
+ {
+     ASSERT(!m_timeouts.contains(timeoutId));
 --- a/src/third_party/WebKit/WebCore/dom/ScriptExecutionContext.h
 +++ b/src/third_party/WebKit/WebCore/dom/ScriptExecutionContext.h
 @@ -91,6 +91,7 @@ namespace WebCore {