diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-12-01 09:22:48 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-01 09:22:48 -0800 |
| commit | f7c6d8fc751a993e19b8ac571877a4c2aa1a6ff8 (patch) | |
| tree | 88e481d34df31f98097d2532988c7fb3cba263ba /WebKit | |
| parent | 0e2d7e7412a32a141274e8a47048d00058bb1d5c (diff) | |
| parent | b2743d4d2391f76c75e6ec82f8fdc185d103b43a (diff) | |
| download | external_webkit-f7c6d8fc751a993e19b8ac571877a4c2aa1a6ff8.zip external_webkit-f7c6d8fc751a993e19b8ac571877a4c2aa1a6ff8.tar.gz external_webkit-f7c6d8fc751a993e19b8ac571877a4c2aa1a6ff8.tar.bz2 | |
Merge "Youtube urls can now start with /v/ or /e/"
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index d622719..ed1da87 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -980,6 +980,7 @@ WTF::PassRefPtr<WebCore::Frame> FrameLoaderClientAndroid::createFrame(const KURL // YouTube flash url path starts with /v/ static const char slash_v_slash[] = { '/', 'v', '/' }; +static const char slash_e_slash[] = { '/', 'e', '/' }; static bool isValidYouTubeVideo(const String& path) { @@ -990,8 +991,10 @@ static bool isValidYouTubeVideo(const String& path) return false; CString str = path.lower().utf8(); const char* data = str.data(); + // Youtube flash url can start with /v/ or /e/ if (memcmp(data, slash_v_slash, sizeof(slash_v_slash)) != 0) - return false; + if (memcmp(data, slash_e_slash, sizeof(slash_e_slash)) != 0) + return false; // Start after /v/ for (unsigned int i = sizeof(slash_v_slash); i < len; i++) { char c = data[i]; |