Commit 71efcb77 authored by jl@opera.com's avatar jl@opera.com

IDL: Use raw pointers instead of RawPtr<> for rvalue types

For unconditionally garbage collected types, use of RawPtr<> is
unnecessary.

Review URL: https://codereview.chromium.org/727523002

git-svn-id: svn://svn.chromium.org/blink/trunk@185425 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 0b090563
......@@ -185,7 +185,7 @@ def cpp_type(idl_type, extended_attributes=None, raw_type=False, used_as_rvalue_
return idl_type.implemented_as + '*'
if idl_type.is_interface_type:
implemented_as_class = idl_type.implemented_as
if raw_type:
if raw_type or (used_as_rvalue_type and idl_type.is_garbage_collected):
return implemented_as_class + '*'
new_type = 'Member' if used_in_cpp_sequence else 'RawPtr'
ptr_type = cpp_ptr_type(('PassRefPtr' if used_as_rvalue_type else 'RefPtr'), new_type, idl_type.gc_type)
......
......@@ -53,12 +53,12 @@ public:
void setTestInterfaceOrNullMember(PassRefPtr<TestInterfaceImplementation> value) { m_testInterfaceOrNullMember = value; }
bool hasTestInterfaceGarbageCollectedMember() const { return m_testInterfaceGarbageCollectedMember; }
RawPtr<TestInterfaceGarbageCollected> testInterfaceGarbageCollectedMember() const { return m_testInterfaceGarbageCollectedMember; }
void setTestInterfaceGarbageCollectedMember(RawPtr<TestInterfaceGarbageCollected> value) { m_testInterfaceGarbageCollectedMember = value; }
TestInterfaceGarbageCollected* testInterfaceGarbageCollectedMember() const { return m_testInterfaceGarbageCollectedMember; }
void setTestInterfaceGarbageCollectedMember(TestInterfaceGarbageCollected* value) { m_testInterfaceGarbageCollectedMember = value; }
bool hasTestInterfaceGarbageCollectedOrNullMember() const { return m_testInterfaceGarbageCollectedOrNullMember; }
RawPtr<TestInterfaceGarbageCollected> testInterfaceGarbageCollectedOrNullMember() const { return m_testInterfaceGarbageCollectedOrNullMember; }
void setTestInterfaceGarbageCollectedOrNullMember(RawPtr<TestInterfaceGarbageCollected> value) { m_testInterfaceGarbageCollectedOrNullMember = value; }
TestInterfaceGarbageCollected* testInterfaceGarbageCollectedOrNullMember() const { return m_testInterfaceGarbageCollectedOrNullMember; }
void setTestInterfaceGarbageCollectedOrNullMember(TestInterfaceGarbageCollected* value) { m_testInterfaceGarbageCollectedOrNullMember = value; }
bool hasTestInterfaceWillBeGarbageCollectedMember() const { return m_testInterfaceWillBeGarbageCollectedMember; }
PassRefPtrWillBeRawPtr<TestInterfaceWillBeGarbageCollected> testInterfaceWillBeGarbageCollectedMember() const { return m_testInterfaceWillBeGarbageCollectedMember; }
......
......@@ -535,13 +535,13 @@ TestInterfaceGarbageCollectedOrString::TestInterfaceGarbageCollectedOrString()
{
}
RawPtr<TestInterfaceGarbageCollected> TestInterfaceGarbageCollectedOrString::getAsTestInterfaceGarbageCollected() const
TestInterfaceGarbageCollected* TestInterfaceGarbageCollectedOrString::getAsTestInterfaceGarbageCollected() const
{
ASSERT(isTestInterfaceGarbageCollected());
return m_testInterfaceGarbageCollected;
}
void TestInterfaceGarbageCollectedOrString::setTestInterfaceGarbageCollected(RawPtr<TestInterfaceGarbageCollected> value)
void TestInterfaceGarbageCollectedOrString::setTestInterfaceGarbageCollected(TestInterfaceGarbageCollected* value)
{
ASSERT(isNull());
m_testInterfaceGarbageCollected = value;
......
......@@ -327,8 +327,8 @@ public:
bool isNull() const { return m_type == SpecificTypeNone; }
bool isTestInterfaceGarbageCollected() const { return m_type == SpecificTypeTestInterfaceGarbageCollected; }
RawPtr<TestInterfaceGarbageCollected> getAsTestInterfaceGarbageCollected() const;
void setTestInterfaceGarbageCollected(RawPtr<TestInterfaceGarbageCollected>);
TestInterfaceGarbageCollected* getAsTestInterfaceGarbageCollected() const;
void setTestInterfaceGarbageCollected(TestInterfaceGarbageCollected*);
bool isString() const { return m_type == SpecificTypeString; }
String getAsString() const;
......
......@@ -104,7 +104,7 @@ bool NavigatorBeacon::sendBeacon(ExecutionContext* context, Navigator& navigator
if (data.isArrayBufferView())
allowed = BeaconLoader::sendBeacon(navigator.frame(), allowance, url, data.getAsArrayBufferView()->view(), bytes);
else if (data.isBlob())
allowed = BeaconLoader::sendBeacon(navigator.frame(), allowance, url, data.getAsBlob().get(), bytes);
allowed = BeaconLoader::sendBeacon(navigator.frame(), allowance, url, data.getAsBlob(), bytes);
else if (data.isString())
allowed = BeaconLoader::sendBeacon(navigator.frame(), allowance, url, data.getAsString(), bytes);
else if (data.isFormData())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment