Title: [105847] trunk/Source/WebCore
- Revision
- 105847
- Author
- [email protected]
- Date
- 2012-01-24 21:27:02 -0800 (Tue, 24 Jan 2012)
Log Message
Attempt to fix Mac build after changeset <http://trac.webkit.org/changeset/105843>
(https://bugs.webkit.org/show_bug.cgi?id=75049)
Don't include NotImplemented.h in KURL.h since NotImplemented.h includes Logging.h, which defines
LOG_CHANNEL_PREFIX to be "Log". And this conflicts with the inclusion of WebKitLogging.h in
WebHTMLView.mm (which would have defined LOG_CHANNEL_PREFIX to be "WebKitLog").
* platform/KURL.h:
(WebCore::KURL::innerURL):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (105846 => 105847)
--- trunk/Source/WebCore/ChangeLog 2012-01-25 05:17:25 UTC (rev 105846)
+++ trunk/Source/WebCore/ChangeLog 2012-01-25 05:27:02 UTC (rev 105847)
@@ -1,3 +1,15 @@
+2012-01-24 Daniel Bates <[email protected]>
+
+ Attempt to fix Mac build after changeset <http://trac.webkit.org/changeset/105843>
+ (https://bugs.webkit.org/show_bug.cgi?id=75049)
+
+ Don't include NotImplemented.h in KURL.h since NotImplemented.h includes Logging.h, which defines
+ LOG_CHANNEL_PREFIX to be "Log". And this conflicts with the inclusion of WebKitLogging.h in
+ WebHTMLView.mm (which would have defined LOG_CHANNEL_PREFIX to be "WebKitLog").
+
+ * platform/KURL.h:
+ (WebCore::KURL::innerURL):
+
2012-01-24 Vangelis Kokkevis <[email protected]>
[chromium] Ignore m_skipsDraw in TiledLayerChromium::drawsContent()
Modified: trunk/Source/WebCore/platform/KURL.h (105846 => 105847)
--- trunk/Source/WebCore/platform/KURL.h 2012-01-25 05:17:25 UTC (rev 105846)
+++ trunk/Source/WebCore/platform/KURL.h 2012-01-25 05:27:02 UTC (rev 105847)
@@ -26,7 +26,6 @@
#ifndef KURL_h
#define KURL_h
-#include "NotImplemented.h"
#include "PlatformString.h"
#include "URLString.h"
#include <wtf/HashMap.h>
@@ -223,7 +222,7 @@
#if USE(GOOGLEURL)
const KURL* innerURL() const { return m_url.innerURL(); }
#else
- const KURL* innerURL() const { notImplemented(); return 0; }
+ const KURL* innerURL() const { return 0; }
#endif
#ifndef NDEBUG
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
