Diff
Modified: trunk/Source/WebCore/ChangeLog (211888 => 211889)
--- trunk/Source/WebCore/ChangeLog 2017-02-08 19:36:00 UTC (rev 211888)
+++ trunk/Source/WebCore/ChangeLog 2017-02-08 19:42:49 UTC (rev 211889)
@@ -1,3 +1,18 @@
+2017-02-08 Aakash Jain <[email protected]>
+
+ Move private methods from WKContentObservation.h to a separate header file
+ https://bugs.webkit.org/show_bug.cgi?id=167998
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebCore.xcodeproj/project.pbxproj: Added WKContentObservationInternal.h
+ * platform/ios/wak/WKContentObservationInternal.h: Added.
+ * platform/ios/wak/WKContentObservation.h: Moved methods to WKContentObservationInternal.h
+ * platform/ios/wak/WKContentObservation.cpp: Included new header file.
+ * page/DOMTimer.cpp: Same.
+ * page/DOMWindow.cpp: Same.
+ * style/RenderTreeUpdater.cpp: Same.
+
2017-02-08 Youenn Fablet <[email protected]>
RTCPeerConnection constructor can take null as input
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (211888 => 211889)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-02-08 19:36:00 UTC (rev 211888)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-02-08 19:42:49 UTC (rev 211889)
@@ -6550,6 +6550,7 @@
E5BA7D63151437CA00FE1E3F /* LengthFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = E5BA7D62151437CA00FE1E3F /* LengthFunctions.h */; settings = {ATTRIBUTES = (Private, ); }; };
EBF5121C1696496C0056BD25 /* JSTypeConversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBF5121A1696496C0056BD25 /* JSTypeConversions.cpp */; };
EBF5121D1696496C0056BD25 /* JSTypeConversions.h in Headers */ = {isa = PBXBuildFile; fileRef = EBF5121B1696496C0056BD25 /* JSTypeConversions.h */; };
+ ECCDB8811E4B8C5900A1AEA6 /* WKContentObservationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = ECCDB8801E4B8C5900A1AEA6 /* WKContentObservationInternal.h */; };
ED2BA83C09A24B91006C0AC4 /* DocumentMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2BA83B09A24B91006C0AC4 /* DocumentMarker.h */; settings = {ATTRIBUTES = (Private, ); }; };
ED501DC60B249F2900AE18D9 /* EditorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED501DC50B249F2900AE18D9 /* EditorMac.mm */; };
EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -14711,6 +14712,7 @@
EB081CD91696084400553730 /* TypeConversions.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = TypeConversions.idl; sourceTree = "<group>"; };
EBF5121A1696496C0056BD25 /* JSTypeConversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTypeConversions.cpp; sourceTree = "<group>"; };
EBF5121B1696496C0056BD25 /* JSTypeConversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTypeConversions.h; sourceTree = "<group>"; };
+ ECCDB8801E4B8C5900A1AEA6 /* WKContentObservationInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentObservationInternal.h; sourceTree = "<group>"; };
ED2BA83B09A24B91006C0AC4 /* DocumentMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentMarker.h; sourceTree = "<group>"; };
ED501DC50B249F2900AE18D9 /* EditorMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = EditorMac.mm; sourceTree = "<group>"; };
EDE3A4FF0C7A430600956A37 /* ColorMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorMac.h; sourceTree = "<group>"; };
@@ -19975,6 +19977,7 @@
A148328B187F506800DA63A6 /* wak */ = {
isa = PBXGroup;
children = (
+ ECCDB8801E4B8C5900A1AEA6 /* WKContentObservationInternal.h */,
FE69986F192087E7006936BD /* FloatingPointEnvironment.cpp */,
FE699870192087E7006936BD /* FloatingPointEnvironment.h */,
A148328C187F508700DA63A6 /* WAKAppKitStubs.h */,
@@ -27191,6 +27194,7 @@
06E81ED70AB5D5E900C87837 /* LocalCurrentGraphicsContext.h in Headers */,
F5973DE015CFB2030027F804 /* LocaleMac.h in Headers */,
7633A72613D8B33A008501B6 /* LocaleToScriptMapping.h in Headers */,
+ ECCDB8811E4B8C5900A1AEA6 /* WKContentObservationInternal.h in Headers */,
A516E8B7136E04DB0076C3C0 /* LocalizedDateCache.h in Headers */,
935207BE09BD410A00F2038D /* LocalizedStrings.h in Headers */,
BCE1C41B0D982980003B02F2 /* Location.h in Headers */,
Modified: trunk/Source/WebCore/page/DOMTimer.cpp (211888 => 211889)
--- trunk/Source/WebCore/page/DOMTimer.cpp 2017-02-08 19:36:00 UTC (rev 211888)
+++ trunk/Source/WebCore/page/DOMTimer.cpp 2017-02-08 19:42:49 UTC (rev 211889)
@@ -47,6 +47,7 @@
#include "ChromeClient.h"
#include "Frame.h"
#include "WKContentObservation.h"
+#include "WKContentObservationInternal.h"
#endif
namespace WebCore {
Modified: trunk/Source/WebCore/page/DOMWindow.cpp (211888 => 211889)
--- trunk/Source/WebCore/page/DOMWindow.cpp 2017-02-08 19:36:00 UTC (rev 211888)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2017-02-08 19:42:49 UTC (rev 211889)
@@ -142,6 +142,7 @@
#if PLATFORM(IOS)
#include "WKContentObservation.h"
+#include "WKContentObservationInternal.h"
#endif
using namespace Inspector;
Modified: trunk/Source/WebCore/platform/ios/wak/WKContentObservation.cpp (211888 => 211889)
--- trunk/Source/WebCore/platform/ios/wak/WKContentObservation.cpp 2017-02-08 19:36:00 UTC (rev 211888)
+++ trunk/Source/WebCore/platform/ios/wak/WKContentObservation.cpp 2017-02-08 19:42:49 UTC (rev 211889)
@@ -25,6 +25,7 @@
#include "config.h"
#include "WKContentObservation.h"
+#include "WKContentObservationInternal.h"
#if PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/wak/WKContentObservation.h (211888 => 211889)
--- trunk/Source/WebCore/platform/ios/wak/WKContentObservation.h 2017-02-08 19:36:00 UTC (rev 211888)
+++ trunk/Source/WebCore/platform/ios/wak/WKContentObservation.h 2017-02-08 19:42:49 UTC (rev 211889)
@@ -39,21 +39,14 @@
WKContentIndeterminateChange = 1
} WKContentChange;
-bool WKObservingContentChanges(void);
-
WEBCORE_EXPORT void WKStopObservingContentChanges(void);
WEBCORE_EXPORT void WKBeginObservingContentChanges(bool allowsIntedeterminateChanges);
WEBCORE_EXPORT WKContentChange WKObservedContentChange(void);
-void WKSetObservedContentChange(WKContentChange aChange);
WEBCORE_EXPORT int WebThreadCountOfObservedContentModifiers(void);
WEBCORE_EXPORT void WebThreadClearObservedContentModifiers(void);
-bool WebThreadContainsObservedContentModifier(void * aContentModifier);
-void WebThreadAddObservedContentModifier(void * aContentModifier);
-void WebThreadRemoveObservedContentModifier(void * aContentModifier);
-
#ifdef __cplusplus
}
#endif
Copied: trunk/Source/WebCore/platform/ios/wak/WKContentObservationInternal.h (from rev 211888, trunk/Source/WebCore/platform/ios/wak/WKContentObservation.h) (0 => 211889)
--- trunk/Source/WebCore/platform/ios/wak/WKContentObservationInternal.h (rev 0)
+++ trunk/Source/WebCore/platform/ios/wak/WKContentObservationInternal.h 2017-02-08 19:42:49 UTC (rev 211889)
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WKContentObservationInternal_h
+#define WKContentObservationInternal_h
+
+#if TARGET_OS_IPHONE
+
+#import "WKContentObservation.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool WKObservingContentChanges(void);
+void WKSetObservedContentChange(WKContentChange aChange);
+bool WebThreadContainsObservedContentModifier(void * aContentModifier);
+void WebThreadAddObservedContentModifier(void * aContentModifier);
+void WebThreadRemoveObservedContentModifier(void * aContentModifier);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // TARGET_OS_IPHONE
+
+#endif // WKContentObservationInternal_h
Modified: trunk/Source/WebCore/style/RenderTreeUpdater.cpp (211888 => 211889)
--- trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2017-02-08 19:36:00 UTC (rev 211888)
+++ trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2017-02-08 19:42:49 UTC (rev 211889)
@@ -43,6 +43,7 @@
#if PLATFORM(IOS)
#include "WKContentObservation.h"
+#include "WKContentObservationInternal.h"
#endif
namespace WebCore {
