Changeset 249264 in webkit

Timestamp:

Aug 29, 2019, 6:11:02 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r249223 - Unreviewed. Restabilize non-unified build.

Source/JavaScriptCore:

• runtime/PropertySlot.h:

Source/WebCore:

• inspector/agents/WebConsoleAgent.h:
• loader/ResourceLoadObserver.h:

Location:

releases/WebKitGTK/webkit-2.26/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/PropertySlot.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/agents/WebConsoleAgent.h (modified) (1 diff)
• WebCore/loader/ResourceLoadObserver.h (modified) (2 diffs)

releases/WebKitGTK/webkit-2.26/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-08-28  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Unreviewed. Restabilize non-unified build.
+
+        * runtime/PropertySlot.h:
+
 2019-08-28  Mark Lam  <mark.lam@apple.com>
 

releases/WebKitGTK/webkit-2.26/Source/JavaScriptCore/runtime/PropertySlot.h

@@ -21 +21 @@
 #pragma once
 
+#include "CallFrame.h"
 #include "DOMAnnotation.h"
 #include "JSCJSValue.h"
@@ -30 +31 @@
 
 namespace JSC {
-class ExecState;
 class GetterSetter;
 class JSObject;

releases/WebKitGTK/webkit-2.26/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-28  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Unreviewed. Restabilize non-unified build.
+
+        * inspector/agents/WebConsoleAgent.h:
+        * loader/ResourceLoadObserver.h:
+
 2019-08-28  Simon Fraser  <simon.fraser@apple.com>
 

releases/WebKitGTK/webkit-2.26/Source/WebCore/inspector/agents/WebConsoleAgent.h

@@ -26 +26 @@
 #pragma once
 
+#include "InspectorWebAgentBase.h"
 #include <JavaScriptCore/InspectorConsoleAgent.h>
 

releases/WebKitGTK/webkit-2.26/Source/WebCore/loader/ResourceLoadObserver.h

@@ -30 +30 @@
 #include "ResourceLoadStatistics.h"
 #include "Timer.h"
+#include <pal/SessionID.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
@@ -39 +40 @@
 class WorkQueue;
 class WallTime;
-}
-
-namespace PAL {
-class SessionID;
 }