Attachment 373070 Details for Bug 199286 – Patch

[patch] Patch

bug199286.diff (text/plain), 2.96 KB, created by Basuke Suzuki on 2019-06-27 17:25:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2019-06-27 17:25:53 PDT

Size: 2.96 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 596824f4ada..5b967e5dcb8 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-06-27  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+         Fix build error on WebCore when disabling ENABLE_INDEXED_DATABASE.
>+        https://bugs.webkit.org/show_bug.cgi?id=199286
>+
>+         Unreviewed build fix.
>+
>+         * testing/Internals.cpp: Make method conditional.
>+         * testing/Internals.h: Ditto.
>+         * testing/Internals.idl: Ditto.
>+
> 2019-06-27  Simon Fraser  <simon.fraser@apple.com>
> 
>         REGRESSION (r246869): ASSERTION FAILED: !renderer().hasRepaintLayoutRects() || renderer().repaintLayoutRects().m_repaintRect == renderer().clippedOverflowRectForRepaint(renderer().containerForRepaint())
>diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
>index acde12f8de4..8834ffba44b 100644
>--- a/Source/WebCore/testing/Internals.cpp
>+++ b/Source/WebCore/testing/Internals.cpp
>@@ -97,8 +97,6 @@
> #include "HistoryController.h"
> #include "HistoryItem.h"
> #include "HitTestResult.h"
>-#include "IDBRequest.h"
>-#include "IDBTransaction.h"
> #include "InspectorClient.h"
> #include "InspectorController.h"
> #include "InspectorFrontendClientLocal.h"
>@@ -273,6 +271,11 @@
> #include "PointerLockController.h"
> #endif
> 
>+#if ENABLE(INDEXED_DATABASE)
>+#include "IDBRequest.h"
>+#include "IDBTransaction.h"
>+#endif
>+
> #if USE(QUICK_LOOK)
> #include "MockPreviewLoaderClient.h"
> #include "PreviewLoader.h"
>@@ -2409,10 +2412,12 @@ ExceptionOr<unsigned> Internals::countFindMatches(const String& text, const Vect
>     return document->page()->countFindMatches(text, parsedOptions.releaseReturnValue(), 1000);
> }
> 
>+#if ENABLE(INDEXED_DATABASE)
> unsigned Internals::numberOfIDBTransactions() const
> {
>     return IDBTransaction::numberOfIDBTransactions;
> }
>+#endif
> 
> unsigned Internals::numberOfLiveNodes() const
> {
>diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h
>index bbf1e91f7a0..91a7e004c92 100644
>--- a/Source/WebCore/testing/Internals.h
>+++ b/Source/WebCore/testing/Internals.h
>@@ -388,7 +388,9 @@ public:
>     ExceptionOr<void> insertAuthorCSS(const String&) const;
>     ExceptionOr<void> insertUserCSS(const String&) const;
> 
>+#if ENABLE(INDEXED_DATABASE)
>     unsigned numberOfIDBTransactions() const;
>+#endif
> 
>     unsigned numberOfLiveNodes() const;
>     unsigned numberOfLiveDocuments() const;
>diff --git a/Source/WebCore/testing/Internals.idl b/Source/WebCore/testing/Internals.idl
>index 15256097bcd..dc9752edd55 100644
>--- a/Source/WebCore/testing/Internals.idl
>+++ b/Source/WebCore/testing/Internals.idl
>@@ -423,7 +423,7 @@ enum CompositingPolicy {
>     void beginSimulatedMemoryPressure();
>     void endSimulatedMemoryPressure();
> 
>-    unsigned long numberOfIDBTransactions();
>+    [Conditional=INDEXED_DATABASE] unsigned long numberOfIDBTransactions();
> 
>     unsigned long numberOfLiveNodes();
>     unsigned long numberOfLiveDocuments();

Actions: View | Formatted Diff | Diff

Attachments on bug 199286: 373053 | 373067 | 373070