[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[hyatt at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 220f4e6583fdaeb5f39e510f593d1684e5cd5421
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 30 02:46:52 2009 +0000

    Fix a couple of bugs with patterns.  Move the setting of the document URL to before the style
    selector gets constructed so that pattern match testing gets the correct URL.
    
    Reviewed by Jon Honeycutt.
    
    * loader/FrameLoader.cpp:
    (WebCore::FrameLoader::begin):
    * page/UserContentURLPattern.cpp:
    (WebCore::UserContentURLPattern::parse):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48919 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bc3351f..aacc3dc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-29  Dave Hyatt  <hyatt at apple.com>
+
+        Reviewed by Jon Honeycutt.
+
+        Fix a couple of bugs with patterns.  Move the setting of the document URL to before the style
+        selector gets constructed so that pattern match testing gets the correct URL.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::begin):
+        * page/UserContentURLPattern.cpp:
+        (WebCore::UserContentURLPattern::parse):
+
 2009-09-29  Alexey Proskuryakov  <ap at apple.com>
 
         Rubber-stamped by Brady Eidson.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 57cf85a..93a1f10 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -947,9 +947,9 @@ void FrameLoader::begin(const KURL& url, bool dispatch, SecurityOrigin* origin)
     m_outgoingReferrer = ref.string();
     m_URL = url;
 
+    document->setURL(m_URL);
     m_frame->setDocument(document);
 
-    document->setURL(m_URL);
     if (m_decoder)
         document->setDecoder(m_decoder.get());
     if (forcedSecurityOrigin)
diff --git a/WebCore/page/UserContentURLPattern.cpp b/WebCore/page/UserContentURLPattern.cpp
index 1e0f1fa..1960131 100644
--- a/WebCore/page/UserContentURLPattern.cpp
+++ b/WebCore/page/UserContentURLPattern.cpp
@@ -90,7 +90,7 @@ bool UserContentURLPattern::parse(const String& pattern)
         pathStartPos = hostEndPos;
     }
 
-    m_path = pattern.right(pathStartPos);
+    m_path = pattern.right(pattern.length() - pathStartPos);
 
     return true;
 }
@@ -128,10 +128,10 @@ bool UserContentURLPattern::matchesHost(const KURL& test) const
 
 struct MatchTester
 {
-    const String& m_pattern;
+    const String m_pattern;
     unsigned m_patternIndex;
     
-    const String& m_test;
+    const String m_test;
     unsigned m_testIndex;
     
     MatchTester(const String& pattern, const String& test)

-- 
WebKit Debian packaging