Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 1564913003: [DevTools] Shows Manifest file in Sources tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update network-toggle-type-filter-actual.txt Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 842 matching lines...) Expand 10 before | Expand all | Expand 10 after
853 webCoreMessageLevel = WarningMessageLevel; 853 webCoreMessageLevel = WarningMessageLevel;
854 break; 854 break;
855 case WebConsoleMessage::LevelError: 855 case WebConsoleMessage::LevelError:
856 webCoreMessageLevel = ErrorMessageLevel; 856 webCoreMessageLevel = ErrorMessageLevel;
857 break; 857 break;
858 default: 858 default:
859 ASSERT_NOT_REACHED(); 859 ASSERT_NOT_REACHED();
860 return; 860 return;
861 } 861 }
862 862
863 frame()->document()->addConsoleMessage(ConsoleMessage::create(OtherMessageSo urce, webCoreMessageLevel, message.text)); 863 frame()->document()->addConsoleMessage(ConsoleMessage::create(OtherMessageSo urce, webCoreMessageLevel, message.text, message.url));
864 } 864 }
865 865
866 void WebLocalFrameImpl::collectGarbage() 866 void WebLocalFrameImpl::collectGarbage()
867 { 867 {
868 if (!frame()) 868 if (!frame())
869 return; 869 return;
870 if (!frame()->settings()->scriptEnabled()) 870 if (!frame()->settings()->scriptEnabled())
871 return; 871 return;
872 V8GCController::collectGarbage(v8::Isolate::GetCurrent()); 872 V8GCController::collectGarbage(v8::Isolate::GetCurrent());
873 } 873 }
(...skipping 1387 matching lines...) Expand 10 before | Expand all | Expand 10 after
2261 } 2261 }
2262 2262
2263 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const 2263 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const
2264 { 2264 {
2265 if (!frame()) 2265 if (!frame())
2266 return WebSandboxFlags::None; 2266 return WebSandboxFlags::None;
2267 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2267 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2268 } 2268 }
2269 2269
2270 } // namespace blink 2270 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/devtools/protocol.json ('k') | third_party/WebKit/public/web/WebConsoleMessage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698