Diff
Modified: trunk/Source/WebCore/ChangeLog (112730 => 112731)
--- trunk/Source/WebCore/ChangeLog 2012-03-30 22:21:43 UTC (rev 112730)
+++ trunk/Source/WebCore/ChangeLog 2012-03-30 22:23:26 UTC (rev 112731)
@@ -1,3 +1,17 @@
+2012-03-30 Adam Barth <[email protected]>
+
+ Move CPP files related to ResourceHandle to WebCore/platform
+ https://bugs.webkit.org/show_bug.cgi?id=82582
+
+ Reviewed by James Robinson.
+
+ Re-land a tiny piece of http://trac.webkit.org/changeset/112572 in the
+ hopes of not breaking the component build this time.
+
+ * WebCore.gyp/WebCore.gyp:
+ * WebCore.gypi:
+ * platform/chromium/support/WebData.cpp: Copied from Source/WebKit/chromium/src/WebData.cpp.
+
2012-03-30 Andreas Kling <[email protected]>
Kill CSSTimingFunctionValue.
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (112730 => 112731)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-03-30 22:21:43 UTC (rev 112730)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-03-30 22:23:26 UTC (rev 112731)
@@ -102,6 +102,7 @@
'../platform/audio',
'../platform/audio/chromium',
'../platform/chromium',
+ '../platform/chromium/support',
'../platform/graphics',
'../platform/graphics/chromium',
'../platform/graphics/filters',
@@ -1430,7 +1431,11 @@
'type': 'static_library',
'dependencies': [
'webcore_prerequisites',
+ '../../Platform/Platform.gyp/Platform.gyp:webkit_platform',
],
+ 'defines': [
+ 'WEBKIT_IMPLEMENTATION=1',
+ ],
# This is needed for mac because of webkit_system_interface. It'd be nice
# if this hard dependency could be split off the rest.
'hard_dependency': 1,
Modified: trunk/Source/WebCore/WebCore.gypi (112730 => 112731)
--- trunk/Source/WebCore/WebCore.gypi 2012-03-30 22:21:43 UTC (rev 112730)
+++ trunk/Source/WebCore/WebCore.gypi 2012-03-30 22:23:26 UTC (rev 112731)
@@ -3271,6 +3271,7 @@
'platform/chromium/ThemeChromiumMac.mm',
'platform/chromium/TraceEvent.h',
'platform/chromium/WidgetChromium.cpp',
+ 'platform/chromium/support/WebData.cpp',
'platform/cocoa/KeyEventCocoa.h',
'platform/cocoa/KeyEventCocoa.mm',
'platform/efl/ClipboardEfl.cpp',
Copied: trunk/Source/WebCore/platform/chromium/support/WebData.cpp (from rev 112721, trunk/Source/WebKit/chromium/src/WebData.cpp) (0 => 112731)
--- trunk/Source/WebCore/platform/chromium/support/WebData.cpp (rev 0)
+++ trunk/Source/WebCore/platform/chromium/support/WebData.cpp 2012-03-30 22:23:26 UTC (rev 112731)
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2009 Google 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:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * 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.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ * OWNER OR 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.
+ */
+
+#include "config.h"
+#include <public/WebData.h>
+
+#include "SharedBuffer.h"
+
+using namespace WebCore;
+
+namespace WebKit {
+
+class WebDataPrivate : public SharedBuffer {
+};
+
+void WebData::reset()
+{
+ if (m_private) {
+ m_private->deref();
+ m_private = 0;
+ }
+}
+
+void WebData::assign(const WebData& other)
+{
+ WebDataPrivate* p = const_cast<WebDataPrivate*>(other.m_private);
+ if (p)
+ p->ref();
+ assign(p);
+}
+
+void WebData::assign(const char* data, size_t size)
+{
+ assign(static_cast<WebDataPrivate*>(
+ SharedBuffer::create(data, size).leakRef()));
+}
+
+size_t WebData::size() const
+{
+ if (!m_private)
+ return 0;
+ return const_cast<WebDataPrivate*>(m_private)->size();
+}
+
+const char* WebData::data() const
+{
+ if (!m_private)
+ return 0;
+ return const_cast<WebDataPrivate*>(m_private)->data();
+}
+
+WebData::WebData(const PassRefPtr<SharedBuffer>& buffer)
+ : m_private(static_cast<WebDataPrivate*>(buffer.leakRef()))
+{
+}
+
+WebData& WebData::operator=(const PassRefPtr<SharedBuffer>& buffer)
+{
+ assign(static_cast<WebDataPrivate*>(buffer.leakRef()));
+ return *this;
+}
+
+WebData::operator PassRefPtr<SharedBuffer>() const
+{
+ return PassRefPtr<SharedBuffer>(const_cast<WebDataPrivate*>(m_private));
+}
+
+void WebData::assign(WebDataPrivate* p)
+{
+ // p is already ref'd for us by the caller
+ if (m_private)
+ m_private->deref();
+ m_private = p;
+}
+
+} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/ChangeLog (112730 => 112731)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-30 22:21:43 UTC (rev 112730)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-30 22:23:26 UTC (rev 112731)
@@ -1,3 +1,13 @@
+2012-03-30 Adam Barth <[email protected]>
+
+ Move CPP files related to ResourceHandle to WebCore/platform
+ https://bugs.webkit.org/show_bug.cgi?id=82582
+
+ Reviewed by James Robinson.
+
+ * WebKit.gyp:
+ * src/WebData.cpp: Removed.
+
2012-03-30 Mark Pilgrim <[email protected]>
GEOLOCATION should be implemented as Page Supplement
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (112730 => 112731)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-03-30 22:21:43 UTC (rev 112730)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-03-30 22:23:26 UTC (rev 112731)
@@ -525,7 +525,6 @@
'src/WebDOMMouseEvent.cpp',
'src/WebDOMMutationEvent.cpp',
'src/WebDOMStringList.cpp',
- 'src/WebData.cpp',
'src/WebDatabase.cpp',
'src/WebDataSourceImpl.cpp',
'src/WebDataSourceImpl.h',
Deleted: trunk/Source/WebKit/chromium/src/WebData.cpp (112730 => 112731)
--- trunk/Source/WebKit/chromium/src/WebData.cpp 2012-03-30 22:21:43 UTC (rev 112730)
+++ trunk/Source/WebKit/chromium/src/WebData.cpp 2012-03-30 22:23:26 UTC (rev 112731)
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2009 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER OR 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.
- */
-
-#include "config.h"
-#include "platform/WebData.h"
-
-#include "SharedBuffer.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-class WebDataPrivate : public SharedBuffer {
-};
-
-void WebData::reset()
-{
- if (m_private) {
- m_private->deref();
- m_private = 0;
- }
-}
-
-void WebData::assign(const WebData& other)
-{
- WebDataPrivate* p = const_cast<WebDataPrivate*>(other.m_private);
- if (p)
- p->ref();
- assign(p);
-}
-
-void WebData::assign(const char* data, size_t size)
-{
- assign(static_cast<WebDataPrivate*>(
- SharedBuffer::create(data, size).leakRef()));
-}
-
-size_t WebData::size() const
-{
- if (!m_private)
- return 0;
- return const_cast<WebDataPrivate*>(m_private)->size();
-}
-
-const char* WebData::data() const
-{
- if (!m_private)
- return 0;
- return const_cast<WebDataPrivate*>(m_private)->data();
-}
-
-WebData::WebData(const PassRefPtr<SharedBuffer>& buffer)
- : m_private(static_cast<WebDataPrivate*>(buffer.leakRef()))
-{
-}
-
-WebData& WebData::operator=(const PassRefPtr<SharedBuffer>& buffer)
-{
- assign(static_cast<WebDataPrivate*>(buffer.leakRef()));
- return *this;
-}
-
-WebData::operator PassRefPtr<SharedBuffer>() const
-{
- return PassRefPtr<SharedBuffer>(const_cast<WebDataPrivate*>(m_private));
-}
-
-void WebData::assign(WebDataPrivate* p)
-{
- // p is already ref'd for us by the caller
- if (m_private)
- m_private->deref();
- m_private = p;
-}
-
-} // namespace WebKit
